nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 20:44:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'channels/nixpkgs-unstable' into staging

Browse Source
This commit is contained in:
John Ericson 2017-10-18 14:53:30 -04:00
commit ee9c59c5b3
55 changed files with 2549 additions and 1108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/introduction.md
View File

@ -48,6 +48,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org).
The current Nix expressions of the channels are available in the
[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository,
which has branches corresponding to the available channels. There is also the
[Nixpkgs Monitor](http://monitor.nixos.org) which keeps track of updates
and security vulnerabilities.
which has branches corresponding to the available channels.

3
lib/systems/platforms.nix
View File

@ -545,6 +545,9 @@ rec {
# Cavium ThunderX stuff.
PCI_HOST_THUNDER_ECAM y
# Nvidia Tegra stuff.
PCI_TEGRA y
# The default (=y) forces us to have the XHCI firmware available in initrd,
# which our initrd builder can't currently do easily.
USB_XHCI_TEGRA m

1
nixos/modules/config/system-path.nix
View File

@ -31,6 +31,7 @@ let
pkgs.nano
pkgs.ncurses
pkgs.netcat
pkgs.nix-info
config.programs.ssh.package
pkgs.perl
pkgs.procps

9
nixos/modules/services/x11/display-managers/default.nix
View File

@ -92,9 +92,12 @@ let
${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
''}
# Tell systemd about our $DISPLAY. This is needed by the
# ssh-agent unit.
${config.systemd.package}/bin/systemctl --user import-environment DISPLAY
# Tell systemd about our $DISPLAY and $XAUTHORITY.
# This is needed by the ssh-agent unit.
#
# Also tell systemd about the dbus session bus address.
# This is required by user units using the session bus.
${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS
# Load X defaults.
${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}

72
nixos/modules/system/boot/resolved.nix
View File

@ -31,8 +31,15 @@ in
example = [ "example.com" ];
type = types.listOf types.str;
description = ''
A list of domains. These domains are used as search suffixes when resolving single-label host names (domain names which contain no dot), in order to qualify them into fully-qualified domain names (FQDNs).
For compatibility reasons, if this setting is not specified, the search domains listed in /etc/resolv.conf are used instead, if that file exists and any domains are configured in it.
A list of domains. These domains are used as search suffixes
when resolving single-label host names (domain names which
contain no dot), in order to qualify them into fully-qualified
domain names (FQDNs).
</para><para>
For compatibility reasons, if this setting is not specified,
the search domains listed in
<filename>/etc/resolv.conf</filename> are used instead, if
that file exists and any domains are configured in it.
'';
};
@ -41,10 +48,30 @@ in
example = "false";
type = types.enum [ "true" "resolve" "false" ];
description = ''
Controls Link-Local Multicast Name Resolution support (RFC 4794) on the local host.
If true, enables full LLMNR responder and resolver support.
If false, disables both.
If set to "resolve", only resolution support is enabled, but responding is disabled.
Controls Link-Local Multicast Name Resolution support
(RFC 4795) on the local host.
</para><para>
If set to
<variablelist>
<varlistentry>
<term><literal>"true"</literal></term>
<listitem><para>
Enables full LLMNR responder and resolver support.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"false"</literal></term>
<listitem><para>
Disables both.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"resolve"</literal></term>
<listitem><para>
Only resolution support is enabled, but responding is disabled.
</para></listitem>
</varlistentry>
</variablelist>
'';
};
@ -53,9 +80,36 @@ in
example = "true";
type = types.enum [ "true" "allow-downgrade" "false" ];
description = ''
If true all DNS lookups are DNSSEC-validated locally (excluding LLMNR and Multicast DNS). Note that this mode requires a DNS server that supports DNSSEC. If the DNS server does not properly support DNSSEC all validations will fail.
If set to "allow-downgrade" DNSSEC validation is attempted, but if the server does not support DNSSEC properly, DNSSEC mode is automatically disabled. Note that this mode makes DNSSEC validation vulnerable to "downgrade" attacks, where an attacker might be able to trigger a downgrade to non-DNSSEC mode by synthesizing a DNS response that suggests DNSSEC was not supported.
If set to false, DNS lookups are not DNSSEC validated.
If set to
<variablelist>
<varlistentry>
<term><literal>"true"</literal></term>
<listitem><para>
all DNS lookups are DNSSEC-validated locally (excluding
LLMNR and Multicast DNS). Note that this mode requires a
DNS server that supports DNSSEC. If the DNS server does
not properly support DNSSEC all validations will fail.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"allow-downgrade"</literal></term>
<listitem><para>
DNSSEC validation is attempted, but if the server does not
support DNSSEC properly, DNSSEC mode is automatically
disabled. Note that this mode makes DNSSEC validation
vulnerable to "downgrade" attacks, where an attacker might
be able to trigger a downgrade to non-DNSSEC mode by
synthesizing a DNS response that suggests DNSSEC was not
supported.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"false"</literal></term>
<listitem><para>
DNS lookups are not DNSSEC validated.
</para></listitem>
</varlistentry>
</variablelist>
'';
};

4
pkgs/applications/audio/snd/default.nix
View File

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "snd-16.9";
name = "snd-17.8";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
sha256 = "1rw9wrj1f0g413ya32s9mwhvv3c6iasjza22irzf6xlv49b9s5dp";
sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf";
};
nativeBuildInputs = [ pkgconfig ];

30
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -95,10 +95,10 @@
ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ahungry-theme";
version = "1.5.0";
version = "1.6.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ahungry-theme-1.5.0.tar";
sha256 = "0xxzmqawd7cwafzb9z6c7hjlh6adc5sj7hfcqxf30b7b7ragqn19";
url = "https://elpa.gnu.org/packages/ahungry-theme-1.6.0.tar";
sha256 = "1b0x7g753gn7mym8286b937zmxv50jgdish2h6wc05w1g1lygwsz";
};
packageRequires = [ emacs ];
meta = {
@ -201,10 +201,10 @@
}) {};
auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auto-correct";
version = "1.1";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auto-correct-1.1.el";
sha256 = "19i84dqqnxc5v36lsmj9zj8wbmg267c50jvq2i9bb66i9pzd0s53";
url = "https://elpa.gnu.org/packages/auto-correct-1.1.1.el";
sha256 = "141dp4r6v6qs1a58z2qmsyr3pfgp3xji0sqg3fn91q2x4dkvqfzl";
};
packageRequires = [];
meta = {
@ -281,10 +281,10 @@
}) {};
captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "captain";
version = "1.0.2";
version = "1.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/captain-1.0.2.el";
sha256 = "0rslksfwzf5bngmbfgv2mwmls5dpwmz7rs9av9p60y7k848haqf1";
url = "https://elpa.gnu.org/packages/captain-1.0.3.el";
sha256 = "02b4s4pfnwfwc3xgh4g96wrqll37m35dc2x09pjwkdjxglki7045";
};
packageRequires = [];
meta = {
@ -1464,10 +1464,10 @@
}) {};
nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "nlinum";
version = "1.7";
version = "1.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nlinum-1.7.el";
sha256 = "0ql1dbad29sdv3wmv65985g8ibl2176m2hqhjfrppgg34h3w51lz";
url = "https://elpa.gnu.org/packages/nlinum-1.8.el";
sha256 = "0bb1c8a68fzv59q2ri7ppbx8cm7sa8n4hxxvxv73db2dcgwrgwga";
};
packageRequires = [];
meta = {
@ -1556,10 +1556,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20171009";
version = "20171016";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20171009.tar";
sha256 = "03j7vcj5rihhdh1mmy667s1jy39wfs0kf4gc0gmqxldml062gcpm";
url = "https://elpa.gnu.org/packages/org-20171016.tar";
sha256 = "1196kv83p953nd9c5gxkn8ndw2kmm2kfw34dldap6m89khqflz5a";
};
packageRequires = [];
meta = {

1342
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

342
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

@ -1031,12 +1031,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
version = "1.8.3";
version = "1.9.0";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
rev = "998407f56009f441a7cb83d678118d4d8e68f661";
sha256 = "0brggqlij0nacx0yjk10rkn045nk0z03r8llmnqkangjm47ffksr";
rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3";
sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@ -1073,12 +1073,12 @@
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ahungry-theme";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "ahungry";
repo = "color-theme-ahungry";
rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9";
sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn";
rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c";
sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@ -1732,12 +1732,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
version = "0.2.1";
version = "0.3";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
rev = "74b27a95429b3207d0005610d11223728039ba81";
sha256 = "1vp5crdjk3pswn6ip3vgkkc49kqnpayfjgzivfi6fplvhz8klrr1";
rev = "c36eff71af1299cc85c5b6fde3ed15eff8a5bd06";
sha256 = "0dwzb7ix4zia6yzm2m1f0lp8hvv4sv3vvlcbnkmng1anjfmmdrn6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@ -2722,6 +2722,27 @@
license = lib.licenses.free;
};
}) {};
benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "benchstat";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Quasilyte";
repo = "benchstat.el";
rev = "b39a97f3072c2d3c1d3f86790b9e134d05b8d7e6";
sha256 = "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat";
sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9";
name = "benchstat";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/benchstat";
license = lib.licenses.free;
};
}) {};
better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "better-defaults";
@ -3649,12 +3670,12 @@
caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "caml";
version = "4.6.0beta1";
version = "4.6.0beta2";
src = fetchFromGitHub {
owner = "ocaml";
repo = "ocaml";
rev = "185bf236abb2bf10abfd3bff45c723ba10551c80";
sha256 = "0057iik539jfcw287vcacb8hfxdnyfk17cc0ymxxy3sk5y1mfjik";
rev = "817604da4d38362b6b2bd4c7787a5add6741cd21";
sha256 = "1d49kiv9nfr624924qwmf0mfsvja28mvliipaylfbslyb3f7jpkl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@ -4646,12 +4667,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
version = "3.10.0pre1";
version = "3.10.0pre2";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
rev = "ecaddda2fea374089d867ad17b8b4700b189f397";
sha256 = "0j6zzirbx1pcb0hyih77w6dbjmz2axknib7aryrcm7pjwd9d0q23";
rev = "4d04ede10c451ce9a53e8bc34e0d64ab167ad9f9";
sha256 = "1ayc9zm7ll58ykdmyzilml17hapq7gc6ssmjr645sbcj3w70ba71";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -5867,22 +5888,22 @@
license = lib.licenses.free;
};
}) {};
counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
version = "0.0.1";
version = "0.0.2";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555";
sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7";
rev = "f95e4812cd17e5f8069c9209241396780d414680";
sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
name = "counsel-bbdb";
};
packageRequires = [ emacs ivy ];
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/counsel-bbdb";
license = lib.licenses.free;
@ -6416,12 +6437,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
version = "1.2";
version = "1.7";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
rev = "da9852867ac115a54ee350a750d4dae182706117";
sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s";
rev = "25f179b9fb72c1b95a3907aa4b4a44f8d261e45a";
sha256 = "0x1amh0ycjvk218d6cyqizkak47b6r1wczakbfkvnbr0khgkgmr7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@ -7214,12 +7235,12 @@
diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diredfl";
version = "0.3";
version = "0.4";
src = fetchFromGitHub {
owner = "purcell";
repo = "diredfl";
rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c";
sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs";
rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3";
sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl";
@ -8018,12 +8039,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
version = "1.9.11";
version = "2.0.13";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2";
sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l";
rev = "0269de80c97c80134c2fd6127de24dd2c25e5d8e";
sha256 = "1rwwhr5wsvbv06l6cv3mi6g4ka24a6zqxgdx6mi1y3mxj08vmn0f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -10022,12 +10043,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
version = "20.1.1";
version = "20.1.2";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
rev = "69292a11cd4b31fd3ff73b44f28d527f2d16f555";
sha256 = "1v5hna4gf2i9lmiyykbs4w2r1yym2p6jb21nxfa5vlhwq85mldfb";
rev = "919ef5de2858e606d4a9be3e0e995b0802c76e33";
sha256 = "0y76ci80wmzrxvj90bhiz6cvwbis34kcc6dzas9xxsj92b6sh7sk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -11260,12 +11281,12 @@
evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-visual-replace";
version = "0.0.4";
version = "0.0.5";
src = fetchFromGitHub {
owner = "troyp";
repo = "evil-visual-replace";
rev = "9bfbaf71898294e25d588a887fb4753641edfbe9";
sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s";
rev = "163fc827a1ffc106475da470c37fb26f4cc9b008";
sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
@ -11616,12 +11637,12 @@
fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fancy-narrow";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "fancy-narrow";
rev = "cd381c1acd5e0d9b6acd7f3e76c3b1de21e8b6df";
sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
rev = "c0f70b4333d4764323b7154e37a378adb1610ab7";
sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow";
@ -12546,12 +12567,12 @@
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
version = "1.1.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
rev = "29a9eb320d62400564360986f7ad400b74070d8e";
sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@ -17476,12 +17497,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
rev = "93df6808dda8f50da4f435c47763733703905119";
sha256 = "1zyl8x03n9n9sc7bys2nqdmzadl5qrwi01qn1gy48jrkfhgiva6g";
rev = "26749ff9f34b2abddf7c47ff71b1046942e38398";
sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@ -20473,6 +20494,27 @@
license = lib.licenses.free;
};
}) {};
js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-auto-format-mode";
version = "1.0.0";
src = fetchFromGitHub {
owner = "ybiquitous";
repo = "js-auto-format-mode";
rev = "37def86f6e46742ddd5e774778d1c208e7942e0e";
sha256 = "0w92r1lk2xb9lqjnqkxp2zv8rmf71kqyvq4mhaxvz36gm19rz1yd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs";
name = "js-auto-format-mode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/js-auto-format-mode";
license = lib.licenses.free;
};
}) {};
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
@ -21890,12 +21932,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
version = "2.17.0";
version = "2.18.0";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
rev = "0da66c7c01e8fea952faa3e21a34664b37918400";
sha256 = "0xzqg5nrrsapxsnyk919w5nb6pad7w06f0c266x9cs4m9wih82wk";
rev = "619a1b35b9a8151703421e2716ea0409162a4b84";
sha256 = "0dakcsdn6pax0q6wdvg23fg327nk35z3lzk2vlvc76780d0fi85h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@ -22869,12 +22911,12 @@
marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "marshal";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "sigma";
repo = "marshal.el";
rev = "92caeddbb3c3de61707d12db62b9915e271807b7";
sha256 = "0fajz4k3p2ki237jz0c3wfab5272fvvw9vzxzfivpmpcnws6gbn6";
rev = "3c15edd8ddfb29a5151182983392ee831826d9d0";
sha256 = "1a17csrp7ni4if8l5bvxb2024fav28vjii1qqym3gcalw0jg6ink";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
@ -23181,6 +23223,27 @@
license = lib.licenses.free;
};
}) {};
meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "meson-mode";
version = "0.1";
src = fetchFromGitHub {
owner = "wentasah";
repo = "meson-mode";
rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee";
sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80";
name = "meson-mode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/meson-mode";
license = lib.licenses.free;
};
}) {};
meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "meta-presenter";
@ -23687,12 +23750,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36";
sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r";
rev = "019e07947426f0192fc3458f3f72c19031b607de";
sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@ -25258,12 +25321,12 @@
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
version = "1.5.7";
version = "1.5.8";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8";
sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4";
rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674";
sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@ -25342,12 +25405,12 @@
omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-scratch";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-scratch.el";
rev = "e73d4c3f9e0d4774261496d018cf944a254e06f5";
sha256 = "0rmpnqb16v0hxfhw4lq2d27vhfhqv1mh8whq2l718l8c280yfn6k";
rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d";
sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@ -25388,8 +25451,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
rev = "40b6251a96057c80a958362a0886c06eea5bfd62";
sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6";
rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a";
sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@ -27052,12 +27115,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
version = "0.2.1";
version = "0.2.3";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
rev = "a0a1bb95d12fd45e3e111d29fd49b8171db1109b";
sha256 = "00pn5adk6qw4lpfsw1lxhp0466q3sndgqgrh4y821lbxssx89lh7";
rev = "37d7a0d3d633542de02b4c415b1931ae93dd8ff6";
sha256 = "09vgv82ws53wgd1inyin8y3v2yixg74w6bnr7awry4jmxbb15kz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@ -27388,12 +27451,12 @@
paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
melpaBuild {
pname = "paradox";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
rev = "17a6690d42a1e854ec270ed930c7494077570fc8";
sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc";
rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245";
sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@ -28618,6 +28681,36 @@
license = lib.licenses.free;
};
}) {};
pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
melpaBuild {
pname = "pocket-reader";
version = "0.1";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "pocket-reader.el";
rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd";
sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf";
name = "pocket-reader";
};
packageRequires = [
dash
emacs
kv
org-web-tools
ov
pocket-lib
rainbow-identifiers
s
];
meta = {
homepage = "https://melpa.org/#/pocket-reader";
license = lib.licenses.free;
};
}) {};
point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "point-pos";
@ -29163,6 +29256,27 @@
license = lib.licenses.free;
};
}) {};
projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-trailblazer";
version = "0.2.0";
src = fetchFromGitHub {
owner = "micdahl";
repo = "projectile-trailblazer";
rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd";
sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer";
sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4";
name = "projectile-trailblazer";
};
packageRequires = [ emacs f inf-ruby inflections projectile rake ];
meta = {
homepage = "https://melpa.org/#/projectile-trailblazer";
license = lib.licenses.free;
};
}) {};
projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "projectile-variable";
@ -30846,12 +30960,12 @@
rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rich-minority";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "rich-minority";
rev = "311ac8ee54078f95b7279e532da6cf5a2afb4125";
sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4";
sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@ -31182,12 +31296,12 @@
ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-hash-syntax";
version = "0.4";
version = "0.5";
src = fetchFromGitHub {
owner = "purcell";
repo = "ruby-hash-syntax";
rev = "a0362c2dc449a1e67ef75ad736bcf8b03b083226";
sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
rev = "bc05c3130a5d3237f04c6064297e56de5f73887d";
sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
@ -31852,12 +31966,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
version = "2.1";
version = "3.1";
src = fetchFromGitHub {
owner = "voloyev";
repo = "sexy-monochrome-theme";
rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96";
sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg";
rev = "f64714a176d9212c9fa82355dd8ec89587ce13f0";
sha256 = "17ahrdyk2v7vz13b4934xn8xjza4b7bfrkq8n42frq3pc8mgwqfd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
@ -32731,6 +32845,27 @@
license = lib.licenses.free;
};
}) {};
smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-semicolon";
version = "0.2.1";
src = fetchFromGitHub {
owner = "iquiw";
repo = "smart-semicolon";
rev = "c11096679dbed3875c37413337ee490ee7951b63";
sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon";
sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0";
name = "smart-semicolon";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/smart-semicolon";
license = lib.licenses.free;
};
}) {};
smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-tabs-mode";
@ -34955,6 +35090,27 @@
license = lib.licenses.free;
};
}) {};
tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tickscript-mode";
version = "0.1";
src = fetchFromGitHub {
owner = "msherry";
repo = "tickscript-mode";
rev = "e0184d7f954ce8d2d2ff4d34610658b0ce88859c";
sha256 = "08ydrg3z3kvb54kxzlhiljrwil8681akp1lihkiplxdvrvg24934";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54";
name = "tickscript-mode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/tickscript-mode";
license = lib.licenses.free;
};
}) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
@ -35167,12 +35323,12 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
version = "1.11.5";
version = "1.11.7";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a";
sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs";
rev = "fa064dfba2e98c23f2c79639347adcb601590df3";
sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
@ -35188,12 +35344,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
version = "1.11.5";
version = "1.11.7";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a";
sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs";
rev = "fa064dfba2e98c23f2c79639347adcb601590df3";
sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@ -35209,12 +35365,12 @@
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
melpaBuild {
pname = "treemacs-projectile";
version = "1.11.5";
version = "1.11.7";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a";
sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs";
rev = "fa064dfba2e98c23f2c79639347adcb601590df3";
sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
@ -35761,12 +35917,12 @@
unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unify-opening";
version = "1.1.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "unify-opening";
rev = "2812e43029cab7183197ce5e3c9577856bfd22c5";
sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf";
sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@ -36832,12 +36988,12 @@
whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whizzml-mode";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "whizzml";
repo = "whizzml-mode";
rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f";
sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa";
rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22";
sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@ -37066,8 +37222,8 @@
version = "0.9.6";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
rev = "4d41c0814bbc";
sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj";
rev = "b56ca38c1447";
sha256 = "10vn8i1ndyn2211ddy0z8vyv6y4myh2wd3xsk5nwx7qjlhkpjg6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View File

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20171009";
version = "20171016";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20171009.tar";
sha256 = "1v8y4gmfrnzsdy9mspqzn157da7lb7z2wvp95r1iywf64325gv5s";
url = "http://orgmode.org/elpa/org-20171016.tar";
sha256 = "1v89wl8xlxavvv2kdd5vms0rwpqaw2x73q0162ybxmrzf4a5f5mw";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20171009";
version = "20171016";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20171009.tar";
sha256 = "0iv1f7hbqh46mymk097x69q00pqpbkcyzjfd9a9slf5xkw1g1lk1";
url = "http://orgmode.org/elpa/org-plus-contrib-20171016.tar";
sha256 = "0xy2xrndlhs4kyvh6mmv24dnh3fn5p63d2gaimnrypf1p8znwzh4";
};
packageRequires = [];
meta = {

4
pkgs/applications/editors/emacs/macport.nix
View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
emacsVersion = "25.3";
emacsName = "emacs-${emacsVersion}";
macportVersion = "6.7";
macportVersion = "6.8";
name = "emacs-mac-${emacsVersion}-${macportVersion}";
builder = ./builder.sh;
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
sha256 = "0fivrasvigszr31w8wg8kb808hmqv2cc8klrm9n0hdxwg5fs5d0y";
sha256 = "167lgl76jz1bq6whb9ajshhw5v9bbw9ci4lji4qlmd5nrwnb7kqg";
};
hiresSrc = fetchurl {

24
pkgs/applications/misc/bb/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }:
stdenv.mkDerivation rec {
name = "bb-${version}";
version = "1.3rc1";
src = fetchurl {
url = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz";
sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
};
buildInputs = [
aalib ncurses libmikmod
xorg.libXau xorg.libXdmcp xorg.libX11
];
meta = with stdenv.lib; {
homepage = http://aa-project.sourceforge.net/bb;
description = "AA-lib demo";
license = licenses.gpl2;
maintainers = maintainers.rnhmjoj;
platforms = platforms.unix;
};
}

4
pkgs/applications/misc/hyper/default.nix
View File

@ -12,11 +12,11 @@ let
];
in
stdenv.mkDerivation rec {
version = "1.4.3";
version = "1.4.8";
name = "hyper-${version}";
src = fetchurl {
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
sha256 = "0f0qxhvwwcpsjnv1rgmdzdl5jwfprnd7fjnd6sb8liq250pij3ld";
sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51";
};
buildInputs = [ dpkg ];
unpackPhase = ''

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -94,12 +94,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "27.0.0.159";
version = "27.0.0.170";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "00nbn8nv6irsak05cwlx9x8q0n91kbjxnkdg4c66ilx2gq5wrz05";
sha256 = "191gqgpsl5dl39m04mm5bkkbv5m5npg91anbwsvzb29cs2yqq95m";
stripRoot = false;
};

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "27.0.0.159";
version = "27.0.0.170";
src = fetchurl {
url =
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"0fgz1aszihjrxpzyrs29wr11imfgnyfb2ca9c1i3n6k9wpwv926p"
"018dx7vpl8ha5c7wlcvh422ll5f0zb9cb77cmylbai84dwb9wrvg"
else
"052dx764b6cfbc7mkxckcr3hbwd5b7l98cp3jqmddkllv4w4h6dp"
"09qd15khv914xcr9c4vy770mm33bl6szfy334ddb5gv6dh6h2gd8"
else
if arch == "x86_64" then
"1p136zn059hp59j0llk7rfsybjx51qjz2h5sd4xl8zqbs0szynid"
"0hyc25ygxrp8k0w1xmg5wx1d2l959glc23bjswf30agwlpyn2rwn"
else
"06l8rjnhpqip6ikc97rf3zsgmy381q4wgzyl9rsjwlvhpgqdlhrl";
"1jsq8lgs4jvplwkkb2pngnr7vq9xv9knajk2247qpraq51fq2vd0";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "27.0.0.159";
version = "27.0.0.170";
src = fetchurl {
url =
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"0h9jpkdkf4kvr2sg61r6pkwcdyf4z3qdj0nlnm27whac9w56jjpj"
"1mz1sxg9wvkgpcwmvbgn1s8x01lx9vkm7wbldfn66j230yrx2mlh"
else
"013a0ar5afm62bk7f4s89235bx36n75z65b3afv941jajijiacc9";
"1ysdl7j7d9fqy509wz0gq2sray08j1v3bv9zwd6nzplgd60qdrva";
};
nativeBuildInputs = [ unzip ];

4
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -29,12 +29,12 @@ let
in buildPythonApplication rec {
name = "qutebrowser-${version}";
version = "1.0.1";
version = "1.0.2";
namePrefix = "";
src = fetchurl {
url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
sha256 = "1gphn8a0xfy5iqiznvgd6fbbzp7r5sp697ayfwnvllvmbr5az9vs";
sha256 = "093nmvl9x3ykrpmvnmx98g9npg4wmq0mmf7qzgbzmg93dnyq2cpk";
};
# Needs tox

18
pkgs/applications/science/electronics/gtkwave/default.nix
View File

@ -1,10 +1,12 @@
{stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
stdenv.mkDerivation rec {
name = "gtkwave-3.3.70";
name = "gtkwave-${version}";
version = "3.3.86";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz";
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
sha256 = "1l1hikhhk7drkbpdmj9qg7c3lj1b86z7f5rnwagrql8bss2j80fx";
};
nativeBuildInputs = [ pkgconfig ];
@ -13,10 +15,10 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ];
meta = {
description = "Wave viewer for Unix and Win32";
homepage = http://gtkwave.sourceforge.net;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
description = "VCD/Waveform viewer for Unix and Win32";
homepage = http://gtkwave.sourceforge.net;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice viric ];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/applications/version-management/git-and-tools/ghq/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "ghq-${version}";
version = "0.7.4";
version = "0.8.0";
goPackagePath = "github.com/motemen/ghq";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "motemen";
repo = "ghq";
rev = "v${version}";
sha256 = "0x2agr7why8mcjhq2j8kh8d0gbwx2333zgf1ribc9fn14ryas1j2";
sha256 = "1gdi0sbmq9kfi8hzd0dpgmhbmcf8q93jy3x08dd8smayrhbbwmld";
};
goDeps = ./deps.nix;

16
pkgs/applications/version-management/git-and-tools/ghq/deps.nix
View File

@ -1,11 +1,11 @@
[
{
goPackagePath = "github.com/codegangsta/cli";
goPackagePath = "github.com/daviddengcn/go-colortext";
fetch = {
type = "git";
url = "https://github.com/codegangsta/cli";
rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
url = "https://github.com/daviddengcn/go-colortext";
rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a";
sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf";
};
}
{
@ -27,12 +27,12 @@
};
}
{
goPackagePath = "github.com/daviddengcn/go-colortext";
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/daviddengcn/go-colortext";
rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a";
sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf";
url = "https://github.com/urfave/cli";
rev = "f017f86fccc5a039a98f23311f34fdf78b014f78";
sha256 = "1biq4wl4z8l0ycinb39mfavnk13d0qnqqdplqybl7klxmk67cvhv";
};
}
]

1
pkgs/applications/video/mpv/default.nix
View File

@ -108,6 +108,7 @@ in stdenv.mkDerivation rec {
(enableFeature dvdnavSupport "dvdnav")
(enableFeature vaapiSupport "vaapi")
(enableFeature waylandSupport "wayland")
(enableFeature stdenv.isLinux "dvbin")
];
configurePhase = ''

3
pkgs/development/compilers/arachne-pnr/default.nix
View File

@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8";
};
enableParallelBuilding = true;
makeFlags =
[ "DESTDIR=$(out)" "ICEBOX=${icestorm}/share/icebox"
[ "PREFIX=$(out)" "ICEBOX=${icestorm}/share/icebox"
];
meta = {

86
pkgs/development/compilers/ghcjs/ghcjs-head.patch Normal file
View File

@ -0,0 +1,86 @@
diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
index db8b12e..7b815c5 100644
--- a/src-bin/Boot.hs
+++ b/src-bin/Boot.hs
@@ -540,9 +540,7 @@ initPackageDB :: B ()
initPackageDB = do
msg info "creating package databases"
initDB "--global" <^> beLocations . blGlobalDB
- traverseOf_ _Just initUser <^> beLocations . blUserDBDir
where
- initUser dir = rm_f (dir </> "package.conf") >> initDB "--user" (dir </> "package.conf.d")
initDB dbName db = do
rm_rf db >> mkdir_p db
ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do
msgD info $ "preparing development boot tree"
checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
testGit "ghcjs-boot" >>= \case
- Just False -> failWith "ghcjs-boot already exists and is not a git repository"
- Just True -> do
- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning"
- rm_rf "ghcjs-boot"
+ Just _ -> do
+ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot"
initGhcjsBoot
Nothing -> do
msgD info "cloning ghcjs-boot git repository"
initGhcjsBoot
checkpoint' "shims-git" "shims repository already cloned" $ do
testGit "shims" >>= \case
- Just False -> failWith "shims already exists and is not a git repository"
- Just True -> do
- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning"
- rm_rf "shims"
- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
+ Just _ -> do
+ msgD info "shims repository already exists; moving on"
Nothing -> do
msgD info "cloning shims git repository"
cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
where
initGhcjsBoot = sub $ do
- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev
cd "ghcjs-boot"
- git_ ["submodule", "update", "--init", "--recursive"]
mapM_ patchPackage =<< allPackages
preparePrimops
buildGenPrim
@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
, "--avoid-reinstalls"
, "--builddir", "dist"
, "--with-compiler", ghcjs ^. pgmLocText
+ , "--with-gcc", "@CC@"
, "--with-hc-pkg", ghcjsPkg ^. pgmLocText
- , "--prefix", toTextI instDir
+ , "--prefix", "@PREFIX@"
+ , "--libdir", "$prefix/lib/$compiler"
+ , "--libsubdir", "$pkgid"
, bool haddock "--enable-documentation" "--disable-documentation"
, "--haddock-html"
--- workaround for hoogle support being broken in haddock for GHC 7.10RC1
-#if !(__GLASGOW_HASKELL__ >= 709)
, "--haddock-hoogle"
-#endif
, "--haddock-hyperlink-source"
-- don't slow down Windows builds too much, on other platforms we get this more
-- or less for free, thanks to dynamic-too
diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
index 33a401f..e2405a7 100644
--- a/src/Compiler/Info.hs
+++ b/src/Compiler/Info.hs
@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
-- | the directory to use if started without -B flag
getDefaultTopDir :: IO FilePath
-getDefaultTopDir = do
- appdir <- getAppUserDataDirectory "ghcjs"
- return (appdir </> subdir </> "ghcjs")
- where
- targetARCH = arch
- targetOS = os
- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
getDefaultLibDir :: IO FilePath
getDefaultLibDir = getDefaultTopDir

18
pkgs/development/compilers/ghcjs/ghcjs.patch
View File

@ -46,6 +46,24 @@ index db8b12e..7b815c5 100644
mapM_ patchPackage =<< allPackages
preparePrimops
buildGenPrim
@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do
globalFlags <- cabalGlobalFlags
flags <- cabalInstallFlags (length pkgs == 1)
let args = globalFlags ++ ("install" : pkgs) ++
- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages
+ [ "--allow-boot-library-installs"
] ++ map ("--configure-option="<>) configureOpts ++ flags
checkInstallPlan pkgs args
cabal_ args
@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do
-- uses somewhat fragile parsing of --dry-run output, find a better way
checkInstallPlan :: [Package] -> [Text] -> B ()
checkInstallPlan pkgs opts = do
- plan <- cabal (opts ++ ["-v2", "--dry-run"])
+ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"])
when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan)
where
hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls
@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
, "--avoid-reinstalls"
, "--builddir", "dist"

2
pkgs/development/compilers/ghcjs/head.nix
View File

@ -45,4 +45,6 @@ bootPkgs.callPackage ./base.nix {
"unix"
];
stage2 = import ./head_stage2.nix;
patches = [ ./ghcjs-head.patch ];
}

8
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -891,9 +891,8 @@ self: super: {
# https://github.com/danidiaz/tailfile-hinotify/issues/2
tailfile-hinotify = dontCheck super.tailfile-hinotify;
# build liquidhaskell with the proper (old) aeson version
liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; };
aeson_0_11_3_0 = super.aeson_0_11_3_0.override { base-orphans = self.base-orphans_0_5_4; };
# build liquidhaskell with the proper (new) aeson version
liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_2_0; };
# Test suite fails: https://github.com/lymar/hastache/issues/46.
# Don't install internal mkReadme tool.
@ -967,4 +966,7 @@ self: super: {
# https://github.com/mgajda/json-autotype/issues/15
json-autotype = doJailbreak super.json-autotype;
# Depends on broken fluid.
fluid-idl-http-client = markBroken super.fluid-idl-http-client;
}

52
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 9.8
# LTS Haskell 9.9
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -191,7 +191,7 @@ default-package-overrides:
- async-dejafu ==0.1.3.0
- async-extra ==0.2.0.0
- async-refresh ==0.2.0.2
- async-refresh-tokens ==0.3.0.0
- async-refresh-tokens ==0.3.0.1
- async-timer ==0.1.4.0
- atom-basic ==0.2.5
- atom-conduit ==0.4.0.3
@ -225,7 +225,7 @@ default-package-overrides:
- base64-bytestring ==1.0.0.1
- base64-string ==0.2
- base-compat ==0.9.3
- basement ==0.0.2
- basement ==0.0.3
- base-noprelude ==4.9.1.0
- base-orphans ==0.6
- base-prelude ==1.2.0.1
@ -730,7 +730,7 @@ default-package-overrides:
- forma ==0.2.0
- format-numbers ==0.1.0.0
- formatting ==6.2.5
- foundation ==0.0.15
- foundation ==0.0.16
- Frames ==0.1.9
- free ==4.12.4
- freenect ==1.2.1
@ -773,7 +773,7 @@ default-package-overrides:
- ghc-tcplugins-extra ==0.2.1
- ghc-typelits-extra ==0.2.3
- ghc-typelits-knownnat ==0.3.1
- ghc-typelits-natnormalise ==0.5.3
- ghc-typelits-natnormalise ==0.5.4
- gi-atk ==2.0.14
- gi-cairo ==1.0.14
- gi-gdk ==3.0.14
@ -962,7 +962,7 @@ default-package-overrides:
- happstack-jmacro ==7.0.12
- happstack-server ==7.4.6.4
- happstack-server-tls ==7.1.6.4
- happy ==1.19.7
- happy ==1.19.8
- harp ==0.4.3
- hasbolt ==0.1.3.0
- hashable ==1.2.6.1
@ -995,11 +995,11 @@ default-package-overrides:
- haskell-tools-refactor ==0.8.1.0
- haskell-tools-rewrite ==0.8.1.0
- haskintex ==0.7.0.1
- hasmin ==0.3.2.4
- hasmin ==0.3.3
- hasql ==0.19.18.2
- hasql-migration ==0.1.3
- hasql-pool ==0.4.1
- hasql-transaction ==0.5
- hasql-transaction ==0.5.1
- hastache ==0.6.1
- hasty-hamiltonian ==1.3.0
- HaTeX ==3.17.3.1
@ -1692,7 +1692,7 @@ default-package-overrides:
- postgresql-simple ==0.5.3.0
- postgresql-simple-migration ==0.1.11.0
- postgresql-simple-opts ==0.2.0.2
- postgresql-simple-queue ==0.5.0.1
- postgresql-simple-queue ==0.5.1.1
- postgresql-simple-url ==0.2.0.0
- postgresql-transactional ==1.1.1
- postgresql-typed ==0.5.1
@ -1851,7 +1851,7 @@ default-package-overrides:
- rest-wai ==0.2.0.1
- result ==0.2.6.0
- rethinkdb ==2.2.0.10
- rethinkdb-client-driver ==0.0.24
- rethinkdb-client-driver ==0.0.25
- retry ==0.7.4.2
- rev-state ==0.1.2
- rfc5051 ==0.1.0.3
@ -2326,7 +2326,7 @@ default-package-overrides:
- versions ==3.1.1
- vhd ==0.2.2
- ViennaRNAParser ==1.3.2
- viewprof ==0.0.0.9
- viewprof ==0.0.0.10
- vinyl ==0.5.3
- vinyl-utils ==0.3.0.0
- void ==0.7.2
@ -2517,10 +2517,8 @@ default-package-overrides:
extra-packages:
- aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier
- aeson < 1 # required by liquidhaskell-0.8.0.0
- aeson-pretty < 0.8 # required by elm compiler
- apply-refact < 0.4 # newer versions don't work with GHC 8.0.x
- base-orphans < 0.6 # required by liquidhaskell-0.8.0.0
- binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers
- binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers
- Cabal == 1.18.* # required for cabal-install et al on old GHC versions
@ -3497,6 +3495,9 @@ dont-distribute-packages:
collections: [ i686-linux, x86_64-linux, x86_64-darwin ]
colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ]
color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ]
colorless-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
colorless-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ]
colorless: [ i686-linux, x86_64-linux, x86_64-darwin ]
colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ]
colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ]
coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3940,6 +3941,7 @@ dont-distribute-packages:
docker: [ i686-linux, x86_64-linux, x86_64-darwin ]
dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ]
doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ]
doctest-driver-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ]
docvim: [ i686-linux, x86_64-linux, x86_64-darwin ]
DOH: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4295,6 +4297,7 @@ dont-distribute-packages:
fordo: [ i686-linux, x86_64-linux, x86_64-darwin ]
forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ]
forest-fire: [ i686-linux, x86_64-linux, x86_64-darwin ]
forger: [ i686-linux, x86_64-linux, x86_64-darwin ]
forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
ForkableT: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4553,7 +4556,9 @@ dont-distribute-packages:
goatee: [ i686-linux, x86_64-linux, x86_64-darwin ]
gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-games: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-youtube: [ i686-linux, x86_64-linux, x86_64-darwin ]
gooey: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4603,6 +4608,7 @@ dont-distribute-packages:
graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ]
graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ]
graphite: [ i686-linux, x86_64-linux, x86_64-darwin ]
graphql-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ]
graql: [ i686-linux, x86_64-linux, x86_64-darwin ]
grasp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4655,7 +4661,8 @@ dont-distribute-packages:
GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtksourceview3: [ "x86_64-darwin" ]
gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtksourceview3: [ i686-linux, x86_64-linux, x86_64-darwin ]
guarded-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ]
guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ]
guid: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4724,6 +4731,7 @@ dont-distribute-packages:
hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-shortcode: [ i686-linux, x86_64-linux, x86_64-darwin ]
halberd: [ i686-linux, x86_64-linux, x86_64-darwin ]
halfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5018,6 +5026,7 @@ dont-distribute-packages:
herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ]
hesh: [ i686-linux, x86_64-linux, x86_64-darwin ]
hesql: [ i686-linux, x86_64-linux, x86_64-darwin ]
heterolist: [ i686-linux, x86_64-linux, x86_64-darwin ]
hetris: [ i686-linux, x86_64-linux, x86_64-darwin ]
heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ]
hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6019,6 +6028,7 @@ dont-distribute-packages:
log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-warper: [ i686-linux, x86_64-linux, x86_64-darwin ]
log2json: [ i686-linux, x86_64-linux, x86_64-darwin ]
log: [ i686-linux, x86_64-linux, x86_64-darwin ]
logentries: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6073,6 +6083,7 @@ dont-distribute-packages:
lvish: [ i686-linux, x86_64-linux, x86_64-darwin ]
lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
lxc: [ i686-linux, x86_64-linux, x86_64-darwin ]
lxd-client-config: [ i686-linux, x86_64-linux, x86_64-darwin ]
lxd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
lye: [ i686-linux, x86_64-linux, x86_64-darwin ]
Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6195,6 +6206,7 @@ dont-distribute-packages:
Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ]
metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
metronome: [ i686-linux, x86_64-linux, x86_64-darwin ]
mezzo: [ i686-linux, x86_64-linux, x86_64-darwin ]
mezzolens: [ i686-linux, x86_64-linux, x86_64-darwin ]
mgeneric: [ i686-linux, x86_64-linux, x86_64-darwin ]
Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6425,6 +6437,7 @@ dont-distribute-packages:
neet: [ i686-linux, x86_64-linux, x86_64-darwin ]
nehe-tuts: [ i686-linux, x86_64-linux, x86_64-darwin ]
neither: [ i686-linux, x86_64-linux, x86_64-darwin ]
neko-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
Neks: [ i686-linux, x86_64-linux, x86_64-darwin ]
nemesis-titan: [ i686-linux, x86_64-linux, x86_64-darwin ]
nerf: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6855,6 +6868,7 @@ dont-distribute-packages:
posix-timer: [ "x86_64-darwin" ]
posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ]
postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgres-embedded: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7036,6 +7050,7 @@ dont-distribute-packages:
rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
raketka: [ i686-linux, x86_64-linux, x86_64-darwin ]
rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ]
rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ]
ralist: [ i686-linux, x86_64-linux, x86_64-darwin ]
rallod: [ i686-linux, x86_64-linux, x86_64-darwin ]
raml: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7109,6 +7124,7 @@ dont-distribute-packages:
record: [ i686-linux, x86_64-linux, x86_64-darwin ]
records-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
records: [ i686-linux, x86_64-linux, x86_64-darwin ]
recursion-schemes-ext: [ i686-linux, x86_64-linux, x86_64-darwin ]
recursors: [ i686-linux, x86_64-linux, x86_64-darwin ]
reddit: [ i686-linux, x86_64-linux, x86_64-darwin ]
redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7252,6 +7268,7 @@ dont-distribute-packages:
robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ]
roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
roc-cluster: [ i686-linux, x86_64-linux, x86_64-darwin ]
rocksdb-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ]
roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ]
roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7410,6 +7427,7 @@ dont-distribute-packages:
seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ]
sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
sequor: [ i686-linux, x86_64-linux, x86_64-darwin ]
serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ]
serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ]
serv: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7422,6 +7440,7 @@ dont-distribute-packages:
servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7436,6 +7455,7 @@ dont-distribute-packages:
servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-rawm: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7671,6 +7691,7 @@ dont-distribute-packages:
spata: [ i686-linux, x86_64-linux, x86_64-darwin ]
special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ]
specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
species: [ i686-linux, x86_64-linux, x86_64-darwin ]
speculate: [ "x86_64-darwin" ]
spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ]
sphero: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7957,6 +7978,7 @@ dont-distribute-packages:
tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ]
texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8142,6 +8164,7 @@ dont-distribute-packages:
tx: [ i686-linux, x86_64-linux, x86_64-darwin ]
txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ]
TYB: [ i686-linux, x86_64-linux, x86_64-darwin ]
tyfam-witnesses: [ i686-linux, x86_64-linux, x86_64-darwin ]
typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8615,6 +8638,7 @@ dont-distribute-packages:
yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-dynamic-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-frontend-pango: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ]

4
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -503,4 +503,8 @@ self: super: builtins.intersectAttrs super {
# Written against the 6.X series of megaparsec
htoml-megaparsec = super.htoml-megaparsec.override { megaparsec = self.megaparsec_6_2_0; };
# Break cyclic reference that results in an infinite recursion.
partial-semigroup = dontCheck super.partial-semigroup;
}

1110
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

1
pkgs/development/libraries/db/db-5.3.nix
View File

@ -3,6 +3,5 @@
import ./generic.nix (args // rec {
version = "5.3.28";
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
license = stdenv.lib.licenses.agpl3;
extraPatches = [ ./clang-5.3.patch ];
})

4
pkgs/development/libraries/opensubdiv/default.nix
View File

@ -28,8 +28,8 @@
[ "-DNO_TUTORIALS=1"
"-DNO_REGRESSION=1"
"-DNO_EXAMPLES=1"
"-DGLEW_INCLUDE_DIR=${glew}/include"
"-DGLEW_LIBRARY=${glew}/lib"
"-DGLEW_INCLUDE_DIR=${glew.dev}/include"
"-DGLEW_LIBRARY=${glew.dev}/lib"
];
enableParallelBuilding = true;

6
pkgs/development/ocaml-modules/pcre/default.nix
View File

@ -2,11 +2,11 @@
buildOcaml {
name = "pcre";
version = "7.1.1";
version = "7.2.3";
src = fetchurl {
url = https://github.com/mmottl/pcre-ocaml/releases/download/v7.1.1/pcre-ocaml-7.1.1.tar.gz;
sha256 = "0nj4gb6hjjjmz5gnl9cjrh4w82rw8cvbwnk0hxhfgfd25p9k50n3";
url = "https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.3/pcre-ocaml-7.2.3.tar.gz";
sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3";
};
buildInputs = [ocaml findlib];

7
pkgs/development/ocaml-modules/re/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:
stdenv.mkDerivation rec {
name = "ocaml-re-1.5.0";
name = "ocaml-re-${version}";
version = "1.7.1";
src = fetchzip {
url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz";
sha256 = "17avk7kwmgdjkri1sj5q4a59ykc9rj0bxj6ixxpl6i0n49br3f92";
url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz";
sha256 = "1z2z4fjrpdbl0q50fdxvy3746w1vx6ybxcb0k81hqm1342nylbmw";
};
buildInputs = [ ocaml findlib ocamlbuild ounit ];

4
pkgs/development/tools/analysis/flow/default.nix
View File

@ -3,14 +3,14 @@
with lib;
stdenv.mkDerivation rec {
version = "0.57.2";
version = "0.57.3";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "04fqnan9m69rjwvm97p0br1wd862ldiybp0v2nqlm6giaaa691r0";
sha256 = "0pmgj2mv4pmgw8slh4gdj7jskcgxbdsy09arh5rnwf0byy81fky6";
};
installPhase = ''

6
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@ -6,11 +6,11 @@ in
stdenv.mkDerivation {
name = "camlp5${if transitional then "_transitional" else ""}-7.01";
name = "camlp5${if transitional then "_transitional" else ""}-7.02";
src = fetchzip {
url = https://github.com/camlp5/camlp5/archive/rel701.tar.gz;
sha256 = "1gxhj7y30f1hbcqnqgg80wz0ymbslsfh09kl2kiackp49fywl606";
url = https://github.com/camlp5/camlp5/archive/rel702.tar.gz;
sha256 = "1m2d55zrgllidhgslvzgmr27f56qzdahz2sv56bvjs3bg7grmhnc";
};
buildInputs = [ ocaml ];

3
pkgs/development/tools/vagrant/default.nix
View File

@ -126,6 +126,9 @@ in stdenv.mkDerivation rec {
cp -r usr/bin "$out"
wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxml2 libxslt ]}" \
--prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib"
install -D "opt/vagrant/embedded/gems/gems/vagrant-$version/contrib/bash/completion.sh" \
"$out/share/bash-completion/completions/vagrant"
'';
preFixup = ''

35
pkgs/misc/emulators/higan/0001-change-flags.diff
View File

@ -1,23 +1,26 @@
diff -rupN higan_v097-source.old/higan/GNUmakefile higan_v097-source/higan/GNUmakefile
--- higan_v097-source.old/higan/GNUmakefile 2016-01-24 09:21:45.822940200 +0100
+++ higan_v097-source/higan/GNUmakefile 2016-01-24 09:24:03.028722500 +0100
@@ -36,7 +36,7 @@ ifeq ($(platform),windows)
else ifeq ($(platform),macosx)
flags += -march=native
else ifneq ($(filter $(platform),linux bsd),)
- flags += -march=native -fopenmp
+ flags += -fopenmp
diff -Naur higan_v105-source.old/higan/GNUmakefile higan_v105-source.new/higan/GNUmakefile
--- higan_v105-source.old/higan/GNUmakefile 2017-10-07 01:34:22.000000000 -0300
+++ higan_v105-source.new/higan/GNUmakefile 2017-10-17 00:02:40.580957396 -0200
@@ -26,7 +26,7 @@
flags += -fopenmp
link += -fopenmp
link += -Wl,-export-dynamic
link += -lX11 -lXext
diff -rupN higan_v097-source.old/nall/GNUmakefile higan_v097-source/nall/GNUmakefile
--- higan_v097-source.old/nall/GNUmakefile 2016-01-24 09:21:46.021749600 +0100
+++ higan_v097-source/nall/GNUmakefile 2016-01-24 09:25:06.347100800 +0100
@@ -40,8 +40,8 @@ cflags := -x c -std=c99
objcflags := -x objective-c -std=c99
ifeq ($(binary),application)
- flags += -march=native
+ flags +=
link += -Wl,-export-dynamic
link += -lX11 -lXext
else ifeq ($(binary),library)
diff -Naur higan_v105-source.old/nall/GNUmakefile higan_v105-source.new/nall/GNUmakefile
--- higan_v105-source.old/nall/GNUmakefile 2017-09-23 18:34:22.000000000 -0300
+++ higan_v105-source.new/nall/GNUmakefile 2017-10-17 00:03:33.568916550 -0200
@@ -40,8 +40,8 @@
objcflags := -x objective-c -std=c11
cppflags := -x c++ -std=c++14
objcppflags := -x objective-c++ -std=c++14
-flags :=
-link :=
+flags := $(CXXFLAGS)
+link := $(LDFLAGS)
# compiler detection
ifeq ($(compiler),)

9
pkgs/misc/emulators/higan/default.nix
View File

@ -10,12 +10,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "higan-${version}";
version = "104";
version = "105";
sourceName = "higan_v${version}-source";
src = fetchurl {
urls = [ "http://download.byuu.org/${sourceName}.7z" ];
sha256 = "0i2ma8zjjxadq4368n4m41vhmrb62na6s7pi219ajdsb96x0091l";
sha256 = "1lpj345vlnwcywhzq1fzxwl08zc2x4d103rgyyp7yw8m0f8f9sdl";
curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
};
@ -81,8 +81,3 @@ stdenv.mkDerivation rec {
platforms = with platforms; unix;
};
}
#
# TODO:
# - fix the BML and BIOS paths - maybe submitting
# a custom patch to upstream would not be a bad idea...

40
pkgs/tools/admin/ansible/2.4.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv
, fetchurl
, pythonPackages
, windowsSupport ? false
}:
pythonPackages.buildPythonPackage rec {
pname = "ansible";
version = "2.4.0.0";
name = "${pname}-${version}";
src = fetchurl {
url = "http://releases.ansible.com/ansible/${name}.tar.gz";
sha256 = "0xkwnx817rygb1922gncv9ivgvb7hjg8g53r39hfdm3jgzp6y9qs";
};
prePatch = ''
sed -i "s,/usr/,$out," lib/ansible/constants.py
'';
doCheck = false;
dontStrip = true;
dontPatchELF = true;
dontPatchShebangs = false;
propagatedBuildInputs = with pythonPackages; [
pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns
] ++ stdenv.lib.optional windowsSupport pywinrm;
meta = with stdenv.lib; {
homepage = http://www.ansible.com;
description = "A simple automation tool";
license = with licenses; [ gpl3 ];
maintainers = with maintainers; [
jgeerds
joamaki
];
platforms = with platforms; linux ++ darwin;
};
}

6
pkgs/tools/admin/fastlane/Gemfile.lock
View File

@ -24,7 +24,7 @@ GEM
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.0)
fastlane (2.60.1)
fastlane (2.61.0)
CFPropertyList (>= 2.3, < 3.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
@ -103,10 +103,10 @@ GEM
rouge (2.0.7)
rubyzip (1.2.1)
security (0.1.3)
signet (0.7.3)
signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (~> 1.5)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
slack-notifier (1.5.1)
terminal-notifier (1.8.0)

8
pkgs/tools/admin/fastlane/gemset.nix
View File

@ -137,10 +137,10 @@
dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sg8xh1rjigiq438knkpdq685kyw34ki3h7baj65qh9mkkc8drxy";
sha256 = "0n73748vw7y29ycx0rjdg9zvn8xhncq07zq1l4a16n5s82rb14iy";
type = "gem";
};
version = "2.60.1";
version = "2.61.0";
};
gh_inspector = {
source = {
@ -360,10 +360,10 @@
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6";
sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
type = "gem";
};
version = "0.7.3";
version = "0.8.1";
};
slack-notifier = {
source = {

4
pkgs/tools/misc/kt/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
name = "kt-${version}";
version = "11.1.0";
version = "12.1.0";
src = fetchFromGitHub {
owner = "fgeller";
repo = "kt";
rev = "v${version}";
sha256 = "1ymygd3l5pfbnjmdjcrspj520v29hnv3bdgxpim38dpv3qj518vq";
sha256 = "014q39bg88vg1xdq1bz6wj982zb148sip3a42hbrinh8qj41y4yg";
};
goPackagePath = "github.com/fgeller/kt";

4
pkgs/tools/networking/axel/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "axel-${version}";
version = "2.14.1";
version = "2.15";
src = fetchurl {
url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
sha256 = "0fayfpyc9cs6yp474400nyjbix6aywicz6pw17rzm4m7k06q5xmc";
sha256 = "0wm16s129615i7rw48422q3x3ixr4v2p9942p0s6qk2fjlc3y8hf";
};
nativeBuildInputs = [ autoreconfHook ];

21
pkgs/tools/networking/bgpdump/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchzip, autoreconfHook, zlib, bzip2 }:
stdenv.mkDerivation rec {
name = "bgpdump-2017-09-29";
src = fetchzip {
url = "https://bitbucket.org/ripencc/bgpdump/get/94a0e724b335.zip";
sha256 = "09g9vz2zc4nyzl669w1j7fxw21ifja6dxbp0xbqh6n7w3gpx2g88";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib bzip2 ];
meta = {
homepage = https://bitbucket.org/ripencc/bgpdump/wiki/Home;
description = ''Analyze dump files produced by Zebra/Quagga or MRT'';
license = stdenv.lib.licenses.hpnd;
maintainers = with stdenv.lib.maintainers; [ lewo ];
platforms = with stdenv.lib.platforms; linux;
};
}

3
pkgs/tools/networking/strongswan/default.nix
View File

@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--enable-swanctl" "--enable-cmd" "--enable-systemd"
"--enable-farp" "--enable-dhcp"
"--enable-openssl"
"--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym"
"--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5"
"--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2"
@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock"
++ stdenv.lib.optionals enableTNC [
"--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
"--enable-curl" "--enable-openssl"
"--enable-curl"
"--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
"--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation"
"--enable-tnc-imv" "--enable-imv-attestation"

44
pkgs/tools/nix/info/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv, lib, coreutils, findutils, gnugrep, darwin, shellcheck
, doCheck ? false # Avoid having GHC in the build-time closure of all NixOS configuratinos
}:
stdenv.mkDerivation {
name = "nix-info";
src = ./info.sh;
nativeBuildInputs = lib.optionals doCheck [
shellcheck
];
path = lib.makeBinPath ([
coreutils findutils gnugrep
] ++ (if stdenv.isDarwin then [ darwin.DarwinTools ] else []));
is_darwin = if stdenv.isDarwin then "yes" else "no";
sandboxtest = ./sandbox.nix;
relaxedsandboxtest = ./relaxedsandbox.nix;
multiusertest = ./multiuser.nix;
unpackCmd = ''
mkdir nix-info
cp $src ./nix-info/nix-info
'';
buildPhase = ''
substituteAllInPlace ./nix-info
'';
inherit doCheck;
checkPhase = ''
shellcheck ./nix-info
'';
installPhase = ''
mkdir -p $out/bin
cp ./nix-info $out/bin/nix-info
'';
meta = {
platforms = lib.platforms.all;
};
}

169
pkgs/tools/nix/info/info.sh Executable file
View File

@ -0,0 +1,169 @@
#!/bin/bash
PATH="@path@:$PATH"
IS_DARWIN="@is_darwin@"
set -eu
set -o pipefail
DEBUG=0
MARKDOWN=0
HOST_OS=0
SANDBOX=0
while true; do
case "${1:-}" in
"")
break
;;
-d | --debug)
set -x
DEBUG=1
shift
;;
-m | --markdown)
MARKDOWN=1
HOST_OS=1
SANDBOX=1
shift
;;
--host-os)
HOST_OS=1
shift
;;
--sandbox)
SANDBOX=1
shift
;;
* )
cat <<EOF
nix-info - get high level info to help with debugging
Options:
-m, --markdown formatting for a GitHub issue
implies: --host-os, --sandbox
--sandbox include sandbox configuration
--host-os include host OS details
-h, --help show this message
-d, --debug debug mode
EOF
exit 1
;;
esac
done
debuglog() {
if [ $DEBUG -eq 1 ]; then
cat >&2
else
cat > /dev/null
fi
}
nixev() {
nix-instantiate --eval --strict -E "$1"
}
desc_system() {
nixev '(import <nixpkgs> {}).system'
}
desc_host_os() {
printf "%s" "$(uname -sr)"
if [ "$IS_DARWIN" = "yes" ]; then
printf ", macOS %s" "$(sw_vers -productVersion)"
fi
if [ -f /etc/os-release ]; then
(
# shellcheck disable=SC1091
. /etc/os-release
printf ", %s, %s" "${NAME:-$(uname -v)}" "${VERSION:-noversion}"
)
fi
}
desc_multi_user() {
if nix-build --no-out-link @multiusertest@ 2>&1 | debuglog; then
printf "yes"
else
printf "no"
fi
}
desc_nixpkgs_path() {
nixev '<nixpkgs>'
}
channel_facts() {
find /nix/var/nix/profiles/per-user \
-mindepth 2 \
-maxdepth 2 \
-name channels \
-print0 \
|\
while IFS= read -r -d '' userchannelset; do
manifest="$userchannelset/manifest.nix"
if [ -e "$manifest" ]; then
userchannels=$(nixev \
"builtins.concatStringsSep \", \"
(map (ch: ch.name)
(import \"$manifest\"))")
fact "channels($(echo "$manifest" | cut -d/ -f7))" \
"$userchannels"
fi
done
}
desc_sandbox() {
if nix-build --no-out-link @sandboxtest@ 2>&1 | debuglog; then
printf "no"
elif nix-build --no-out-link @relaxedsandboxtest@ 2>&1 | debuglog; then
printf "relaxed"
else
printf "yes"
fi
}
fact() {
name="${1:-0}"
value="${2:-0}"
last="${3:-1}"
if [ $MARKDOWN -eq 0 ]; then
printf "%s: %s" "$name" "$value"
if [ "$last" -eq 1 ]; then
printf ", "
fi
else
printf " - %s: \`%s\`\n" "$name" "$value"
fi
if [ "$last" -eq 0 ]; then
echo ""
fi
}
last_fact() {
fact "$1" "$2" 0
}
fact "system" "$(desc_system)"
if [ $HOST_OS -eq 1 ]; then
fact "host os" "$(desc_host_os)"
fi
fact "multi-user?" "$(desc_multi_user)"
if [ $SANDBOX -eq 1 ]; then
fact "sandbox" "$(desc_sandbox)"
fi
fact "version" "$(nix-env --version)"
channel_facts
last_fact "nixpkgs" "$(desc_nixpkgs_path)"

12
pkgs/tools/nix/info/multiuser.nix Normal file
View File

@ -0,0 +1,12 @@
let
pkgs = import <nixpkgs> {};
in pkgs.runCommand "diagnostics-multiuser"
{ }
''
set -x
# no cache: ${toString builtins.currentTime}
# For reproducibility, nix always uses nixbld group:
# https://github.com/NixOS/nix/blob/1dd29d7aebae706f3e90a18bbfae727f2ed03c70/src/libstore/build.cc#L1896-L1908
test "$(groups)" == "nixbld"
touch $out
''

12
pkgs/tools/nix/info/relaxedsandbox.nix Normal file
View File

@ -0,0 +1,12 @@
let
pkgs = import <nixpkgs> {};
in pkgs.runCommand "diagnostics-sandbox"
{
__noChroot = true;
}
''
set -x
# no cache: ${toString builtins.currentTime}
test -d "$(dirname "$out")/../var/nix"
touch $out
''

10
pkgs/tools/nix/info/sandbox.nix Normal file
View File

@ -0,0 +1,10 @@
let
pkgs = import <nixpkgs> {};
in pkgs.runCommand "diagnostics-sandbox"
{ }
''
set -x
# no cache: ${toString builtins.currentTime}
test -d "$(dirname "$out")/../var/nix"
touch $out
''

6
pkgs/tools/package-management/nix/default.nix
View File

@ -161,12 +161,12 @@ in rec {
nixUnstable = (lib.lowPrio (common rec {
name = "nix-1.12${suffix}";
suffix = "pre5650_1dd29d7a";
suffix = "pre5655_cbc21691";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "1dd29d7aebae706f3e90a18bbfae727f2ed03c70";
sha256 = "182v2rczm8al1ggbaca8qapvrjyp21li1fd3fiwr5nqgazgr5308";
rev = "cbc216911dbda23c3bc050c969bc725fe60760ef";
sha256 = "0ynnk2m2n5pjmhy5gry90dy5k2wwy29v2wnq6zz32ak9zwz36x8r";
};
fromGit = true;
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };

8
pkgs/tools/system/smartmontools/default.nix
View File

@ -4,12 +4,12 @@
let
version = "6.5";
dbrev = "4394";
dbrev = "4548";
drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
driverdb = fetchurl {
url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
sha256 = "1kdpgbl1az0xhqn7j613cx366n7amra8xz3391jpzzrd3vlga393";
name = "smartmontools-drivedb.h";
url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
sha256 = "0nwk4ir0c40b01frqm7a0lvljh5k9yhslc3j4485zjsx3v5w269f";
name = "smartmontools-drivedb.h";
};
in stdenv.mkDerivation rec {

12
pkgs/top-level/all-packages.nix
View File

@ -6855,8 +6855,9 @@ with pkgs;
ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {};
ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};
ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};
ansible = ansible_2_3;
ansible2 = ansible_2_3;
ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {};
ansible = ansible_2_4;
ansible2 = ansible_2_4;
antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
@ -13780,6 +13781,8 @@ with pkgs;
bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { };
bb = callPackage ../applications/misc/bb { };
beast = callPackage ../applications/audio/beast {
inherit (gnome2) libgnomecanvas libart_lgpl;
guile = guile_1_8;
@ -13808,6 +13811,8 @@ with pkgs;
inherit (gnome2) zenity;
};
bgpdump = callPackage ../tools/networking/bgpdump { };
blackbox = callPackage ../applications/version-management/blackbox { };
bleachbit = callPackage ../applications/misc/bleachbit { };
@ -19150,6 +19155,9 @@ with pkgs;
nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; };
nix-info = callPackage ../tools/nix/info { };
nix-info-tested = callPackage ../tools/nix/info { doCheck = true; };
nix-index = callPackage ../tools/package-management/nix-index { };
inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })

19
pkgs/top-level/perl-packages.nix
View File

@ -309,11 +309,11 @@ let self = _self // overrides; _self = with self; {
};
AppSqitch = buildPerlModule rec {
version = "0.9994";
version = "0.9996";
name = "App-Sqitch-${version}";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz";
sha256 = "0in602z40s50fdlmws4g0a1pb8p7yn0wx8jgsacz26a4i1q7gpi4";
sha256 = "864edde554e7cd6578e8fe2a4c17ea8eda82da878cdfd00fd9fb3c53f696fc1e";
};
buildInputs = [
CaptureTiny PathClass TestDeep TestDir TestException
@ -391,6 +391,21 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestNoWarnings Moo TypeTiny ];
};
ArrayFIFO = buildPerlPackage rec {
name = "Array-FIFO-0.10";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz";
sha256 = "8082b7ca456d02c7c862ba409cbd62a9cafdb8c5832f5d7fb1d37ba8698ee5b1";
};
buildInputs = [ TestSpec ];
propagatedBuildInputs = [ Moose namespaceautoclean ];
meta = {
homepage = https://github.com/dwburke/perl-Array-FIFO;
description = "A Simple limitable FIFO array, with sum and average methods";
license = stdenv.lib.licenses.artistic2;
};
};
ListCompare = buildPerlPackage rec {
name = "List-Compare-0.53";
src = fetchurl {

7
pkgs/top-level/release.nix
View File

@ -47,6 +47,8 @@ let
jobs.nix-repl.x86_64-darwin
jobs.nix.x86_64-darwin
jobs.nox.x86_64-darwin
jobs.nix-info.x86_64-darwin
jobs.nix-info-tested.x86_64-darwin
jobs.openssh.x86_64-darwin
jobs.openssl.x86_64-darwin
jobs.postgresql.x86_64-darwin
@ -88,6 +90,11 @@ let
# Needed by travis-ci to test PRs
jobs.nox.x86_64-linux
jobs.nox.x86_64-darwin
# Needed for support
jobs.nix-info.x86_64-linux
jobs.nix-info.x86_64-darwin
jobs.nix-info-tested.x86_64-linux
jobs.nix-info-tested.x86_64-darwin
# Ensure that X11/GTK+ are in order.
jobs.thunderbird.x86_64-linux
# Ensure that basic stuff works on darwin