From 1cc97befd5550732fd155d04cdd9eca3f5024dbc Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 8 Nov 2017 21:55:40 -0800 Subject: [PATCH 001/785] lib/eval-config: document NIXOS_EXTRA_MODULE_PATH This adds some documentation about importing modules external to Nixpkgs, which provides context for documenting NIXOS_EXTRA_MODULE_PATH. Closes #30376 --- .../manual/development/importing-modules.xml | 59 +++++++++++++++++++ .../manual/development/writing-modules.xml | 1 + 2 files changed, 60 insertions(+) create mode 100644 nixos/doc/manual/development/importing-modules.xml diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml new file mode 100644 index 00000000000..ec1da09b950 --- /dev/null +++ b/nixos/doc/manual/development/importing-modules.xml @@ -0,0 +1,59 @@ +
+ +Importing Modules + + + Sometimes NixOS modules need to be used in configuration but exist + outside of Nixpkgs. These modules can be imported: + + + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Use a locally-available module definition in + # ./example-module/default.nix + ./example-module + ]; + + services.exampleModule.enable = true; +} + + + + The environment variable NIXOS_EXTRA_MODULE_PATH is + an absolute path to a NixOS module that is included alongside the + Nixpkgs NixOS modules. Like any NixOS module, this module can import + additional modules: + + + +# ./module-list/default.nix +[ + ./example-module1 + ./example-module2 +] + + + +# ./extra-module/default.nix +{ imports = import ./module-list.nix; } + + + +# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module +{ config, lib, pkgs, ... }: + +{ + # No `imports` needed + + services.exampleModule1.enable = true; +} + + +
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index cb363b45675..a49f99cb266 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -180,6 +180,7 @@ in { + -- GitLab From 8c5da2713cda9e31197e1cd9f4fba20bc32fc239 Mon Sep 17 00:00:00 2001 From: Sebastian Conybeare Date: Thu, 22 Feb 2018 14:02:52 -0600 Subject: [PATCH 002/785] monkeysphere: wrap the monkeysphere executable with the necessary crypto libraries for ssh-proxycommand --- pkgs/tools/security/monkeysphere/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index f0d3a870676..d1266ca495e 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { CryptOpenSSLRSA CryptOpenSSLBignum ]}" + wrapProgram $out/bin/monkeysphere --prefix PERL5LIB :\ + "${with perlPackages; stdenv.lib.makePerlPath [ + CryptOpenSSLRSA + CryptOpenSSLBignum + ]}" ''; meta = with stdenv.lib; { -- GitLab From d37b43f434e5752bdcd2262365dcfedd15b622b5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 15:38:46 -0800 Subject: [PATCH 003/785] rtaudio: 4.1.2 -> 5.0.0 Semi-automatic update. These checks were performed: - built on NixOS - found 5.0.0 with grep in /nix/store/sxxwa9mma9933vxb4w3d2szxjqx5w773-rtaudio-5.0.0 - found 5.0.0 in filename of file in /nix/store/sxxwa9mma9933vxb4w3d2szxjqx5w773-rtaudio-5.0.0 cc "@magnetophon" --- pkgs/development/libraries/audio/rtaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 326572996b4..1df696c0ec6 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, rtmidi }: stdenv.mkDerivation rec { - version = "4.1.2"; + version = "5.0.0"; name = "rtaudio-${version}"; src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; rev = "${version}"; - sha256 = "09j84l9l3q0g238z5k89rm8hgk0i1ir8917an7amq474nwjp80pq"; + sha256 = "0jkqnhc2pq31nmq4daxhmqdjgv2qi4ib27hwms2r5zhnmvvzlr67"; }; buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ]; -- GitLab From 2fa1165e89db2c49ccd616a39507c9bdd30c50d2 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 12 Aug 2017 21:14:36 +0200 Subject: [PATCH 004/785] switch-to-configuration: use Net::DBus to retrieve the list of units This resolves the FIXME, and opens up the possibility of using more of the systemd DBus interface to make things more robust. --- .../activation/switch-to-configuration.pl | 19 +++++++++---------- nixos/modules/system/activation/top-level.nix | 3 ++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 87a4ab2a586..2ce04ed5342 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -4,6 +4,7 @@ use strict; use warnings; use File::Basename; use File::Slurp; +use Net::DBus; use Sys::Syslog qw(:standard :macros); use Cwd 'abs_path'; @@ -67,17 +68,15 @@ EOF $SIG{PIPE} = "IGNORE"; sub getActiveUnits { - # FIXME: use D-Bus or whatever to query this, since parsing the - # output of list-units is likely to break. - # Use current version of systemctl binary before daemon is reexeced. - my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`; + my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); + my $units = $mgr->ListUnitsByPatterns([], []); my $res = {}; - foreach my $line (split '\n', $lines) { - chomp $line; - last if $line eq ""; - $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next; - next if $1 eq "UNIT"; - $res->{$1} = { load => $2, state => $3, substate => $4 }; + for my $item (@$units) { + my ($id, $description, $load_state, $active_state, $sub_state, + $following, $unit_path, $job_id, $job_type, $job_path) = @$item; + next unless $following eq ''; + next if $job_id == 0 and $active_state eq 'inactive'; + $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state }; } return $res; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 091a2e412ee..f4af9a580fd 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -127,7 +127,8 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + + perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); # Replace runtime dependencies -- GitLab From 88d34b1dda9094516c0fc6ae9f17b44c8247e848 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Mar 2018 13:55:38 -0800 Subject: [PATCH 005/785] gperftools: 2.6.1 -> 2.6.3 Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` got 0 exit code - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` and found version 2.6.3 - found 2.6.3 with grep in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3 - found 2.6.3 in filename of file in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3 --- pkgs/development/libraries/gperftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 5c863cf26cb..2a2710531e0 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.6.1"; + name = "gperftools-2.6.3"; src = fetchurl { url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; - sha256 = "10cxd6s5pkm2d934gh47hrn9xcrw4qlc9yr7s99z4a508bmngd1q"; + sha256 = "17zfivp6n00rlqbrx6q6h71y2f815nvlzysff1ihgk4mxpv2yjri"; }; buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; -- GitLab From 869336d6233ec48234278c654f1a39b3746b9bc6 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 14:54:42 +0300 Subject: [PATCH 006/785] parity: 1.8.11 -> 1.9.5 --- pkgs/applications/altcoins/parity/default.nix | 8 +- .../parity/patches/vendored-sources-1.8.patch | 100 ------------------ .../parity/patches/vendored-sources-1.9.patch | 16 +-- 3 files changed, 12 insertions(+), 112 deletions(-) delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index fe2c2c62827..99179932109 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.8.11"; - sha256 = "1vabkglmmbx9jccwsqwvwck1brdjack3sw6iwsxy01wsc2jam56k"; - cargoSha256 = "1l5hx77glclpwd9i35rr3lxfxshsf1bsxvs2chsp2vwjy06knjmi"; - patches = [ ./patches/vendored-sources-1.8.patch ]; + version = "1.9.5"; + sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7"; + cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva"; + patches = [ ./patches/vendored-sources-1.9.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch deleted file mode 100644 index 3239df63de3..00000000000 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/.cargo/config b/.cargo/config -new file mode 100644 -index 000000000..8dddda426 ---- /dev/null -+++ b/.cargo/config -@@ -0,0 +1,94 @@ -+[source."https://github.com/alexcrichton/mio-named-pipes"] -+git = "https://github.com/alexcrichton/mio-named-pipes" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/parity-tokio-ipc"] -+git = "https://github.com/nikvolf/parity-tokio-ipc" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/tokio-named-pipes"] -+git = "https://github.com/nikvolf/tokio-named-pipes" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/bn"] -+git = "https://github.com/paritytech/bn" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/hidapi-rs"] -+git = "https://github.com/paritytech/hidapi-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/js-precompiled.git"] -+git = "https://github.com/paritytech/js-precompiled.git" -+branch = "stable" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/jsonrpc.git"] -+git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.8" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/libusb-rs"] -+git = "https://github.com/paritytech/libusb-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/libusb-sys"] -+git = "https://github.com/paritytech/libusb-sys" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/nanomsg.rs.git"] -+git = "https://github.com/paritytech/nanomsg.rs.git" -+branch = "parity-1.7" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-ctrlc.git"] -+git = "https://github.com/paritytech/rust-ctrlc.git" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-rocksdb"] -+git = "https://github.com/paritytech/rust-rocksdb" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-secp256k1"] -+git = "https://github.com/paritytech/rust-secp256k1" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-snappy"] -+git = "https://github.com/paritytech/rust-snappy" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/trezor-sys"] -+git = "https://github.com/paritytech/trezor-sys" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tailhook/rotor"] -+git = "https://github.com/tailhook/rotor" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tomusdrw/ws-rs"] -+git = "https://github.com/tomusdrw/ws-rs" -+branch = "master" -+replace-with = "vendored-sources" diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index d1f6520d706..31c12d83faf 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -1,22 +1,22 @@ diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..0efb69724 ---- /dev/null +--- a/.cargo/config +++ b/.cargo/config -@@ -0,0 +1,100 @@ +@@ -0,0 +4,104 @@ + +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"] -+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git" ++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"] ++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"] -+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git" ++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"] ++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git" +branch = "master" +replace-with = "vendored-sources" + @@ -90,8 +90,8 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/pepyakin/wasmi"] -+git = "https://github.com/pepyakin/wasmi" ++[source."https://github.com/paritytech/wasmi"] ++git = "https://github.com/paritytech/wasmi" +branch = "master" +replace-with = "vendored-sources" + -- GitLab From 1310e23e38a38dbfb8dcab99b04d0cac6a3f31ff Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 14:54:59 +0300 Subject: [PATCH 007/785] parity-beta: 1.9.4 -> 1.10.0 --- pkgs/applications/altcoins/parity/beta.nix | 8 +- .../patches/vendored-sources-1.10.patch | 118 ++++++++++++++++++ 2 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index ee4203fa88c..ed78133a759 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.9.4"; - sha256 = "00b6wsyc2chmdkhfhi9h1i06hpcjj2abcx3qdc6k39clgha0081f"; - cargoSha256 = "0pyb1mpykdp6i7c30lm5fprrxg3zanak44g28cygzli3l9l3xiy3"; - patches = [ ./patches/vendored-sources-1.9.patch ]; + version = "1.10.0"; + sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g"; + cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m"; + patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch new file mode 100644 index 00000000000..3e8e032f30c --- /dev/null +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch @@ -0,0 +1,118 @@ +diff --git a/.cargo/config b/.cargo/config +index 72652ad2f..b21c6aa7b 100644 +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,3 +1,113 @@ + [target.x86_64-pc-windows-msvc] + # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 + rustflags = ["-Ctarget-feature=+crt-static"] ++ ++[source."https://github.com/alexcrichton/mio-named-pipes"] ++git = "https://github.com/alexcrichton/mio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"] ++git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git" ++rev = "bd25b41cd642c6b822d820dded3aa601a29aa079" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"] ++git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git" ++rev = "4b6f112412716cd05123d32eeb7fda448288a6c6" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/parity-tokio-ipc"] ++git = "https://github.com/nikvolf/parity-tokio-ipc" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/tokio-named-pipes"] ++git = "https://github.com/nikvolf/tokio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/parity-js/dapp-wallet.git"] ++git = "https://github.com/parity-js/dapp-wallet.git" ++rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/parity-js/shell.git"] ++git = "https://github.com/parity-js/shell.git" ++rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/bn"] ++git = "https://github.com/paritytech/bn" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hyper"] ++git = "https://github.com/paritytech/hyper" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/jsonrpc.git"] ++git = "https://github.com/paritytech/jsonrpc.git" ++branch = "parity-1.10" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-rs"] ++git = "https://github.com/paritytech/libusb-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-sys"] ++git = "https://github.com/paritytech/libusb-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-ctrlc.git"] ++git = "https://github.com/paritytech/rust-ctrlc.git" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-rocksdb"] ++git = "https://github.com/paritytech/rust-rocksdb" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-secp256k1"] ++git = "https://github.com/paritytech/rust-secp256k1" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-snappy"] ++git = "https://github.com/paritytech/rust-snappy" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/trezor-sys"] ++git = "https://github.com/paritytech/trezor-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/wasm-utils"] ++git = "https://github.com/paritytech/wasm-utils" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/wasmi"] ++git = "https://github.com/paritytech/wasmi" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tailhook/rotor"] ++git = "https://github.com/tailhook/rotor" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tomusdrw/ws-rs"] ++git = "https://github.com/tomusdrw/ws-rs" ++branch = "master" ++replace-with = "vendored-sources" -- GitLab From cac10651ea9e96c828d0f032f6ad462a9b088ac1 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 17:15:13 +0300 Subject: [PATCH 008/785] parity: patch fixes --- .../altcoins/parity/patches/vendored-sources-1.9.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index 31c12d83faf..d91b103c6ce 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -1,9 +1,9 @@ diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..0efb69724 ---- a/.cargo/config +--- /dev/null +++ b/.cargo/config -@@ -0,0 +4,104 @@ +@@ -0,0 +1,100 @@ + +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" -- GitLab From caec3b9e091c6eb5f765c417396e9969f51a0da4 Mon Sep 17 00:00:00 2001 From: James Kay Date: Thu, 22 Mar 2018 16:30:47 +0000 Subject: [PATCH 009/785] PyQt5: 5.10.0 -> 5.10.1 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 225da204e21..eb07f80ed45 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -6,7 +6,7 @@ let pname = "PyQt"; - version = "5.10"; + version = "5.10.1"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; in buildPythonPackage { @@ -24,7 +24,7 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; + sha256 = "1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr"; }; nativeBuildInputs = [ pkgconfig qmake ]; -- GitLab From fc7ed300d1aafec35f9ea8437b0e6ef6f7669b3d Mon Sep 17 00:00:00 2001 From: James Kay Date: Thu, 22 Mar 2018 16:31:06 +0000 Subject: [PATCH 010/785] plover: 3.1.0 -> 3.1.1 --- pkgs/applications/misc/plover/default.nix | 26 ++++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index b8fa38268c3..19230a11426 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,26 +1,22 @@ { stdenv, fetchurl, python27Packages, wmctrl }: -python27Packages.buildPythonPackage rec { - name = "plover-${version}"; - version = "3.1.0"; +with python27Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "3.1.1"; meta = with stdenv.lib; { description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; + license = licenses.gpl2; }; src = fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; }; - # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 - postPatch = '' - substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" - ''; - - buildInputs = with python27Packages; [ pytest mock ]; - propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi - wxPython xlib wmctrl ]; -} + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ + six setuptools pyserial appdirs hidapi wxPython xlib wmctrl + ]; +}; -- GitLab From 51a8848f122108f997ac6923f3ec497f5d6391d7 Mon Sep 17 00:00:00 2001 From: James Kay Date: Thu, 22 Mar 2018 17:18:32 +0000 Subject: [PATCH 011/785] plover: add 4.0.0.dev6 --- pkgs/applications/misc/plover/default.nix | 59 ++++++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 19230a11426..09558ff4c47 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,22 +1,47 @@ -{ stdenv, fetchurl, python27Packages, wmctrl }: +{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl }: -with python27Packages; buildPythonPackage rec { - name = "plover-${version}"; - version = "3.1.1"; +{ + stable = with python27Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "3.1.1"; - meta = with stdenv.lib; { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; - }; + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; + }; - src = fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ + six setuptools pyserial appdirs hidapi wxPython xlib wmctrl + ]; }; - buildInputs = [ pytest mock ]; - propagatedBuildInputs = [ - six setuptools pyserial appdirs hidapi wxPython xlib wmctrl - ]; -}; + dev = with python36Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "4.0.0.dev6"; + + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "067rkpqnjjxwyv9cwh9i925ndba6fvj6q0r56lizy0l26b4jc8rp"; + }; + + # I'm not sure why we don't find PyQt5 here but there's a similar + # sed on many of the platforms Plover builds for + postPatch = "sed -i /PyQt5/d setup.cfg"; + + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8e6b900829..a1371984d4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17085,7 +17085,7 @@ with pkgs; gtksharp = gtk-sharp-2_0; }; - plover = callPackage ../applications/misc/plover { }; + plover = recurseIntoAttrs (callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; -- GitLab From 8a77a0ae0ef7a430ebc7165bdb42936ee8ea352f Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 1 Apr 2018 20:32:33 +0000 Subject: [PATCH 012/785] go_1_{9,10}: disable TestWritevError test --- pkgs/development/compilers/go/1.10.nix | 2 ++ pkgs/development/compilers/go/1.9.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 145f6a17978..d99d82277bc 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -77,6 +77,8 @@ stdenv.mkDerivation rec { sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go # Remove cert tests that conflict with NixOS's cert resolution sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c866212170c..4db67c92738 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -77,6 +77,8 @@ stdenv.mkDerivation rec { sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go # Remove cert tests that conflict with NixOS's cert resolution sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go -- GitLab From 9e11e4ba64a209f3bc5009444878a60bc6849762 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 1 Apr 2018 20:39:12 +0000 Subject: [PATCH 013/785] go_1_{9,10}: disable TestVariousDeadlines test --- pkgs/development/compilers/go/1.10.nix | 2 ++ pkgs/development/compilers/go/1.9.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index d99d82277bc..b0fdd0c88bf 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -79,6 +79,8 @@ stdenv.mkDerivation rec { sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go # TestWritevError hangs sometimes sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 4db67c92738..1fa38b99747 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -79,6 +79,8 @@ stdenv.mkDerivation rec { sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go # TestWritevError hangs sometimes sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go -- GitLab From a683d2cd00780cf7d20caeeef44deb4cc60d2add Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Thu, 5 Apr 2018 09:18:20 +1000 Subject: [PATCH 014/785] Modified .editorconfig to apply indentation style to docbook files --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7b40ff1ff56..f272739f240 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,8 +13,8 @@ charset = utf-8 # see https://nixos.org/nixpkgs/manual/#chap-conventions -# Match nix/ruby files, set indent to spaces with width of two -[*.{nix,rb}] +# Match nix/ruby/docbook files, set indent to spaces with width of two +[*.{nix,rb,xml}] indent_style = space indent_size = 2 -- GitLab From add9f5cf4a7affb20de29cfc74d0c91621f35bd4 Mon Sep 17 00:00:00 2001 From: koral Date: Thu, 5 Apr 2018 23:16:49 +0200 Subject: [PATCH 015/785] gmrender-resurrect: init --- .../networking/gmrender-resurrect/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/networking/gmrender-resurrect/default.nix diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix new file mode 100644 index 00000000000..6926f1522c7 --- /dev/null +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, makeWrapper +, gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: + +let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in + +stdenv.mkDerivation { + name = "gmrender-resurrect-${version}"; + + src = fetchFromGitHub { + owner = "hzeller"; + repo = "gmrender-resurrect"; + rev = "${version}"; + sha256 = "1dmdhyz27bh74qmvncfd3kw7zqwnd05bhxcfjjav98z5qrxdygj4"; + }; + + preConfigurePhases = "autoconfPhase"; + + autoconfPhase = "./autogen.sh"; + + buildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav libupnp ]; + nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; + + postInstall = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "${gst-plugins-base}/lib/gstreamer-1.0:${gst-plugins-good}/lib/gstreamer-1.0:${gst-plugins-bad}/lib/gstreamer-1.0:${gst-plugins-ugly}/lib/gstreamer-1.0:${gst-libav}/lib/gstreamer-1.0" + done + ''; + + meta = with stdenv.lib; { + description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; + homepage = https://github.com/hzeller/gmrender-resurrect; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96d3ecee2c7..f18882203bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2513,6 +2513,10 @@ with pkgs; glxinfo = callPackage ../tools/graphics/glxinfo { }; + gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; + }; + gmvault = callPackage ../tools/networking/gmvault { }; gnash = callPackage ../misc/gnash { }; -- GitLab From cc1ab7413d588f5dc3956b4c705a23f6af474e56 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 29 Mar 2018 22:15:01 +0300 Subject: [PATCH 016/785] calibre: remove unnecessary patch In addition to bumping the version, remove a patch which made self.update_checker None. This caused errors that showed on the terminal after closing Calibre (if it was launched from a terminal). --- .../misc/calibre/no_updates_dialog.patch | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch index 4d37c3b642f..faaaf2c1994 100644 --- a/pkgs/applications/misc/calibre/no_updates_dialog.patch +++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch @@ -13,15 +13,3 @@ diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre parser.add_option('--ignore-plugins', default=False, action='store_true', help=_('Ignore custom plugins, useful if you installed a plugin' ' that is preventing calibre from starting')) -diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py ---- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800 -+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800 -@@ -154,6 +154,8 @@ - self.update_checker.signal.update_found.connect(self.update_found, - type=Qt.QueuedConnection) - self.update_checker.start() -+ else: -+ self.update_checker = None - - def recalc_update_label(self, number_of_plugin_updates): - self.update_found(self.last_newest_calibre_version, number_of_plugin_updates) -- GitLab From f3657a05d82082e4bf1610c69216f71bbe731253 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 8 Apr 2018 00:18:56 +0100 Subject: [PATCH 017/785] minidlna nixos module: add loglevel config --- .../modules/services/networking/minidlna.nix | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 61d063dbfe0..6401631bf62 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -1,23 +1,16 @@ # Module for MiniDLNA, a simple DLNA server. - { config, lib, pkgs, ... }: with lib; let - cfg = config.services.minidlna; - port = 8200; - in { - ###### interface - options = { - services.minidlna.enable = mkOption { type = types.bool; default = false; @@ -43,24 +36,48 @@ in ''; }; + services.minidlna.loglevel = mkOption { + type = types.str; + default = "warn"; + example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn"; + description = + '' + Defines the type of messages that should be logged, and down to + which level of importance they should be considered. + + The possible types are “artwork”, “database”, “general”, “http”, + “inotify”, “metadata”, “scanner”, “ssdp” and “tivo”. + + The levels are “off”, “fatal”, “error”, “warn”, “info” and + “debug”, listed here in order of decreasing importance. “off” + turns off logging messages entirely, “fatal” logs the most + critical messages only, and so on down to “debug” that logs every + single messages. + + The types are comma-separated, followed by an equal sign (‘=’), + followed by a level that applies to the preceding types. This can + be repeated, separating each of these constructs with a comma. + + Defaults to “general,artwork,database,inotify,scanner,metadata, + http,ssdp,tivo=warn” which logs every type of message at the + “warn” level. + ''; + }; + services.minidlna.config = mkOption { type = types.lines; description = "The contents of MiniDLNA's configuration file."; }; - }; - ###### implementation - config = mkIf cfg.enable { - services.minidlna.config = '' port=${toString port} friendly_name=${config.networking.hostName} MiniDLNA db_dir=/var/cache/minidlna - log_level=warn + log_level=${cfg.loglevel} inotify=yes ${concatMapStrings (dir: '' media_dir=${dir} @@ -98,7 +115,5 @@ in " -f ${pkgs.writeText "minidlna.conf" cfg.config}"; }; }; - }; - } -- GitLab From 759e66f63df4532e96ad1f0dd56b34364dd9da80 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 9 Apr 2018 11:39:30 -0700 Subject: [PATCH 018/785] btrbk: fix SSH filter script --- pkgs/tools/backup/btrbk/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ace54318665..dd10eeb8e5a 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, asciidoc-full, makeWrapper }: +, utillinux, asciidoc-full, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { --replace "/bin/date" "${coreutils}/bin/date" \ --replace "/bin/echo" "${coreutils}/bin/echo" \ --replace '$btrbk' 'btrbk' + + # Fix SSH filter script + sed -i '/^export PATH/d' ssh_filter_btrbk.sh + substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger ''; preFixup = '' -- GitLab From d031891c6bf151ef31517c1bc633ff21ecee864a Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 9 Apr 2018 13:57:42 -0700 Subject: [PATCH 019/785] btrbk: clean up build inputs --- pkgs/tools/backup/btrbk/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index dd10eeb8e5a..958afa3f6a9 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, utillinux, asciidoc-full, makeWrapper }: +, utillinux, asciidoc, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; }; - buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ]; + nativeBuildInputs = [ asciidoc makeWrapper ]; + + buildInputs = with perlPackages; [ perl DateCalc ]; preInstall = '' for f in $(find . -name Makefile); do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c493337c16..1ff50d20958 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -886,7 +886,9 @@ with pkgs; btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; - btrbk = callPackage ../tools/backup/btrbk { }; + btrbk = callPackage ../tools/backup/btrbk { + asciidoc = asciidoc-full; + }; buildtorrent = callPackage ../tools/misc/buildtorrent { }; -- GitLab From 4ae2488e80e71c41b2aaa98e82e7d37b5df19eaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 23:20:33 -0700 Subject: [PATCH 020/785] grpc: 1.10.0 -> 1.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grpc/versions. These checks were done: - built on NixOS - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables help’ got 0 exit code - found 1.10.1 with grep in /nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1 - directory tree listing: https://gist.github.com/dc70d4a21aaa0b79ffe8dca6d80841f0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 9f9166e43c9..fc1f186a219 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.10.0"; + version = "1.10.1"; name = "grpc-${version}"; src = fetchurl { url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; - sha256 = "0wngrb44bpryrvrnx5y1ncrhi2097qla929wqjwvs0razbk3v9rr"; + sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; -- GitLab From a45dad98119c69644d61e77e3c011e975aa7f4cb Mon Sep 17 00:00:00 2001 From: davidak Date: Wed, 11 Apr 2018 14:12:47 +0200 Subject: [PATCH 021/785] tealdeer: init at 1.0.0 --- pkgs/tools/misc/tealdeer/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/tealdeer/default.nix diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix new file mode 100644 index 00000000000..fe0aa6cc308 --- /dev/null +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -0,0 +1,34 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }: + +rustPlatform.buildRustPackage rec { + name = "tealdeer-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "dbrgn"; + repo = "tealdeer"; + rev = "v${version}"; + sha256 = "0mkcja9agkbj2i93hx01r77w66ca805v4wvivcnrqmzid001717v"; + }; + + cargoSha256 = "1qrvic7b6g3f3gjzx7x97ipp7ppa79c0aawn0lsav0c9xxzl44jq"; + + buildInputs = [ openssl cacert curl ]; + + nativeBuildInputs = [ pkgconfig ]; + + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + # disable tests for now since one needs network + # what is unavailable in sandbox build + # and i can't disable just this one + doCheck = false; + + meta = with stdenv.lib; { + description = "An implementation of tldr in Rust"; + homepage = "https://github.com/dbrgn/tealdeer"; + maintainers = with maintainers; [ davidak ]; + license = with licenses; [ asl20 mit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c..2ebd27c93f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2089,6 +2089,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + tealdeer = callPackage ../tools/misc/tealdeer/default.nix { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { -- GitLab From 42a84598fb7baacc991c03e228a07a536bc0624a Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Thu, 5 Apr 2018 18:43:56 +1000 Subject: [PATCH 022/785] Added cross-references to NixOS manual --- .../manual/administration/cleaning-store.xml | 4 +- .../administration/container-networking.xml | 6 +- .../manual/administration/control-groups.xml | 4 +- .../administration/declarative-containers.xml | 14 +-- .../administration/imperative-containers.xml | 10 +-- .../doc/manual/configuration/abstractions.xml | 12 +-- .../configuration/ad-hoc-network-config.xml | 4 +- .../configuration/adding-custom-packages.xml | 6 +- .../doc/manual/configuration/config-file.xml | 26 +++--- .../configuration/customizing-packages.xml | 6 +- .../configuration/declarative-packages.xml | 6 +- .../doc/manual/configuration/file-systems.xml | 8 +- nixos/doc/manual/configuration/firewall.xml | 14 +-- .../doc/manual/configuration/ipv4-config.xml | 10 +-- .../doc/manual/configuration/ipv6-config.xml | 8 +- .../doc/manual/configuration/linux-kernel.xml | 14 +-- .../configuration/luks-file-systems.xml | 6 +- nixos/doc/manual/configuration/modularity.xml | 36 ++++---- .../manual/configuration/network-manager.xml | 4 +- nixos/doc/manual/configuration/ssh.xml | 6 +- nixos/doc/manual/configuration/user-mgmt.xml | 26 +++--- nixos/doc/manual/configuration/wireless.xml | 4 +- nixos/doc/manual/configuration/x-windows.xml | 46 +++++----- nixos/doc/manual/configuration/xfce.xml | 24 +++--- .../manual/installation/changing-config.xml | 2 +- .../installing-from-other-distro.xml | 4 +- .../installing-virtualbox-guest.xml | 4 +- nixos/doc/manual/installation/installing.xml | 85 ++++++++++--------- nixos/doc/manual/installation/upgrading.xml | 4 +- nixos/modules/i18n/input-method/default.xml | 78 ++++++++--------- nixos/modules/programs/digitalbitbox/doc.xml | 38 ++++----- nixos/modules/programs/plotinus.xml | 2 +- nixos/modules/security/acme.xml | 22 ++--- nixos/modules/security/hidepid.xml | 12 +-- .../modules/services/databases/postgresql.xml | 12 +-- nixos/modules/services/editors/emacs.xml | 20 ++--- nixos/modules/services/misc/gitlab.xml | 59 +++++++------ .../modules/services/misc/taskserver/doc.xml | 12 +-- .../services/networking/dnscrypt-proxy.xml | 20 ++--- 39 files changed, 340 insertions(+), 338 deletions(-) diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml index 4cf62947f52..52512b8f127 100644 --- a/nixos/doc/manual/administration/cleaning-store.xml +++ b/nixos/doc/manual/administration/cleaning-store.xml @@ -29,8 +29,8 @@ this unit automatically at certain points in time, for instance, every night at 03:15: -nix.gc.automatic = true; -nix.gc.dates = "03:15"; + = true; + = "03:15"; diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index d89d262eff4..2fc353059df 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -39,9 +39,9 @@ IP address. This can be accomplished using the following configuration on the host: -networking.nat.enable = true; -networking.nat.internalInterfaces = ["ve-+"]; -networking.nat.externalInterface = "eth0"; + = true; + = ["ve-+"]; + = "eth0"; where eth0 should be replaced with the desired external interface. Note that ve-+ is a wildcard diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml index 0d7b8ae910a..03db40a3bc5 100644 --- a/nixos/doc/manual/administration/control-groups.xml +++ b/nixos/doc/manual/administration/control-groups.xml @@ -47,7 +47,7 @@ would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s CPU share in configuration.nix: -systemd.services.httpd.serviceConfig.CPUShares = 512; +systemd.services.httpd.serviceConfig.CPUShares = 512; By default, every cgroup has 1024 CPU shares, so this will halve the @@ -61,7 +61,7 @@ available memory. Per-cgroup memory limits can be specified in httpd.service to 512 MiB of RAM (excluding swap): -systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 94f03a2ee11..79b230e5fc7 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -15,8 +15,8 @@ following specifies that there shall be a container named containers.database = { config = { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql96; + { = true; + = pkgs.postgresql96; }; }; @@ -33,11 +33,11 @@ ports. However, they cannot change the network configuration. You can give a container its own network as follows: -containers.database = - { privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; - }; +containers.database = { + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; +}; This gives the container a private virtual Ethernet interface with IP diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index d5d8140e076..d39ac7f8bef 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -30,8 +30,8 @@ line. For instance, to create a container that has # nixos-container create foo --config ' - services.openssh.enable = true; - users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; + = true; + users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' @@ -100,9 +100,9 @@ specify a new configuration on the command line: # nixos-container update foo --config ' - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; + = true; + = "foo@example.org"; + = [ 80 ]; ' # curl http://$(nixos-container show-ip foo)/ diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml index cbd54bca62f..f794085295c 100644 --- a/nixos/doc/manual/configuration/abstractions.xml +++ b/nixos/doc/manual/configuration/abstractions.xml @@ -11,7 +11,7 @@ to abstract. Take, for instance, this Apache HTTP Server configuration: { - services.httpd.virtualHosts = + = [ { hostName = "example.org"; documentRoot = "/webroot"; adminAddr = "alice@example.org"; @@ -43,7 +43,7 @@ let }; in { - services.httpd.virtualHosts = + = [ exampleOrgCommon (exampleOrgCommon // { enableSSL = true; @@ -66,7 +66,7 @@ allowed. Thus, you also could have written: { - services.httpd.virtualHosts = + = let exampleOrgCommon = ...; in [ exampleOrgCommon (exampleOrgCommon // { ... }) @@ -86,7 +86,7 @@ the host name. This can be done as follows: { - services.httpd.virtualHosts = + = let makeVirtualHost = name: { hostName = name; @@ -113,7 +113,7 @@ element in a list: { - services.httpd.virtualHosts = + = let makeVirtualHost = ...; in map makeVirtualHost @@ -132,7 +132,7 @@ function that takes a set as its argument, like this: { - services.httpd.virtualHosts = + = let makeVirtualHost = { name, root }: { hostName = name; diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml index 26a572ba1fb..c53b9598109 100644 --- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml @@ -6,14 +6,14 @@ Ad-Hoc Configuration -You can use to specify +You can use to specify shell commands to be run at the end of network-setup.service. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address: -networking.localCommands = + = '' ip -6 addr add 2001:610:685:1::1/64 dev eth0 ''; diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index ab3665bae50..ae58f61d73e 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -24,7 +24,7 @@ manual. Finally, you add it to environment.systemPackages, e.g. -environment.systemPackages = [ pkgs.my-package ]; + = [ pkgs.my-package ]; and you run nixos-rebuild, specifying your own @@ -41,7 +41,7 @@ Nixpkgs tree. For instance, here is how you specify a build of the package directly in configuration.nix: -environment.systemPackages = + = let my-hello = with pkgs; stdenv.mkDerivation rec { name = "hello-2.8"; @@ -57,7 +57,7 @@ environment.systemPackages = Of course, you can also move the definition of my-hello into a separate Nix expression, e.g. -environment.systemPackages = [ (import ./my-hello.nix) ]; + = [ (import ./my-hello.nix) ]; where my-hello.nix contains: diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 3d1cdaf4c4a..60a4dac97d5 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -28,9 +28,9 @@ form name = { config, pkgs, ... }: -{ services.httpd.enable = true; - services.httpd.adminAddr = "alice@example.org"; - services.httpd.documentRoot = "/webroot"; +{ = true; + = "alice@example.org"; + = "/webroot"; } @@ -40,7 +40,7 @@ the document root. Sets can be nested, and in fact dots in option names are shorthand for defining a set containing another set. For instance, - defines a set named + defines a set named services that contains a set named httpd, which in turn contains an option definition named enable with value true. @@ -89,7 +89,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no Strings are enclosed in double quotes, e.g. -networking.hostName = "dexter"; + = "dexter"; Special characters can be escaped by prefixing them with a @@ -99,7 +99,7 @@ networking.hostName = "dexter"; single quotes, e.g. -networking.extraHosts = + = '' 127.0.0.2 other-localhost 10.0.0.1 server @@ -125,8 +125,8 @@ networking.extraHosts = false, e.g. -networking.firewall.enable = true; -networking.firewall.allowPing = false; + = true; + = false; @@ -138,7 +138,7 @@ networking.firewall.allowPing = false; For example, -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; +."net.ipv4.tcp_keepalive_time" = 60; (Note that here the attribute name @@ -158,7 +158,7 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; enclosed in braces, as in the option definition -fileSystems."/boot" = +."/boot" = { device = "/dev/sda1"; fsType = "ext4"; options = [ "rw" "data=ordered" "relatime" ]; @@ -175,7 +175,7 @@ fileSystems."/boot" = elements are separated by whitespace, like this: -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + = [ "fuse" "kvm-intel" "coretemp" ]; List elements can be any other type, e.g. sets: @@ -195,12 +195,12 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; the function argument pkgs. Typical uses: -environment.systemPackages = + = [ pkgs.thunderbird pkgs.emacs ]; -postgresql.package = pkgs.postgresql90; + = pkgs.postgresql90; The latter option definition changes the default PostgreSQL diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index 8aa01fb57a0..8b7654e9b42 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -28,7 +28,7 @@ has a dependency on GTK+ 2. If you want to build it against GTK+ 3, you can specify that as follows: -environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; + = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; The function override performs the call to the Nix @@ -38,7 +38,7 @@ the set of arguments specified by you. So here the function argument causing Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, -environment.systemPackages would be a list with two + would be a list with two elements.) Even greater customisation is possible using the function @@ -51,7 +51,7 @@ For instance, if you want to override the source code of Emacs, you can say: -environment.systemPackages = [ + = [ (pkgs.emacs.overrideAttrs (oldAttrs: { name = "emacs-25.0-pre"; src = /path/to/my/emacs/tree; diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index dc2fa715097..4c875e6f037 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -8,12 +8,12 @@ With declarative package management, you specify which packages you want on your system by setting the option -. For instance, adding the +. For instance, adding the following line to configuration.nix enables the Mozilla Thunderbird email application: -environment.systemPackages = [ pkgs.thunderbird ]; + = [ pkgs.thunderbird ]; The effect of this specification is that the Thunderbird package from @@ -34,7 +34,7 @@ name, such as different channels that you might have.) To “uninstall” a package, simply remove it from - and run + and run nixos-rebuild switch. diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index ae3d124cd6b..0ff37c38d8b 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -13,21 +13,21 @@ device /dev/disk/by-label/data onto the mount point /data: -fileSystems."/data" = +."/data" = { device = "/dev/disk/by-label/data"; fsType = "ext4"; }; Mount points are created automatically if they don’t already exist. -For , it’s best to use the topology-independent +For , it’s best to use the topology-independent device aliases in /dev/disk/by-label and /dev/disk/by-uuid, as these don’t change if the topology changes (e.g. if a disk is moved to another IDE controller). You can usually omit the file system type -(), since mount can usually +(), since mount can usually detect the type and load the necessary kernel module automatically. However, if the file system is needed at early boot (in the initial ramdisk) and is not ext2, ext3 @@ -38,7 +38,7 @@ available. System startup will fail if any of the filesystems fails to mount, dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding -options = [ "nofail" ];. +options = [ "nofail" ];. diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml index 75cccef95b3..ecc21a3bdf5 100644 --- a/nixos/doc/manual/configuration/firewall.xml +++ b/nixos/doc/manual/configuration/firewall.xml @@ -12,37 +12,37 @@ both IPv4 and IPv6 traffic. It is enabled by default. It can be disabled as follows: -networking.firewall.enable = false; + = false; If the firewall is enabled, you can open specific TCP ports to the outside world: -networking.firewall.allowedTCPPorts = [ 80 443 ]; + = [ 80 443 ]; Note that TCP port 22 (ssh) is opened automatically if the SSH daemon -is enabled (). UDP +is enabled (). UDP ports can be opened through -. +. To open ranges of TCP ports: -networking.firewall.allowedTCPPortRanges = [ + = [ { from = 4000; to = 4007; } { from = 8000; to = 8010; } ]; Similarly, UDP port ranges can be opened through -. +. Also of interest is -networking.firewall.allowPing = true; + = true; to allow the machine to respond to ping requests. (ICMPv6 pings are diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index 68238b547d6..f3ce4af39b9 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,15 +12,15 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; Typically you’ll also want to set a default gateway and set of name servers: -networking.defaultGateway = "192.168.1.1"; -networking.nameservers = [ "8.8.8.8" ]; + = "192.168.1.1"; + = [ "8.8.8.8" ]; @@ -31,10 +31,10 @@ service The default gateway and name server configuration is performed by network-setup.service. -The host name is set using : +The host name is set using : -networking.hostName = "cartman"; + = "cartman"; The default host name is nixos. Set it to the diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 74a21e18ec3..6b0ba0d48f0 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -11,14 +11,14 @@ is used to automatically assign IPv6 addresses to all interfaces. You can disable IPv6 support globally by setting: -networking.enableIPv6 = false; + = false; You can disable IPv6 on a single interface using a normal sysctl (in this example, we use interface eth0): -boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +."net.ipv6.conf.eth0.disable_ipv6" = true; @@ -26,14 +26,14 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; For configuring a gateway, optionally with explicitly specified interface: -networking.defaultGateway6 = { + = { address = "fe00::1"; interface = "enp0s3"; } diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 52be26d6024..b9325629256 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -10,7 +10,7 @@ the option . For instance, this selects the Linux 3.10 kernel: -boot.kernelPackages = pkgs.linuxPackages_3_10; + = pkgs.linuxPackages_3_10; Note that this not only replaces the kernel, but also packages that are specific to the kernel version, such as the NVIDIA video drivers. @@ -45,23 +45,23 @@ is typically y, n or Kernel modules for hardware devices are generally loaded automatically by udev. You can force a module to -be loaded via , e.g. +be loaded via , e.g. -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + = [ "fuse" "kvm-intel" "coretemp" ]; If the module is required early during the boot (e.g. to mount the root file system), you can use -: +: -boot.initrd.extraKernelModules = [ "cifs" ]; + = [ "cifs" ]; This causes the specified modules and their dependencies to be added to the initial ramdisk. Kernel runtime parameters can be set through -, e.g. +, e.g. -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; +."net.ipv4.tcp_keepalive_time" = 120; sets the kernel’s TCP keepalive time to 120 seconds. To see the available parameters, run sysctl -a. diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 00c795cd089..6c2b4cc60b5 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -33,13 +33,13 @@ as /, add the following to configuration.nix: -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -fileSystems."/".device = "/dev/mapper/crypted"; +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +."/".device = "/dev/mapper/crypted"; Should grub be used as bootloader, and /boot is located on an encrypted partition, it is necessary to add the following grub option: -boot.loader.grub.enableCryptodisk = true; + = true; diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 5420c7f8838..2f76459a24e 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -22,8 +22,8 @@ use other modules by including them from { config, pkgs, ... }: { imports = [ ./vpn.nix ./kde.nix ]; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.emacs ]; + = true; + = [ pkgs.emacs ]; ... } @@ -35,25 +35,25 @@ latter might look like this: { config, pkgs, ... }: -{ services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; +{ = true; + = true; + = true; } Note that both configuration.nix and kde.nix define the option -. When multiple modules +. When multiple modules define an option, NixOS will try to merge the definitions. In the case of -, that’s easy: the lists of +, that’s easy: the lists of packages can simply be concatenated. The value in configuration.nix is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use mkBefore: -boot.kernelModules = mkBefore [ "kvm-intel" ]; + = mkBefore [ "kvm-intel" ]; This causes the kvm-intel kernel module to be @@ -61,7 +61,7 @@ loaded before any other kernel modules. For other types of options, a merge may not be possible. For instance, if two modules define -, +, nixos-rebuild will give an error: @@ -72,7 +72,7 @@ When that happens, it’s possible to force one definition take precedence over the others: -services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; + = pkgs.lib.mkForce "bob@example.org"; @@ -89,15 +89,15 @@ wondering how it’s possible that the (indirect) is a “lazy” language — it only computes values when they are needed. This works as long as no individual configuration value depends on itself.. For example, here is a module that adds -some packages to only if - is set to +some packages to only if + is set to true somewhere else: { config, pkgs, ... }: -{ environment.systemPackages = - if config.services.xserver.enable then +{ = + if config. then [ pkgs.firefox pkgs.thunderbird ] @@ -113,10 +113,10 @@ value of a configuration option is. The command allows you to find out: -$ nixos-option services.xserver.enable +$ nixos-option true -$ nixos-option boot.kernelModules +$ nixos-option [ "tun" "ipv6" "loop" ... ] @@ -130,10 +130,10 @@ typical use: $ nix-repl '<nixpkgs/nixos>' -nix-repl> config.networking.hostName +nix-repl> config. "mandark" -nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +nix-repl> map (x: x.hostName) config. [ "example.org" "example.gov" ] diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index b4808e74ff9..bbbee3a52ed 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -10,7 +10,7 @@ use NetworkManager. You can enable NetworkManager by setting: -networking.networkmanager.enable = true; + = true; some desktop managers (e.g., GNOME) enable NetworkManager @@ -20,7 +20,7 @@ automatically for you. belong to the networkmanager group: -users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; +users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml index 7c928baaf89..7dbe598cffe 100644 --- a/nixos/doc/manual/configuration/ssh.xml +++ b/nixos/doc/manual/configuration/ssh.xml @@ -10,12 +10,12 @@ setting: -services.openssh.enable = true; + = true; By default, root logins using a password are disallowed. They can be disabled entirely by setting -services.openssh.permitRootLogin to + to "no". You can declaratively specify authorised RSA/DSA public keys for @@ -23,7 +23,7 @@ a user as follows: -users.extraUsers.alice.openssh.authorizedKeys.keys = +users.extraUsers.alice.openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index c6656edff6c..848b221baa7 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -12,12 +12,12 @@ management. In the declarative style, users are specified in states that a user account named alice shall exist: -users.users.alice = - { isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +.alice = + { isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; @@ -32,13 +32,13 @@ a password. However, you can use the passwd program to set a password, which is retained across invocations of nixos-rebuild. -If you set users.mutableUsers to false, then the contents of /etc/passwd -and /etc/group will be congruent to your NixOS configuration. For instance, -if you remove a user from users.users and run nixos-rebuild, the user -account will cease to exist. Also, imperative commands for managing users +If you set to false, then the contents of +/etc/passwd and /etc/group will be congruent to +your NixOS configuration. For instance, if you remove a user from +and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be -assigned by setting the user's hashedPassword option. A -hashed password can be generated using mkpasswd -m sha-512 +assigned by setting the user's hashedPassword +option. A hashed password can be generated using mkpasswd -m sha-512 after installing the mkpasswd package. A user ID (uid) is assigned automatically. You can also specify @@ -54,7 +54,7 @@ to the user specification. group named students shall exist: -users.groups.students.gid = 1000; +.students.gid = 1000; As with users, the group ID (gid) is optional and will be assigned diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 1868380dcbf..6ce43a43700 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -15,12 +15,12 @@ section on wireless networks. NixOS will start wpa_supplicant for you if you enable this setting: -networking.wireless.enable = true; + = true; NixOS lets you specify networks for wpa_supplicant declaratively: -networking.wireless.networks = { + = { echelon = { psk = "abcdefgh"; }; diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 9c2c59006f1..fd0daf6c6e5 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -9,14 +9,14 @@ The X Window System (X11) provides the basis of NixOS’ graphical user interface. It can be enabled as follows: -services.xserver.enable = true; + = true; The X server will automatically detect and use the appropriate video driver from a set of X.org drivers (such as vesa and intel). You can also specify a driver manually, e.g. -services.xserver.videoDrivers = [ "r128" ]; + = [ "r128" ]; to enable X.org’s xf86-video-r128 driver. @@ -25,13 +25,13 @@ Otherwise, you can only log into a plain undecorated xterm window. Thus you should pick one or more of the following lines: -services.xserver.desktopManager.plasma5.enable = true; -services.xserver.desktopManager.xfce.enable = true; -services.xserver.desktopManager.gnome3.enable = true; -services.xserver.windowManager.xmonad.enable = true; -services.xserver.windowManager.twm.enable = true; -services.xserver.windowManager.icewm.enable = true; -services.xserver.windowManager.i3.enable = true; + = true; + = true; + = true; + = true; + = true; + = true; + = true; @@ -40,22 +40,22 @@ program that provides a graphical login prompt and manages the X server) is SLiM. You can select an alternative one by picking one of the following lines: -services.xserver.displayManager.sddm.enable = true; -services.xserver.displayManager.lightdm.enable = true; + = true; + = true; You can set the keyboard layout (and optionally the layout variant): -services.xserver.layout = "de"; -services.xserver.xkbVariant = "neo"; + = "de"; + = "neo"; The X server is started automatically at boot time. If you don’t want this to happen, you can set: -services.xserver.autorun = false; + = false; The X server can then be started manually: @@ -70,13 +70,13 @@ The X server can then be started manually: has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "nvidia" ]; + = [ "nvidia" ]; Or if you have an older card, you may have to use one of the legacy drivers: -services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy173" ]; + = [ "nvidiaLegacy340" ]; + = [ "nvidiaLegacy304" ]; + = [ "nvidiaLegacy173" ]; You may need to reboot after enabling this driver to prevent a clash with other kernel modules. @@ -84,7 +84,7 @@ with other kernel modules. On 64-bit systems, if you want full acceleration for 32-bit programs such as Wine, you should also set the following: -hardware.opengl.driSupport32Bit = true; + = true; @@ -96,7 +96,7 @@ hardware.opengl.driSupport32Bit = true; has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "ati_unfree" ]; + = [ "ati_unfree" ]; You will need to reboot after enabling this driver to prevent a clash with other kernel modules. @@ -104,7 +104,7 @@ with other kernel modules. On 64-bit systems, if you want full acceleration for 32-bit programs such as Wine, you should also set the following: -hardware.opengl.driSupport32Bit = true; + = true; @@ -115,12 +115,12 @@ hardware.opengl.driSupport32Bit = true; Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: -services.xserver.libinput.enable = true; + = true; The driver has many options (see ). For instance, the following disables tap-to-click behavior: -services.xserver.libinput.tapping = false; + = false; Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09. diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 18804d2c08b..8cb592faed5 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -9,9 +9,9 @@ To enable the Xfce Desktop Environment, set -services.xserver.desktopManager = { - xfce.enable = true; - default = "xfce"; +services.xserver.desktopManager = { + xfce.enable = true; + default = "xfce"; }; @@ -20,12 +20,12 @@ services.xserver.desktopManager = { Optionally, compton can be enabled for nice graphical effects, some example settings: -services.compton = { - enable = true; - fade = true; - inactiveOpacity = "0.9"; - shadow = true; - fadeDelta = 4; +services.compton = { + enable = true; + fade = true; + inactiveOpacity = "0.9"; + shadow = true; + fadeDelta = 4; }; @@ -33,9 +33,9 @@ services.compton = { Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your - environment.systemPackages. + . - + Thunar Volume Support @@ -44,7 +44,7 @@ services.compton = { Thunar volume support, put -services.xserver.desktopManager.xfce.enable = true; + = true; into your configuration.nix. diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 4db9020b960..52d8a292f8b 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -75,7 +75,7 @@ have set mutableUsers = false. Another way is to temporarily add the following to your configuration: -users.extraUsers.your-user.initialPassword = "test" +users.extraUsers.your-user.initialHashedPassword = "test"; Important: delete the $hostname.qcow2 file if you diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index ecd020a067a..11fcb43732a 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -111,7 +111,7 @@ $ nix-channel --add https://nixos.org/channels/nixos-versionconfiguration.nix: -boot.loader.grub.extraEntries = '' + = '' menuentry "Ubuntu" { search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e configfile "($ubuntu)/boot/grub/grub.cfg" @@ -183,7 +183,7 @@ $ sudo groupdel nixbld account with sudo passwd -l root if you use sudo) - users.extraUsers.root.initialHashedPassword = ""; + users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 7fcd22a112c..2b31b7ed315 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -42,7 +42,7 @@ -boot.loader.grub.device = "/dev/sda"; + = "/dev/sda"; @@ -51,7 +51,7 @@ boot.loader.grub.device = "/dev/sda"; -boot.initrd.checkJournalingFS = false; + = false; diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e20b6574b72..f967a7fe268 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -208,26 +208,29 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif BIOS systems - You must set the option - to specify on which disk - the GRUB boot loader is to be installed. Without it, NixOS cannot - boot. + You must set the option + to specify on which disk + the GRUB boot loader is to be installed. Without it, NixOS cannot + boot. UEFI systems - You must set the option - to true. - nixos-generate-config should do this automatically for new - configurations when booted in - UEFI mode. - You may want to look at the options starting with - and - as well. + You must set the option + to true. + nixos-generate-config should do this automatically for new + configurations when booted in + UEFI mode. + You may want to look at the options starting with + and + as well. + + + If there are other operating systems running on the machine before installing NixOS, the - option can be set to + option can be set to true to automatically add them to the grub menu. Another critical option is , @@ -269,15 +272,15 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif As the last step, nixos-install will ask you to set the password for the root user, e.g. - -setting root password... -Enter new UNIX password: *** -Retype new UNIX password: *** - + + setting root password... + Enter new UNIX password: *** + Retype new UNIX password: *** + - To prevent the password prompt, set users.mutableUsers = false; in + To prevent the password prompt, set = false; in configuration.nix, which allows unattended installation necessary in automation. @@ -290,20 +293,20 @@ Retype new UNIX password: *** If everything went well: - -# reboot + + # reboot You should now be able to boot into the installed NixOS. The - GRUB boot menu shows a list of available - configurations (initially just one). Every time you - change the NixOS configuration (see Changing Configuration ), a - new item is added to the menu. This allows you to easily roll back - to a previous configuration if something goes wrong. + GRUB boot menu shows a list of available + configurations (initially just one). Every time you + change the NixOS configuration (see Changing Configuration ), a + new item is added to the menu. This allows you to easily roll back + to a previous configuration if something goes wrong. You should log in and change the root password with passwd. @@ -376,26 +379,26 @@ drive (here /dev/sda). NixOS Configuration - -{ config, pkgs, ... }: + + { config, pkgs, ... }: -{ - imports = + { + imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./hardware-configuration.nix ]; - boot.loader.grub.device = "/dev/sda"; # (for BIOS systems only) - boot.loader.systemd-boot.enable = true; # (for UEFI systems only) + = "/dev/sda"; # (for BIOS systems only) + = true; # (for UEFI systems only) - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; - # Enable the OpenSSH server. - services.sshd.enable = true; -} + # Enable the OpenSSH server. + services.sshd.enable = true; + } diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index aee6523345c..24881c8fec0 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -119,7 +119,7 @@ able to go back to your original channel. the following to configuration.nix: -system.autoUpgrade.enable = true; + = true; This enables a periodically executed systemd service named @@ -130,7 +130,7 @@ runs, see systemctl list-timers.) You can also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03; + = https://nixos.org/channels/nixos-17.03; diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index 45d6daf068b..76ffa8cb7e3 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -6,56 +6,56 @@ Input Methods -Input methods are an operating system component that allows any data, such - as keyboard strokes or mouse movements, to be received as input. In this way - users can enter characters and symbols not found on their input devices. Using - an input method is obligatory for any language that has more graphemes than +Input methods are an operating system component that allows any data, such + as keyboard strokes or mouse movements, to be received as input. In this way + users can enter characters and symbols not found on their input devices. Using + an input method is obligatory for any language that has more graphemes than there are keys on the keyboard. The following input methods are available in NixOS: IBus: The intelligent input bus. - Fcitx: A customizable lightweight input + Fcitx: A customizable lightweight input method. Nabi: A Korean input method based on XIM. - Uim: The universal input method, is a library with a XIM + Uim: The universal input method, is a library with a XIM bridge.
IBus -IBus is an Intelligent Input Bus. It provides full featured and user +IBus is an Intelligent Input Bus. It provides full featured and user friendly input method user interface. The following snippet can be used to configure IBus: i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; }; -i18n.inputMethod.ibus.engines is optional and can be +i18n.inputMethod.ibus.engines is optional and can be used to add extra IBus engines. Available extra IBus engines are: - Anthy (ibus-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji + Anthy (ibus-engines.anthy): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Hangul (ibus-engines.hangul): Korean input + Hangul (ibus-engines.hangul): Korean input method. - m17n (ibus-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n + m17n (ibus-engines.m17n): m17n is an input + method that uses input methods and corresponding icons in the m17n database. - mozc (ibus-engines.mozc): A Japanese input + mozc (ibus-engines.mozc): A Japanese input method from Google. - Table (ibus-engines.table): An input method + Table (ibus-engines.table): An input method that load tables of input methods. - table-others (ibus-engines.table-others): + table-others (ibus-engines.table-others): Various table-based input methods. To use this, and any other table-based input methods, it must appear in the list of engines along with table. For example: @@ -72,71 +72,71 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
Fcitx -Fcitx is an input method framework with extension support. It has three - built-in Input Method Engine, Pinyin, QuWei and Table-based input +Fcitx is an input method framework with extension support. It has three + built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. The following snippet can be used to configure Fcitx: i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; + enabled = "fcitx"; + fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; }; -i18n.inputMethod.fcitx.engines is optional and can be +i18n.inputMethod.fcitx.engines is optional and can be used to add extra Fcitx engines. Available extra Fcitx engines are: - Anthy (fcitx-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji + Anthy (fcitx-engines.anthy): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Chewing (fcitx-engines.chewing): Chewing is - an intelligent Zhuyin input method. It is one of the most popular input + Chewing (fcitx-engines.chewing): Chewing is + an intelligent Zhuyin input method. It is one of the most popular input methods among Traditional Chinese Unix users. - Hangul (fcitx-engines.hangul): Korean input + Hangul (fcitx-engines.hangul): Korean input method. - Unikey (fcitx-engines.unikey): Vietnamese input + Unikey (fcitx-engines.unikey): Vietnamese input method. - m17n (fcitx-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n + m17n (fcitx-engines.m17n): m17n is an input + method that uses input methods and corresponding icons in the m17n database. - mozc (fcitx-engines.mozc): A Japanese input + mozc (fcitx-engines.mozc): A Japanese input method from Google. - table-others (fcitx-engines.table-others): + table-others (fcitx-engines.table-others): Various table-based input methods.
Nabi -Nabi is an easy to use Korean X input method. It allows you to enter - phonetic Korean characters (hangul) and pictographic Korean characters +Nabi is an easy to use Korean X input method. It allows you to enter + phonetic Korean characters (hangul) and pictographic Korean characters (hanja). The following snippet can be used to configure Nabi: i18n.inputMethod = { - enabled = "nabi"; + enabled = "nabi"; };
Uim -Uim (short for "universal input method") is a multilingual input method +Uim (short for "universal input method") is a multilingual input method framework. Applications can use it through so-called bridges. The following snippet can be used to configure uim: i18n.inputMethod = { - enabled = "uim"; + enabled = "uim"; }; -Note: The i18n.inputMethod.uim.toolbar option can be +Note: The option can be used to choose uim toolbar.
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml index 7acbc2fc4dd..a26653dda53 100644 --- a/nixos/modules/programs/digitalbitbox/doc.xml +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -15,9 +15,9 @@ installed by setting programs.digitalbitbox to true in a manner similar to - - programs.digitalbitbox.enable = true; - + + = true; + and bundles the digitalbitbox package (see ), which contains the @@ -46,11 +46,11 @@ digitalbitbox package which could be installed as follows: - - environment.systemPackages = [ - pkgs.digitalbitbox - ]; - + + = [ + pkgs.digitalbitbox +]; +
@@ -62,9 +62,9 @@ The digitalbitbox hardware package enables the udev rules for Digital Bitbox devices and may be installed as follows: - - hardware.digitalbitbox.enable = true; - + + = true; + @@ -72,14 +72,14 @@ the udevRule51 and udevRule52 attributes by means of overriding as follows: - - programs.digitalbitbox = { - enable = true; - package = pkgs.digitalbitbox.override { - udevRule51 = "something else"; - }; - }; - + +programs.digitalbitbox = { + enable = true; + package = pkgs.digitalbitbox.override { + udevRule51 = "something else"; + }; +}; + diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml index 85b0e023e6c..91740ee16ec 100644 --- a/nixos/modules/programs/plotinus.xml +++ b/nixos/modules/programs/plotinus.xml @@ -17,7 +17,7 @@ To enable Plotinus, add the following to your configuration.nix: -programs.plotinus.enable = true; + = true; diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 6130ed82ed3..7cdc554989e 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -48,9 +48,9 @@ http { configuration.nix: -security.acme.certs."foo.example.com" = { - webroot = "/var/www/challenges"; - email = "foo@example.com"; +."foo.example.com" = { + webroot = "/var/www/challenges"; + email = "foo@example.com"; }; @@ -58,17 +58,17 @@ security.acme.certs."foo.example.com" = { The private key key.pem and certificate fullchain.pem will be put into /var/lib/acme/foo.example.com. The target directory can -be configured with the option security.acme.directory. +be configured with the option . Refer to for all available configuration -options for the security.acme module. +options for the security.acme module.
Using ACME certificates in Nginx NixOS supports fetching ACME certificates for you by setting -enableACME = true; in a virtualHost config. We + enableACME = true; in a virtualHost config. We first create self-signed placeholder certificates in place of the real ACME certs. The placeholder certs are overwritten when the ACME certs arrive. For foo.example.com the config would @@ -77,13 +77,13 @@ look like. services.nginx = { - enable = true; - virtualHosts = { + enable = true; + virtualHosts = { "foo.example.com" = { - forceSSL = true; - enableACME = true; + forceSSL = true; + enableACME = true; locations."/" = { - root = "/var/www"; + root = "/var/www"; }; }; }; diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml index 5715ee7ac16..d69341eb3cd 100644 --- a/nixos/modules/security/hidepid.xml +++ b/nixos/modules/security/hidepid.xml @@ -8,9 +8,9 @@ Setting - - security.hideProcessInformation = true; - + + = true; + ensures that access to process information is restricted to the owning user. This implies, among other things, that command-line arguments remain private. Unless your deployment relies on unprivileged @@ -25,9 +25,9 @@ To allow a service foo to run without process information hiding, set - - systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; - + +systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; + diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index a9802694295..98a631c0cd3 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -23,15 +23,15 @@ configuration.nix: -services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql94; + = true; + = pkgs.postgresql94; Note that you are required to specify the desired version of PostgreSQL (e.g. pkgs.postgresql94). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for - such as the most recent + such as the most recent release of PostgreSQL. - If services.emacs.defaultEditor is + If is true, the EDITOR variable will be set to a wrapper script which launches emacsclient. @@ -497,10 +497,10 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal Emacs daemon is not wanted for all users, it is possible to install the service but not globally enable it: - + + = false; + = true; + @@ -582,7 +582,7 @@ services.emacs.install = true; To install the DocBook 5.0 schemas, either add pkgs.docbook5 to - environment.systemPackages ( (NixOS), or run nix-env -i pkgs.docbook5 (Nix). diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index 4b00f50abd6..3306ba8e9b1 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -18,19 +18,18 @@ webserver to proxy HTTP requests to the socket. frontend proxy: - services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts."git.example.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; - }; - }; -''; +services.nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts."git.example.com" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + }; +}; @@ -49,24 +48,24 @@ all data like the repositories and uploads will be stored. services.gitlab = { - enable = true; - databasePassword = "eXaMpl3"; - initialRootPassword = "UseNixOS!"; - https = true; - host = "git.example.com"; - port = 443; - user = "git"; - group = "git"; + enable = true; + databasePassword = "eXaMpl3"; + initialRootPassword = "UseNixOS!"; + https = true; + host = "git.example.com"; + port = 443; + user = "git"; + group = "git"; smtp = { - enable = true; - address = "localhost"; - port = 25; + enable = true; + address = "localhost"; + port = 25; }; secrets = { - db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; - secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; - otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; - jws = '' + db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; + secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; + otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; + jws = '' -----BEGIN RSA PRIVATE KEY----- MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm @@ -96,7 +95,7 @@ services.gitlab = { -----END RSA PRIVATE KEY----- ''; }; - extraConfig = { + extraConfig = { gitlab = { email_from = "gitlab-no-reply@example.com"; email_display_name = "Example GitLab"; @@ -116,7 +115,7 @@ secret from config/secrets.yml located in your Gitlab state folder. Refer to for all available configuration -options for the services.gitlab module. +options for the services.gitlab module.
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml index 6d4d2a9b488..75493ac1394 100644 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -55,7 +55,7 @@ Because Taskserver by default only provides scripts to setup users imperatively, the nixos-taskserver tool is used for addition and deletion of organisations along with users and groups defined - by and as well for + by and as well for imperative set up. @@ -99,10 +99,10 @@ For example, let's say you have the following configuration: { - services.taskserver.enable = true; - services.taskserver.fqdn = "server"; - services.taskserver.listenHost = "::"; - services.taskserver.organisations.my-company.users = [ "alice" ]; + = true; + = "server"; + = "::"; + services.taskserver.organisations.my-company.users = [ "alice" ]; } This creates an organisation called my-company with the @@ -136,7 +136,7 @@ $ ssh server nixos-taskserver user export my-company alice | sh If you set any options within - , + service.taskserver.pki.manual.*, nixos-taskserver won't issue certificates, but you can still use it for adding or removing user accounts. diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml index 555c6df4d55..ff108869858 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.xml +++ b/nixos/modules/services/networking/dnscrypt-proxy.xml @@ -19,7 +19,7 @@ To enable the client proxy, set - services.dnscrypt-proxy.enable = true; + = true; @@ -38,17 +38,17 @@ DNS client, change the default proxy listening port to a non-standard value and point the other client to it: - services.dnscrypt-proxy.localPort = 43; + = 43; dnsmasq - { - services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#43" ]; - } +{ + = true; + = [ "127.0.0.1#43" ]; +} @@ -56,10 +56,10 @@ unbound - { - services.unbound.enable = true; - services.unbound.forwardAddresses = [ "127.0.0.1@43" ]; - } +{ + = true; + = [ "127.0.0.1@43" ]; +} -- GitLab From 7292c5a5701bacc4188a00e0399a92aa748ec6a5 Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Tue, 17 Apr 2018 09:19:55 +1000 Subject: [PATCH 023/785] Fixed indentation --- .../doc/manual/configuration/config-file.xml | 4 +-- .../doc/manual/configuration/ipv4-config.xml | 5 ++- .../doc/manual/configuration/ipv6-config.xml | 5 ++- nixos/doc/manual/configuration/user-mgmt.xml | 14 ++++---- .../installing-from-other-distro.xml | 10 ++++-- nixos/doc/manual/installation/installing.xml | 35 +++++++++---------- 6 files changed, 41 insertions(+), 32 deletions(-) diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 60a4dac97d5..d4ca15bb3e7 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -29,8 +29,8 @@ form name = { config, pkgs, ... }: { = true; - = "alice@example.org"; - = "/webroot"; + = "alice@example.org"; + = "/webroot"; } diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index f3ce4af39b9..fbc9695c601 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,7 +12,10 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0.ipv4.addresses = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; Typically you’ll also want to set a default gateway and set of name diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 6b0ba0d48f0..e8960dc8930 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -26,7 +26,10 @@ example, we use interface eth0): DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +networking.interfaces.eth0.ipv6.addresses = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 848b221baa7..1456a589411 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -12,13 +12,13 @@ management. In the declarative style, users are specified in states that a user account named alice shall exist: -.alice = - { isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; - }; +.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; Note that alice is a member of the diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 11fcb43732a..7e6ddb05cd6 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -183,7 +183,9 @@ $ sudo groupdel nixbld account with sudo passwd -l root if you use sudo) - users.extraUsers.root.initialHashedPassword = ""; + +users.extraUsers.root.initialHashedPassword = ""; + @@ -243,13 +245,15 @@ $ sudo groupdel nixbld $ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE +$ sudo touch /etc/NIXOS_LUSTRATE + Let's also make sure the NixOS configuration files are kept once we reboot on NixOS: -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f967a7fe268..ba6098d917d 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -273,9 +273,9 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif you to set the password for the root user, e.g. - setting root password... - Enter new UNIX password: *** - Retype new UNIX password: *** +setting root password... +Enter new UNIX password: *** +Retype new UNIX password: *** @@ -380,25 +380,24 @@ drive (here /dev/sda). NixOS Configuration - { config, pkgs, ... }: - - { - imports = - [ # Include the results of the hardware scan. +{ config, pkgs, ... }: { + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix - ]; + ]; - = "/dev/sda"; # (for BIOS systems only) - = true; # (for UEFI systems only) + = "/dev/sda"; # (for BIOS systems only) + = true; # (for UEFI systems only) - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; - # Enable the OpenSSH server. - services.sshd.enable = true; - } + # Enable the OpenSSH server. + services.sshd.enable = true; +} + -- GitLab From b81aa02800795724fe0a01e7544c49b04a40994a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 17 Apr 2018 12:40:05 +0300 Subject: [PATCH 024/785] firewall service: run stop commands in reload Do cleanup of user-created additional rules. Of course it'd be much better to just use iptables-{save,restore} for declarative management, but as it's still not there... --- nixos/modules/services/networking/firewall.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 20c0b0acf16..c4bd0e7f9ee 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -242,6 +242,9 @@ let # Don't allow traffic to leak out until the script has completed ip46tables -A INPUT -j nixos-drop + + ${cfg.extraStopCommands} + if ${startScript}; then ip46tables -D INPUT -j nixos-drop 2>/dev/null || true else -- GitLab From 6bf47e0d77fad929d37c007883dd3a493bc2947c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 14:53:42 +0200 Subject: [PATCH 025/785] mypaint-brushes: init at 1.3.0 --- .../libraries/mypaint-brushes/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/mypaint-brushes/default.nix diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix new file mode 100644 index 00000000000..140dbcc937b --- /dev/null +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchpatch, autoconf, automake, fetchFromGitHub, pkgconfig}: + +let + pname = "mypaint-brushes"; + version = "1.3.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "Jehan"; + repo = pname; + rev = "v${version}"; + sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + patches = [ + # build with automake 1.16 + (fetchpatch { + url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; + sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; + }) + ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + homepage = http://mypaint.org/; + description = "Brushes used by MyPaint and other software using libmypaint."; + license = licenses.cc0; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca44af43550..c1c63060734 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17032,6 +17032,8 @@ with pkgs; mypaint = callPackage ../applications/graphics/mypaint { }; + mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; -- GitLab From d1f7c51d179ac2ebcb7649ca8b7606ec098a0ea2 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 17 Apr 2018 18:34:45 -0700 Subject: [PATCH 026/785] vulkan-loader: fix broken symlink in output --- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 2b0d765efc8..8345786d3e8 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin mkdir -p $out/lib $out/share/vulkan/explicit_layer.d - cp -d layers/*.so $out/lib/ - cp -d layers/*.json $out/share/vulkan/explicit_layer.d/ + cp -L layers/*.so $out/lib/ + cp -L layers/*.json $out/share/vulkan/explicit_layer.d/ sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json mkdir -p $dev/include cp -rv ../include $dev/ -- GitLab From 85854ab2435629c6cb127773f422e2309bf0eade Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 18 Apr 2018 08:21:43 +0200 Subject: [PATCH 027/785] vamp-sdk: 2.5 -> 2.7.1 --- pkgs/development/libraries/audio/vamp/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index 8098ac9f3ef..f8b1006d2eb 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -1,16 +1,19 @@ # set VAMP_PATH ? # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: rec { vampSDK = stdenv.mkDerivation { - name = "vamp-sdk-2.5"; + name = "vamp-sdk-2.7.1"; + # version = "2.7.1"; - src = fetchurl { - url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz; - sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv"; + src = fetchFromGitHub { + owner = "c4dm"; + repo = "vamp-plugin-sdk"; + rev = "vamp-plugin-sdk-v2.7.1"; + sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From efe25f416c7a594c33b8239935a843a6941077b1 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 18 Apr 2018 17:09:48 +0300 Subject: [PATCH 028/785] parity: 1.9.5 -> 1.9.6 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 99179932109..71485551ef6 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.9.5"; - sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7"; - cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva"; + version = "1.9.6"; + sha256 = "17h7c93c95pj71nbw152rl4ka240zzd8w0yf8k4l4rimcsbra92g"; + cargoSha256 = "0gk26yncahrlnx6xz13x775wrwh7xsfqiifspjislmgk7xknqjm0"; patches = [ ./patches/vendored-sources-1.9.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } -- GitLab From 44342f139ec014442c0b1538099868696e641cb2 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 18 Apr 2018 17:09:57 +0300 Subject: [PATCH 029/785] parity-beta: 1.10.0 -> 1.10.1 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index ed78133a759..b1bf38427a8 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.10.0"; - sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g"; - cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m"; + version = "1.10.1"; + sha256 = "0313ch4rqnwrsf7y1h8bdwjk59gvcj08jjf6sybb6ww0ml7a6i7b"; + cargoSha256 = "00jr4g3q40pc1wi7fmfq1j8iakmv9pid7l31rf76wj4n8g051zc7"; patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } -- GitLab From e8c936556dcbb08e23f374015191d96c621a10c2 Mon Sep 17 00:00:00 2001 From: vodkabot <38538876+vodkabot@users.noreply.github.com> Date: Thu, 19 Apr 2018 21:54:09 +0300 Subject: [PATCH 030/785] twilight: init at 2018-04-19 --- pkgs/tools/graphics/twilight/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/graphics/twilight/default.nix diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix new file mode 100644 index 00000000000..8d1ee7b7bfb --- /dev/null +++ b/pkgs/tools/graphics/twilight/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub +, libGL, libGLU, freeglut, libX11 }: + +let + version = "2018-04-19"; +in stdenv.mkDerivation rec { + name = "twilight-${version}"; + + src = fetchFromGitHub { + owner = "tweakoz"; + repo = "twilight"; + rev = "43f21d15c2a8923c9d707bdf3789f480bfd4b36d"; + sha256 = "0mmmi4jj8yd8wnah6kx5na782sjycszgzim33dfalr0ph361m4pz"; + }; + + buildInputs = [ libGL libGLU freeglut libX11 ]; + + installPhase = '' + install -Dm755 twilight $out/bin/twilight + ''; + + meta = with stdenv.lib; { + description = "Redo of IRIX twilight backdrop in old school OpenGL"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05bb159a5f7..bf47b1ebf6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5251,6 +5251,10 @@ with pkgs; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; + twilight = callPackage ../tools/graphics/twilight/default.nix { + libX11 = xorg.libX11; + }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; -- GitLab From b95a24fdf1f751c44282f6c38b84b763a85eee19 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 20 Apr 2018 11:07:07 +0800 Subject: [PATCH 031/785] nixos-container: support restarts --- .../nixos-container/nixos-container.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 2cb723a7b71..a210a65f431 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -242,11 +242,21 @@ sub terminateContainer { while ( kill 0, $leader ) { Time::HiRes::sleep(0.1) } } +sub startContainer { + system("systemctl", "start", "container\@$containerName") == 0 + or die "$0: failed to start container\n"; +} + sub stopContainer { system("systemctl", "stop", "container\@$containerName") == 0 or die "$0: failed to stop container\n"; } +sub restartContainer { + stopContainer; + startContainer; +} + # Run a command in the container. sub runInContainer { my @args = @_; @@ -285,9 +295,12 @@ if ($action eq "destroy") { unlink($confFile) or die; } +elsif ($action eq "restart") { + restartContainer; +} + elsif ($action eq "start") { - system("systemctl", "start", "container\@$containerName") == 0 - or die "$0: failed to start container\n"; + startContainer; } elsif ($action eq "stop") { -- GitLab From cf351f6389eaf83f7122285389e9958110fe9da2 Mon Sep 17 00:00:00 2001 From: James Kay Date: Fri, 20 Apr 2018 16:20:45 +0100 Subject: [PATCH 032/785] atlassian-cli: init at 7.8.0 --- .../office/atlassian-cli/default.nix | 31 +++++++++++++++++++ .../office/atlassian-cli/wrapper.sh | 20 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/office/atlassian-cli/default.nix create mode 100755 pkgs/applications/office/atlassian-cli/wrapper.sh diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix new file mode 100644 index 00000000000..a56c15bffb2 --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchzip, jre }: +stdenv.mkDerivation { + name = "atlassian-cli"; + version = "7.8.0"; + src = fetchzip { + url = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip; + sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; + extraPostFetch = "chmod go-w $out"; + }; + tools = [ "agile" "bamboo" "bitbucket" "confluence" "csv" + "hipchat" "jira" "servicedesk" "structure" "tempo" "trello" "upm" ]; + installPhase = '' + mkdir -p $out/{bin,share/doc/atlassian-cli} + cp -r lib $out/share/java + cp -r README.txt license $out/share/doc/atlassian-cli + for tool in $tools + do + substitute ${./wrapper.sh} $out/bin/$tool \ + --subst-var out \ + --subst-var-by jre ${jre} \ + --subst-var-by tool $tool + chmod +x $out/bin/$tool + done + ''; + meta = with stdenv.lib; { + description = "An integrated family of CLI’s for various Atlassian applications"; + homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; + maintainers = [ maintainers.twey ]; + license = [ licenses.unfreeRedistributable ]; + }; +} diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/applications/office/atlassian-cli/wrapper.sh new file mode 100755 index 00000000000..80b60dbc468 --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/wrapper.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +tool=@tool@ +user=ATLASSIAN_${tool^^}_USER +host=ATLASSIAN_${tool^^}_HOST +pass=ATLASSIAN_${tool^^}_PASS + +[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli +if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ] +then + >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli' + exit 1 +fi + +@jre@/bin/java \ + -jar @out@/share/java/@tool@-cli-* \ + --server "${!host}" \ + --user "${!user}" \ + --password "${!pass}" \ + "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b80db9d4d0c..3b34769e148 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14766,6 +14766,8 @@ with pkgs; artha = callPackage ../applications/misc/artha { }; + atlassian-cli = callPackage ../applications/office/atlassian-cli { }; + atomEnv = callPackage ../applications/editors/atom/env.nix { gconf = gnome2.GConf; }; -- GitLab From d71a8533ff24c510be9692c24df64d8675d7d8b5 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Sun, 22 Apr 2018 12:23:19 +0900 Subject: [PATCH 033/785] ffmpeg library clash fix --- pkgs/tools/misc/sweep-visualizer/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index c1f3fbea8e5..cbf849494b7 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -24,10 +24,9 @@ buildPhase = ":"; installPhase = '' - mkdir -p $out/lib $out/bin $out/share/sweep-visualizer + mkdir -p $out/bin $out/share/sweep-visualizer mv usr/share/* $out/share mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/ - mv $out/share/sweep-visualizer/*.so $out/lib/ ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer ''; @@ -40,12 +39,12 @@ ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; in '' - for lib in $out/lib/*.so; do - patchelf --set-rpath "$out/lib:${libPath}" $lib + for lib in $out/share/sweep-visualizer/*.so; do + patchelf --set-rpath "$out/share/sweep-visualizer:${libPath}" $lib done patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${libPath}" \ + --set-rpath "$out/share/sweep-visualizer:${libPath}" \ $out/share/sweep-visualizer/sweep_visualizer wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} ''; -- GitLab From 236703f9f3ac1d0904d63940d00f885dfeeb854b Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 22 Apr 2018 20:10:15 +0200 Subject: [PATCH 034/785] nixos/systemd-networkd: wait for udev to settle ... to avoid race condition between udevd renaming and networkd configuring interfaces (39069) --- nixos/modules/system/boot/networkd.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index eea10613ea5..74d17cf9787 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -712,6 +712,9 @@ in systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; restartTriggers = map (f: f.source) (unitFiles); + # prevent race condition with interface renaming (#39069) + requires = [ "systemd-udev-settle.service" ]; + after = [ "systemd-udev-settle.service" ]; }; systemd.services.systemd-networkd-wait-online = { -- GitLab From 1b4027c6fcaf73b7e1ed83bbe728827a83f1be47 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 12:08:24 +0200 Subject: [PATCH 035/785] abootimg: init at 0.6 --- pkgs/development/mobile/abootimg/default.nix | 43 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/mobile/abootimg/default.nix diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix new file mode 100644 index 00000000000..a2ddda34347 --- /dev/null +++ b/pkgs/development/mobile/abootimg/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, utillinux }: + +let + version = "0.6"; +in +stdenv.mkDerivation { + name = "abootimg-${version}"; + + src = fetchFromGitHub { + owner = "ggrandou"; + repo = "abootimg"; + rev = "7e127fee6a3981f6b0a50ce9910267cd501e09d4"; + sha256 = "1qgx9fxwhylgnixzkz2mzv2707f65qq7rar2rsqak536vhig1z9a"; + }; + + nativeBuildInputs = [ makeWrapper utillinux ]; + + postPatch = '' + cat < version.h + #define VERSION_STR "${version}" + EOF + ''; + + installPhase = '' + mkdir -p $out/bin + install -D -m 755 abootimg $out/bin + install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1; + + install -D -m 755 abootimg-pack-initrd $out/bin + wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]} + + install -D -m 755 abootimg-unpack-initrd $out/bin + wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ggrandou/abootimg; + description = "Manipulate Android Boot Images"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e320dc31f..940a3672f19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -688,6 +688,8 @@ with pkgs; pkgs_i686 = pkgsi686Linux; }; + abootimg = callPackage ../development/mobile/abootimg {}; + adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { adb = androidenv.platformTools; }; -- GitLab From 8647df2fb6be8d586376c2cb76ca5f2518dcbb81 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 20:37:03 +0200 Subject: [PATCH 036/785] goocanvas_2: support gobjectIntrospection --- pkgs/development/libraries/goocanvas/2.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 026f58079f6..ef36a9c076f 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -13,11 +13,13 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; - buildInputs = [ gtk3 cairo glib ]; + buildInputs = [ gtk3 cairo glib gobjectIntrospection ]; configureFlags = [ "--disable-python" ]; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; meta = with stdenv.lib; { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; -- GitLab From 0e5f82b847632cfd01122915ad9c57b2c65a2026 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 20:37:27 +0200 Subject: [PATCH 037/785] pdf-quench: init at 1.0.5 --- pkgs/applications/misc/pdf-quench/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/pdf-quench/default.nix diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix new file mode 100644 index 00000000000..5b80fb16122 --- /dev/null +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: + +pythonPackages.buildPythonApplication rec { + name = "pdf-quench-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "linuxerwang"; + repo = "pdf-quench"; + rev = "b72b3970b371026f9a7ebe6003581e8a63af98f6"; + sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ]; + propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; + + dontBuild = true; + doCheck = false; + + postPatch = '' + substituteInPlace src/pdf_quench.py \ + --replace /usr/bin/python "${pythonPackages.python}/bin/python" + ''; + + installPhase = '' + install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/linuxerwang/pdf-quench; + description = "A visual tool for cropping pdf files"; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e320dc31f..a45a6f2d04a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4276,6 +4276,8 @@ with pkgs; pdfmod = callPackage ../applications/misc/pdfmod { }; + pdf-quench = callPackage ../applications/misc/pdf-quench { }; + jbig2enc = callPackage ../tools/graphics/jbig2enc { }; pdfread = callPackage ../tools/graphics/pdfread { -- GitLab From 94a420b92159ad979b97859a3db4779f91826a9f Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Mon, 23 Apr 2018 21:27:42 +0200 Subject: [PATCH 038/785] fetchFromGitLab: Use API archive download endpoint. According to https://gitlab.com/gitlab-org/gitlab-ce/issues/45586#note_69828451 this URL is something with guaranteed stability. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67a5390aa6a..7928f08f458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -288,7 +288,7 @@ with pkgs; ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://gitlab.com/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.tar.gz"; + url = "https://gitlab.com/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; meta.homepage = "https://gitlab.com/${owner}/${repo}/"; } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; -- GitLab From e304b6b216ef77c7c19fae799e282c94a4b32506 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Mon, 23 Apr 2018 22:02:24 +0200 Subject: [PATCH 039/785] typora: 0.9.44 -> 0.9.47 --- pkgs/applications/editors/typora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 7c6d186b883..d687712fc08 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.44"; + version = "0.9.47"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5"; + sha256 = "431741948f5a2faba04984c495bea56b4a800c6dbb7e21e24ad3124fb8ffcbc9"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3"; + sha256 = "a95c8c1e296d8587a4dc6182af3b24253c3c2abc991badb7c758cd6d1bf5b1b6"; } ; -- GitLab From 884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 23 Apr 2018 23:54:04 +0200 Subject: [PATCH 040/785] tbs: updated to kernel-4.14 * updated meta data * fix concurrent names for fetchFromGitHub derivations --- pkgs/os-specific/linux/tbs/default.nix | 28 +++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index e4b954d4dbf..db20a7ab821 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }: +{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }: let - media = fetchFromGitHub { + + media = fetchFromGitHub rec { + name = repo; owner = "tbsdtv"; repo = "linux_media"; - rev = "14ebbec91f2cd0423aaf859fc6e6d5d986397cd4"; - sha256 = "1cmqj3kby8sxfcpvslbxywr95529vjxzbn800fdp35lka1fv962h"; + rev = "efe31531b77efd3a4c94516504a5823d31cdc776"; + sha256 = "1533qi3sb91v00289hl5zaj4l35r2sf9fqc6z5ky1vbb7byxgnlr"; }; - build = fetchFromGitHub { + + build = fetchFromGitHub rec { + name = repo; owner = "tbsdtv"; repo = "media_build"; - rev = "c340e29a4047e43f7ea7ebf19e1e28c1f2112d05"; - sha256 = "0hfn1j9qk8lh30z3ywj22qky480nsf8z2iag2bqhrhy4375vjlbl"; + rev = "a0d62eba4d429e0e9d2c2f910fb203e817cac84b"; + sha256 = "1329s7w9xlqjqwkpaqsd6b5dmzhm97jw0c7c7zzmmbdkl289i4i4"; }; + in stdenv.mkDerivation { - name = "tbs-2017-11-05-${kernel.version}"; + name = "tbs-2018.04.18-${kernel.version}"; srcs = [ media build ]; sourceRoot = "${build.name}"; @@ -39,10 +44,13 @@ in stdenv.mkDerivation { installFlags = [ "DESTDIR=$(out)" ]; hardeningDisable = [ "pic" "format" ]; - nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ]; - meta = with stdenv.lib; { + nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ] + ++ lib.optional (lib.versionAtLeast kernel.version "4.14") [ libelf ]; + + meta = with lib; { homepage = https://www.tbsdtv.com/; + description = "Linux driver for TBSDTV cards"; license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = 20; -- GitLab From 0fad5f7a8445d2848878789f2d1b9b01fc13c18f Mon Sep 17 00:00:00 2001 From: Marcin Falkiewicz Date: Mon, 23 Apr 2018 16:02:12 +0200 Subject: [PATCH 041/785] wine: add Vulkan support --- pkgs/misc/emulators/wine/base.nix | 1 + pkgs/misc/emulators/wine/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index db58c398526..864b8fac96f 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev + ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 91fb0da82d8..ca67ca836ba 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -40,7 +40,9 @@ pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, - xmlSupport ? false }: + xmlSupport ? false, + vulkanSupport ? false, +}: let wine-build = build: release: lib.getAttr build (callPackage ./packages.nix { @@ -51,7 +53,7 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport udevSupport; + openglSupport gstreamerSupport udevSupport vulkanSupport; }; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a088d6644b..46bdee7b7ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21074,6 +21074,7 @@ with pkgs; fontconfigSupport = true; alsaSupport = true; openglSupport = true; + vulkanSupport = stdenv.isLinux; tlsSupport = true; cupsSupport = true; dbusSupport = true; -- GitLab From cdfa85c599a2d0fbc3288e6245564c91d8ac1a92 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Apr 2018 15:40:12 +0200 Subject: [PATCH 042/785] cddlib: 0.94h -> 0.94i, add cdd_both_reps binary --- pkgs/development/libraries/cddlib/default.nix | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 818eb6db8c6..ee56b50e1da 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -1,17 +1,49 @@ -{stdenv, fetchurl, gmp}: +{ stdenv +, fetchurl +, fetchpatch +, gmp +, autoreconfHook +}: + stdenv.mkDerivation rec { name = "cddlib-${version}"; - fileVersion = "094h"; - version = "0.94h"; - src = fetchurl { + version = "0.94i"; + src = let + fileVersion = stdenv.lib.replaceStrings ["."] [""] version; + in fetchurl { + # Might switch to github in the future, see + # https://trac.sagemath.org/ticket/21952#comment:20 urls = [ "http://archive.ubuntu.com/ubuntu/pool/universe/c/cddlib/cddlib_${fileVersion}.orig.tar.gz" "ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-${fileVersion}.tar.gz" ]; - name = ""; - sha256 = "1dasasscwfg793q8fwzgwf64xwj7w62yfvszpr8x8g38jka08vgy"; + sha256 = "00zdgiqb91vx6gd2103h3ijij0llspsxc6zz3iw2bll39fvkl4xq"; }; buildInputs = [gmp]; + nativeBuildInputs = [ + autoreconfHook + ]; + # compute reduced H and V representation of polytope + # this patch is included by most distributions (Debian, Conda, ArchLinux, SageMath) + # proposed upstream (no answer yet): https://github.com/cddlib/cddlib/pull/3 + both_reps_c = (fetchurl { + name = "cdd_both_reps.c"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cdd_both_reps.c?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; + sha256 = "0r9yc5bgiz8i72c6vsn2y2mjk5581iw94gji9v7lg16kzzgrk9x0"; + }); + preAutoreconf = '' + # Required by sage.geometry.polyhedron + cp ${both_reps_c} src/cdd_both_reps.c + cp ${both_reps_c} src-gmp/cdd_both_reps.c + ''; + patches = [ + # add the cdd_both_reps binary + (fetchpatch { + name = "add-cdd_both_reps-binary.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch?id=78e3a61a68c916450aa4e5ceecd20041583af901"; + sha256 = "162ni2fr7dpbdkz0b5nizxq7qr5k1i1d75g0smiylpzfb0hb761a"; + }) + ]; meta = { inherit version; description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; -- GitLab From 81c1b9c9fc55d86ee3a7178c30e9744a15bd6da5 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Tue, 24 Apr 2018 21:05:03 +0200 Subject: [PATCH 043/785] googleearth: remove it's broken, and even after adjusting the derivation to the currently available downloads it does not run well for me and it is rather annoying to adjust the derivation to the moving google-earth-stable_current source download link --- .../applications/misc/googleearth/default.nix | 79 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 81 deletions(-) delete mode 100644 pkgs/applications/misc/googleearth/default.nix diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix deleted file mode 100644 index f8ba66c4197..00000000000 --- a/pkgs/applications/misc/googleearth/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv -, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 -, zlib, fontconfig, dpkg }: - -let - arch = - if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "i686-linux" then "i386" - else throw "Unsupported system ${stdenv.system}"; - sha256 = - if arch == "amd64" - then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" - else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; - fullPath = stdenv.lib.makeLibraryPath [ - glibc - glib - stdenv.cc.cc - libSM - libICE - libXi - libXv - libGLU_combined - libXrender - libXrandr - libXfixes - libXcursor - libXinerama - freetype - libXext - libX11 - qt4 - zlib - fontconfig - ]; -in -stdenv.mkDerivation rec { - version = "7.1.4.1529"; - name = "googleearth-${version}"; - - src = fetchurl { - url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb"; - inherit sha256; - }; - - phases = "unpackPhase installPhase"; - - buildInputs = [ dpkg ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase ='' - mkdir $out - mv usr/* $out/ - rmdir usr - mv * $out/ - rm $out/bin/google-earth $out/opt/google/earth/free/google-earth - ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${fullPath}:\$ORIGIN" \ - $out/opt/google/earth/free/googleearth-bin - - for a in $out/opt/google/earth/free/*.so* ; do - patchelf --set-rpath "${fullPath}:\$ORIGIN" $a - done - ''; - - dontPatchELF = true; - - meta = { - description = "A world sphere viewer"; - homepage = http://earth.google.com; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a4ebec0480..90df35e128a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16071,8 +16071,6 @@ with pkgs; google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - googleearth = callPackage_i686 ../applications/misc/googleearth { }; - google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { inherit (gnome2) GConf; }; -- GitLab From e05099fdde718fef86bb7991fa89c69815b7362f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 12:14:08 -0700 Subject: [PATCH 044/785] libfm-extra: 1.2.5 -> 1.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libfm-extra/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.3.0 with grep in /nix/store/jfppsgl453gipb6vx66y4pcssxd7fq54-libfm-extra-1.3.0 - directory tree listing: https://gist.github.com/74991e480da532d6ef49f6fb5727d564 --- pkgs/development/libraries/libfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 851ee7f326b..01bfe1653fe 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; + sha256 = "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 82a9df76cce9f46ccf76aeab2a5f98fc38ea81ae Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Tue, 24 Apr 2018 21:25:13 +0200 Subject: [PATCH 045/785] tuxpaint: init at 0.9.22 --- pkgs/games/tuxpaint/default.nix | 46 ++++++++++++++++++++ pkgs/games/tuxpaint/tuxpaint-completion.diff | 16 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 64 insertions(+) create mode 100644 pkgs/games/tuxpaint/default.nix create mode 100644 pkgs/games/tuxpaint/tuxpaint-completion.diff diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix new file mode 100644 index 00000000000..ddf0782b210 --- /dev/null +++ b/pkgs/games/tuxpaint/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, + cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf }: + +stdenv.mkDerivation rec { + version = "0.9.22"; + name = "tuxpaint-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz"; + sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca"; + }; + + nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo + librsvg gettext libpaper fribidi pkgconfig gperf ]; + hardeningDisable = [ "format" ]; + makeFlags = [ "GPERF=${gperf}/bin/gperf" + "PREFIX=$$out" + "COMPLETIONDIR=$$out/share/bash-completion/completions" + ]; + + patches = [ ./tuxpaint-completion.diff ]; + postPatch = '' + grep -Zlr include.*SDL . | xargs -0 sed -i -e 's,"SDL,"SDL/SDL,' + ''; + + # stamps + stamps = fetchurl { + url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2014-08-23/tuxpaint-stamps-2014.08.23.tar.gz"; + sha256 = "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q"; + }; + + postInstall = '' + tar xzf $stamps + cd tuxpaint-stamps-2014.08.23 + make install-all PREFIX=$out + rm -rf $out/share/tuxpaint/stamps/military + ''; + + meta = { + description = "Open Source Drawing Software for Children"; + homepage = http://www.tuxpaint.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ woffs ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/pkgs/games/tuxpaint/tuxpaint-completion.diff new file mode 100644 index 00000000000..0824b2becf4 --- /dev/null +++ b/pkgs/games/tuxpaint/tuxpaint-completion.diff @@ -0,0 +1,16 @@ +--- tuxpaint-0.9.22/src/tuxpaint-completion.bash~ 1970-01-01 01:00:01.000000000 +0100 ++++ tuxpaint-0.9.22/src/tuxpaint-completion.bash 2018-03-06 10:54:03.437560921 +0100 +@@ -8,7 +8,6 @@ + # FIXME: See http://www.debian-administration.org/articles/316 for an intro + # to how we should be doing this... -bjk 2009.09.09 + +-have tuxpaint && + _tuxpaint() + { + local cur +@@ -96,4 +95,4 @@ + fi + + } +-[ "${have:-}" ] && complete -F _tuxpaint $filenames tuxpaint ++complete -F _tuxpaint $filenames tuxpaint diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a4ebec0480..6611baa9fe1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19442,6 +19442,8 @@ with pkgs; tremulous = callPackage ../games/tremulous { }; + tuxpaint = callPackage ../games/tuxpaint { }; + speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC -- GitLab From 2ac306c91cefc585d23239b54e5539abb64c0c04 Mon Sep 17 00:00:00 2001 From: Felix Dietze Date: Tue, 24 Apr 2018 21:57:51 +0200 Subject: [PATCH 046/785] nixos manual: Fix typo in Syntax Summary --- nixos/doc/manual/configuration/summary.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index be1f2263149..38032c5d9dc 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -53,7 +53,7 @@ manual for the rest. { x = 1; y = 2; } - An set with attributes names x and y + A set with attributes named x and y { foo.bar = 1; } -- GitLab From f827bd40072c7f275a09ccc57d36a468941c618e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 13:23:53 -0700 Subject: [PATCH 047/785] grib-api: 1.26.0 -> 1.26.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grib-api/versions. These checks were done: - built on NixOS - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_histogram -h’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_histogram --help’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_info -v’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_filter -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_ls -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_dump -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib2ppm -h’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib2ppm --help’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_set -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_get -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_get_data -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_copy -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_packing help’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_compare -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_index_build help’ got 0 exit code - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_index_build -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_to_netcdf -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -V’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -v’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys --version’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys version’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -h’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys --help’ and found version 1.26.1 - ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys help’ and found version 1.26.1 - found 1.26.1 with grep in /nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1 - directory tree listing: https://gist.github.com/e201ebaf6d3662af211ceca919f68df1 --- pkgs/development/libraries/grib-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 61409279ded..9113b671664 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec{ name = "grib-api-${version}"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; - sha256 = "00cmmj44bhdlzhqbvwb3bb4xks3bpva669m6g3g6ffjaqm25b90c"; + sha256 = "1v1apx9421m8zkjmych5yr66mvqjrrygc98bvyl4miasmsb4ndfs"; }; preConfigure = '' -- GitLab From 40bb3374e91cbdbace29594a0f620d4402bc703c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 24 Apr 2018 23:12:40 +0200 Subject: [PATCH 048/785] source-and-tags: fix default.nix Tested by observing that the following command produces a correctly looking TAGS file: $ nix-shell -E 'let pkgs = import ./. {}; in pkgs.myEnvFun {name = "myEnvFun-htags-test"; buildInputs = [(pkgs.sourceAndTags.sourceWithTagsDerivation (pkgs.sourceAndTags.addHasktagsTaggingInfo pkgs.haskellPackages.scientific).passthru.sourceWithTags)];}' --run 'cat $TAG_FILES' --- pkgs/misc/source-and-tags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 981c01e2b4a..7c082cbbbb0 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -1,4 +1,4 @@ -args: with args; { +{ stdenv, lib, glibcLocales, unzip, hasktags, ctags } : { # optional srcDir annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags || x ? meta && x.meta ? sourceWithTags ); @@ -59,8 +59,8 @@ args: with args; { # without this creating tag files for lifted-base fails export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - ${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""} - + ${if stdenv.isLinux then "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;" else ""} + ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . mv tags \$TAG_FILE }"; -- GitLab From e199143f11db153c1b844320295f9a1e1be4ac83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 25 Apr 2018 00:37:25 +0200 Subject: [PATCH 049/785] matterbridge module: add configPath option as a workaround, waiting for nix encryption --- .../services/networking/matterbridge.nix | 84 ++++++++++++------- 1 file changed, 53 insertions(+), 31 deletions(-) diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index 5526e2ba23a..e2f47840595 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ options, config, pkgs, lib, ... }: with lib; @@ -6,7 +6,11 @@ let cfg = config.services.matterbridge; - matterbridgeConfToml = pkgs.writeText "matterbridge.toml" (cfg.configFile); + matterbridgeConfToml = + if cfg.configPath == null then + pkgs.writeText "matterbridge.toml" (cfg.configFile) + else + cfg.configPath; in @@ -15,17 +19,32 @@ in services.matterbridge = { enable = mkEnableOption "Matterbridge chat platform bridge"; + configPath = mkOption { + type = with types; nullOr str; + default = null; + example = "/etc/nixos/matterbridge.toml"; + description = '' + The path to the matterbridge configuration file. + ''; + }; + configFile = mkOption { type = types.str; example = '' - #WARNING: as this file contains credentials, be sure to set correct file permissions [irc] + # WARNING: as this file contains credentials, do not use this option! + # It is kept only for backwards compatibility, and would cause your + # credentials to be in the nix-store, thus with the world-readable + # permission bits. + # Use services.matterbridge.configPath instead. + + [irc] [irc.freenode] Server="irc.freenode.net:6667" Nick="matterbot" [mattermost] [mattermost.work] - #do not prefix it wit http:// or https:// + # Do not prefix it with http:// or https:// Server="yourmattermostserver.domain" Team="yourteam" Login="yourlogin" @@ -44,6 +63,10 @@ in channel="off-topic" ''; description = '' + WARNING: THIS IS INSECURE, as your password will end up in + /nix/store, thus publicly readable. Use + services.matterbridge.configPath instead. + The matterbridge configuration file in the TOML file format. ''; }; @@ -65,32 +88,31 @@ in }; }; - config = mkMerge [ - (mkIf cfg.enable { - - users.extraUsers = mkIf (cfg.user == "matterbridge") [ - { name = "matterbridge"; - group = "matterbridge"; - } ]; - - users.extraGroups = mkIf (cfg.group == "matterbridge") [ - { name = "matterbridge"; - } ]; - - systemd.services.matterbridge = { - description = "Matterbridge chat platform bridge"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; - Restart = "always"; - RestartSec = "10"; - }; + config = mkIf cfg.enable { + warnings = optional options.services.matterbridge.configFile.isDefined + "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; + + users.extraUsers = optional (cfg.user == "matterbridge") + { name = "matterbridge"; + group = "matterbridge"; + }; + + users.extraGroups = optional (cfg.group == "matterbridge") + { name = "matterbridge"; }; - }) - ]; -} + systemd.services.matterbridge = { + description = "Matterbridge chat platform bridge"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; + Restart = "always"; + RestartSec = "10"; + }; + }; + }; +} -- GitLab From 24600635755cea965bf21b1b1073076d7bfd498a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 00:17:31 +0000 Subject: [PATCH 050/785] nixos: installer: cleanup a bit --- nixos/modules/installer/cd-dvd/iso-image.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 83f8a2586bd..08923970cd3 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -73,7 +73,8 @@ let APPEND ${toString config.boot.loader.grub.memtest86.params} ''; - isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + isolinuxCfg = concatStringsSep "\n" + ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); # The EFI boot image. efiDir = pkgs.runCommand "efi-directory" {} '' -- GitLab From 72ec248eda744ccdf1233cebbeeb176355f4b0d8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Apr 2018 06:27:21 +0000 Subject: [PATCH 051/785] coqPackages.contribs.containers: make available for Coq 8.8 --- pkgs/development/coq-modules/contribs/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 82d1f7a4746..7b274812737 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -189,7 +189,7 @@ let mkContrib = repo: revs: param: sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33"; }; - containers = mkContrib "containers" [ "8.6" "8.7" ] { + containers = mkContrib "containers" [ "8.6" "8.7" "8.8" ] { "8.6" = { version = "8.6.0"; rev = "fa1fec7"; @@ -200,6 +200,11 @@ let mkContrib = repo: revs: param: rev = "77ac16366529c9e558f70ba86f0168a76ca76b8f"; sha256 = "01gp8injb0knaxgqsdc4x9h8714k7qxg7j5w7y6i45dnpd81ndr4"; }; + "8.8" = { + version = "20180330"; + rev = "52b86bed1671321b25fe4d7495558f9f221b12aa"; + sha256 = "0hbnrwdgryr52170cfrlbiymr88jsyxilnpr343vnprqq3zk1xz0"; + }; }."${coq.coq-version}"; continuations = mkContrib "continuations" [ ] { -- GitLab From 8ffaeecfca73704c67831e83d59890c52197b9c0 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:28:52 +0300 Subject: [PATCH 052/785] clion: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 84ba32c4125..de98c4b049f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -239,12 +239,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */ + sha256 = "170xgm3dzakvlwxx5kpy4zilq140kzcaxx9g3dm1w0i83g4l5j48"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml -- GitLab From a52b5be4a26ea74f3f6062330d5a6e63239ac5d7 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:07 +0300 Subject: [PATCH 053/785] goland: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index de98c4b049f..f6db50a106b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -265,12 +265,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */ + sha256 = "11bkbh661fpypr1v89xba4nmf02l4map9jdlj2ky6d77l9295ip3"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; -- GitLab From e74d28ef96827252dc9abd53423439fbd7fac5d4 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:23 +0300 Subject: [PATCH 054/785] idea-community: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f6db50a106b..5f08271c5cd 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -278,12 +278,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */ + sha256 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; -- GitLab From 21feb8a2eda7a309a2498cdcebd18cf1e698a12f Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:36 +0300 Subject: [PATCH 055/785] idea-ultimate: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5f08271c5cd..f5b87eb26e7 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -291,12 +291,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */ + sha256 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; -- GitLab From 12f07ac1bc9f5ca718305a7199456f802c4cd058 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:54 +0300 Subject: [PATCH 056/785] pycharm-community: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f5b87eb26e7..0dd4bc2a9b6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -317,12 +317,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */ + sha256 = "1s26jczag12p3v3r6fdk02mmg55npzn0mzkmgcvh40fr7q7mq2pr"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; -- GitLab From 609766bf80598d58445a2099741e07686ddac96b Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:12 +0300 Subject: [PATCH 057/785] pycharm-professional: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 0dd4bc2a9b6..cd792cb31b8 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -330,12 +330,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */ + sha256 = "0k7529xhhnvjz7ycs5ab4qc4cr35g1v2qxlswy1aqcgzh2zg4c85"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; -- GitLab From ef038375f8701125b35832147cfbf7706a52c809 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:37 +0300 Subject: [PATCH 058/785] ruby-mine: 2017.3.3 -> 2017.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index cd792cb31b8..e6c84a308e9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -356,12 +356,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */ + sha256 = "094m45jhrh4n64q5lrgfyvrimqjll6kcl2cx3cbsa3pp7x16abqn"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2017.3"; -- GitLab From 2479b449b6db3409abf7752e0455dc08a19805c3 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:53 +0300 Subject: [PATCH 059/785] webstorm: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e6c84a308e9..aedfb1fec3d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -369,12 +369,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */ + sha256 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; -- GitLab From 077811ebe37fd1c5ff75fec40f89111db15214c4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 19 Mar 2018 12:38:17 +0800 Subject: [PATCH 060/785] nixos lcdproc: module for lcdd/lcdproc --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/lcd.nix | 172 ++++++++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 nixos/modules/services/hardware/lcd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e7f28c670be..b00cc7a6769 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -245,6 +245,7 @@ ./services/hardware/illum.nix ./services/hardware/interception-tools.nix ./services/hardware/irqbalance.nix + ./services/hardware/lcd.nix ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix ./services/hardware/pommed.nix diff --git a/nixos/modules/services/hardware/lcd.nix b/nixos/modules/services/hardware/lcd.nix new file mode 100644 index 00000000000..d78d742cd31 --- /dev/null +++ b/nixos/modules/services/hardware/lcd.nix @@ -0,0 +1,172 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.hardware.lcd; + pkg = lib.getBin pkgs.lcdproc; + + serverCfg = pkgs.writeText "lcdd.conf" '' + [server] + DriverPath=${pkg}/lib/lcdproc/ + ReportToSyslog=false + Bind=${cfg.serverHost} + Port=${toString cfg.serverPort} + ${cfg.server.extraConfig} + ''; + + clientCfg = pkgs.writeText "lcdproc.conf" '' + [lcdproc] + Server=${cfg.serverHost} + Port=${toString cfg.serverPort} + ReportToSyslog=false + ${cfg.client.extraConfig} + ''; + + serviceCfg = { + DynamicUser = true; + Restart = "on-failure"; + Slice = "lcd.slice"; + }; + +in with lib; { + + meta.maintainers = with maintainers; [ peterhoeg ]; + + options = with types; { + services.hardware.lcd = { + serverHost = mkOption { + type = str; + default = "localhost"; + description = "Host on which LCDd is listening."; + }; + + serverPort = mkOption { + type = int; + default = 13666; + description = "Port on which LCDd is listening."; + }; + + server = { + enable = mkOption { + type = bool; + default = false; + description = "Enable the LCD panel server (LCDd)"; + }; + + openPorts = mkOption { + type = bool; + default = false; + description = "Open the ports in the firewall"; + }; + + usbPermissions = mkOption { + type = bool; + default = false; + description = '' + Set group-write permissions on a USB device. + + + A USB connected LCD panel will most likely require having its + permissions modified for lcdd to write to it. Enabling this option + sets group-write permissions on the device identified by + and + . In order to find the + values, you can run the lsusb command. Example + output: + + + + Bus 005 Device 002: ID 0403:c630 Future Technology Devices International, Ltd lcd2usb interface + + + + In this case the vendor id is 0403 and the product id is c630. + ''; + }; + + usbVid = mkOption { + type = str; + default = ""; + description = "The vendor ID of the USB device to claim."; + }; + + usbPid = mkOption { + type = str; + default = ""; + description = "The product ID of the USB device to claim."; + }; + + usbGroup = mkOption { + type = str; + default = "dialout"; + description = "The group to use for settings permissions. This group must exist or you will have to create it."; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Additional configuration added verbatim to the server config."; + }; + }; + + client = { + enable = mkOption { + type = bool; + default = false; + description = "Enable the LCD panel client (LCDproc)"; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Additional configuration added verbatim to the client config."; + }; + + restartForever = mkOption { + type = bool; + default = true; + description = "Try restarting the client forever."; + }; + }; + }; + }; + + config = mkIf (cfg.server.enable || cfg.client.enable) { + networking.firewall.allowedTCPPorts = mkIf (cfg.server.enable && cfg.server.openPorts) [ cfg.serverPort ]; + + services.udev.extraRules = mkIf (cfg.server.enable && cfg.server.usbPermissions) '' + ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="${cfg.server.usbVid}", ATTRS{idProduct}=="${cfg.server.usbPid}", MODE="660", GROUP="${cfg.server.usbGroup}" + ''; + + systemd.services = { + lcdd = mkIf cfg.server.enable { + description = "LCDproc - server"; + wantedBy = [ "lcd.target" ]; + serviceConfig = serviceCfg // { + ExecStart = "${pkg}/bin/LCDd -f -c ${serverCfg}"; + SupplementaryGroups = cfg.server.usbGroup; + }; + }; + + lcdproc = mkIf cfg.client.enable { + description = "LCDproc - client"; + after = [ "lcdd.service" ]; + wantedBy = [ "lcd.target" ]; + serviceConfig = serviceCfg // { + ExecStart = "${pkg}/bin/lcdproc -f -c ${clientCfg}"; + # If the server is being restarted at the same time, the client will + # fail as it cannot connect, so space it out a bit. + RestartSec = "5"; + # Allow restarting for eternity + StartLimitIntervalSec = lib.mkIf cfg.client.restartForever "0"; + StartLimitBurst = lib.mkIf cfg.client.restartForever "0"; + }; + }; + }; + + systemd.targets.lcd = { + description = "LCD client/server"; + after = [ "lcdd.service" "lcdproc.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; +} -- GitLab From 524b29471bc3683650005ebffec042fb15e0937c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 12 Apr 2018 21:29:58 -0300 Subject: [PATCH 061/785] onestepback: init at 0.98 --- pkgs/misc/themes/onestepback/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/misc/themes/onestepback/default.nix diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix new file mode 100644 index 00000000000..609e027d9eb --- /dev/null +++ b/pkgs/misc/themes/onestepback/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + version = "0.98"; + +in fetchzip { + name = "onestepback-${version}"; + + url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; + + postFetch = '' + mkdir -p $out/share/themes + unzip $downloadedFile -x OneStepBack/LICENSE -d $out/share/themes + ''; + + sha256 = "0sjacvx7020lzc89r5310w83wclw96gzzczy3mss54ldkgmnd0mr"; + + meta = with stdenv.lib; { + description = "Gtk theme inspired by the NextStep look"; + homepage = https://www.opendesktop.org/p/1013663/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f8c3e0765c..85212825a0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19609,6 +19609,8 @@ with pkgs; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; + onestepback = callPackage ../misc/themes/onestepback { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { -- GitLab From 184cb1e8c6ac5b226d29f14c5452e9dbafc2792f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 10:01:40 -0700 Subject: [PATCH 062/785] soapysdr+plugins: init at 0.6.1 --- .../applications/misc/soapyairspy/default.nix | 30 +++++++++++ .../misc/soapybladerf/default.nix | 31 ++++++++++++ .../applications/misc/soapyhackrf/default.nix | 30 +++++++++++ .../applications/misc/soapyremote/default.nix | 28 +++++++++++ pkgs/applications/misc/soapysdr/default.nix | 50 +++++++++++++++++++ pkgs/applications/misc/soapyuhd/default.nix | 34 +++++++++++++ pkgs/top-level/all-packages.nix | 23 +++++++++ 7 files changed, 226 insertions(+) create mode 100644 pkgs/applications/misc/soapyairspy/default.nix create mode 100644 pkgs/applications/misc/soapybladerf/default.nix create mode 100644 pkgs/applications/misc/soapyhackrf/default.nix create mode 100644 pkgs/applications/misc/soapyremote/default.nix create mode 100644 pkgs/applications/misc/soapysdr/default.nix create mode 100644 pkgs/applications/misc/soapyuhd/default.nix diff --git a/pkgs/applications/misc/soapyairspy/default.nix b/pkgs/applications/misc/soapyairspy/default.nix new file mode 100644 index 00000000000..af72c784135 --- /dev/null +++ b/pkgs/applications/misc/soapyairspy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake +, airspy, soapysdr +} : + +let + version = "0.1.1"; + +in stdenv.mkDerivation { + name = "soapyairspy-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyAirspy"; + rev = "soapy-airspy-${version}"; + sha256 = "072vc9619s9f22k7639krr1p2418cmhgm44yhzy7x9dzapc43wvk"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ airspy soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyAirspy; + description = "SoapySDR plugin for Airspy devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix new file mode 100644 index 00000000000..4e1adc32946 --- /dev/null +++ b/pkgs/applications/misc/soapybladerf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, libbladeRF, soapysdr +} : + +let + version = "0.3.5"; + +in stdenv.mkDerivation { + name = "soapybladerf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyBladeRF"; + rev = "soapy-bladerf-${version}"; + sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libbladeRF soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyBladeRF; + description = "SoapySDR plugin for BladeRF devices"; + license = licenses.lgpl21; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix new file mode 100644 index 00000000000..f5543af9c60 --- /dev/null +++ b/pkgs/applications/misc/soapyhackrf/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, hackrf, soapysdr +} : + +let + version = "0.3.2"; + +in stdenv.mkDerivation { + name = "soapyhackrf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyHackRF"; + rev = "soapy-hackrf-${version}"; + sha256 = "1sgx2nk8yrzfwisjfs9mw0xwc47bckzi17p42s2pbv7zcxzpb66p"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ hackrf soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyHackRF; + description = "SoapySDR plugin for HackRF devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapyremote/default.nix b/pkgs/applications/misc/soapyremote/default.nix new file mode 100644 index 00000000000..d10b09f99a8 --- /dev/null +++ b/pkgs/applications/misc/soapyremote/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, soapysdr }: + +let + version = "0.4.3"; + +in stdenv.mkDerivation { + name = "soapyremote-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyRemote"; + rev = "d07f43863b1ef79252f8029cfb5947220f21311d"; + sha256 = "0i101dfqq0aawybv0qyjgsnhk39dc4q6z6ys2gsvwjhpf3d48aw0"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyRemote; + description = "SoapySDR plugin for remote access to SDRs"; + license = licenses.boost; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix new file mode 100644 index 00000000000..6230f2f6f6a --- /dev/null +++ b/pkgs/applications/misc/soapysdr/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, lndir, makeWrapper +, fetchFromGitHub, cmake +, libusb, pkgconfig +, python, swig2, numpy, ncurses +, extraPackages ? [] +} : + +let + version = "0.6.1"; + +in stdenv.mkDerivation { + name = "soapysdr-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapySDR"; + rev = "soapy-sdr-${version}"; + sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libusb ncurses numpy swig2 python ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_PYTHON_CONFIG=ON" + ]; + + postFixup = lib.optionalString (lib.length extraPackages != 0) '' + # Join all plugins via symlinking + for i in ${toString extraPackages}; do + ${lndir}/bin/lndir -silent $i $out + done + + # Needed for at least the remote plugin server + for file in out/bin/*; do + ${makeWrapper}/bin/wrapProgram "$file" \ + --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages} + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapySDR; + description = "Vendor and platform neutral SDR support library"; + license = licenses.boost; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/soapyuhd/default.nix b/pkgs/applications/misc/soapyuhd/default.nix new file mode 100644 index 00000000000..4f2a79c97fe --- /dev/null +++ b/pkgs/applications/misc/soapyuhd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, uhd, boost, soapysdr +} : + +let + version = "0.3.4"; + +in stdenv.mkDerivation { + name = "soapyuhd-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyUHD"; + rev = "soapy-uhd-${version}"; + sha256 = "1da7cjcvfdqhgznm7x14s1h7lwz5lan1b48akw445ah1vxwvh4hl"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ uhd boost soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + postPatch = '' + sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyAirspy; + description = "SoapySDR plugin for UHD devices"; + license = licenses.gpl3; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5e8b16e017..b9399883823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11464,6 +11464,29 @@ with pkgs; snappy = callPackage ../development/libraries/snappy { }; + soapyairspy = callPackage ../applications/misc/soapyairspy { }; + + soapybladerf = callPackage ../applications/misc/soapybladerf { }; + + soapyhackrf = callPackage ../applications/misc/soapyhackrf { }; + + soapysdr = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; }; + + soapyremote = callPackage ../applications/misc/soapyremote { }; + + soapysdr-with-plugins = callPackage ../applications/misc/soapysdr { + inherit (python3Packages) python numpy; + extraPackages = [ + soapyairspy + soapybladerf + soapyhackrf + soapyremote + soapyuhd + ]; + }; + + soapyuhd = callPackage ../applications/misc/soapyuhd { }; + socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; sofia_sip = callPackage ../development/libraries/sofia-sip { }; -- GitLab From e0d33717282a3fba85840c01ae8ac485832fed93 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 11:54:41 -0700 Subject: [PATCH 063/785] limesuite: init at 18.04.1 --- pkgs/applications/misc/limesuite/default.nix | 55 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/misc/limesuite/default.nix diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix new file mode 100644 index 00000000000..e166c7a6b51 --- /dev/null +++ b/pkgs/applications/misc/limesuite/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, cmake +, sqlite, wxGTK30, libusb1, soapysdr +, mesa_glu, libX11, gnuplot, fltk +} : + +let + version = "18.04.1"; + +in stdenv.mkDerivation { + name = "limesuite-${version}"; + + src = fetchFromGitHub { + owner = "myriadrf"; + repo = "LimeSuite"; + rev = "v${version}"; + sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libusb1 + sqlite + wxGTK30 + fltk + gnuplot + libusb1 + soapysdr + mesa_glu + libX11 + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + postInstall = '' + mkdir -p $out/lib/udev/rules.d + cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d + + mkdir -p $out/share/limesuite + cp bin/Release/lms7suite_mcu/* $out/share/limesuite + + cp bin/dualRXTX $out/bin + cp bin/basicRX $out/bin + cp bin/singleRX $out/bin + ''; + + meta = with stdenv.lib; { + description = "Driver and GUI for LMS7002M-based SDR platforms"; + homepage = https://github.com/myriadrf/LimeSuite; + license = licenses.apache2; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9399883823..1b6135c4dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3513,6 +3513,8 @@ with pkgs; libwebsockets = callPackage ../development/libraries/libwebsockets { }; + limesuite = callPackage ../applications/misc/limesuite { }; + limesurvey = callPackage ../servers/limesurvey { }; linuxquota = callPackage ../tools/misc/linuxquota { }; @@ -11477,6 +11479,7 @@ with pkgs; soapysdr-with-plugins = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; extraPackages = [ + limesuite soapyairspy soapybladerf soapyhackrf -- GitLab From 7ba275410139c664354557f152ff8739631f498e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 11:58:50 -0700 Subject: [PATCH 064/785] welle-io: add soapysdr support --- pkgs/applications/misc/welle-io/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index d705de1a8cd..b3a9a3f3b86 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -1,6 +1,6 @@ { stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, libusb, fftwSinglePrec }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: let version = "1.0-rc2"; @@ -28,10 +28,11 @@ in stdenv.mkDerivation { qtquickcontrols qtquickcontrols2 rtl-sdr + soapysdr-with-plugins ]; cmakeFlags = [ - "-DRTLSDR=true" + "-DRTLSDR=true" "-DSOAPYSDR=true" ]; enableParallelBuilding = true; -- GitLab From b9acfb4ecfbbdac123fed170f5b2806fe4e846d0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 19 Mar 2018 22:41:06 -0400 Subject: [PATCH 065/785] treewide: isArm -> isAarch32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilà we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile (cherry picked from commit ba52ae50488de85a9cf60a3a04f1c9ca7122ec74) --- lib/systems/doubles.nix | 2 +- lib/systems/for-meta.nix | 2 +- lib/systems/inspect.nix | 7 +++++-- lib/systems/parse.nix | 2 +- nixos/lib/qemu-flags.nix | 2 +- nixos/modules/config/gnu.nix | 4 ++-- pkgs/applications/audio/sunvox/default.nix | 2 +- .../instant-messengers/toxic/default.nix | 2 +- .../applications/virtualization/qemu/default.nix | 6 +++--- pkgs/build-support/bintools-wrapper/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- .../compilers/gcc/snapshot/default.nix | 2 +- pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 6 +++--- pkgs/development/compilers/ghc/8.4.1.nix | 4 ++-- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/development/compilers/go/1.10.nix | 4 ++-- pkgs/development/compilers/go/1.4.nix | 2 +- pkgs/development/compilers/go/1.9.nix | 4 ++-- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/generic.nix | 4 ++-- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- pkgs/development/compilers/sbcl/default.nix | 2 +- .../haskell-modules/configuration-common.nix | 10 +++++----- .../haskell-modules/generic-builder.nix | 2 +- pkgs/development/interpreters/perl/default.nix | 2 +- .../interpreters/picolisp/default.nix | 2 +- .../interpreters/spidermonkey/1.8.5.nix | 8 ++++---- pkgs/development/libraries/ffmpeg/generic.nix | 14 +++++++------- pkgs/development/libraries/freetype/default.nix | 2 +- pkgs/development/libraries/glibc/common-2.27.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/gnu-efi/default.nix | 2 +- pkgs/development/libraries/icu/base.nix | 2 +- pkgs/development/libraries/jemalloc/default.nix | 2 +- pkgs/development/libraries/libdrm/default.nix | 2 +- .../development/libraries/libtoxcore/default.nix | 2 +- .../development/libraries/libtoxcore/new-api.nix | 4 ++-- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/libvpx/git.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 6 +++--- pkgs/development/libraries/pixman/default.nix | 2 +- pkgs/development/libraries/pth/default.nix | 2 +- pkgs/development/libraries/v8/3.16.14.nix | 4 ++-- pkgs/development/libraries/v8/6_x.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- .../webrtc-audio-processing/default.nix | 2 +- .../python-modules/Cython/default.nix | 2 +- pkgs/development/tools/misc/binutils/2.30.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- pkgs/os-specific/linux/kbd/default.nix | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/uclibc/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- pkgs/tools/networking/cjdns/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/system/storebrowse/default.nix | 2 +- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 69 files changed, 109 insertions(+), 106 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 012a1786a3c..c6618083ce7 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ in rec { none = []; - arm = filterDoubles predicates.isArm; + arm = filterDoubles predicates.isAarch32; aarch64 = filterDoubles predicates.isAarch64; x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index fa713b1e613..68c68c2cd36 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -7,7 +7,7 @@ in rec { inherit (lib.systems.doubles) all mesaPlatforms; none = []; - arm = [ patterns.isArm ]; + arm = [ patterns.isAarch32 ]; aarch64 = [ patterns.isAarch64 ]; x86 = [ patterns.isx86 ]; i686 = [ patterns.isi686 ]; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index a7bd17f68a4..91ae2cd2557 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -9,8 +9,8 @@ rec { isx86_64 = { cpu = cpuTypes.x86_64; }; isPowerPC = { cpu = cpuTypes.powerpc; }; isx86 = { cpu = { family = "x86"; }; }; - isArm = { cpu = { family = "arm"; }; }; - isAarch64 = { cpu = { family = "aarch64"; }; }; + isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; + isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; isWasm = { cpu = { family = "wasm"; }; }; @@ -43,6 +43,9 @@ rec { [ "x86" "arm" "aarch64" ]; isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; }) [ "x86" "arm" "aarch64" "mips" ]; + + # Deprecated after 18.03 + isArm = isAarch32; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 03d052f5f19..8a6c951d5e5 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -72,7 +72,7 @@ rec { armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index fcdcbf1b007..e4c95ebdfb0 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -9,7 +9,7 @@ ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; qemuBinary = qemuPkg: { diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index ef48ccb7b4f..93d13097019 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -26,11 +26,11 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isArm) grub2; + ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. - boot.loader.grub.enable = !pkgs.stdenv.isArm; + boot.loader.grub.enable = !pkgs.stdenv.isAarch32; boot.loader.grub.version = 2; # GNU lsh. diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ccbceddefd2..47b0bf2e736 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -5,7 +5,7 @@ let arch = if stdenv.isAarch64 then "arm64" - else if stdenv.isArm + else if stdenv.isAarch32 then "arm_armhf_raspberry_pi" else if stdenv.is64bit then "x86_64" diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e2e25be49f2..4934a737405 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk_pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut libqrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 00303be12da..c3d8d05eea9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,7 +4,7 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL @@ -26,7 +26,7 @@ let hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" else if stdenv.isi686 then "i386-softmmu" - else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch32 then "arm-softmmu" else if stdenv.isAarch64 then "aarch64-softmmu" else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 8e94ccfa49b..a5084808c3b 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -55,7 +55,7 @@ let else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". - else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" + else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" @@ -174,7 +174,7 @@ stdenv.mkDerivation { sep = optionalString (!targetPlatform.isMips) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" - else if targetPlatform.isArm then endianPrefix + "arm" + else if targetPlatform.isAarch32 then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isi686 then "i386" else if targetPlatform.isMips then { diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index c63867a1d2d..8cee08c0926 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -258,7 +258,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 36adfd075df..c798a67de84 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -300,7 +300,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index c436da678fd..c729bbeb66f 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -309,7 +309,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index b9ca8696d4e..f2a091e34dc 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -329,7 +329,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index df0c1578dae..3de5b4dd270 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -333,7 +333,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index e8997b1efb0..888e455488c 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -329,7 +329,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index c1306d374d5..3c98b7a58f7 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -301,7 +301,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index c56798e31ae..cb9f78aa081 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ]; + buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index 8a08ab4b986..c0bc2a9dd73 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 1c3f260da1c..b2a1aafe613 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -25,7 +25,7 @@ enableShared ? !(targetPlatform.isDarwin # On iOS, dynamic linking is not supported - && (targetPlatform.isAarch64 || targetPlatform.isArm)) + && (targetPlatform.isAarch64 || targetPlatform.isAarch32)) , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 8f7cdc9568e..f232e0b4728 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index bc3ccbdcdf5..51497e0d9ce 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 145f6a17978..b22bfb2bd10 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index b8c283fef07..32eb0d98d18 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c866212170c..955d9029d38 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index c69554e633a..8cfe2bb7bcf 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 648ef0d91f9..8bad5494e8b 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 03ae6e518d0..54e9ae671af 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -7,7 +7,7 @@ let real_url = if url == null then "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz" else url; - safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); + safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in { stdenv, fetchurl, ncurses, buildEnv @@ -15,7 +15,7 @@ in , flambdaSupport ? false }: -assert useX11 -> !stdenv.isArm && !stdenv.isMips; +assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 707f7966dd9..529123398a5 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' + postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 39b84ae6a36..8006648a7dc 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (setf features (remove x features)))) '' + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") - + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" + + stdenv.lib.optionalString stdenv.isAarch32 "(enable :arm)" + '' )) " > customize-target-features.lisp diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 08443de111d..6d95805ddb6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -937,11 +937,11 @@ self: super: { JuicyPixels = dontHaddock super.JuicyPixels; # armv7l fixes. - happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs; - servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger; - swagger2 = if pkgs.stdenv.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2; + happy = if pkgs.stdenv.isAarch32 then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if pkgs.stdenv.isAarch32 then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if pkgs.stdenv.isAarch32 then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if pkgs.stdenv.isAarch32 then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if pkgs.stdenv.isAarch32 then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a29056d965a..01e2eef58cb 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -133,7 +133,7 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !hostPlatform.isAarch32 && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f7324fc6d01..b3381c1dd8f 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -82,7 +82,7 @@ let preConfigure = optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString (stdenv.isArm || stdenv.isMips) '' + '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 4618d0da9dd..6f7f2df96bf 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; - patchPhase = optionalString stdenv.isArm '' + patchPhase = optionalString stdenv.isAarch32 '' sed -i s/-m32//g Makefile cat >>Makefile < libGLU_combined != null; @@ -153,8 +153,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport libGLU_combined - ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM - ++ optional ((isLinux || isFreeBSD) && !isArm) libva + ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8f16f85cabf..be4da5a035b 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; # The asm for armel is written with the 'asm' keyword. - CFLAGS = optionalString stdenv.isArm "-std=gnu99"; + CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix index 6c443ebbb93..272e18905c1 100644 --- a/pkgs/development/libraries/glibc/common-2.27.nix +++ b/pkgs/development/libraries/glibc/common-2.27.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d40733adf87..5179ce4a9a8 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index b65a8ee5fc1..57204776dec 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 5973c89cef7..551e7e5e1f6 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -38,7 +38,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index a46abe3b4f7..bb7c35ddc9c 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ] ++ stdenv.lib.optional stdenv.isAarch32 "ARCH=arm" ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 87551ee6ee0..ee868d371ce 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -31,7 +31,7 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isArm '' + '' + stdenv.lib.optionalString stdenv.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 0882431cc15..d4c9e0ff24a 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; + ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp"; doCheck = true; patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index e5e1e2e7a39..45a71759d45 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-install-test-programs" ] - ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) + ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 16fca9ce3d3..9af8718dc5f 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium libmsgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 8d0a467c82a..785bc6f3c84 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus ]; - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ]; # Some tests fail randomly due to timeout. This kind of problem is well known # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 1e96ff9bb1a..272761cc6af 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -41,7 +41,7 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 824449a347a..a861428f0f7 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -43,11 +43,11 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in -assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support +assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3f873022f7a..67500216800 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -32,17 +32,17 @@ else let defaultGalliumDrivers = - if stdenv.isArm + if stdenv.isAarch32 then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then ["nouveau" "vc4" ] else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then ["nouveau"] else ["i915" "i965" "nouveau" "radeon" "r200"]; defaultVulkanDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then [] else ["intel"] ++ lib.optional enableRadv "radeon"; in diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 6b891bdb38c..98d4c737ebd 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck libpng; - configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; + configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; doCheck = true; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index b7b09caed9b..6118d9c41d6 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = stdenv.lib.optionalString stdenv.isArm '' + preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index 73f5febb668..e1a9336e3a5 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -3,10 +3,10 @@ assert readline != null; let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index 4095ff20c2b..adebedbf2ac 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -4,7 +4,7 @@ }: let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then if stdenv.is64bit then"arm64" else "arm" diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 4d49fdce3a9..3246c23ab02 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -10,7 +10,7 @@ let arch = if stdenv.isx86_64 then "x64" else if stdenv.isi686 then "ia32" else if stdenv.isAarch64 then "arm64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b5a3aed91d9..529091518eb 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # Avoid this error: # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode - patchPhase = stdenv.lib.optionalString stdenv.isArm '' + patchPhase = stdenv.lib.optionalString stdenv.isAarch32 '' substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 751e064ad70..ce63970495b 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # result is "3L" instead of "3", so let's fix it in-place. # # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' + postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isAarch32) && !isPy3k) '' sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ tests/run/cpdef_enums.pyx ''; diff --git a/pkgs/development/tools/misc/binutils/2.30.nix b/pkgs/development/tools/misc/binutils/2.30.nix index 830c0733052..2a8e6d88b93 100644 --- a/pkgs/development/tools/misc/binutils/2.30.nix +++ b/pkgs/development/tools/misc/binutils/2.30.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 05d0d21a179..549eaf5253d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index d1e40371e37..bfade509fca 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) '' + ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5fbd9955c2a..50f5999c557 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -353,7 +353,7 @@ with stdenv.lib; SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default SECURITY_YAMA? y # Prevent processes from ptracing non-children processes DEVKMEM n # Disable /dev/kmem - ${optionalString (! stdenv.hostPlatform.isArm) + ${optionalString (! stdenv.hostPlatform.isAarch32) (if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack '' else '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fc72728cbab..5992c1ffa95 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + (if stdenv.isAarch32 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index c4d2bf04d7a..180aabc94cc 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -43,7 +43,7 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" - '' + stdenv.lib.optionalString (stdenv.isArm && cross == null) '' + '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 25fee035cd5..1b4585e065b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -123,7 +123,7 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl; + ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 42288e6245e..190fc500068 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -117,7 +117,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD - isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian; + isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index d16e730b5ab..817da08c05e 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { stdenv.lib.optional stdenv.isLinux utillinux; buildPhase = - stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 " + stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d20cb3c3785..3dfd136ad06 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, go }: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); let diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 40332f7b0d4..179b4cb1a4c 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchhg, go, sqlite}: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); stdenv.mkDerivation rec { name = "storebrowse-20130318212204"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82ad4769977..d38f8d20188 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5988,7 +5988,7 @@ with pkgs; # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = !stdenv.isArm; + profiledCompiler = !stdenv.isAarch32; libcCross = if targetPlatform != buildPlatform then libcCross else null; })); @@ -6352,12 +6352,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; + jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); jre8_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else if stdenv.isDarwin then jre8 @@ -6366,12 +6366,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; - jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" + jdk9 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; + jre9 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk9.jre // { outputs = [ "jre" ]; })); jre9_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre9 else if stdenv.isDarwin then jre9 @@ -9126,7 +9126,7 @@ with pkgs; cairo = callPackage ../development/libraries/cairo { glSupport = config.cairo.gl or (stdenv.isLinux && - !stdenv.isArm && !stdenv.isMips); + !stdenv.isAarch32 && !stdenv.isMips); }; -- GitLab From 683b91ea1083b39958939f487f31e4aaabfa4996 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 12:59:23 -0700 Subject: [PATCH 066/785] limesuite: fix license --- pkgs/applications/misc/limesuite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix index e166c7a6b51..fb1ef8fb669 100644 --- a/pkgs/applications/misc/limesuite/default.nix +++ b/pkgs/applications/misc/limesuite/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Driver and GUI for LMS7002M-based SDR platforms"; homepage = https://github.com/myriadrf/LimeSuite; - license = licenses.apache2; + license = licenses.asl20; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; }; -- GitLab From 3a8b8bcb693bcae570d2541bc9eb4849ad73d2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Mon, 4 Dec 2017 19:37:09 +0100 Subject: [PATCH 067/785] all-packages.nix: made new block CHEMISTRY --- pkgs/top-level/all-packages.nix | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaa458529e3..5ede261d5c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2770,8 +2770,6 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; - gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; - gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -3114,8 +3112,6 @@ with pkgs; jmespath = callPackage ../development/tools/jmespath { }; - jmol = callPackage ../applications/science/chemistry/jmol { }; - jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; jnettop = callPackage ../tools/networking/jnettop { }; @@ -3744,8 +3740,6 @@ with pkgs; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; - molden = callPackage ../applications/science/chemistry/molden { }; - molly-guard = callPackage ../os-specific/linux/molly-guard { }; moneyplex = callPackage ../applications/office/moneyplex { }; @@ -7151,8 +7145,6 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; - inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -14842,10 +14834,6 @@ with pkgs; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; - avogadro = callPackage ../applications/science/chemistry/avogadro { - eigen = eigen2; - }; - avrdudess = callPackage ../applications/misc/avrdudess { }; avxsynth = callPackage ../applications/video/avxsynth { @@ -17404,8 +17392,6 @@ with pkgs; puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; - pymol = callPackage ../applications/science/chemistry/pymol { }; - pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; @@ -19730,6 +19716,22 @@ with pkgs; ### SCIENCE + ### SCIENCE/CHEMISTY + + avogadro = callPackage ../applications/science/chemistry/avogadro { + eigen = eigen2; + }; + + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; + + jmol = callPackage ../applications/science/chemistry/jmol { }; + + molden = callPackage ../applications/science/chemistry/molden { }; + + octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; + + pymol = callPackage ../applications/science/chemistry/pymol { }; + ### SCIENCE/GEOMETRY drgeo = callPackage ../applications/science/geometry/drgeo { -- GitLab From 75d8c81868fdbffbc27fe0ae94c6870da5f42143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Mon, 26 Mar 2018 13:01:25 +0200 Subject: [PATCH 068/785] pymol: 1.8.4 -> 2.1.0 --- .../applications/science/chemistry/pymol/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 39c027706ee..e7dd04377be 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeDesktopItem , python3, python3Packages -, glew, freeglut, libpng, libxml2, tk, freetype }: +, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }: with stdenv.lib; let pname = "pymol"; - ver_maj = "1.8"; - ver_min = "4"; + ver_maj = "2"; + ver_min = "1"; version = "${ver_maj}.${ver_min}.0"; description = "A Python-enhanced molecular graphics tool"; @@ -16,7 +16,7 @@ let name = "${pname}"; exec = "${pname}"; desktopName = "PyMol Molecular Graphics System"; - genericName = "Molecular Modeller"; + genericName = "Molecular Modeler"; comment = description; mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; categories = "Graphics;Education;Science;Chemistry;"; @@ -26,10 +26,10 @@ python3Packages.buildPythonApplication { name = "pymol-${version}"; src = fetchurl { url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2"; - sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n"; + sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s"; }; - buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype ]; + buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; installPhase = '' -- GitLab From 329d1ba69a3b8b16af228bff28066274bc4cf085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Mon, 4 Dec 2017 19:53:36 +0100 Subject: [PATCH 069/785] jmol: made it runnable --- .../science/chemistry/jmol/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c85e1143d10..4c4278c30fa 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -1,9 +1,20 @@ { stdenv , fetchurl , unzip +, makeDesktopItem , jre }: +let + desktopItem = makeDesktopItem { + name = "jmol"; + exec = "jmol"; + desktopName = "JMol"; + genericName = "Molecular Modeler"; + mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; + categories = "Graphics;Education;Science;Chemistry;"; + }; +in stdenv.mkDerivation rec { version = "${baseVersion}.${patchVersion}"; baseVersion = "14.29"; @@ -16,19 +27,18 @@ stdenv.mkDerivation rec { sha256 = "1ndq9am75janshrnk26334z1nmyh3k4bp20napvf2zv0lfp8k3bv"; }; - buildInputs = [ - jre - ]; + patchPhase = '' + sed -i -e "4s:.*:command=${jre}/bin/java:" -e "10s:.*:jarpath=$out/share/jmol/Jmol.jar:" -e "11,21d" jmol + ''; installPhase = '' - mkdir -p "$out/share/jmol" - mkdir -p "$out/bin" + mkdir -p "$out/share/jmol" "$out/bin" ${unzip}/bin/unzip jsmol.zip -d "$out/share/" - sed -i -e 's|command=java|command=${jre}/bin/java|' jmol.sh cp *.jar jmol.sh "$out/share/jmol" - ln -s $out/share/jmol/jmol.sh "$out/bin/jmol" + cp -r ${desktopItem}/share/applications $out/share + cp jmol $out/bin ''; enableParallelBuilding = true; @@ -38,7 +48,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/jmol; license = licenses.lgpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = with maintainers; [ timokau mounium ]; }; } - -- GitLab From 42297b0e1ce0198fa87b3b1d31c2057707ad4611 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 25 Apr 2018 14:44:03 -0700 Subject: [PATCH 070/785] limesuite: removed unnecessary cmakeFlag --- pkgs/applications/misc/limesuite/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix index fb1ef8fb669..4599fab0c6d 100644 --- a/pkgs/applications/misc/limesuite/default.nix +++ b/pkgs/applications/misc/limesuite/default.nix @@ -30,8 +30,6 @@ in stdenv.mkDerivation { libX11 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - postInstall = '' mkdir -p $out/lib/udev/rules.d cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d -- GitLab From c600f02e430b49c8907a63a12c62ee407b95cf5d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 26 Apr 2018 00:16:26 +0200 Subject: [PATCH 071/785] cups-kyodialog3: init at 8.1601 --- pkgs/misc/cups/drivers/kyodialog3/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/misc/cups/drivers/kyodialog3/default.nix diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix new file mode 100644 index 00000000000..bc48b2c8f33 --- /dev/null +++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -0,0 +1,65 @@ +{ stdenv, lib, fetchzip, cups + + # Can either be "EU" or "Global"; it's unclear what the difference is + , region ? "Global" +}: + +let + platform = + if stdenv.system == "x86_64-linux" then "64bit" + else if stdenv.system == "i686-linux" then "32bit" + else throw "Unsupported system: ${stdenv.system}"; + debPlatform = + if platform == "64bit" then "amd64" + else "i386"; + debRegion = if region == "EU" then "EU." else ""; + + # TODO: add Qt4 for kyodialog3 application + libPath = lib.makeLibraryPath [ cups ]; +in +stdenv.mkDerivation rec { + name = "cups-kyodialog3-${version}"; + version = "8.1601"; + + dontPatchELF = true; + dontStrip = true; + + src = fetchzip { + url = "https://usa.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/us/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz"; + sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal"; + }; + + installPhase = '' + mkdir -p $out + cd $out + + # unpack the debian archive + ar p ${src}/KyoceraLinuxPackages/${region}/${platform}/kyodialog3.en${debRegion}_0.5-0_${debPlatform}.deb data.tar.gz | tar -xz + rm -Rf KyoceraLinuxPackages + + # strip $out/usr + mv usr/* . + rmdir usr + + # allow cups to find the ppd files + mkdir -p share/cups/model + mv share/ppd/kyocera share/cups/model/Kyocera + rmdir share/ppd + + # prepend $out to all references in ppd and desktop files + find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; + find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; + + # patchELF all executables + find -type f -executable -exec patchelf --set-rpath ${libPath} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; + ''; + + meta = with lib; { + description = "CUPS drivers for several Kyocera printers"; + homepage = "https://www.kyoceradocumentsolutions.com"; + license = licenses.unfree; + maintainers = [ maintainers.steveej ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4235616748c..8bdd4f5ae50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19994,6 +19994,8 @@ with pkgs; cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + cups-kyodialog3 = callPackage ../misc/cups/drivers/kyodialog3 {}; + cups-dymo = callPackage ../misc/cups/drivers/dymo {}; cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {}; -- GitLab From 3e3b39f173f9abc99da84084a1f4657c9de885bd Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 26 Apr 2018 01:41:53 +0200 Subject: [PATCH 072/785] qemu: 2.11.1 -> 2.12.0 --- .../virtualization/qemu/default.nix | 10 +- .../virtualization/qemu/statfs-flags.patch | 197 ------------------ 2 files changed, 3 insertions(+), 204 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/statfs-flags.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9839aadc9c1..0496adb6f40 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -21,8 +21,8 @@ with stdenv.lib; let - version = "2.11.1"; - sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr"; + version = "2.12.0"; + sha256 = "17377xxbmwbrnh895a108z944pqi39hzrbw4jzgj8pcipi3s3x69"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -69,11 +69,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "ga" ]; - patches = [ ./no-etc-install.patch ./statfs-flags.patch (fetchpatch { - name = "glibc-2.27-memfd.patch"; - url = "https://git.qemu.org/?p=qemu.git;a=patch;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0"; - sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; - }) ] + patches = [ ./no-etc-install.patch ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ diff --git a/pkgs/applications/virtualization/qemu/statfs-flags.patch b/pkgs/applications/virtualization/qemu/statfs-flags.patch deleted file mode 100644 index 52a470a2869..00000000000 --- a/pkgs/applications/virtualization/qemu/statfs-flags.patch +++ /dev/null @@ -1,197 +0,0 @@ -commit 909fe47c7009aa9a75fe9470c5f8d3dd5b50917a -Author: Shea Levy -Date: Sun Feb 18 13:50:11 2018 -0500 - - linux-user: Support f_flags in statfs when available. - - Signed-off-by: Shea Levy - -diff --git a/configure b/configure -index 913e14839d..52fe2bf941 100755 ---- a/configure -+++ b/configure -@@ -5303,6 +5303,22 @@ if compile_prog "" "" ; then - have_utmpx=yes - fi - -+########################################## -+# Check for newer fields of struct statfs on Linux -+ -+if test "$linux_user" = "yes"; then -+ cat > $TMPC < -+ -+int main(void) { -+ struct statfs fs; -+ fs.f_flags = 0; -+} -+EOF -+ if compile_object ; then -+ have_statfs_flags=yes -+ fi -+fi - ########################################## - # checks for sanitizers - -@@ -6518,6 +6534,10 @@ if test "$have_utmpx" = "yes" ; then - echo "HAVE_UTMPX=y" >> $config_host_mak - fi - -+if test "$have_statfs_flags" = "yes" ; then -+ echo "HAVE_STATFS_FLAGS=y" >> $config_host_mak -+fi -+ - if test "$ivshmem" = "yes" ; then - echo "CONFIG_IVSHMEM=y" >> $config_host_mak - fi -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 82b35a6bdf..77481eca2c 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -9534,6 +9534,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, - __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]); - __put_user(stfs.f_namelen, &target_stfs->f_namelen); - __put_user(stfs.f_frsize, &target_stfs->f_frsize); -+#ifdef HAVE_STATFS_FLAGS -+ __put_user(stfs.f_flags, &target_stfs->f_flags); -+#endif - memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); - unlock_user_struct(target_stfs, arg2, 1); - } -diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h -index a35c52a60a..64aa49d3c5 100644 ---- a/linux-user/syscall_defs.h -+++ b/linux-user/syscall_defs.h -@@ -362,7 +362,14 @@ struct kernel_statfs { - int f_ffree; - kernel_fsid_t f_fsid; - int f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ int f_frsize; -+ int f_flags; -+ int f_spare[4]; -+#else - int f_spare[6]; -+#endif -+ - }; - - struct target_dirent { -@@ -2223,7 +2230,12 @@ struct target_statfs { - /* Linux specials */ - target_fsid_t f_fsid; - int32_t f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[5]; -+#else - int32_t f_spare[6]; -+#endif - }; - #else - struct target_statfs { -@@ -2239,7 +2251,12 @@ struct target_statfs { - /* Linux specials */ - target_fsid_t f_fsid; - abi_long f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[5]; -+#else - abi_long f_spare[6]; -+#endif - }; - #endif - -@@ -2255,7 +2272,12 @@ struct target_statfs64 { - uint64_t f_bavail; - target_fsid_t f_fsid; - uint32_t f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[5]; -+#else - uint32_t f_spare[6]; -+#endif - }; - #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \ - defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \ -@@ -2271,7 +2293,12 @@ struct target_statfs { - target_fsid_t f_fsid; - abi_long f_namelen; - abi_long f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[4]; -+#else - abi_long f_spare[5]; -+#endif - }; - - struct target_statfs64 { -@@ -2285,7 +2312,12 @@ struct target_statfs64 { - target_fsid_t f_fsid; - abi_long f_namelen; - abi_long f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[4]; -+#else - abi_long f_spare[5]; -+#endif - }; - #elif defined(TARGET_S390X) - struct target_statfs { -@@ -2299,7 +2331,13 @@ struct target_statfs { - kernel_fsid_t f_fsid; - int32_t f_namelen; - int32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[4]; -+#else - int32_t f_spare[5]; -+#endif -+ - }; - - struct target_statfs64 { -@@ -2313,7 +2351,12 @@ struct target_statfs64 { - kernel_fsid_t f_fsid; - int32_t f_namelen; - int32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[4]; -+#else - int32_t f_spare[5]; -+#endif - }; - #else - struct target_statfs { -@@ -2327,7 +2370,12 @@ struct target_statfs { - target_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[4]; -+#else - uint32_t f_spare[5]; -+#endif - }; - - struct target_statfs64 { -@@ -2341,7 +2389,12 @@ struct target_statfs64 { - target_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[4]; -+#else - uint32_t f_spare[5]; -+#endif - }; - #endif - -- GitLab From 4de774a63bef6d97246641212d8c38cc34ff6665 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 26 Apr 2018 06:09:05 +0200 Subject: [PATCH 073/785] nixos/dhparams: Add a VM test We're going to make changes to the dhparams module so we really want to make sure we don't break it, so having a NixOS VM test is to make sure we don't blow things up and can iterate on it. Signed-off-by: aszlig Cc: @Ekleog --- nixos/release.nix | 1 + nixos/tests/dhparams.nix | 105 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 nixos/tests/dhparams.nix diff --git a/nixos/release.nix b/nixos/release.nix index 2f779280e6b..9d8a62f9995 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -269,6 +269,7 @@ in rec { tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; tests.deluge = callTest tests/deluge.nix {}; + tests.dhparams = callTest tests/dhparams.nix {}; tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {}; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix new file mode 100644 index 00000000000..36079b99097 --- /dev/null +++ b/nixos/tests/dhparams.nix @@ -0,0 +1,105 @@ +let + common = { pkgs, ... }: { + security.dhparams.enable = true; + environment.systemPackages = [ pkgs.openssl ]; + }; + +in import ./make-test.nix { + name = "dhparams"; + + nodes.generation1 = { pkgs, config, ... }: { + imports = [ common ]; + security.dhparams.params.foo = 16; + security.dhparams.params.bar = 17; + + systemd.services.foo = { + description = "Check systemd Ordering"; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + # This is to make sure that the dhparams generation of foo occurs + # before this service so we need this service to start as early as + # possible to provoke a race condition. + DefaultDependencies = false; + + # We check later whether the service has been started or not. + ConditionPathExists = "${config.security.dhparams.path}/foo.pem"; + }; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + # The reason we only provide an ExecStop here is to ensure that we don't + # accidentally trigger an error because a file system is not yet ready + # during very early startup (we might not even have the Nix store + # available, for example if future changes in NixOS use systemd mount + # units to do early file system initialisation). + serviceConfig.ExecStop = "${pkgs.coreutils}/bin/true"; + }; + }; + + nodes.generation2 = { + imports = [ common ]; + security.dhparams.params.foo = 18; + }; + + nodes.generation3 = common; + + testScript = { nodes, ... }: let + getParamPath = gen: name: let + node = "generation${toString gen}"; + inherit (nodes.${node}.config.security.dhparams) path; + in "${path}/${name}.pem"; + + assertParamBits = gen: name: bits: let + path = getParamPath gen name; + in '' + $machine->nest('check bit size of ${path}', sub { + my $out = $machine->succeed('openssl dhparam -in ${path} -text'); + $out =~ /^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$/m; + die "bit size should be ${toString bits} but it is $1 instead." + if $1 != ${toString bits}; + }); + ''; + + switchToGeneration = gen: let + node = "generation${toString gen}"; + inherit (nodes.${node}.config.system.build) toplevel; + switchCmd = "${toplevel}/bin/switch-to-configuration test"; + in '' + $machine->nest('switch to generation ${toString gen}', sub { + $machine->succeed('${switchCmd}'); + $main::machine = ''$${node}; + }); + ''; + + in '' + my $machine = $generation1; + + $machine->waitForUnit('multi-user.target'); + + subtest "verify startup order", sub { + $machine->succeed('systemctl is-active foo.service'); + }; + + subtest "check bit sizes of dhparam files", sub { + ${assertParamBits 1 "foo" 16} + ${assertParamBits 1 "bar" 17} + }; + + ${switchToGeneration 2} + + subtest "check whether bit size has changed", sub { + ${assertParamBits 2 "foo" 18} + }; + + subtest "ensure that dhparams file for 'bar' was deleted", sub { + $machine->fail('test -e ${getParamPath 1 "bar"}'); + }; + + ${switchToGeneration 3} + + subtest "ensure that 'security.dhparams.path' has been deleted", sub { + $machine->fail( + 'test -e ${nodes.generation3.config.security.dhparams.path}' + ); + }; + ''; +} -- GitLab From 761266bd18cf1117a11d2fd6168259f7fe867122 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 26 Apr 2018 06:19:48 +0200 Subject: [PATCH 074/785] nixos/dhparams: Turn params into a submodule We're going to implement an option which allows us to turn off stateful handling of Diffie-Hellman parameter files by putting them into the Nix store. However, modules now might need a way to reference these files, so we add a now path option to every param specified, which carries a read-only value of the path where to find the corresponding DH params file. I've also improved the description of security.dhparams.params a bit so that it uses and . The NixOS VM test also reflects this change and checks whether the old way to specify the bit size still works. Signed-off-by: aszlig Cc: @Ekleog --- nixos/modules/security/dhparams.nix | 64 +++++++++++++++++++++-------- nixos/tests/dhparams.nix | 16 +++++--- 2 files changed, 57 insertions(+), 23 deletions(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 55c75713101..7c9fe986e57 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -1,10 +1,38 @@ { config, lib, pkgs, ... }: with lib; + let cfg = config.security.dhparams; -in -{ + + paramsSubmodule = { name, config, ... }: { + options.bits = mkOption { + type = types.addCheck types.int (b: b >= 16) // { + name = "bits"; + description = "integer of at least 16 bits"; + }; + default = 4096; + description = '' + The bit size for the prime that is used during a Diffie-Hellman + key exchange. + ''; + }; + + options.path = mkOption { + type = types.path; + readOnly = true; + description = '' + The resulting path of the generated Diffie-Hellman parameters + file for other services to reference. This could be either a + store path or a file inside the directory specified by + . + ''; + }; + + config.path = "${cfg.path}/${name}.pem"; + }; + +in { options = { security.dhparams = { params = mkOption { @@ -14,21 +42,23 @@ in The value is the size (in bits) of the DH params to generate. The generated DH params path can be found in - security.dhparams.path/name.pem. + config.security.dhparams.params.name.path. - Note: The name of the DH params is taken as being the name of the - service it serves: the params will be generated before the said - service is started. + The name of the DH params is taken as being the name of + the service it serves and the params will be generated before the + said service is started. - Warning: If you are removing all dhparams from this list, you have - to leave security.dhparams.enable for at least one activation in - order to have them be cleaned up. This also means if you rollback to - a version without any dhparams the existing ones won't be cleaned - up. + If you are removing all dhparams from this list, you + have to leave for at + least one activation in order to have them be cleaned up. This also + means if you rollback to a version without any dhparams the + existing ones won't be cleaned up. ''; - type = with types; attrsOf int; + type = with types; let + coerce = bits: { inherit bits; }; + in attrsOf (coercedTo types.int coerce (submodule paramsSubmodule)); default = {}; - example = { nginx = 3072; }; + example = literalExample "{ nginx.bits = 3072; }"; }; path = mkOption { @@ -71,10 +101,10 @@ in if [ ! -f "$file" ]; then continue fi - '' + concatStrings (mapAttrsToList (name: value: + '' + concatStrings (mapAttrsToList (name: { bits, ... }: '' if [ "$file" == "${cfg.path}/${name}.pem" ] && \ - ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then + ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then continue fi '' @@ -89,7 +119,7 @@ in ''; }; } // - mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" { + mapAttrs' (name: { bits, ... }: nameValuePair "dhparams-gen-${name}" { description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; after = [ "dhparams-init.service" ]; before = [ "${name}.service" ]; @@ -99,7 +129,7 @@ in '' mkdir -p ${cfg.path} if [ ! -f ${cfg.path}/${name}.pem ]; then - ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value} + ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString bits} fi ''; }) cfg.params; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix index 36079b99097..ead5f2efce7 100644 --- a/nixos/tests/dhparams.nix +++ b/nixos/tests/dhparams.nix @@ -9,8 +9,13 @@ in import ./make-test.nix { nodes.generation1 = { pkgs, config, ... }: { imports = [ common ]; - security.dhparams.params.foo = 16; - security.dhparams.params.bar = 17; + security.dhparams.params = { + # Use low values here because we don't want the test to run for ages. + foo.bits = 16; + # Also use the old format to make sure the type is coerced in the right + # way. + bar = 17; + }; systemd.services.foo = { description = "Check systemd Ordering"; @@ -22,7 +27,7 @@ in import ./make-test.nix { DefaultDependencies = false; # We check later whether the service has been started or not. - ConditionPathExists = "${config.security.dhparams.path}/foo.pem"; + ConditionPathExists = config.security.dhparams.params.foo.path; }; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; @@ -37,7 +42,7 @@ in import ./make-test.nix { nodes.generation2 = { imports = [ common ]; - security.dhparams.params.foo = 18; + security.dhparams.params.foo.bits = 18; }; nodes.generation3 = common; @@ -45,8 +50,7 @@ in import ./make-test.nix { testScript = { nodes, ... }: let getParamPath = gen: name: let node = "generation${toString gen}"; - inherit (nodes.${node}.config.security.dhparams) path; - in "${path}/${name}.pem"; + in nodes.${node}.config.security.dhparams.params.${name}.path; assertParamBits = gen: name: bits: let path = getParamPath gen name; -- GitLab From 3e11ff6e0d9fb21a962408407f24b465b30fe96f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 26 Apr 2018 06:38:02 +0200 Subject: [PATCH 075/785] nixos/dhparams: Introduce a 'stateful' option This option allows us to turn off stateful generation of Diffie-Hellman parameters, which in some way is still stateful as the generated DH params file is non-deterministic. However what we can avoid with this is to have an increased surface for failures during system startup, because generation of the parameters is done during build-time. Another advantage of this is that we no longer need to take care of cleaning up the files that are no longer used and in my humble opinion I would have preferred that #11505 (which puts the dhparams in the Nix store) would have been merged instead of #22634 (which we have now). Luckily we can still change that and this change gives the user the option to put the dhparams into the Nix store. Beside of the more obvious advantages pointed out here, this also effects test runtime if more services are starting to use this (for example see #39507 and #39288), because generating DH params could take a long time depending on the bit size which adds up to test runtime. If we generate the DH params in a separate derivation, subsequent test runs won't need to wait for DH params generation during bootup. Of course, tests could still mock this by force-disabling the service and adding a service or activation script that places pre-generated DH params in /var/lib/dhparams but this would make tests less readable and the workaround would have to be made for each test affected. Note that the 'stateful' option is still true by default so that we are backwards-compatible with existing systems. Signed-off-by: aszlig Cc: @Ekleog, @abbradar, @fpletz --- nixos/modules/security/dhparams.nix | 39 +++++++++++++++++++++++------ nixos/tests/dhparams.nix | 21 ++++++++++++++++ 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 7c9fe986e57..64b296eea5b 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -29,7 +29,11 @@ let ''; }; - config.path = "${cfg.path}/${name}.pem"; + config.path = let + generated = pkgs.runCommand "dhparams-${name}.pem" { + nativeBuildInputs = [ pkgs.openssl ]; + } "openssl dhparam -out \"$out\" ${toString config.bits}"; + in if cfg.stateful then "${cfg.path}/${name}.pem" else generated; }; in { @@ -52,7 +56,9 @@ in { have to leave for at least one activation in order to have them be cleaned up. This also means if you rollback to a version without any dhparams the - existing ones won't be cleaned up. + existing ones won't be cleaned up. Of course this only applies if + is + true. ''; type = with types; let coerce = bits: { inherit bits; }; @@ -61,12 +67,29 @@ in { example = literalExample "{ nginx.bits = 3072; }"; }; + stateful = mkOption { + type = types.bool; + default = true; + description = '' + Whether generation of Diffie-Hellman parameters should be stateful or + not. If this is enabled, PEM-encoded files for Diffie-Hellman + parameters are placed in the directory specified by + . Otherwise the files are + created within the Nix store. + + If this is false the resulting store + path will be non-deterministic and will be rebuilt every time the + openssl package changes. + ''; + }; + path = mkOption { - description = - '' - Path to the directory in which Diffie-Hellman parameters will be - stored. - ''; + description = '' + Path to the directory in which Diffie-Hellman parameters will be + stored. This only is relevant if + is + true. + ''; type = types.str; default = "/var/lib/dhparams"; }; @@ -82,7 +105,7 @@ in { }; }; - config = mkIf cfg.enable { + config = mkIf (cfg.enable && cfg.stateful) { systemd.services = { dhparams-init = { description = "Cleanup old Diffie-Hellman parameters"; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix index ead5f2efce7..da75391e4ce 100644 --- a/nixos/tests/dhparams.nix +++ b/nixos/tests/dhparams.nix @@ -47,6 +47,13 @@ in import ./make-test.nix { nodes.generation3 = common; + nodes.generation4 = { + imports = [ common ]; + security.dhparams.stateful = false; + security.dhparams.params.foo2.bits = 18; + security.dhparams.params.bar2.bits = 19; + }; + testScript = { nodes, ... }: let getParamPath = gen: name: let node = "generation${toString gen}"; @@ -105,5 +112,19 @@ in import ./make-test.nix { 'test -e ${nodes.generation3.config.security.dhparams.path}' ); }; + + ${switchToGeneration 4} + + subtest "check bit sizes dhparam files", sub { + ${assertParamBits 4 "foo2" 18} + ${assertParamBits 4 "bar2" 19} + }; + + subtest "check whether dhparam files are in the Nix store", sub { + $machine->succeed( + 'expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}', + 'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}', + ); + }; ''; } -- GitLab From ce8777386786f5a38fb0bc8728515a66c82c3d04 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 26 Apr 2018 07:11:54 +0200 Subject: [PATCH 076/785] nixos/dhparams: Clean up module expression First of all let's start with a clean up the multiline string indentation for descriptions, because having two indentation levels after description is a waste of screen estate. A quick survey in the form of the following also reveals that the majority of multiline strings in nixpkgs is starting the two beginning quotes in the same line: $ find -name '*.nix' -exec sed -n -e '/=$/ { n; /'\'\''/p }' {} + | wc -l 817 $ find -name '*.nix' -exec grep "= *'' *\$" {} + | wc -l 14818 The next point is to get the type, default and example attributes on top of the description because that's the way it's rendered in the manual. Most services have their enable option close to the beginning of the file, so let's move it to the top. Also, I found the script attribute for dhparams-init.service a bit hard to read as it was using string concatenation to split a "for" loop. Now for the more substantial clean ups rather than just code style: * Remove the "with lib;" at the beginning of the module, because it makes it easier to do a quick check with "nix-instantiate --parse". * Use ConditionPathExists instead of test -e for checking whether we need to generate the dhparams file. This avoids spawning a shell if the file exists already and it's probably more common that it will exist, except for the initial creation of course. * When cleaning up old dhparams file, use RemainAfterExit so that the unit won't be triggered again whenever we stop and start a service depending on it. * Capitalize systemd unit descriptions to be more in par with most other unit descriptions (also see 0c5e837b66f58265ce2b66a33d0f47a3). * Use "=" instead of "==" for conditionals using []. It's just a very small nitpick though and it will only fail for POSIX shells. Bash on the other side accepts it anyway. Signed-off-by: aszlig Cc: @Ekleog --- nixos/modules/security/dhparams.nix | 154 ++++++++++++++-------------- 1 file changed, 75 insertions(+), 79 deletions(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 64b296eea5b..481d4c5db51 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkOption types; cfg = config.security.dhparams; paramsSubmodule = { name, config, ... }: { @@ -39,32 +38,39 @@ let in { options = { security.dhparams = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to generate new DH params and clean up old DH params. + ''; + }; + params = mkOption { - description = - '' - Diffie-Hellman parameters to generate. - - The value is the size (in bits) of the DH params to generate. The - generated DH params path can be found in - config.security.dhparams.params.name.path. - - The name of the DH params is taken as being the name of - the service it serves and the params will be generated before the - said service is started. - - If you are removing all dhparams from this list, you - have to leave for at - least one activation in order to have them be cleaned up. This also - means if you rollback to a version without any dhparams the - existing ones won't be cleaned up. Of course this only applies if - is - true. - ''; type = with types; let coerce = bits: { inherit bits; }; - in attrsOf (coercedTo types.int coerce (submodule paramsSubmodule)); + in attrsOf (coercedTo int coerce (submodule paramsSubmodule)); default = {}; - example = literalExample "{ nginx.bits = 3072; }"; + example = lib.literalExample "{ nginx.bits = 3072; }"; + description = '' + Diffie-Hellman parameters to generate. + + The value is the size (in bits) of the DH params to generate. The + generated DH params path can be found in + config.security.dhparams.params.name.path. + + The name of the DH params is taken as being the name of + the service it serves and the params will be generated before the + said service is started. + + If you are removing all dhparams from this list, you + have to leave for at + least one activation in order to have them be cleaned up. This also + means if you rollback to a version without any dhparams the + existing ones won't be cleaned up. Of course this only applies if + is + true. + ''; }; stateful = mkOption { @@ -84,77 +90,67 @@ in { }; path = mkOption { + type = types.str; + default = "/var/lib/dhparams"; description = '' Path to the directory in which Diffie-Hellman parameters will be stored. This only is relevant if is true. ''; - type = types.str; - default = "/var/lib/dhparams"; - }; - - enable = mkOption { - description = - '' - Whether to generate new DH params and clean up old DH params. - ''; - default = false; - type = types.bool; }; }; }; - config = mkIf (cfg.enable && cfg.stateful) { + config = lib.mkIf (cfg.enable && cfg.stateful) { systemd.services = { dhparams-init = { - description = "Cleanup old Diffie-Hellman parameters"; - wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set + description = "Clean Up Old Diffie-Hellman Parameters"; + + # Clean up even when no DH params is set + wantedBy = [ "multi-user.target" ]; + + serviceConfig.RemainAfterExit = true; serviceConfig.Type = "oneshot"; - script = - # Create directory - '' - if [ ! -d ${cfg.path} ]; then - mkdir -p ${cfg.path} - fi - '' + + + script = '' + if [ ! -d ${cfg.path} ]; then + mkdir -p ${cfg.path} + fi + # Remove old dhparams - '' - for file in ${cfg.path}/*; do - if [ ! -f "$file" ]; then - continue - fi - '' + concatStrings (mapAttrsToList (name: { bits, ... }: - '' - if [ "$file" == "${cfg.path}/${name}.pem" ] && \ - ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then + for file in ${cfg.path}/*; do + if [ ! -f "$file" ]; then + continue + fi + ${lib.concatStrings (lib.mapAttrsToList (name: { bits, path, ... }: '' + if [ "$file" = ${lib.escapeShellArg path} ] && \ + ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \ + | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then continue fi - '' - ) cfg.params) + - '' - rm $file - done - - # TODO: Ideally this would be removing the *former* cfg.path, though this - # does not seem really important as changes to it are quite unlikely - rmdir --ignore-fail-on-non-empty ${cfg.path} - ''; + '') cfg.params)} + rm $file + done + + # TODO: Ideally this would be removing the *former* cfg.path, though + # this does not seem really important as changes to it are quite + # unlikely + rmdir --ignore-fail-on-non-empty ${cfg.path} + ''; }; - } // - mapAttrs' (name: { bits, ... }: nameValuePair "dhparams-gen-${name}" { - description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; - after = [ "dhparams-init.service" ]; - before = [ "${name}.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - script = - '' - mkdir -p ${cfg.path} - if [ ! -f ${cfg.path}/${name}.pem ]; then - ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString bits} - fi - ''; - }) cfg.params; + } // lib.mapAttrs' (name: { bits, path, ... }: lib.nameValuePair "dhparams-gen-${name}" { + description = "Generate Diffie-Hellman Parameters for ${name}"; + after = [ "dhparams-init.service" ]; + before = [ "${name}.service" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathExists = "!${path}"; + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p ${lib.escapeShellArg cfg.path} + ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \ + ${toString bits} + ''; + }) cfg.params; }; } -- GitLab From 274579cc95ae33457b5cd643ea030d1f530eb31e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 24 Nov 2016 15:40:04 +0100 Subject: [PATCH 077/785] nixos/infinoted: Abstract over libinfinity version --- nixos/modules/services/editors/infinoted.nix | 2 +- pkgs/development/libraries/libinfinity/default.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 963147b18a0..9074a4345ea 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -129,7 +129,7 @@ in { serviceConfig = { Type = "simple"; Restart = "always"; - ExecStart = "${cfg.package}/bin/infinoted-0.6 --config-file=/var/lib/infinoted/infinoted.conf"; + ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf"; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 944cf7a6f5e..208e0111062 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -12,7 +12,8 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.7.1"; + name = "libinfinity-${version}"; + version = "0.7.1"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; @@ -36,6 +37,10 @@ in stdenv.mkDerivation rec { ${edf avahiSupport "avahi"} ''; + passthru = { + inherit version; + }; + meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; -- GitLab From 1ec8160f8ca9b05fc19d23bac5b6d8c87a19ad39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 23:57:03 -0700 Subject: [PATCH 078/785] php: 7.2.4 -> 7.2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/php/versions. These checks were done: - built on NixOS - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar.phar help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phpdbg help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm --help’ got 0 exit code - found 7.2.5 with grep in /nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5 - directory tree listing: https://gist.github.com/c9aa24f676de9bcd4cc434c086932362 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7cb9b4dea7f..301aa99637d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.4"; - sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i"; + version = "7.2.5"; + sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk"; }; } -- GitLab From c35dc53e5652e85a7692ef1f0176f80c7ebc406a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Apr 2018 01:17:40 -0700 Subject: [PATCH 079/785] welle-io: remove aarch64 from platform flags --- pkgs/applications/misc/welle-io/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index b3a9a3f3b86..143ec518ac5 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -42,7 +42,6 @@ in stdenv.mkDerivation { homepage = http://www.welle.io/; maintainers = with maintainers; [ ck3d ]; license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; - } -- GitLab From 8898063828e5813682bf2c8aa751e0e48d989296 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 01:20:56 -0700 Subject: [PATCH 080/785] openvpn: 2.4.5 -> 2.4.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openvpn/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.4.6 with grep in /nix/store/5hj70y409c0b01zmx4rddiicgq7jajb2-openvpn-2.4.6 - directory tree listing: https://gist.github.com/ce0bc5e31d7d26ead341febdc7bdc6ee --- pkgs/tools/networking/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 31fccbffa79..d96652e456d 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23"; + sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 89fb95b93fd4710755bcbb062f383cca63144925 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 02:54:03 -0700 Subject: [PATCH 081/785] libwps: 0.4.8 -> 0.4.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwps/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2html -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2raw -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2raw --version’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2text -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2csv -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2raw -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2raw --version’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2text -v’ and found version 0.4.9 - found 0.4.9 with grep in /nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9 - directory tree listing: https://gist.github.com/a3fdf5973402ddf0aa6d1a0ecd058d41 --- pkgs/development/libraries/libwps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 84748d601a6..2f89c0abdfc 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "163gdqaanqfs767aj6zdzagqldngn8i7f0hbmhhxlxr0wmvx6c9q"; + sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From cd3047f313773bbe60df63f512dcf9271c60b34a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:33:31 -0700 Subject: [PATCH 082/785] libraw: 0.18.8 -> 0.18.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libraw/versions. These checks were done: - built on NixOS - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test --help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/postprocessing_benchmark -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/postprocessing_benchmark help’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_emu -h’ got 0 exit code - ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_emu help’ got 0 exit code - found 0.18.9 with grep in /nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9 - directory tree listing: https://gist.github.com/5d0a0f5fe58f15c25701c4dc878c5080 --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index d4ad1c03860..4ad2f7ba34d 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.8"; + version = "0.18.9"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n"; + sha256 = "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj"; }; outputs = [ "out" "lib" "dev" "doc" ]; -- GitLab From a050133e9f75010fc2fba37c4acfe98c264f6e4c Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 26 Apr 2018 19:39:03 +0900 Subject: [PATCH 083/785] linux-mptcp: enable advanced schedulers --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index c4bade2abed..d486bd1d6d2 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -33,8 +33,7 @@ buildLinux (rec { DEFAULT_MPTCP_PM default # MPTCP scheduler selection. - # Disabled as the only non-default is the useless round-robin. - MPTCP_SCHED_ADVANCED n + MPTCP_SCHED_ADVANCED y DEFAULT_MPTCP_SCHED default # Smarter TCP congestion controllers -- GitLab From 70e070afa7685126eef21456682807da0c9f16c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 05:57:09 -0700 Subject: [PATCH 084/785] fastjet: 3.3.0 -> 3.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fastjet/versions. These checks were done: - built on NixOS - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config -h’ got 0 exit code - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --help’ got 0 exit code - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --version’ and found version 3.3.1 - found 3.3.1 with grep in /nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1 - directory tree listing: https://gist.github.com/aa455f4d0802d2b2b76678ecccfe3eab --- pkgs/development/libraries/physics/fastjet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 0ee68415b89..b4ffccb5360 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fastjet-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "03x75mmnlw2m0a7669k82rf9a7dgjwygf8wjbk8cdgnb82c5pnp9"; + sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn"; }; buildInputs = [ python2 ]; -- GitLab From 8a3cdb993d1c7e62dc62dd7239852930f2e71997 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 06:18:41 -0700 Subject: [PATCH 085/785] containerd: 1.0.3 -> 1.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/containerd/versions. These checks were done: - built on NixOS - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd -h’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd --help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release -h’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release --help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr -h’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr --help’ got 0 exit code - ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr help’ got 0 exit code - found 1.1.0 with grep in /nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0 - directory tree listing: https://gist.github.com/7b4a990853acfbf946f8abe02582f41d --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 53372103457..3854c577188 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; + sha256 = "0nknqprmi04jfiivrk158jyddc95q4jggfsm7cg7rpvjamkzn6c8"; }; hardeningDisable = [ "fortify" ]; -- GitLab From 3d4aa7e95def212895c36262355ca6349cfe7d5a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Apr 2018 07:27:23 -0500 Subject: [PATCH 086/785] qemu: workaround 'struct sysinfo' conflict musl <--> linux Most everyone using musl patches the linux headers instead, but various software uses a local workaround like the one added in this commit (psutils, for example). It's not obvious to me which project has the "bug", and I'm reluctant to even propose modifying our headers without clear answer on the issue. Also, modifying those headers triggers rebuild-all-the-things. Hopefully upstream projects sort this out, in the meantime adding this define is a bit of a kludge but does the job. ------- For the curious, the patch usually is something like this: https://patchwork.kernel.org/patch/3833241/ Here's an updated version that also ensures kernel users get the sysinfo struct as expected too: https://raw.githubusercontent.com/openwrt/openwrt/e3c43ade0bae9491aeea50fa361e846bb5002dc0/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch (cherry picked from commit dtzWill/nixpkgs@91b5f5a463f5545fbf4f916b3c624840fcb9f300) --- pkgs/applications/virtualization/qemu/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0496adb6f40..dd68eb19380 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { preConfigure = '' unset CPP # intereferes with dependency calculation + '' + optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; configureFlags = -- GitLab From 00610fe0903e0aa300e4f7797a6d84d13f3d8ce9 Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 26 Apr 2018 18:15:21 +0200 Subject: [PATCH 087/785] qemu-riscv: remove, obsolete with qemu 2.12 upstream qemu 2.12 includes riscv support --- .../virtualization/qemu/riscv.nix | 30 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/riscv.nix diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix deleted file mode 100644 index 2159ad4b4dc..00000000000 --- a/pkgs/applications/virtualization/qemu/riscv.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ qemu, fetchFromGitHub, lib }: let - src = fetchFromGitHub { - owner = "riscv"; - repo = "riscv-qemu"; - rev = "f733c7b5f86147216e14aff90c03ccdd76056bef"; - sha256 = "1ppr9qqwi7qqh8m6dgk1hrzg8zri240il27l67vfayd8ijagb9zq"; - fetchSubmodules = true; - }; - version = "2.11.92"; - revCount = "60378"; - shortRev = builtins.substring 0 9 src.rev; - targets = [ "riscv32-linux-user" "riscv32-softmmu" - "riscv64-linux-user" "riscv64-softmmu" - ]; -in lib.overrideDerivation qemu (orig: { - name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; - inherit src; -# <<<<<<< HEAD -# # https://github.com/riscv/riscv-qemu/pull/109 -# patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ]; -# ======= - # The pulseaudio and statfs patches are in 2.12.0+, which this is based on - patches = [ - ./force-uid0-on-9p.patch - ./no-etc-install.patch - ]; - - configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; - postInstall = null; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1606e82ca8..fb490a4753b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17424,8 +17424,6 @@ with pkgs; inherit (darwin.stubs) rez setfile; }; - qemu-riscv = lowPrio (callPackage ../applications/virtualization/qemu/riscv.nix {}); - qgis = callPackage ../applications/gis/qgis { inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; -- GitLab From a026242e4a2353d33dea47c09617f0988eae779f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Apr 2018 12:24:45 -0500 Subject: [PATCH 088/785] netbsd: remove broken attributes --- pkgs/os-specific/bsd/netbsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 42633232c71..e382fcbb9f0 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -287,7 +287,7 @@ let }; in rec { - inherit compat libc libutil install make mtree netBSDDerivation; + inherit compat install make netBSDDerivation; getent = netBSDDerivation { path = "usr.bin/getent"; -- GitLab From 4539f1f2f72ab4d95642506c4481379f09d2699c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Apr 2018 12:29:58 -0500 Subject: [PATCH 089/785] netbsd: install db.h to compat --- pkgs/os-specific/bsd/netbsd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index e382fcbb9f0..387d0cd270e 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -196,6 +196,7 @@ let install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h + install -D $NETBSDSRCDIR/include/db.h $out/include/db.h ''; extraPaths = [ libc.src libutil.src (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") -- GitLab From e521bada21b18bcb623c549b5d153d5612afbf96 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Apr 2018 12:31:06 -0500 Subject: [PATCH 090/785] netbsd: propagate compat --- pkgs/os-specific/bsd/netbsd/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 387d0cd270e..03d93f3d908 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -288,7 +288,7 @@ let }; in rec { - inherit compat install make netBSDDerivation; + inherit compat install netBSDDerivation; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -309,6 +309,7 @@ in rec { sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "7.1.2"; nativeBuildInputs = [ ]; + propagatedBuildInputs = [ compat ]; extraPaths = [ (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") @@ -358,7 +359,8 @@ in rec { libedit = netBSDDerivation { path = "lib/libedit"; - buildInputs = [ compat libterminfo ]; + buildInputs = [ libterminfo libcurses ]; + propagatedBuildInputs = [ compat ]; patchPhase = '' sed -i '1i #undef bool_t' el.h ''; @@ -380,7 +382,8 @@ in rec { path = "lib/libcurses"; version = "7.1.2"; sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; - buildInputs = [ compat libterminfo ]; + buildInputs = [ libterminfo ]; + propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr }; -- GitLab From 968e8a1099859bf41cc34ca453bda897cdb8380c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Apr 2018 17:57:53 +0000 Subject: [PATCH 091/785] netbsd: fix getent with musl --- pkgs/os-specific/bsd/netbsd/default.nix | 58 +++++++++++++------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 03d93f3d908..f64c36932e3 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -25,6 +25,7 @@ let "-D__warn_references(a,b)=" "-D__strong_alias(a,b)=" "-D__va_list=va_list" + "-D__scanflike(a,b)=" ]; # Definitions passed to share/mk/*.mk. Should be pretty simple - @@ -210,9 +211,36 @@ let version = "7.1.2"; sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8"; extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ makeMinimal mandoc groff compat ]; + nativeBuildInputs = [ makeMinimal mandoc groff ]; + buildInputs = [ compat fts ]; RENAME = "-D"; }; + + fts = netBSDDerivation { + pname = "fts"; + path = "include/fts.h"; + sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; + version = "7.1.2"; + nativeBuildInputs = [ ]; + propagatedBuildInputs = [ compat ]; + extraPaths = [ + (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") + (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") + (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + ]; + buildPhase = '' + cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ + -o lib/libc/gen/fts.o + ar -rsc libfts.a lib/libc/gen/fts.o + ''; + installPhase = '' + install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 + install -D include/fts.h $out/include/fts.h + install -D lib/libc/include/namespace.h $out/include/namespace.h + install -D libfts.a $out/lib/libfts.a + ''; + setupHook = ./fts-setup-hook.sh; + }; # END BOOTSTRAPPING libutil = netBSDDerivation { @@ -288,7 +316,7 @@ let }; in rec { - inherit compat install netBSDDerivation; + inherit compat install netBSDDerivation fts; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -303,32 +331,6 @@ in rec { version = "7.1.2"; }; - fts = netBSDDerivation { - pname = "fts"; - path = "include/fts.h"; - sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "7.1.2"; - nativeBuildInputs = [ ]; - propagatedBuildInputs = [ compat ]; - extraPaths = [ - (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") - (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") - (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") - ]; - buildPhase = '' - cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ - -o lib/libc/gen/fts.o - ar -rsc libfts.a lib/libc/gen/fts.o - ''; - installPhase = '' - install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 - install -D include/fts.h $out/include/fts.h - install -D lib/libc/include/namespace.h $out/include/namespace.h - install -D libfts.a $out/lib/libfts.a - ''; - setupHook = ./fts-setup-hook.sh; - }; - games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; -- GitLab From 1cfc5f1da21b1527bc86e1b368bbda3885f125d1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Apr 2018 18:08:53 -0400 Subject: [PATCH 092/785] pythia: 8.226 -> 8.235, enable lhapdf6 plugin --- pkgs/development/libraries/physics/pythia/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index eca2807ce15..3f9f3f8498b 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.226"; + version = "8.235"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g"; + sha256 = "17cfgs7v469pdnnzvlmdagcdhi0h419znqmaws90l9d8cmhhsbz8"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--with-hepmc2=${hepmc}" + "--with-lhapdf6=${lhapdf}" ]; enableParallelBuilding = true; -- GitLab From 2f47c93ec848ae4b9594a13406f71982282ce0d7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Apr 2018 18:09:26 -0400 Subject: [PATCH 093/785] sacrifice: set LD_LIBRARY_PATH for pythia plugins to work --- pkgs/applications/science/physics/sacrifice/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 99d6df77f85..6c25f720ebf 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia }: +{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { name = "sacrifice-${version}"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost hepmc lhapdf pythia ]; + nativeBuildInputs = [ makeWrapper ]; patches = [ ./compat.patch @@ -27,8 +28,11 @@ stdenv.mkDerivation rec { "--with-pythia=${pythia}" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = if stdenv.isDarwin then '' install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia + '' else '' + wrapProgram $out/bin/run-pythia \ + --prefix LD_LIBRARY_PATH : "${pythia}/lib" ''; enableParallelBuilding = true; -- GitLab From ddc23593e1885e04663fe735e29c4f45978a6d87 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 01:59:36 +0000 Subject: [PATCH 094/785] netbsd: fix links installer --- pkgs/os-specific/bsd/netbsd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f64c36932e3..f0220fc05d2 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -280,6 +280,9 @@ let --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \ --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.links.mk \ + --replace '-o ''${LINKSOWN_''${.ALLSRC:T}:U''${LINKSOWN}}' "" \ + --replace '-g ''${LINKSGRP_''${.ALLSRC:T}:U''${LINKSGRP}}' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \ --replace '-o ''${MANOWN} -g ''${MANGRP}' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \ @@ -338,6 +341,7 @@ in rec { patchPhase = '' sed -i '1i #include ' adventure/save.c ''; + buildInputs = [ compat libcurses ]; }; who = netBSDDerivation { -- GitLab From ff3b88713c4e5bfeb839e59b3ad4753043d3b47c Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Fri, 27 Apr 2018 12:01:24 +1000 Subject: [PATCH 095/785] labelImg: init at 1.6.0 --- .../machine-learning/labelimg/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/labelimg/default.nix diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix new file mode 100644 index 00000000000..802a03bd4c7 --- /dev/null +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -0,0 +1,23 @@ +{ stdenv, python2Packages, fetchurl }: + python2Packages.buildPythonApplication rec { + name = "labelImg-${version}"; + version = "1.6.0"; + src = fetchurl { + url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; + sha256 = "126kc4r7xm9170kh7snqsfkkc868m5bcnswrv7b4cq9ivlrdwbm4"; + }; + propagatedBuildInputs = with python2Packages; [ + pyqt4 + lxml + ]; + preBuild = '' + make qt4py2 + ''; + meta = with stdenv.lib; { + description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images"; + homepage = https://github.com/tzutalin/labelImg; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.cmcdragonkai ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e07f237448..fbb5d864e88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12428,6 +12428,8 @@ with pkgs; lwan = callPackage ../servers/http/lwan { }; + labelImg = callPackage ../applications/science/machine-learning/labelimg { }; + mailman = callPackage ../servers/mail/mailman { }; mattermost = callPackage ../servers/mattermost { }; -- GitLab From 51190e4d8c2f83aeb7da135f179997268ca1184f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 08:41:11 +0200 Subject: [PATCH 096/785] php56: 5.6.35 -> 5.6.36 Changelog: http://www.php.net/ChangeLog-5.php#5.6.36 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7cb9b4dea7f..b128224e6b7 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -338,8 +338,8 @@ let in { php56 = generic { - version = "5.6.35"; - sha256 = "14ivsxdny0s7qm9pf773pafs8xzlzzpmaz039lwymn11rblsfy7f"; + version = "5.6.36"; + sha256 = "0ahp9vk33dpsqgld0gg4npff67v0l39hs3wk5dm6h3lablzhwsk2"; }; php70 = generic { -- GitLab From bd547f6688e75b45278a0d5b28a4dae1762c4728 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 09:00:36 +0200 Subject: [PATCH 097/785] php70: 7.0.29 -> 7.0.30 Changelog: http://www.php.net/ChangeLog-7.php#7.0.30 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b128224e6b7..a5afd5878f5 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -343,8 +343,8 @@ in { }; php70 = generic { - version = "7.0.29"; - sha256 = "1g1z1nhnmq0idsb9rfb46cdddfimaacw3yal291i2ypzqpal54cq"; + version = "7.0.30"; + sha256 = "0l0bhnlgxmfl7mrdykmxfl53simxsksdcnbg5ymqz6r31i03hgr1"; }; php71 = generic { -- GitLab From 73d5006abcf983d91f31f1962ec1a7649fd23981 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 07:05:56 +0000 Subject: [PATCH 098/785] netbsd: more cleanup --- pkgs/os-specific/bsd/netbsd/default.nix | 130 ++++++++++++++++++------ 1 file changed, 100 insertions(+), 30 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f0220fc05d2..67ad3687c2c 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -15,19 +15,11 @@ let extraPaths = [ ]; - nativeBuildInputs = [ makeMinimal mandoc groff install yacc flex ]; + nativeBuildInputs = [ makeMinimal mandoc groff install stat + yacc flex tsort lorder ]; buildInputs = [ compat ]; installFlags = [ "includes" ]; - # These should be coverd in nbcompat, but are missing, sadly - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__warn_references(a,b)=" - "-D__strong_alias(a,b)=" - "-D__va_list=va_list" - "-D__scanflike(a,b)=" - ]; - # Definitions passed to share/mk/*.mk. Should be pretty simple - # eventually maybe move it to a configure script. DESTDIR = "$(out)"; @@ -46,8 +38,12 @@ let LIBUTIL=""; LIBSSL = ""; LIBCRYPTO = ""; + LIBCRYPT = ""; LIBCURSES = ""; + LIBTERMINFO = ""; + LIBM = ""; "LIBDO.terminfo" = "_external"; + "LIBDO.curses" = "_external"; _GCC_CRTBEGIN = ""; _GCC_CRTBEGINS = ""; _GCC_CRTEND = ""; @@ -75,7 +71,6 @@ let # not using bsd binutils SHLIB_WARNTEXTREL = "no"; SHLIB_MKMAP = "no"; - OBJCOPY = "true"; PRESERVE = "-p"; MACHINE_ARCH = hostPlatform.parsed.cpu.name; @@ -85,9 +80,8 @@ let # but without they end up using gcc on Darwin stdenv preConfigure = '' export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} - '' + lib.optionalString (!builtins.hasAttr "nativeBuildInputs" attrs) '' - # hack until #38657 is fixed - export PATH=${install}/bin:$PATH + # Parallel building. Needs the space. + export makeFlags+=" -j $NIX_BUILD_CORES" ''; postUnpack = '' @@ -110,12 +104,14 @@ let fi ''; - # need to create directories for xinstall to work + # Need to create directories for xinstall to work. Unused ones + # will be removed in the postInstall. preInstall = '' mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR + $out$DOCDIR $out$LOCALEDIR $out/usr/games for i in 1 2 3 4 5 6 7 8 9; do - mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i $out$DOCDIR/reference/ref$i + mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ + $out$DOCDIR/reference/ref$i done mkdir -p $out/usr/include ''; @@ -126,7 +122,6 @@ let cd $out/usr find . -type d -exec mkdir -p $out/\{} \; find . -type f -exec mv \{} $out/\{} \; - find . -type d -delete fi find $out -type d -empty -delete @@ -147,8 +142,6 @@ let buildInputs = []; nativeBuildInputs = []; - NIX_CFLAGS_COMPILE = ""; - NIX_LDFLAGS = ""; patchPhase = '' patchShebangs configure @@ -174,8 +167,6 @@ let # override defaults to prevent infinite recursion nativeBuildInputs = [ makeMinimal ]; buildInputs = [ zlib ]; - NIX_CFLAGS_COMPILE = ""; - NIX_LDFLAGS = ""; # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later @@ -198,6 +189,19 @@ let install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h install -D $NETBSDSRCDIR/include/db.h $out/include/db.h + install -D $NETBSDSRCDIR/include/netconfig.h $out/include/netconfig.h + install -D $NETBSDSRCDIR/include/rpc/types.h $out/include/rpc/types.h + install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h + install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h + + # Remove lingering /usr references + if [ -d $out/usr ]; then + cd $out/usr + find . -type d -exec mkdir -p $out/\{} \; + find . -type f -exec mv \{} $out/\{} \; + fi + + find $out -type d -empty -delete ''; extraPaths = [ libc.src libutil.src (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") @@ -241,6 +245,27 @@ let ''; setupHook = ./fts-setup-hook.sh; }; + + stat = netBSDDerivation { + path = "usr.bin/stat"; + version = "7.1.2"; + sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; + nativeBuildInputs = [ makeMinimal mandoc groff install ]; + }; + + tsort = netBSDDerivation { + path = "usr.bin/tsort"; + version = "7.1.2"; + sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; + nativeBuildInputs = [ makeMinimal mandoc groff install ]; + }; + + lorder = netBSDDerivation { + path = "usr.bin/lorder"; + version = "7.1.2"; + sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; + nativeBuildInputs = [ makeMinimal mandoc groff install ]; + }; # END BOOTSTRAPPING libutil = netBSDDerivation { @@ -267,7 +292,7 @@ let version = "7.1.2"; patchPhase = '' # make needs this to pick up our sys make files - NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" # can't set owner or group in Nix build # maybe there is a better way to trick it? @@ -293,13 +318,10 @@ let substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \ --replace '-o ''${LIBOWN} -g ''${LIBGRP}' "" - - substituteInPlace $NETBSDSRCDIR/share/mk/Makefile \ - --replace /usr/share/mk /share/mk + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ --replace '-Wl,--fatal-warnings' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace ' ''${_ARFL} ''${.TARGET} `NM=''${NM} ''${LORDER} ''${.ALLSRC:M*o} | ''${TSORT}`' ' ''${_ARFL} ''${.TARGET} ''${.ALLSRC:M*o}' \ --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ --replace '-Wl,--whole-archive' "" \ --replace '-Wl,--no-whole-archive' "" @@ -340,8 +362,36 @@ in rec { version = "7.1.2"; patchPhase = '' sed -i '1i #include ' adventure/save.c + + # Disable some games that don't build. They should be possible to + # build but need to look at how to implement stuff in Linux. + substituteInPlace Makefile \ + ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \ + --replace atc "" \ + --replace boggle "" \ + --replace dm "" \ + --replace fortune "" \ + --replace hunt "" \ + --replace larn "" \ + --replace phantasia "" \ + --replace rogue "" \ + --replace sail "" \ + --replace trek "" \ + --replace dab "" ''; - buildInputs = [ compat libcurses ]; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-DOXTABS=XTABS" + "-DRANDOM_MAX=RAND_MAX" + "-DINFTIM=-1" + ]; + buildInputs = [ compat libcurses libterminfo libressl ]; + extraPaths = [ + (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4") + who.src + ]; }; who = netBSDDerivation { @@ -358,8 +408,8 @@ in rec { }; fingerd = netBSDDerivation { - path = "usr.bin/fingerd"; - sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqz00"; + path = "libexec/fingerd"; + sha256 = "1hhdq70hrxxkjnjfmjm3w8w9g9xq2ngxaxk0chy4vm7chg9nfpmp"; version = "7.1.2"; }; @@ -367,9 +417,17 @@ in rec { path = "lib/libedit"; buildInputs = [ libterminfo libcurses ]; propagatedBuildInputs = [ compat ]; + postBuild = "mkdir -p $out/usr/include/readline"; patchPhase = '' sed -i '1i #undef bool_t' el.h + substituteInPlace config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" ''; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; version = "7.1.2"; sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca"; }; @@ -389,8 +447,20 @@ in rec { version = "7.1.2"; sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; buildInputs = [ libterminfo ]; + NIX_CFLAGS_COMPILE = [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ]; propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr + patchPhase = '' + substituteInPlace printw.c \ + --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ + --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' + substituteInPlace scanw.c \ + --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' + ''; }; nbperf = netBSDDerivation { -- GitLab From 707f7ca1d213c0f945b1ed73f702874dd5f6317c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 09:25:58 +0200 Subject: [PATCH 099/785] php71: 7.1.16 -> 7.1.17 Changelog: http://www.php.net/ChangeLog-7.php#7.1.17 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index a5afd5878f5..d494060c388 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.16"; - sha256 = "1rg7n12rd2v1p2yar615kqcdxpvphw3p89lpgajjgwy0qzwjm3il"; + version = "7.1.17"; + sha256 = "1kyvg1dvn2zddlc7apl8c74wlwz45rxx10fr1s4z6l1cannf6971"; }; php72 = generic { -- GitLab From 53e3aa1539049d6e4603e47d7262d7928673ed9e Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Fri, 27 Apr 2018 09:03:18 +0200 Subject: [PATCH 100/785] cassandra: 3.11.1 -> 3.11.2 --- pkgs/servers/nosql/cassandra/3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index 4647260b1e2..f18b6256d3f 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.1"; - sha256 = "1vgh4ysnl4xg8g5v6zm78h3sq308r7s17ppbw0ck4bwyfnbddvkg"; + version = "3.11.2"; + sha256 = "0867i3irsji3qkjpp2s171xmjf2r8yhwzhs24ka8hljxv457f8p9"; }) -- GitLab From 9939fb2cb6ae28e87be6ac38b85d0537eb0a097e Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 27 Apr 2018 15:11:31 +0300 Subject: [PATCH 101/785] parity-beta: 1.10.1 -> 1.10.2 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- .../parity/patches/vendored-sources-1.10.patch | 18 +++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index b1bf38427a8..9cbab6ad095 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.10.1"; - sha256 = "0313ch4rqnwrsf7y1h8bdwjk59gvcj08jjf6sybb6ww0ml7a6i7b"; - cargoSha256 = "00jr4g3q40pc1wi7fmfq1j8iakmv9pid7l31rf76wj4n8g051zc7"; + version = "1.10.2"; + sha256 = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l"; + cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh"; patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch index 3e8e032f30c..e59858442c9 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch @@ -2,7 +2,7 @@ diff --git a/.cargo/config b/.cargo/config index 72652ad2f..b21c6aa7b 100644 --- a/.cargo/config +++ b/.cargo/config -@@ -1,3 +1,113 @@ +@@ -1,3 +1,108 @@ [target.x86_64-pc-windows-msvc] # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 rustflags = ["-Ctarget-feature=+crt-static"] @@ -42,6 +42,11 @@ index 72652ad2f..b21c6aa7b 100644 +rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" @@ -97,16 +102,6 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasmi"] -+git = "https://github.com/paritytech/wasmi" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tailhook/rotor"] +git = "https://github.com/tailhook/rotor" +branch = "master" @@ -116,3 +111,4 @@ index 72652ad2f..b21c6aa7b 100644 +git = "https://github.com/tomusdrw/ws-rs" +branch = "master" +replace-with = "vendored-sources" ++ -- GitLab From 82f24d65a3c6f58e6c0a14aec1b048cd2f521992 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 27 Apr 2018 15:11:52 +0300 Subject: [PATCH 102/785] parity: 1.9.6 -> 1.9.7 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- .../parity/patches/vendored-sources-1.9.patch | 20 +++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 71485551ef6..d85fc25355c 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.9.6"; - sha256 = "17h7c93c95pj71nbw152rl4ka240zzd8w0yf8k4l4rimcsbra92g"; - cargoSha256 = "0gk26yncahrlnx6xz13x775wrwh7xsfqiifspjislmgk7xknqjm0"; + version = "1.9.7"; + sha256 = "1h9rmyqkdv2v83g12dadgqflq1n1qqgd5hrpy20ajha0qpbiv3ph"; + cargoSha256 = "0ss5jw43850r8l34prai5vk1zd5d5fjyg4rcav1asbq6v683bww0"; patches = [ ./patches/vendored-sources-1.9.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index d91b103c6ce..3e1ba2429f2 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -1,10 +1,9 @@ diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..0efb69724 ---- /dev/null +--- /dev/null +++ b/.cargo/config -@@ -0,0 +1,100 @@ -+ +@@ -0,0 +1,94 @@ +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" +branch = "master" @@ -30,6 +29,11 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" @@ -85,16 +89,6 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasmi"] -+git = "https://github.com/paritytech/wasmi" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tailhook/rotor"] +git = "https://github.com/tailhook/rotor" +branch = "master" -- GitLab From 65c1cfce3f72436a3a9fcba8053f6a7a5c6e078e Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 16:39:45 +0000 Subject: [PATCH 103/785] nixos/networkd: Allow RequiredForOnline field in [Link] section This was previously missing. --- nixos/modules/system/boot/networkd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index eea10613ea5..e95ca27914e 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -146,12 +146,13 @@ let # .network files have a [Link] section with different options than in .netlink files checkNetworkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "MACAddress" "MTUBytes" "ARP" "Unmanaged" + "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) (assertValueOneOf "Unmanaged" boolValues) + (assertValueOneOf "RquiredForOnline" boolValues) ]; -- GitLab From 192352ff2f9a736f959a569a74cd42fcdb29021c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 16:34:02 +0000 Subject: [PATCH 104/785] nixos/cupsd: Introduce services.printing.logLevel option Previously we indirectly suggested that the user use services.printing.extraConf to set this, but this doesn't work with the default merge ordering. Fix this by making it an independent option. Fixes #39611. --- nixos/modules/services/printing/cupsd.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ecab8cfc7df..c4147986439 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -83,6 +83,8 @@ let WebInterface ${if cfg.webInterface then "Yes" else "No"} + LogLevel ${cfg.logLevel} + ${cfg.extraConf} ''; @@ -165,6 +167,15 @@ in ''; }; + logLevel = mkOption { + type = types.str; + default = "info"; + example = "debug"; + description = '' + Specifies the cupsd logging verbosity. + ''; + }; + extraFilesConf = mkOption { type = types.lines; default = ""; @@ -180,7 +191,7 @@ in example = '' BrowsePoll cups.example.com - LogLevel debug + MaxCopies 42 ''; description = '' Extra contents of the configuration file of the CUPS daemon @@ -345,8 +356,6 @@ in services.printing.extraConf = '' - LogLevel info - DefaultAuthType Basic -- GitLab From e8d5070e23203163afb6450a6d82fc59e0012580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 18:19:05 +0100 Subject: [PATCH 105/785] nixos/nixos-generate-config: update search command --- nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 14c611e18bc..74b61a64667 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -577,8 +577,8 @@ $bootLoaderConfig # Set your time zone. # time.timeZone = "Europe/Amsterdam"; - # List packages installed in system profile. To search by name, run: - # \$ nix-env -qaP | grep wget + # List packages installed in system profile. To search, run: + # \$ nix search wget # environment.systemPackages = with pkgs; [ # wget vim # ]; -- GitLab From 06c7d4d40dc77c79e50b54282345c1d71a1ac058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 19:55:35 +0200 Subject: [PATCH 106/785] opam: propagate `curl` and `unzip` dependencies These are required for `opam init` to succeed. Closes #14466 Cc @henrytill --- pkgs/development/tools/ocaml/opam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 63f79981e1b..469e97e19de 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { name = "opam-${version}"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; src = srcs.opam; @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/opam \ - --suffix PATH : ${aspcud}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin ''; doCheck = false; -- GitLab From be0b3e3cd0d784333c151d1c7cc7e45b6af189ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 22:22:26 +0200 Subject: [PATCH 107/785] kcov: 34 -> 35 As the maintainer currently in `meta.maintainers` appears to not have touched the package since 2015, I've also added myself there. --- pkgs/development/tools/analysis/kcov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 3c3665e7220..ce391b938ca 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kcov-${version}"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1i4pn5na8m308pssk8585nmqi8kwd63a9h2rkjrn4w78ibmxvj01"; + sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw"; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = http://simonkagstrom.github.io/kcov/index.html; license = licenses.gpl2; - maintainers = [ maintainers.gal_bolle ]; + maintainers = with maintainers; [ gal_bolle ekleog ]; platforms = platforms.linux; }; } -- GitLab From df85ddd229adcdd75f67e78eb4513d7df0cea947 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 27 Apr 2018 19:04:31 +0200 Subject: [PATCH 108/785] bspwm: 0.9.4 -> 0.9.5 --- pkgs/applications/window-managers/bspwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index c494ee266be..49af25e4bc2 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1srgsszp184zg123wdij0zp57c16m7lmal51rhflyx2c9fiiqm9l"; + sha256 = "09h3g1rxxjyw861mk32lj774nmwkx8cwxq4wfgmf4dpbizymvhhr"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; -- GitLab From 1a244d9a3572b5cb7e62224a265007d00c81fdd8 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 27 Apr 2018 22:54:07 +0200 Subject: [PATCH 109/785] bspwm: add rvolosatovs to maintainers --- pkgs/applications/window-managers/bspwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 49af25e4bc2..0538228d4b4 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager based on binary space partitioning"; homepage = https://github.com/baskerville/bspwm; - maintainers = with maintainers; [ meisternu epitrochoid ]; + maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; license = licenses.bsd2; platforms = platforms.linux; }; -- GitLab From 5c7b7c360be8083cfcc57f7e377b01d8135f32c2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 27 Apr 2018 20:21:20 +0200 Subject: [PATCH 110/785] pythonPackages.opentimestamps: 0.2.1 -> 0.3.0 --- .../python-modules/opentimestamps/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index 1271a46f047..370378f097a 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -2,15 +2,17 @@ , bitcoinlib, GitPython, pysha3 }: buildPythonPackage rec { - name = "opentimestamps-${version}"; - version = "0.2.1"; + pname = "opentimestamps"; + version = "0.3.0"; disabled = (!isPy3k); + # We can't use the pypi source because it doesn't include README.md which is + # needed in setup.py src = fetchFromGitHub { owner = "opentimestamps"; repo = "python-opentimestamps"; - rev = "python-opentimestamps-v0.2.1"; - sha256 = "1cilv1ls9mdqk8zriqfkz7xcl8i1ncm0f89n4c8k4s82kf5y56rm"; + rev = "python-opentimestamps-v${version}"; + sha256 = "1i843mbz4h9vqc3y2x09ix6bv9wc0gzq36zhbnmf5by08iaiydks"; }; # Remove a failing test which expects the test source file to reside in the -- GitLab From 4e79f2fb42e54711b864a1f02cb54a2b2e653be2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 27 Apr 2018 20:21:50 +0200 Subject: [PATCH 111/785] opentimestamps-client: 0.5.1 -> 0.6.0 --- pkgs/tools/misc/opentimestamps-client/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index a062aa992be..3fbd874503d 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -1,19 +1,21 @@ { lib, buildPythonApplication, fetchFromGitHub, isPy3k -, opentimestamps, GitPython, pysocks }: +, opentimestamps, appdirs, GitPython, pysocks }: buildPythonApplication rec { - name = "opentimestamps-client-${version}"; - version = "0.5.1"; + pname = "opentimestamps-client"; + version = "0.6.0"; disabled = (!isPy3k); + # We can't use the pypi source because it doesn't include README.md which is + # needed in setup.py src = fetchFromGitHub { owner = "opentimestamps"; repo = "opentimestamps-client"; - rev = "opentimestamps-client-v0.5.1"; - sha256 = "0s549xkb75r5wyvjlfmac8a1df6w0y55l98f492zsihdns1d6rzq"; + rev = "opentimestamps-client-v${version}"; + sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp"; }; - propagatedBuildInputs = [ opentimestamps GitPython pysocks ]; + propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; meta = { description = "Command-line tool to create and verify OpenTimestamps proofs"; -- GitLab From 468f3ce0edfc753110e70ad82589acc7487c640a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 23:02:09 +0100 Subject: [PATCH 112/785] nixos/xserver: remove nvidiaLegacy173 from videoDrivers.examples see https://github.com/NixOS/nixpkgs/commit/92265e807e60fac8bbf3c08a82715b575b5e4e7e#commitcomment-28773179 --- nixos/modules/services/x11/xserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 29d1f17d28c..1404231f837 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -242,7 +242,7 @@ in default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" - "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" "nvidiaLegacy173" + "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" ]; description = '' The names of the video drivers the configuration -- GitLab From 4317f7ab26942b4fad23f616932a1df1611bd44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 23:52:50 +0200 Subject: [PATCH 113/785] kcov: fix build on aarch64 Apparently, without this patch `NT_PRSTATUS` is not found. So the patch adds the include apparently necessary. `NT_PRSTATUS` is also defined in ``, which would likely have been a better name, were it not in the `linux/` directory, which is a priori not stable. The need to do that is kind of weird (the change was introduced in [1], and fedora apparently didn't need this additional import), but I'll try to upstream it. [1] https://github.com/SimonKagstrom/kcov/pull/239 --- .../tools/analysis/kcov/aarch64_nt_prstatus.patch | 12 ++++++++++++ pkgs/development/tools/analysis/kcov/default.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch new file mode 100644 index 00000000000..d5c3662e9ab --- /dev/null +++ b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch @@ -0,0 +1,12 @@ +diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc +index 59b615f..e02cddf 100644 +--- a/src/engines/ptrace.cc ++++ b/src/engines/ptrace.cc +@@ -21,6 +21,7 @@ + + #if defined(__aarch64__) + # include ++# include + #endif + + #include diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index ce391b938ca..7d75d9a34e1 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; + patches = [ ./aarch64_nt_prstatus.patch ]; + enableParallelBuilding = true; meta = with stdenv.lib; { -- GitLab From 14568ddaabd23a96ffa537728888e1d8e8ee687a Mon Sep 17 00:00:00 2001 From: Sander Hollaar Date: Sat, 28 Apr 2018 00:19:05 +0200 Subject: [PATCH 114/785] netcat-openbsd: 1.187 -> 1.190: (#39605) http://metadata.ftp-master.debian.org/changelogs/main/n/netcat-openbsd/netcat-openbsd_1.190-1_changelog --- pkgs/tools/networking/netcat-openbsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 2d9776abfcf..1a79e17c659 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: stdenv.mkDerivation rec { - version = "1.187"; + version = "1.190"; deb-version = "${version}-1"; name = "netcat-openbsd-${version}"; srcs = [ (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw"; + sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38"; }) (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q"; + sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv"; }) ]; -- GitLab From df3566c9560b3305bd33faf4bc7580dc55f4f71e Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Sun, 25 Mar 2018 16:49:54 -0400 Subject: [PATCH 115/785] unifi, nixos/unifi: support LTS (5.6.36) and release (5.7.20) Ubiquiti has both a LTS and current version of their Unifi controller software. The latter adds new features, but may drop support for some devices. This adds the capability to use either for the unifi module but defaults to the LTS version, which was the previous behavior. --- nixos/modules/services/networking/unifi.nix | 37 ++++++++++++++++++--- pkgs/servers/unifi/default.nix | 28 ++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 55 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 8e5f0bfc070..94958bfdd83 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -4,22 +4,22 @@ let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; cmd = '' - @${pkgs.jre}/bin/java java \ + @${cfg.jrePackage}/bin/java java \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ -jar ${stateDir}/lib/ace.jar ''; mountPoints = [ { - what = "${pkgs.unifi}/dl"; + what = "${cfg.unifiPackage}/dl"; where = "${stateDir}/dl"; } { - what = "${pkgs.unifi}/lib"; + what = "${cfg.unifiPackage}/lib"; where = "${stateDir}/lib"; } { - what = "${pkgs.mongodb}/bin"; + what = "${cfg.mongodbPackage}/bin"; where = "${stateDir}/bin"; } { @@ -41,6 +41,33 @@ in ''; }; + services.unifi.jrePackage = mkOption { + type = types.package; + default = pkgs.jre8; + defaultText = "pkgs.jre8"; + description = '' + The JRE package to use. Check the release notes to ensure it is supported. + ''; + }; + + services.unifi.unifiPackage = mkOption { + type = types.package; + default = pkgs.unifiLTS; + defaultText = "pkgs.unifiLTS"; + description = '' + The unifi package to use. + ''; + }; + + services.unifi.mongodbPackage = mkOption { + type = types.package; + default = pkgs.mongodb; + defaultText = "pkgs.mongodb"; + description = '' + The mongodb package to use. + ''; + }; + services.unifi.dataDir = mkOption { type = types.str; default = "${stateDir}/data"; @@ -137,7 +164,7 @@ in rm -rf "${stateDir}/webapps" mkdir -p "${stateDir}/webapps" chown unifi "${stateDir}/webapps" - ln -s "${pkgs.unifi}/webapps/ROOT" "${stateDir}/webapps/ROOT" + ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT" ''; postStop = '' diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index e9d2fd07dc5..dac4bf6899a 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,21 +2,37 @@ , dpkg , fetchurl , unzip +, useLTS ? false }: -stdenv.mkDerivation rec { - name = "unifi-controller-${version}"; - version = "5.6.36"; - src = fetchurl { +let + versions = { + stable = { + version = "5.7.20"; + sha256 = "1ylj4i5mcv6z9n32275ccdf1rqk74zilqsih3r6xzhm30pxrd8dd"; + }; + lts = { + version = "5.6.36"; + sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi"; + }; + }; + selectedVersion = + let attr = if useLTS then "lts" else "stable"; + in versions."${attr}"; +in + +stdenv.mkDerivation { + name = "unifi-controller-${selectedVersion.version}"; + src = with selectedVersion; fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi"; + inherit sha256; }; buildInputs = [ dpkg ]; unpackPhase = '' - dpkg-deb -x ${src} ./ + dpkg-deb -x $src ./ ''; doConfigure = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bd29155a97..ef5a7c1d8ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12909,6 +12909,7 @@ with pkgs; axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; + unifiLTS = callPackage ../servers/unifi { useLTS=true; }; virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; -- GitLab From 3ee2db1ab1cdede280dbcab66fd85329e2345bb6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 22:32:20 +0000 Subject: [PATCH 116/785] netbsd: fix games on linux --- pkgs/os-specific/bsd/netbsd/default.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 67ad3687c2c..75bd85be49d 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -108,10 +108,10 @@ let # will be removed in the postInstall. preInstall = '' mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR $out/usr/games + $out$DOCDIR $out$LOCALEDIR for i in 1 2 3 4 5 6 7 8 9; do mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ - $out$DOCDIR/reference/ref$i + $out$DOCDIR/reference/ref$i done mkdir -p $out/usr/include ''; @@ -363,8 +363,10 @@ in rec { patchPhase = '' sed -i '1i #include ' adventure/save.c - # Disable some games that don't build. They should be possible to - # build but need to look at how to implement stuff in Linux. + # Disable some games that don't build. They should be possible + # to build but need to look at how to implement stuff in + # Linux. macOS is missing gettime. TODO try to get these + # working. substituteInPlace Makefile \ ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \ --replace atc "" \ @@ -378,6 +380,9 @@ in rec { --replace sail "" \ --replace trek "" \ --replace dab "" + substituteInPlace Makefile.inc \ + --replace 2555 555 \ + --replace 2550 550 ''; NIX_CFLAGS_COMPILE = [ "-D__noinline=" @@ -387,6 +392,17 @@ in rec { "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" ]; + postBuild = '' + mkdir -p $out/usr/games $out/usr/share/games/ching \ + $out/usr/share/games/quiz.db \ + $out/usr/libexec/ching $out/var/games/hackdir + touch $out/var/games/hackdir/perm + ''; + preFixup = '' + mkdir -p $out/bin + mv $out/games/* $out/bin + rmdir $out/games + ''; buildInputs = [ compat libcurses libterminfo libressl ]; extraPaths = [ (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4") -- GitLab From e421c427d2c9cca60567b6057dfb1ff71e07278b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Apr 2018 18:33:42 -0400 Subject: [PATCH 117/785] fastjet: add veprbl to maintainers --- pkgs/development/libraries/physics/fastjet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 0ee68415b89..2f3dfea9a51 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; homepage = http://fastjet.fr/; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; } -- GitLab From e2fb669bc5154e13dfe78cd19b7727ed7a0248e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 22:52:54 +0000 Subject: [PATCH 118/785] netbsd: fix finger --- pkgs/os-specific/bsd/netbsd/default.nix | 28 +++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 75bd85be49d..c44e25b00fc 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -340,6 +340,19 @@ let sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m"; }; + who = netBSDDerivation { + path = "usr.bin/who"; + version = "7.1.2"; + sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; + patchPhase = '' + substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ + --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \ + --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ + --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" \ + --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" + ''; + }; + in rec { inherit compat install netBSDDerivation fts; @@ -410,17 +423,20 @@ in rec { ]; }; - who = netBSDDerivation { - path = "usr.bin/who"; - version = "7.1.2"; - sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; - }; - finger = netBSDDerivation { path = "usr.bin/finger"; sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; version = "7.1.2"; extraPaths = [ who.src ]; + NIX_CFLAGS_COMPILE = [ + "-DSUPPORT_UTMP" + "-USUPPORT_UTMPX" + ]; + patchPhase = '' + + ${who.patchPhase} + + ''; }; fingerd = netBSDDerivation { -- GitLab From fa850e8fda68c92984760f9ff9086e8cde6ef835 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 27 Apr 2018 18:52:46 -0400 Subject: [PATCH 119/785] conglomerate: init at 2017-09-10 --- .../science/biology/conglomerate/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/biology/conglomerate/default.nix diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix new file mode 100644 index 00000000000..c04bc84c156 --- /dev/null +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, coreutils, perl, bicpl, libminc, zlib, minc_tools, + makeWrapper, GetoptTabular, MNI-Perllib }: + +stdenv.mkDerivation rec { + pname = "conglomerate"; + name = "${pname}-2017-09-10"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "7343238bc6215942c7ecc885a224f24433a291b0"; + sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc zlib bicpl ]; + propagatedBuildInputs = [ coreutils minc_tools perl GetoptTabular MNI-Perllib ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ]; + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/BIC-MNI/conglomerate; + description = "More command-line utilities for working with MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10053f926da..d98e2aec1d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19740,6 +19740,10 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { + inherit (perlPackages) GetoptTabular MNI-Perllib; + }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; diamond = callPackage ../applications/science/biology/diamond { }; -- GitLab From 92808e667fd909ecd2a1502b20d9dd163986aec8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Sat, 28 Apr 2018 00:58:40 +0200 Subject: [PATCH 120/785] blobfuse: init at 1.0.1-RC-Preview (#39073) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/filesystems/blobfuse/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/tools/filesystems/blobfuse/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18ed73b1932..aec6f67a919 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1726,6 +1726,11 @@ github = "jbedo"; name = "Justin Bedő"; }; + jbgi = { + email = "jb@giraudeau.info"; + github = "jbgi"; + name = "Jean-Baptiste Giraudeau"; + }; jcumming = { email = "jack@mudshark.org"; name = "Jack Cummings"; diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix new file mode 100644 index 00000000000..f847cde98a9 --- /dev/null +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: + +stdenv.mkDerivation rec { + name = "blobfuse-${version}"; + version = "1.0.1-RC-Preview"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-storage-fuse"; + rev = "v${version}"; + sha256 = "143rxgfmprir4a7frrv8llkv61jxzq50w2v8wn32vx6gl6vci1zs"; + }; + + buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "Mount an Azure Blob storage as filesystem through FUSE"; + license = licenses.mit; + maintainers = with maintainers; [ jbgi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef5a7c1d8ba..31e091b810e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -838,6 +838,8 @@ with pkgs; boost = boost160; }; + blobfuse = callPackage ../tools/filesystems/blobfuse { }; + blockdiag = pythonPackages.blockdiag; blsd = callPackage ../tools/misc/blsd { -- GitLab From b1950f081dcb1906ee20babf08c6377167a85f2d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Apr 2018 19:16:32 -0400 Subject: [PATCH 121/785] fastjet: update license in meta Fixes: 70e070 ('fastjet: 3.3.0 -> 3.3.1') --- pkgs/development/libraries/physics/fastjet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 2f3dfea9a51..812d741fec9 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://fastjet.fr/; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; -- GitLab From 99b8d106e987b7fcddf4a92bd54e7f2ba8b0006a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:32:19 -0500 Subject: [PATCH 122/785] netcat-gnu: move to pkgs/tools/networking/netcat --- pkgs/tools/networking/{netcat-gnu => netcat}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/tools/networking/{netcat-gnu => netcat}/default.nix (100%) diff --git a/pkgs/tools/networking/netcat-gnu/default.nix b/pkgs/tools/networking/netcat/default.nix similarity index 100% rename from pkgs/tools/networking/netcat-gnu/default.nix rename to pkgs/tools/networking/netcat/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31e091b810e..8e61a555aac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3877,7 +3877,7 @@ with pkgs; netcat = netcat-openbsd; - netcat-gnu = callPackage ../tools/networking/netcat-gnu { }; + netcat-gnu = callPackage ../tools/networking/netcat { }; netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; -- GitLab From 949bb9887254be8b56cd7837e09bc7366b3e097f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:33:05 -0500 Subject: [PATCH 123/785] libressl: build netcat --- pkgs/development/libraries/libressl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index ae03ef7ecb9..8f028bcb546 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -11,6 +11,8 @@ let inherit sha256; }; + configureFlags = [ "--enable-nc" ]; + enableParallelBuilding = true; outputs = [ "bin" "dev" "out" "man" ]; -- GitLab From c65000af91d91708a1afbb4cb24b1daac068aaa0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 00:33:51 +0000 Subject: [PATCH 124/785] openbsd: fixup mg --- pkgs/os-specific/bsd/default.nix | 2 +- pkgs/os-specific/bsd/openbsd/default.nix | 28 +- pkgs/os-specific/bsd/openbsd/nc.patch | 421 ----------------------- 3 files changed, 18 insertions(+), 433 deletions(-) delete mode 100644 pkgs/os-specific/bsd/openbsd/nc.patch diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix index a8301ea2a8f..5f094a8dad3 100644 --- a/pkgs/os-specific/bsd/default.nix +++ b/pkgs/os-specific/bsd/default.nix @@ -3,6 +3,6 @@ rec { netbsd = recurseIntoAttrs (callPackages ./netbsd {}); openbsd = recurseIntoAttrs (callPackages ./openbsd { - inherit (netbsd) compat netBSDDerivation libcurses; + inherit (netbsd) compat netBSDDerivation libcurses libterminfo; }); } diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix index 9ccc0adaa2d..6d909e1c556 100644 --- a/pkgs/os-specific/bsd/openbsd/default.nix +++ b/pkgs/os-specific/bsd/openbsd/default.nix @@ -1,4 +1,4 @@ -{ fetchcvs, netBSDDerivation, compat, libcurses, libressl }: +{ fetchcvs, netBSDDerivation, compat, libcurses, libterminfo }: let fetchOpenBSD = path: version: sha256: fetchcvs { @@ -21,22 +21,28 @@ in { path = "usr.bin/mg"; version = "6.3"; sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc"; - buildInputs = [ compat libcurses ]; + buildInputs = [ compat libcurses libterminfo ]; patchPhase = '' NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys" + substituteInPlace fileio.c \ + --replace "bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec" "bp->b_fi.fi_mtime.tv_sec != sb.st_mtim.tv_sec" \ + --replace "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec" "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtim.tv_nsec" \ + --replace "bp->b_fi.fi_mtime = sb.st_mtimespec" "bp->b_fi.fi_mtime = sb.st_mtim" + substituteInPlace Makefile \ + --replace "-o root -g wheel" "" \ + --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" + ''; + NIX_CFLAGS_COMPILE = [ "-DTCSASOFT=0x10" "-Dpledge(a,b)=0" ]; + preBuild = '' + cc -c $BSDSRCDIR/lib/libc/stdlib/strtonum.c -o strtonum.o + NIX_LDFLAGS+=" strtonum.o" ''; extraPaths = [ (fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9") (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") - ]; - }; - - nc = openBSDDerivation { - path = "usr.bin/nc"; - version = "6.3"; - sha256 = "0fmnh6ccxab0qvhmgspyd3wra1ps2516i0j6hwkvna2lcny20xvr"; - patches = [ ./nc.patch ]; - buildInputs = [ compat libressl ]; + (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") + (fetchOpenBSD "lib/libc/stdlib/strtonum.c" "6.3" "0xn3qxvb3g76hz698sjkf85p07zrcdv2g31inp8caqw2mpk6jadv") + ]; }; } diff --git a/pkgs/os-specific/bsd/openbsd/nc.patch b/pkgs/os-specific/bsd/openbsd/nc.patch deleted file mode 100644 index de6fb2d04c4..00000000000 --- a/pkgs/os-specific/bsd/openbsd/nc.patch +++ /dev/null @@ -1,421 +0,0 @@ ---- a/nc.1 -+++ b/nc.1 -@@ -204,9 +204,6 @@ Proxy authentication is only supported f - Specifies the source port - .Nm - should use, subject to privilege restrictions and availability. --It is an error to use this option in conjunction with the --.Fl l --option. - .It Fl R Ar CAfile - Specifies the filename from which the root CA bundle for certificate - verification is loaded, in PEM format. -@@ -258,6 +255,7 @@ For IPv4 TOS value - may be one of - .Ar critical , - .Ar inetcontrol , -+.Ar lowcost , - .Ar lowdelay , - .Ar netcontrol , - .Ar throughput , ---- a/netcat.c -+++ b/netcat.c -@@ -32,6 +32,8 @@ - * *Hobbit* . - */ - -+#define _GNU_SOURCE -+ - #include - #include - #include -@@ -41,6 +43,49 @@ - #include - #include - #include -+#ifdef __linux__ -+# include -+#endif -+ -+#ifndef IPTOS_LOWDELAY -+# define IPTOS_LOWDELAY 0x10 -+# define IPTOS_THROUGHPUT 0x08 -+# define IPTOS_RELIABILITY 0x04 -+# define IPTOS_LOWCOST 0x02 -+# define IPTOS_MINCOST IPTOS_LOWCOST -+#endif /* IPTOS_LOWDELAY */ -+ -+# ifndef IPTOS_DSCP_AF11 -+# define IPTOS_DSCP_AF11 0x28 -+# define IPTOS_DSCP_AF12 0x30 -+# define IPTOS_DSCP_AF13 0x38 -+# define IPTOS_DSCP_AF21 0x48 -+# define IPTOS_DSCP_AF22 0x50 -+# define IPTOS_DSCP_AF23 0x58 -+# define IPTOS_DSCP_AF31 0x68 -+# define IPTOS_DSCP_AF32 0x70 -+# define IPTOS_DSCP_AF33 0x78 -+# define IPTOS_DSCP_AF41 0x88 -+# define IPTOS_DSCP_AF42 0x90 -+# define IPTOS_DSCP_AF43 0x98 -+# define IPTOS_DSCP_EF 0xb8 -+#endif /* IPTOS_DSCP_AF11 */ -+ -+#ifndef IPTOS_DSCP_CS0 -+# define IPTOS_DSCP_CS0 0x00 -+# define IPTOS_DSCP_CS1 0x20 -+# define IPTOS_DSCP_CS2 0x40 -+# define IPTOS_DSCP_CS3 0x60 -+# define IPTOS_DSCP_CS4 0x80 -+# define IPTOS_DSCP_CS5 0xa0 -+# define IPTOS_DSCP_CS6 0xc0 -+# define IPTOS_DSCP_CS7 0xe0 -+#endif /* IPTOS_DSCP_CS0 */ -+ -+#ifndef IPTOS_DSCP_EF -+# define IPTOS_DSCP_EF 0xb8 -+#endif /* IPTOS_DSCP_EF */ -+ - - #include - #include -@@ -268,10 +315,14 @@ main(int argc, char *argv[]) - uflag = 1; - break; - case 'V': -+# if defined(RT_TABLEID_MAX) - rtableid = (int)strtonum(optarg, 0, - RT_TABLEID_MAX, &errstr); - if (errstr) - errx(1, "rtable %s: %s", errstr, optarg); -+# else -+ errx(1, "no alternate routing table support available"); -+# endif - break; - case 'v': - vflag = 1; -@@ -320,7 +371,11 @@ main(int argc, char *argv[]) - oflag = optarg; - break; - case 'S': -+# if defined(TCP_MD5SIG) - Sflag = 1; -+# else -+ errx(1, "no TCP MD5 signature support available"); -+# endif - break; - case 'T': - errstr = NULL; -@@ -345,35 +400,23 @@ main(int argc, char *argv[]) - argc -= optind; - argv += optind; - -+# if defined(RT_TABLEID_MAX) - if (rtableid >= 0) - if (setrtable(rtableid) == -1) - err(1, "setrtable"); -- -- if (family == AF_UNIX) { -- if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) -- err(1, "pledge"); -- } else if (Fflag && Pflag) { -- if (pledge("stdio inet dns sendfd tty", NULL) == -1) -- err(1, "pledge"); -- } else if (Fflag) { -- if (pledge("stdio inet dns sendfd", NULL) == -1) -- err(1, "pledge"); -- } else if (Pflag && usetls) { -- if (pledge("stdio rpath inet dns tty", NULL) == -1) -- err(1, "pledge"); -- } else if (Pflag) { -- if (pledge("stdio inet dns tty", NULL) == -1) -- err(1, "pledge"); -- } else if (usetls) { -- if (pledge("stdio rpath inet dns", NULL) == -1) -- err(1, "pledge"); -- } else if (pledge("stdio inet dns", NULL) == -1) -- err(1, "pledge"); -+# endif - - /* Cruft to make sure options are clean, and used properly. */ - if (argv[0] && !argv[1] && family == AF_UNIX) { - host = argv[0]; - uport = NULL; -+ } else if (!argv[0] && lflag) { -+ if (sflag) -+ errx(1, "cannot use -s and -l"); -+ if (pflag) -+ errx(1, "cannot use -p and -l"); -+ if (zflag) -+ errx(1, "cannot use -z and -l"); - } else if (argv[0] && !argv[1]) { - if (!lflag) - usage(1); -@@ -385,12 +428,6 @@ main(int argc, char *argv[]) - } else - usage(1); - -- if (lflag && sflag) -- errx(1, "cannot use -s and -l"); -- if (lflag && pflag) -- errx(1, "cannot use -p and -l"); -- if (lflag && zflag) -- errx(1, "cannot use -z and -l"); - if (!lflag && kflag) - errx(1, "must use -l with -k"); - if (uflag && usetls) -@@ -425,8 +462,8 @@ main(int argc, char *argv[]) - } else { - strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX", - UNIX_DG_TMP_SOCKET_SIZE); -- if (mktemp(unix_dg_tmp_socket_buf) == NULL) -- err(1, "mktemp"); -+ if (mkstemp(unix_dg_tmp_socket_buf) == -1) -+ err(1, "mkstemp"); - unix_dg_tmp_socket = unix_dg_tmp_socket_buf; - } - } -@@ -901,8 +938,10 @@ remote_connect(const char *host, const c - if (sflag || pflag) { - struct addrinfo ahints, *ares; - -+# if defined (SO_BINDANY) - /* try SO_BINDANY, but don't insist */ - setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on)); -+# endif - memset(&ahints, 0, sizeof(struct addrinfo)); - ahints.ai_family = res->ai_family; - ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -@@ -994,9 +1033,15 @@ local_listen(char *host, char *port, str - res->ai_protocol)) < 0) - continue; - -+ ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x)); -+ if (ret == -1) -+ err(1, NULL); -+ -+# if defined(SO_REUSEPORT) - ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x)); - if (ret == -1) - err(1, NULL); -+# endif - - set_common_sockopts(s, res->ai_family); - -@@ -1452,11 +1497,13 @@ set_common_sockopts(int s, int af) - { - int x = 1; - -+# if defined(TCP_MD5SIG) - if (Sflag) { - if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG, - &x, sizeof(x)) == -1) - err(1, NULL); - } -+# endif - if (Dflag) { - if (setsockopt(s, SOL_SOCKET, SO_DEBUG, - &x, sizeof(x)) == -1) -@@ -1467,9 +1514,14 @@ set_common_sockopts(int s, int af) - IP_TOS, &Tflag, sizeof(Tflag)) == -1) - err(1, "set IP ToS"); - -+#if defined(IPV6_TCLASS) - else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, - IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1) - err(1, "set IPv6 traffic class"); -+#else -+ else if (af == AF_INET6) -+ errx(1, "can't set IPv6 traffic class (unavailable)"); -+#endif - } - if (Iflag) { - if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, -@@ -1487,19 +1539,34 @@ set_common_sockopts(int s, int af) - IP_TTL, &ttl, sizeof(ttl))) - err(1, "set IP TTL"); - -+#if defined(IPV6_UNICAST_HOPS) - else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, - IPV6_UNICAST_HOPS, &ttl, sizeof(ttl))) - err(1, "set IPv6 unicast hops"); -+#else -+ else if (af == AF_INET6) -+ errx(1, "can't set IPv6 unicast hops (unavailable)"); -+#endif - } - - if (minttl != -1) { -+#if defined(IP_MINTTL) - if (af == AF_INET && setsockopt(s, IPPROTO_IP, - IP_MINTTL, &minttl, sizeof(minttl))) - err(1, "set IP min TTL"); -+#else -+ if (af == AF_INET) -+ errx(1, "can't set IP min TTL (unavailable)"); -+#endif - -+#if defined(IPV6_MINHOPCOUNT) - else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, - IPV6_MINHOPCOUNT, &minttl, sizeof(minttl))) - err(1, "set IPv6 min hop count"); -+#else -+ else if (af == AF_INET6) -+ errx(1, "can't set IPv6 min hop count (unavailable)"); -+#endif - } - } - -@@ -1534,6 +1601,7 @@ process_tos_opt(char *s, int *val) - { "cs7", IPTOS_DSCP_CS7 }, - { "ef", IPTOS_DSCP_EF }, - { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, -+ { "lowcost", IPTOS_LOWCOST }, - { "lowdelay", IPTOS_LOWDELAY }, - { "netcontrol", IPTOS_PREC_NETCONTROL }, - { "reliability", IPTOS_RELIABILITY }, -@@ -1741,7 +1812,7 @@ help(void) - \t-Z Peer certificate file\n\ - \t-z Zero-I/O mode [used for scanning]\n\ - Port numbers can be individual or ranges: lo-hi [inclusive]\n"); -- exit(1); -+ exit(0); - } - - void ---- a/socks.c -+++ b/socks.c -@@ -219,11 +219,11 @@ socks_connect(const char *host, const ch - buf[2] = SOCKS_NOAUTH; - cnt = atomicio(vwrite, proxyfd, buf, 3); - if (cnt != 3) -- err(1, "write failed (%zu/3)", cnt); -+ err(1, "write failed (%zu/3)", (size_t)cnt); - - cnt = atomicio(read, proxyfd, buf, 2); - if (cnt != 2) -- err(1, "read failed (%zu/3)", cnt); -+ err(1, "read failed (%zu/3)", (size_t)cnt); - - if (buf[1] == SOCKS_NOMETHOD) - errx(1, "authentication method negotiation failed"); -@@ -272,11 +272,11 @@ socks_connect(const char *host, const ch - - cnt = atomicio(vwrite, proxyfd, buf, wlen); - if (cnt != wlen) -- err(1, "write failed (%zu/%zu)", cnt, wlen); -+ err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen); - - cnt = atomicio(read, proxyfd, buf, 4); - if (cnt != 4) -- err(1, "read failed (%zu/4)", cnt); -+ err(1, "read failed (%zu/4)", (size_t)cnt); - if (buf[1] != 0) { - errx(1, "connection failed, SOCKSv5 error: %s", - socks5_strerror(buf[1])); -@@ -285,12 +285,12 @@ socks_connect(const char *host, const ch - case SOCKS_IPV4: - cnt = atomicio(read, proxyfd, buf + 4, 6); - if (cnt != 6) -- err(1, "read failed (%zu/6)", cnt); -+ err(1, "read failed (%zu/6)", (size_t)cnt); - break; - case SOCKS_IPV6: - cnt = atomicio(read, proxyfd, buf + 4, 18); - if (cnt != 18) -- err(1, "read failed (%zu/18)", cnt); -+ err(1, "read failed (%zu/18)", (size_t)cnt); - break; - default: - errx(1, "connection failed, unsupported address type"); -@@ -310,11 +310,11 @@ socks_connect(const char *host, const ch - - cnt = atomicio(vwrite, proxyfd, buf, wlen); - if (cnt != wlen) -- err(1, "write failed (%zu/%zu)", cnt, wlen); -+ err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen); - - cnt = atomicio(read, proxyfd, buf, 8); - if (cnt != 8) -- err(1, "read failed (%zu/8)", cnt); -+ err(1, "read failed (%zu/8)", (size_t)cnt); - if (buf[1] != 90) { - errx(1, "connection failed, SOCKSv4 error: %s", - socks4_strerror(buf[1])); -@@ -328,39 +328,39 @@ socks_connect(const char *host, const ch - - /* Try to be sane about numeric IPv6 addresses */ - if (strchr(host, ':') != NULL) { -- r = snprintf(buf, sizeof(buf), -+ r = snprintf((char*)buf, sizeof(buf), - "CONNECT [%s]:%d HTTP/1.0\r\n", - host, ntohs(serverport)); - } else { -- r = snprintf(buf, sizeof(buf), -+ r = snprintf((char*)buf, sizeof(buf), - "CONNECT %s:%d HTTP/1.0\r\n", - host, ntohs(serverport)); - } - if (r == -1 || (size_t)r >= sizeof(buf)) - errx(1, "hostname too long"); -- r = strlen(buf); -+ r = strlen((char*)buf); - - cnt = atomicio(vwrite, proxyfd, buf, r); - if (cnt != r) -- err(1, "write failed (%zu/%d)", cnt, r); -+ err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r); - - if (authretry > 1) { - char resp[1024]; - - proxypass = getproxypass(proxyuser, proxyhost); -- r = snprintf(buf, sizeof(buf), "%s:%s", -+ r = snprintf((char*)buf, sizeof(buf), "%s:%s", - proxyuser, proxypass); - if (r == -1 || (size_t)r >= sizeof(buf) || -- b64_ntop(buf, strlen(buf), resp, -+ b64_ntop(buf, strlen((char*)buf), resp, - sizeof(resp)) == -1) - errx(1, "Proxy username/password too long"); -- r = snprintf(buf, sizeof(buf), "Proxy-Authorization: " -+ r = snprintf((char*)buf, sizeof(buf), "Proxy-Authorization: " - "Basic %s\r\n", resp); - if (r == -1 || (size_t)r >= sizeof(buf)) - errx(1, "Proxy auth response too long"); -- r = strlen(buf); -+ r = strlen((char*)buf); - if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r) -- err(1, "write failed (%zu/%d)", cnt, r); -+ err(1, "write failed (%zu/%d)", (size_t)cnt, r); - } - - /* Terminate headers */ -@@ -368,22 +368,22 @@ socks_connect(const char *host, const ch - err(1, "write failed (%zu/2)", cnt); - - /* Read status reply */ -- proxy_read_line(proxyfd, buf, sizeof(buf)); -+ proxy_read_line(proxyfd, (char*)buf, sizeof(buf)); - if (proxyuser != NULL && -- strncmp(buf, "HTTP/1.0 407 ", 12) == 0) { -+ strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) { - if (authretry > 1) { - fprintf(stderr, "Proxy authentication " - "failed\n"); - } - close(proxyfd); - goto again; -- } else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 && -- strncmp(buf, "HTTP/1.1 200 ", 12) != 0) -+ } else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 && -+ strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0) - errx(1, "Proxy error: \"%s\"", buf); - - /* Headers continue until we hit an empty line */ - for (r = 0; r < HTTP_MAXHDRS; r++) { -- proxy_read_line(proxyfd, buf, sizeof(buf)); -+ proxy_read_line(proxyfd, (char*)buf, sizeof(buf)); - if (*buf == '\0') - break; - } \ No newline at end of file -- GitLab From 3c3b82234a6faa5a4c07323d0066452055d1ea81 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:34:41 -0500 Subject: [PATCH 125/785] netcat-openbsd: remove --- .../networking/netcat-openbsd/default.nix | 51 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/tools/networking/netcat-openbsd/default.nix diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix deleted file mode 100644 index 1a79e17c659..00000000000 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: - -stdenv.mkDerivation rec { - version = "1.190"; - deb-version = "${version}-1"; - name = "netcat-openbsd-${version}"; - - srcs = [ - (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38"; - }) - (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libbsd ]; - - sourceRoot = name; - - prePatch = '' - for i in $(cat ../debian/patches/series); do - patch -p1 < "../debian/patches/$i" - done - ''; - - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6"; - sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr"; - }) - ]; - - installPhase = '' - runHook preInstall - install -Dm0755 nc $out/bin/nc - install -Dm0644 nc.1 $out/share/man/man1/nc.1 - runHook postInstall - ''; - - meta = with stdenv.lib; { - homepage = https://packages.debian.org/netcat-openbsd; - description = "TCP/IP swiss army knife, OpenBSD variant"; - platforms = platforms.linux; - maintainers = with maintainers; [ willibutz ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b4dd2bf915..a7f59d1268f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,6 +138,7 @@ mapAliases (rec { mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 ncat = nmap; # added 2016-01-26 + netcat-openbsd = libressl.bin; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e61a555aac..0b59862c20e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3879,8 +3879,6 @@ with pkgs; netcat-gnu = callPackage ../tools/networking/netcat { }; - netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; - nethogs = callPackage ../tools/networking/nethogs { }; netkittftp = callPackage ../tools/networking/netkit/tftp { }; -- GitLab From 6bc19398bed6a4062979c86454e41581f0bddbc7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 01:03:34 +0000 Subject: [PATCH 126/785] openbsd: remove --- pkgs/os-specific/bsd/default.nix | 3 -- pkgs/os-specific/bsd/openbsd/default.nix | 48 ------------------------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/os-specific/bsd/openbsd/default.nix diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix index 5f094a8dad3..a75c132b55a 100644 --- a/pkgs/os-specific/bsd/default.nix +++ b/pkgs/os-specific/bsd/default.nix @@ -2,7 +2,4 @@ rec { netbsd = recurseIntoAttrs (callPackages ./netbsd {}); - openbsd = recurseIntoAttrs (callPackages ./openbsd { - inherit (netbsd) compat netBSDDerivation libcurses libterminfo; - }); } diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix deleted file mode 100644 index 6d909e1c556..00000000000 --- a/pkgs/os-specific/bsd/openbsd/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchcvs, netBSDDerivation, compat, libcurses, libterminfo }: - -let - fetchOpenBSD = path: version: sha256: fetchcvs { - cvsRoot = "anoncvs@anoncvs.ca.openbsd.org:/cvs"; - module = "src/${path}"; - inherit sha256; - tag = "OPENBSD_${builtins.replaceStrings ["."] ["_"] version}"; - }; - - # OpenBSD is a fork of NetBSD - # We can build it with minimal changes - openBSDDerivation = attrs: netBSDDerivation (attrs // { - name = "${attrs.pname or (baseNameOf attrs.path)}-openbsd-${attrs.version}"; - src = fetchOpenBSD attrs.path attrs.version attrs.sha256; - }); - -in { - - mg = openBSDDerivation { - path = "usr.bin/mg"; - version = "6.3"; - sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc"; - buildInputs = [ compat libcurses libterminfo ]; - patchPhase = '' - NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys" - substituteInPlace fileio.c \ - --replace "bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec" "bp->b_fi.fi_mtime.tv_sec != sb.st_mtim.tv_sec" \ - --replace "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec" "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtim.tv_nsec" \ - --replace "bp->b_fi.fi_mtime = sb.st_mtimespec" "bp->b_fi.fi_mtime = sb.st_mtim" - substituteInPlace Makefile \ - --replace "-o root -g wheel" "" \ - --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" - ''; - NIX_CFLAGS_COMPILE = [ "-DTCSASOFT=0x10" "-Dpledge(a,b)=0" ]; - preBuild = '' - cc -c $BSDSRCDIR/lib/libc/stdlib/strtonum.c -o strtonum.o - NIX_LDFLAGS+=" strtonum.o" - ''; - extraPaths = [ - (fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9") - (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") - (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") - (fetchOpenBSD "lib/libc/stdlib/strtonum.c" "6.3" "0xn3qxvb3g76hz698sjkf85p07zrcdv2g31inp8caqw2mpk6jadv") - ]; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06e..beffac76715 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21379,5 +21379,5 @@ with pkgs; mount wall hostname more sysctl; inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) - netbsd openbsd; + netbsd; } -- GitLab From 004111c27e11684d6945f82124110c5f17c1bf01 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 01:03:47 +0000 Subject: [PATCH 127/785] netbsd: small fixups --- pkgs/os-specific/bsd/netbsd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index c44e25b00fc..f9c8653447f 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -11,7 +11,7 @@ let netBSDDerivation = attrs: stdenv.mkDerivation ((rec { name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; - src = fetchNetBSD attrs.path attrs.version attrs.sha256; + src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; @@ -187,6 +187,7 @@ let install -D $NETBSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h + install -D $NETBSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h install -D $NETBSDSRCDIR/include/db.h $out/include/db.h install -D $NETBSDSRCDIR/include/netconfig.h $out/include/netconfig.h -- GitLab From d11f290f670d04071f893deea891a373e1548821 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 01:31:06 +0000 Subject: [PATCH 128/785] netbsd: cleanup and musl suppot --- pkgs/os-specific/bsd/netbsd/default.nix | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f9c8653447f..0cd2b4ffc6e 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -405,6 +405,7 @@ in rec { "-DOXTABS=XTABS" "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" + (if hostPlatform.isMusl then "-include sys/ttydefaults.h -include sys/file.h" else "") ]; postBuild = '' mkdir -p $out/usr/games $out/usr/share/games/ching \ @@ -424,21 +425,19 @@ in rec { ]; }; - finger = netBSDDerivation { - path = "usr.bin/finger"; - sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; - version = "7.1.2"; - extraPaths = [ who.src ]; - NIX_CFLAGS_COMPILE = [ - "-DSUPPORT_UTMP" - "-USUPPORT_UTMPX" - ]; - patchPhase = '' - - ${who.patchPhase} - - ''; - }; + # finger = netBSDDerivation { + # path = "usr.bin/finger"; + # sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; + # version = "7.1.2"; + # extraPaths = [ who.src ]; + # NIX_CFLAGS_COMPILE = [ + # "-DSUPPORT_UTMP" + # "-USUPPORT_UTMPX" + # ]; + # patchPhase = '' + # ${who.patchPhase} + # ''; + # }; fingerd = netBSDDerivation { path = "libexec/fingerd"; -- GitLab From 5f419f3df7f71b9dd88e513fcdd1303a5d5b99dd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 20:50:15 -0500 Subject: [PATCH 129/785] netbsd: improve darwin support --- pkgs/os-specific/bsd/netbsd/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 0cd2b4ffc6e..343b61bab38 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -68,10 +68,10 @@ let HOST_SH = "${bash}/bin/sh"; - # not using bsd binutils SHLIB_WARNTEXTREL = "no"; SHLIB_MKMAP = "no"; PRESERVE = "-p"; + OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; MACHINE_ARCH = hostPlatform.parsed.cpu.name; MACHINE_CPU = hostPlatform.parsed.cpu.name; @@ -393,7 +393,7 @@ in rec { --replace rogue "" \ --replace sail "" \ --replace trek "" \ - --replace dab "" + --replace dab "" substituteInPlace Makefile.inc \ --replace 2555 555 \ --replace 2550 550 @@ -469,6 +469,7 @@ in rec { version = "7.1.2"; sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; + MKPIC = if stdenv.isDarwin then "no" else "yes"; extraPaths = [ (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") ]; @@ -483,10 +484,11 @@ in rec { "-D__scanflike(a,b)=" "-D__va_list=va_list" "-D__warn_references(a,b)=" - ]; + ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr - patchPhase = '' + MKPIC = if stdenv.isDarwin then "no" else "yes"; + patchPhase = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' -- GitLab From e375bd4a9e789105b84eabf61f11b1d55b7131d3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 16:23:21 +0200 Subject: [PATCH 130/785] gdk_pixbuf: export moduleDir --- pkgs/development/libraries/gdk-pixbuf/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 6bfa6bdc2fb..069b78f6bca 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "gdk_pixbuf"; }; + + # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc + moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders"; }; meta = with stdenv.lib; { -- GitLab From 3ebb162d902906c2eb65bd4978f9d77a8a841522 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 28 Apr 2018 00:59:26 +0200 Subject: [PATCH 131/785] gegl_0_4: init at 0.4.0 --- pkgs/development/libraries/gegl/4.0.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/gegl/4.0.nix diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix new file mode 100644 index 00000000000..a8e50945c3f --- /dev/null +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which +, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw +, libwebp, gnome3, libintl }: + +let + version = "0.4.0"; +in stdenv.mkDerivation rec { + name = "gegl-${version}"; + + src = fetchurl { + url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + sha256 = "1ighk4z8nlqrzyj8w97s140hzj59564l3xv6fpzbr97m1zx2nkfh"; + }; + + # needs fonts otherwise, don't know how to pass them + configureFlags = [ "--disable-docs" ]; + + enableParallelBuilding = true; + + doCheck = true; + + buildInputs = [ + libpng cairo libjpeg librsvg pango gtk bzip2 + libraw libwebp gnome3.gexiv2 + ]; + + propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc + + nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; + + meta = with stdenv.lib; { + description = "Graph-based image processing framework"; + homepage = http://www.gegl.org; + license = licenses.gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1c63060734..c9513d60db4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8904,6 +8904,10 @@ with pkgs; gtk = self.gtk2; }; + gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { + gtk = self.gtk2; + }; + geoclue = callPackage ../development/libraries/geoclue {}; geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; -- GitLab From 59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 27 Apr 2018 22:44:25 -0400 Subject: [PATCH 132/785] nixos docs: Move generated XML in to a specific subdirectory to allow easier hacking --- nixos/doc/manual/configuration/configuration.xml | 3 +-- nixos/doc/manual/default.nix | 11 ++++++++--- nixos/doc/manual/man-configuration.xml | 2 +- nixos/doc/manual/manual.xml | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 8677c13db40..f092c7e207f 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -25,9 +25,8 @@ effect after you run nixos-rebuild. - + - diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index ac22712baf8..c396c799c63 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -102,13 +102,18 @@ let ''; + generatedSources = runCommand "generated-docbook" {} '' + mkdir $out + ln -s ${modulesDoc} $out/modules.xml + ln -s ${optionsDocBook} $out/options-db.xml + printf "%s" "${version}" > $out/version + ''; + copySources = '' cp -prd $sources/* . # */ + ln -s ${generatedSources} ./generated chmod -R u+w . - ln -s ${modulesDoc} configuration/modules.xml - ln -s ${optionsDocBook} options-db.xml - printf "%s" "${version}" > version ''; toc = builtins.toFile "toc.xml" diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml index 05531b3909a..89d321d6972 100644 --- a/nixos/doc/manual/man-configuration.xml +++ b/nixos/doc/manual/man-configuration.xml @@ -31,7 +31,7 @@ therein. You can use the following options in configuration.nix. - + diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 9aa332f026d..a7825579e03 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -6,7 +6,7 @@ NixOS Manual - Version + Version @@ -39,7 +39,7 @@ Configuration Options - + -- GitLab From 2f893ff53db6e812230e3fe8bf4b1c10f34ccdde Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 07:20:40 +0200 Subject: [PATCH 133/785] autoPatchelfHook: Provide a better derivation name Thanks to @Ericson2314 for the suggestion to provide a name for the hook script. Comment was posted here: https://github.com/NixOS/nixpkgs/pull/34506#discussion_r167421856 Very useful if you use some other hooks and autoPatchelfHook so you don't just get a bunch of "hook" derivations. Tested by quickly building (not running) teamviewer and masterpdfeditor. Signed-off-by: aszlig Reported-by: John Ericson --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c060c588e8..3795cce452a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -80,7 +80,7 @@ with pkgs; ../build-support/setup-hooks/autoreconf.sh; autoPatchelfHook = makeSetupHook - { deps = [ file ]; } + { name = "auto-patchelf-hook"; deps = [ file ]; } ../build-support/setup-hooks/auto-patchelf.sh; ensureNewerSourcesHook = { year }: makeSetupHook {} -- GitLab From 1c235abda6446eb787d33feb5eb329d72531ce9c Mon Sep 17 00:00:00 2001 From: davidak Date: Sat, 28 Apr 2018 07:58:52 +0200 Subject: [PATCH 134/785] elementary-xfce-icon-theme: 2017-11-28 -> 0.11 --- pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 724f3a066cc..8a831a630d8 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "elementary-xfce-icon-theme-${version}"; - version = "2017-11-28"; + version = "0.11"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; - rev = "b5cc6f044ed24e388ed2fffed1d02f43ce76f5e6"; - sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y"; + rev = "elementary-xfce-${version}"; + sha256 = "1hgbw9wwsgrbrs8lgdhba2m8m1cvqbcy27b87kjws6jsa00f5hx6"; }; nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; -- GitLab From 0ff0d138e4e9d68853c463a540d61718aa91cffb Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 28 Apr 2018 04:00:55 -0400 Subject: [PATCH 135/785] nixos docs: Add a makefile for hacking on the nixos docs --- nixos/doc/manual/Makefile | 8 ++++++++ nixos/doc/manual/default.nix | 1 + nixos/doc/manual/manual.xml | 3 ++- nixos/doc/manual/options-to-docbook.xsl | 8 ++++---- nixos/release.nix | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 nixos/doc/manual/Makefile diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile new file mode 100644 index 00000000000..b15fbaa270f --- /dev/null +++ b/nixos/doc/manual/Makefile @@ -0,0 +1,8 @@ +debug: + nix-shell --packages xmloscopy \ + --run 'xmloscopy --docbook5 ./manual.xml ./manual-combined.xml' + +generated: ./options-to-docbook.xsl + nix-build ../../release.nix \ + --attr manualGeneratedSources.x86_64-linux \ + --out-link ./generated diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index c396c799c63..2c6309474b3 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -229,6 +229,7 @@ let ''; in rec { + inherit generatedSources; # The NixOS options in JSON format. optionsJSON = runCommand "options-json" diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index a7825579e03..676924e5c8b 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -39,7 +39,8 @@ Configuration Options - + diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl index 7b45b233ab2..43a69806a2b 100644 --- a/nixos/doc/manual/options-to-docbook.xsl +++ b/nixos/doc/manual/options-to-docbook.xsl @@ -15,9 +15,9 @@ - - - + + Configuration Options + @@ -100,7 +100,7 @@ - + diff --git a/nixos/release.nix b/nixos/release.nix index 2f779280e6b..4994cd98302 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -124,7 +124,6 @@ let preferLocalBuild = true; }; - in rec { channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; }; @@ -132,6 +131,7 @@ in rec { manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub)); manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); + manualGeneratedSources = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.generatedSources); options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; -- GitLab From a77dc213a7825f5dd13c7989e38d82e64816d881 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 28 Apr 2018 04:04:56 -0400 Subject: [PATCH 136/785] nixos manual: update xi:include for configuruation.nix's options-db --- nixos/doc/manual/man-configuration.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml index 89d321d6972..37ffb9d648a 100644 --- a/nixos/doc/manual/man-configuration.xml +++ b/nixos/doc/manual/man-configuration.xml @@ -31,7 +31,8 @@ therein. You can use the following options in configuration.nix. - + -- GitLab From 74fcb1c770e3a5178a7ee089b3caf406f7bf94bf Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 28 Apr 2018 04:15:16 -0400 Subject: [PATCH 137/785] nixos docs: include note about make for debugging the nixos docs --- .../development/writing-documentation.xml | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml index 59a287717ac..8b787fae1fe 100644 --- a/nixos/doc/manual/development/writing-documentation.xml +++ b/nixos/doc/manual/development/writing-documentation.xml @@ -18,13 +18,25 @@ The DocBook sources of the are in the nixos/doc/manual - subdirectory of the Nixpkgs repository. If you make modifications to - the manual, it's important to build it before committing. You can do - that as follows: + subdirectory of the Nixpkgs repository. + - nix-build nixos/release.nix -A manual.x86_64-linux + + You can quickly validate your edits with make: + + $ cd /path/to/nixpkgs/nixos/doc/manual + $ make + + + + Once you are done making modifications to the manual, it's important + to build it before committing. You can do that as follows: + + +nix-build nixos/release.nix -A manual.x86_64-linux + When this command successfully finishes, it will tell you where the manual got generated. The HTML will be accessible through the -- GitLab From bf325f1bd7f148a6043add54446f983700dd2c64 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 28 Apr 2018 11:08:42 +0200 Subject: [PATCH 138/785] quassel: 0.12.4 -> 0.12.5 (fixes RCE & remote crash) It was found that Quassel could be remotely crashed and had an unauthenticated RCE vulnerability. The public annoucement can be found on the oss-sec archive [1]. The bump to 0.12.5 is supposed fixe both issues. [1] http://seclists.org/oss-sec/2018/q2/77 --- pkgs/applications/networking/irc/quassel/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/source.nix b/pkgs/applications/networking/irc/quassel/source.nix index f3941ee976e..20daba78899 100644 --- a/pkgs/applications/networking/irc/quassel/source.nix +++ b/pkgs/applications/networking/irc/quassel/source.nix @@ -1,9 +1,9 @@ { fetchurl }: rec { - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { url = "https://github.com/quassel/quassel/archive/${version}.tar.gz"; - sha256 = "0q2qlhy1d6glw9pwxgcgwvspd1mkk3yi6m21dx9gnj86bxas2qs2"; + sha256 = "04f42x87a4wkj3va3wnmj2jl7ikqqa7d7nmypqpqwalzpzk7kxwv"; }; } -- GitLab From dda74d9e50dbd8a412de743a53e9cfd585407342 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Apr 2018 12:48:06 +0300 Subject: [PATCH 139/785] nixos/qemu-vm: Always add a virtio RNG device to the quest mke2fs has this annoying property that it uses getrandom() to get random numbers (for whatever purposes) which blocks until the kernel's secure RNG has sufficient entropy, which it usually doesn't in the early boot (except if your CPU supports RDRAND) where we may need to create the root disk. So let's give the VM a virtio RNG to avoid the boot getting stuck at mke2fs. --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 2b78276fcde..3d4bd315f81 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -77,6 +77,7 @@ let -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ + -device virtio-rng-pci \ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -- GitLab From 6134887bef5357ccda4d81aef78182217df4c3ed Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 15:52:00 +0200 Subject: [PATCH 140/785] mpir: Build with C++ support This is needed by Alkimia which I'm going to package soon as part of KMyMoney. I enabled this by default, because it doesn't increase the closure size a whole lot (only around 150 KiB): $ nix-store -q --size /nix/store/...old...-mpir-3.0.0 1223248 $ nix-store -q --size /nix/store/...new...-mpir-3.0.0 1377136 Introducing an option for enabling/disabling this is not worth it, because it doesn't conflict with anything and the size increase is the only drawback and we can still make it configurable if we want someday. Signed-off-by: aszlig Cc: @7c6f434c --- pkgs/development/libraries/mpir/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index cbcf83f1d32..b9b25e7f43b 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; }; + configureFlags = [ "--enable-cxx" ]; + meta = { inherit version; description = ''A highly optimised library for bignum arithmetic forked from GMP''; -- GitLab From 5370b8267c94bf5762683746f537c002f0ea3ac6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 01:21:25 +0200 Subject: [PATCH 141/785] kdewebkit: Add package expression This is one of the requirements of KMyMoney and packaging is quite straightforward with no unexpected traps. Signed-off-by: aszlig Cc: @ttuegel --- pkgs/development/libraries/kde-frameworks/default.nix | 1 + .../libraries/kde-frameworks/kdewebkit.nix | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/libraries/kde-frameworks/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index f54139836b1..d780fc30a4c 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -155,6 +155,7 @@ let kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; kdesu = callPackage ./kdesu.nix {}; + kdewebkit = callPackage ./kdewebkit.nix {}; kemoticons = callPackage ./kemoticons.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; kiconthemes = callPackage ./kiconthemes {}; diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix new file mode 100644 index 00000000000..b7dcfb7fe64 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix @@ -0,0 +1,11 @@ +{ mkDerivation, extra-cmake-modules +, kconfig, kcoreaddons, kio, kparts, qtwebkit +}: + +mkDerivation { + name = "kdewebkit"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons kio kparts ]; + propagatedBuildInputs = [ qtwebkit ]; + outputs = [ "out" "dev" ]; +} -- GitLab From d2b8d8bddc40734b14e9b04039a1ae5415a60b4d Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 01:32:32 +0200 Subject: [PATCH 142/785] alkimia: init at 7.0.1 This is used by KMyMoney and also the reason why I needed to add C++ support to MPIR in the parent commit. The reason why I didn't add myself as a maintainer is because I'm not personally using KMyMoney and thus Alkimia. Signed-off-by: aszlig --- .../development/libraries/alkimia/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/alkimia/default.nix diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix new file mode 100644 index 00000000000..495c5118e74 --- /dev/null +++ b/pkgs/development/libraries/alkimia/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, fetchurl, lib +, extra-cmake-modules, doxygen, graphviz, qtbase, mpir +}: + +mkDerivation rec { + name = "alkimia-${version}"; + version = "7.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/alkimia/${version}/src/${name}.tar.xz"; + sha256 = "1fri76465058fgsyrmdrc3hj1javz4g10mfzqp5rsj7qncjr1i22"; + }; + + nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; + + buildInputs = [ qtbase ]; + propagatedBuildInputs = [ mpir ]; + + meta = { + description = "Library used by KDE finance applications"; + license = lib.licenses.lgpl21Plus; + platforms = qtbase.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3795cce452a..213bdcc784e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11181,6 +11181,8 @@ with pkgs; accounts-qt = callPackage ../development/libraries/accounts-qt { }; + alkimia = callPackage ../development/libraries/alkimia { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; -- GitLab From 93042b7376139fca94e1223a7a5803399806ef61 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 02:21:22 +0200 Subject: [PATCH 143/785] kmymoney: init at 5.0.1 I tried to use -DENABLE_SQLCIPHER and also passed the right directories to the Qt 5 source of the QSQLiteDriver but CMake then failed to run qt4_automoc, by which I'd imply that SQLCipher is not maintained anymore (after all KMyMoney using qgpgme as well, which doesn't require sources). Another odd thing is that CMake reports that the weboob plugin is disabled, but after inspecting it turns out that the reporting is just wrong. This is already fixed upstream but not yet released in KDE/kmymoney@8b086cf921879770971e9331f005339bfacdc84c. In addition of running the upstream test suite I have manually tested a few things in a VM by using the following Nix expression: (import { configuration = { pkgs, ... }: { environment.systemPackages = with pkgs; [ kmymoney aqbanking gwenhywfar libchipcard python2Packages.weboob kgpg ]; users.users.test.isNormalUser = true; virtualisation.diskSize = 4096; virtualisation.memorySize = 2048; services.xserver = { enable = true; inherit ((import {}).config.services.xserver) layout; displayManager.sddm.enable = true; displayManager.sddm.autoLogin.enable = true; displayManager.sddm.autoLogin.user = "test"; desktopManager.default = "plasma5"; desktopManager.plasma5.enable = true; }; }; }).vm The things I have tested in particular are: * Basic startup * Completing the wizard * Add some test transactions * GPG encryption * Generation of charts and reports * Rough check whether OFX integration lists supported financial institutions. * Small check of AqBanking implementation, whether accounts and users can be configured, but didn't test actual connectivity with a financial institution. * Check of Weboob integration with a test PayPal backend, however also just with a dummy account and without actually connecting to PayPal. One of the upstream tests "reports-chart-test" seems to fail even though generating charts and reports are working when testing manually. It also seems that this is the case on other distributions, for example Gentoo has disabled that test as well: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5169cec68fa6fd67841 Note that I didn't add myself as a maintainer because I'm not personally using KMyMoney but just packaged it for someone else. I hope this is useful for other people, so that maybe someday[TM] there will be a proper maintainer. Signed-off-by: aszlig Cc: @ttuegel --- pkgs/applications/office/kmymoney/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/office/kmymoney/default.nix diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix new file mode 100644 index 00000000000..212aaa5fa2c --- /dev/null +++ b/pkgs/applications/office/kmymoney/default.nix @@ -0,0 +1,70 @@ +{ stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools + +, akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive +, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement +, kitemmodels, libical, libofx, qgpgme + +# Needed for running tests: +, qtbase, xvfb_run + +# For weboob, which only supports Python 2.x: +, python2Packages +}: + +stdenv.mkDerivation rec { + name = "kmymoney-${version}"; + version = "5.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz"; + sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx"; + }; + + # Hidden dependency that wasn't included in CMakeLists.txt: + NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + doxygen extra-cmake-modules graphviz kdoctools python2Packages.wrapPython + ]; + + buildInputs = [ + akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils + kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels + libical libofx qgpgme + + # Put it into buildInputs so that CMake can find it, even though we patch + # it into the interface later. + python2Packages.weboob + ]; + + weboobPythonPath = [ python2Packages.weboob ]; + + postInstall = '' + buildPythonPath "$weboobPythonPath" + patchPythonScript "$out/share/kmymoney/weboob/kmymoneyweboob.py" + + # Within the embedded Python interpreter, sys.argv is unavailable, so let's + # assign it to a dummy value so that the assignment of sys.argv[0] injected + # by patchPythonScript doesn't fail: + sed -i -e '1i import sys; sys.argv = [""]' \ + "$out/share/kmymoney/weboob/kmymoneyweboob.py" + ''; + + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + installCheckPhase = let + pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}"; + in lib.optionalString doInstallCheck '' + QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} CTEST_OUTPUT_ON_FAILURE=1 \ + ${xvfb_run}/bin/xvfb-run -s '-screen 0 1024x768x24' make test \ + ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now. + ''; + + meta = { + description = "Personal finance manager for KDE"; + homepage = https://kmymoney.org/; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 213bdcc784e..329c6fb8105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16476,6 +16476,11 @@ with pkgs; kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { + inherit (kdeApplications) kidentitymanagement; + inherit (kdeFrameworks) kdewebkit; + }; + kodestudio = callPackage ../applications/editors/kodestudio { }; konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; -- GitLab From 9e883426417b5f249a45a3cdb9fdbbd6625f8e08 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 13:53:07 +0200 Subject: [PATCH 144/785] alkimia: Add meta.longDescription @7c6f434c wrote in [1]: Maybe copy-paste the upstream "Alkimia is the infrastructure for common storage and business logic that will be used by all financial applications in KDE. The target is to share financial related information over application bounderies." as longDescription for Alkimia? The current description makes me want to look up the homepage to find out what it actually is (then I do, and despair). [1]: https://github.com/NixOS/nixpkgs/pull/39647#issuecomment-385169261 Signed-off-by: aszlig --- pkgs/development/libraries/alkimia/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index 495c5118e74..6f4fd09015e 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -18,6 +18,13 @@ mkDerivation rec { meta = { description = "Library used by KDE finance applications"; + longDescription = '' + Alkimia is the infrastructure for common storage and business + logic that will be used by all financial applications in KDE. + + The target is to share financial related information over + application bounderies. + ''; license = lib.licenses.lgpl21Plus; platforms = qtbase.meta.platforms; }; -- GitLab From ea5787ad5291ee1c131326cb9c9fec03d359edff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 28 Apr 2018 13:02:20 +0100 Subject: [PATCH 145/785] cups-kyodialog3: use autoPatchelfHook, add missing qt4 --- pkgs/misc/cups/drivers/kyodialog3/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix index bc48b2c8f33..073bd4ccbbf 100644 --- a/pkgs/misc/cups/drivers/kyodialog3/default.nix +++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchzip, cups +{ stdenv, lib, fetchzip, cups, autoPatchelfHook # Can either be "EU" or "Global"; it's unclear what the difference is - , region ? "Global" + , region ? "Global", qt4 }: let @@ -9,19 +9,15 @@ let if stdenv.system == "x86_64-linux" then "64bit" else if stdenv.system == "i686-linux" then "32bit" else throw "Unsupported system: ${stdenv.system}"; - debPlatform = + debPlatform = if platform == "64bit" then "amd64" else "i386"; debRegion = if region == "EU" then "EU." else ""; - - # TODO: add Qt4 for kyodialog3 application - libPath = lib.makeLibraryPath [ cups ]; in stdenv.mkDerivation rec { name = "cups-kyodialog3-${version}"; version = "8.1601"; - dontPatchELF = true; dontStrip = true; src = fetchzip { @@ -29,6 +25,10 @@ stdenv.mkDerivation rec { sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal"; }; + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ cups qt4 ]; + installPhase = '' mkdir -p $out cd $out @@ -49,9 +49,6 @@ stdenv.mkDerivation rec { # prepend $out to all references in ppd and desktop files find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; - - # patchELF all executables - find -type f -executable -exec patchelf --set-rpath ${libPath} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; meta = with lib; { @@ -61,5 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.steveej ]; platforms = platforms.linux; }; - } -- GitLab From 1f34893553398a9c83140958fbe6e656acd785db Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 28 Apr 2018 13:08:52 +0100 Subject: [PATCH 146/785] hyena: fix hyena & pdfmod builds on higher versions of mono Helps with #36711 --- pkgs/development/libraries/hyena/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index edd35bd27e4..f99aa0b6f0c 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build/dll-map-makefile-verifier patchShebangs build/private-icon-theme-installer + substituteInPlace configure --replace lib/mono/2.0/ lib/mono/2.0-api/ find -name Makefile.in | xargs -n 1 -d '\n' sed -e 's/^dnl/#/' -i ''; -- GitLab From 9f2b67d89b10b2f5375e77c976990f87c869d6fd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:27:10 +0200 Subject: [PATCH 147/785] Revert ".version: remove final newline" This reverts commit e109784f84d44cc73abeaa6c96c5a5d5bf9e3e06. --- .editorconfig | 4 ---- .version | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index f5df33889e6..7b40ff1ff56 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,7 +26,3 @@ indent_size = 4 # Match diffs, avoid to trim trailing whitespace [*.{diff,patch}] trim_trailing_whitespace = false - -# https://github.com/NixOS/nixpkgs/pull/39336#discussion_r183387754 -[.version] -insert_final_newline = false diff --git a/.version b/.version index c1b80a50279..770bde1f44b 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -18.09 \ No newline at end of file +18.09 -- GitLab From f66cdc71a3300581501fd953f8e359b7ff824933 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:30:12 +0200 Subject: [PATCH 148/785] osquery: use `stdenv.lib.nixpkgsVersion` This way easier to understand and the officially recommended approach. /cc @dezgeg @fpletz --- pkgs/tools/system/osquery/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 2a719efd79b..b88186a610b 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "nixos;${builtins.readFile "${toString path}/.version"}"; + OSQUERY_PLATFORM = "nixos;${stdenv.lib.nixpkgsVersion}"; src = fetchFromGitHub { owner = "facebook"; -- GitLab From 39909289f452fcd60127cbd2372f22ac35f25d08 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:33:35 +0200 Subject: [PATCH 149/785] lib: deduplicate version/suffix references The logic regarding the generated `.version-suffix` file is already defined in `lib/trivial.nix` and shouldn't be duplicated in `nixos/version`. --- lib/trivial.nix | 9 +++++---- nixos/modules/misc/version.nix | 6 ++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index a928e1dbca9..a6a4abba118 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -58,11 +58,12 @@ rec { inherit (lib.strings) fileContents; + version = fileContents ../.version; + suffix = let suffixFile = ../.version-suffix; in + if pathExists suffixFile then fileContents suffixFile else "pre-git"; + # Return the Nixpkgs version number. - nixpkgsVersion = - let suffixFile = ../.version-suffix; in - fileContents ../.version - + (if pathExists suffixFile then fileContents suffixFile else "pre-git"); + nixpkgsVersion = version + suffix; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index b8f0a223c91..d9d60b72509 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.system.nixos; - releaseFile = "${toString pkgs.path}/.version"; - suffixFile = "${toString pkgs.path}/.version-suffix"; revisionFile = "${toString pkgs.path}/.git-revision"; gitRepo = "${toString pkgs.path}/.git"; gitCommitId = lib.substring 0 7 (commitIdFromGitRepo gitRepo); @@ -25,14 +23,14 @@ in nixos.release = mkOption { readOnly = true; type = types.str; - default = fileContents releaseFile; + default = trivial.version; description = "The NixOS release (e.g. 16.03)."; }; nixos.versionSuffix = mkOption { internal = true; type = types.str; - default = if pathExists suffixFile then fileContents suffixFile else "pre-git"; + default = trivial.suffix; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; -- GitLab From 9274ea390348e17f766732e7fbd335e3bc164954 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 Apr 2018 10:31:05 +0200 Subject: [PATCH 150/785] treewide: rename version attributes As suggested in https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745 the versioning attributes in `lib` should be consistent to `nixos/version` which implicates the following changes: * `lib.trivial.version` -> `lib.trivial.release` * `lib.trivial.suffix` -> `lib.trivial.versionSuffix` * `lib.nixpkgsVersion` -> `lib.version` As `lib.nixpkgsVersion` is referenced several times in `NixOS/nixpkgs`, `NixOS/nix` and probably several user's setups. As the rename will cause a notable impact it's better to keep `lib.nixpkgsVersion` as alias with a warning yielded by `builtins.trace`. --- doc/Makefile | 2 +- doc/default.nix | 2 +- lib/default.nix | 2 +- lib/trivial.nix | 8 +++++--- nixos/doc/manual/release-notes/rl-1809.xml | 5 +++++ nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- nixos/modules/misc/version.nix | 4 ++-- pkgs/tools/system/osquery/default.nix | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 0ddae8631f3..952ef4bfcbb 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -64,7 +64,7 @@ manual-full.xml: ${MD_TARGETS} .version *.xml .version: nix-instantiate --eval \ - -E '(import ../lib).nixpkgsVersion' > .version + -E '(import ../lib).version' > .version %.section.xml: %.section.md pandoc $^ -w docbook+smart \ diff --git a/doc/default.nix b/doc/default.nix index 8abde58bb11..e5be364506f 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -30,7 +30,7 @@ pkgs.stdenv.mkDerivation { ]; postPatch = '' - echo ${lib.nixpkgsVersion} > .version + echo ${lib.version} > .version ''; installPhase = '' diff --git a/lib/default.nix b/lib/default.nix index b3c4fdc0e59..60ce01a93cd 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -58,7 +58,7 @@ let replaceStrings seq stringLength sub substring tail; inherit (trivial) id const concat or and boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info - nixpkgsVersion mod compare splitByAndCompare + nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions diff --git a/lib/trivial.nix b/lib/trivial.nix index a6a4abba118..251cb796db0 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -58,12 +58,14 @@ rec { inherit (lib.strings) fileContents; - version = fileContents ../.version; - suffix = let suffixFile = ../.version-suffix; in + release = fileContents ../.version; + versionSuffix = let suffixFile = ../.version-suffix; in if pathExists suffixFile then fileContents suffixFile else "pre-git"; # Return the Nixpkgs version number. - nixpkgsVersion = version + suffix; + version = release + versionSuffix; + + nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 2e53f0563ba..949dbf0e0c1 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -123,6 +123,11 @@ following incompatible changes: lib.traceCallXml has been deprecated. Please complain if you use the function regularly. + + The attribute lib.nixpkgsVersion has been deprecated in favor of + lib.version. Please refer to the discussion in + NixOS/nixpkgs#39416 for further reference. + diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 347e6b9c6e0..9461144fad5 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -6,7 +6,7 @@ set -e set -o pipefail -version=$(nix-instantiate --eval --strict '' -A lib.nixpkgsVersion | sed s/'"'//g) +version=$(nix-instantiate --eval --strict '' -A lib.version | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index d9d60b72509..74c86443ab9 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -23,14 +23,14 @@ in nixos.release = mkOption { readOnly = true; type = types.str; - default = trivial.version; + default = trivial.release; description = "The NixOS release (e.g. 16.03)."; }; nixos.versionSuffix = mkOption { internal = true; type = types.str; - default = trivial.suffix; + default = trivial.versionSuffix; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index b88186a610b..a0aaa846bc7 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "nixos;${stdenv.lib.nixpkgsVersion}"; + OSQUERY_PLATFORM = "nixos;${stdenv.lib.version}"; src = fetchFromGitHub { owner = "facebook"; -- GitLab From ba1b2ef24386d306409cbf3f95a4a57f796bc3ba Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 28 Apr 2018 15:22:48 +0200 Subject: [PATCH 151/785] makemkv: 1.10.8 -> 1.12.2, switch from qt4 to qt5 --- pkgs/applications/video/makemkv/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index a4b08e1ce47..acc9c88d2ff 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl -, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav +, openssl, qt5, libGLU_combined, zlib, pkgconfig, libav }: stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.10.8"; + ver = "1.12.2"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29"; + sha256 = "0ylybq0776am5yy064b55q0jja1q1p9dscwmn7f1p3igzv15rypj"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7"; + sha256 = "063rgb88zbh4zwysyhjn4awykcnc90qgsx6d8ggm27wy849306v1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [openssl qt4 libGLU_combined zlib libav]; + buildInputs = [openssl qt5.qtbase libGLU_combined zlib libav]; - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ] + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt5.qtbase zlib ] + ":" + stdenv.cc.cc + "/lib64"; meta = with stdenv.lib; { -- GitLab From f8d0c9e3c3b92f8af058b742eb7553d53c3502a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Apr 2018 02:31:07 +0200 Subject: [PATCH 152/785] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/bb8ed19628062fa0afd844771b20ee50a49a1721. --- .../haskell-modules/hackage-packages.nix | 1269 +++++++++++++---- 1 file changed, 1019 insertions(+), 250 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8d25c173d75..8b035359730 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6110,14 +6110,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "GLFW-b_1_4_8_4" = callPackage + "GLFW-b_3_2_1_0" = callPackage ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit , test-framework, test-framework-hunit }: mkDerivation { pname = "GLFW-b"; - version = "1.4.8.4"; - sha256 = "1xww650q80ii9f80v9kpz56lwgd1cirvhqjdca1vq9xs8k30hfd0"; + version = "3.2.1.0"; + sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i"; libraryHaskellDepends = [ base bindings-GLFW deepseq ]; testHaskellDepends = [ base bindings-GLFW deepseq HUnit test-framework @@ -9534,16 +9534,18 @@ self: { }) {}; "Hastodon" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, http-conduit - , http-types, mime-types, MissingH, text + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , exceptions, http-client, http-conduit, http-types, mime-types + , MissingH, resourcet, text, transformers }: mkDerivation { pname = "Hastodon"; - version = "0.3.2"; - sha256 = "0qdq23mg1nszsf3ldbdawdkcmbv18cmny6529k9kwlfq9fhdm83x"; + version = "0.4.0"; + sha256 = "00zq3kzzazqlgbh45xc6py3m23x448af34d4y3z903by79fid79f"; libraryHaskellDepends = [ - aeson base bytestring http-client http-conduit http-types - mime-types MissingH text + aeson attoparsec base bytestring conduit exceptions http-client + http-conduit http-types mime-types MissingH resourcet text + transformers ]; homepage = "https://github.com/syucream/hastodon"; description = "mastodon client module for Haskell"; @@ -14039,14 +14041,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libGL;}; - "OpenGLRaw_3_3_0_0" = callPackage + "OpenGLRaw_3_3_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, libGL , text, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "3.3.0.0"; - sha256 = "145j4fa4vs7x5r6x5i0733qc9aw27ggzax3xpjc7pmibmrkri20p"; + version = "3.3.0.1"; + sha256 = "0jzipa8avnrsw2via8ks012illwg2in27l01y1bp35ci0w2f92fq"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -16596,7 +16598,7 @@ self: { description = "A .NET Bridge for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + }) {inherit (pkgs) glib; mono = null;}; "Saturnin" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, either @@ -21062,6 +21064,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "access-token-provider" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring + , bytestring, containers, exceptions, filepath, http-client + , http-client-tls, http-types, katip, lens, lens-aeson, mtl, random + , safe-exceptions, stm, tasty, tasty-hunit, text, th-format + , transformers, unliftio, unliftio-core, uuid + }: + mkDerivation { + pname = "access-token-provider"; + version = "0.1.0.0"; + sha256 = "03832v0aab3imqim8f6g1r0jj2pfrrca45qnvpkw7ry7krbq5z7q"; + libraryHaskellDepends = [ + aeson aeson-casing base base64-bytestring bytestring containers + exceptions filepath http-client http-client-tls http-types katip + lens lens-aeson mtl random safe-exceptions stm text th-format + transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions http-client http-types + katip lens mtl random safe-exceptions tasty tasty-hunit text + th-format unliftio unliftio-core uuid + ]; + homepage = "https://github.com/mtesseract/access-token-provider#readme"; + description = "Provides Access Token for Services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "accuerr" = callPackage ({ mkDerivation, base, bifunctors, lens, semigroups }: mkDerivation { @@ -30397,8 +30426,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.25"; - sha256 = "0p5pg2ix0ppan0cz4b0pk16ihfcnvqwb8g93k4bh7d304ca5xdk4"; + version = "0.2.0.26"; + sha256 = "14s8bic1kvsigmi5nmjdca6pkh223axygr74nmygjbvwmryfxcxn"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -32479,6 +32508,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backprop_0_1_5_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, criterion, deepseq + , directory, hmatrix, lens, microlens, mnist-idx, mwc-random + , primitive, random, reflection, time, transformers + , type-combinators, vector + }: + mkDerivation { + pname = "backprop"; + version = "0.1.5.2"; + sha256 = "1mb99dwpng07vsaa3vhl6b0kn8ym6qz7i9a0gyj8hafxawbrznfh"; + libraryHaskellDepends = [ + base binary deepseq microlens primitive random reflection + transformers type-combinators vector + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory hmatrix lens mnist-idx + mwc-random time transformers vector + ]; + homepage = "https://github.com/mstksg/backprop#readme"; + description = "Heterogeneous automatic differentation (backpropagation)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -33510,8 +33563,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.1"; - sha256 = "1zjjmz36lxxrxgx449212q878mzavjpwx5jad0lk9ninpas16h5v"; + version = "0.1.0.2"; + sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -33790,6 +33843,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-core_0_7_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty + , tasty-hunit, text, time, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.7.2.1"; + sha256 = "0v9mspr3r7g5n73pgdwipgx2z23cd5g537g8afd1hj22p7d993jw"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri tagged text time vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + homepage = "http://travis.athougies.net/projects/beam.html"; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable @@ -37079,10 +37154,8 @@ self: { ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { pname = "bitwise"; - version = "0.1.1.1"; - sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d"; - revision = "2"; - editedCabalFile = "1dqddxjf4kpb16k51z40qlnl0shw6gmpf1c1ckdn4q8jm61bmlgn"; + version = "1.0.0.1"; + sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -40244,6 +40317,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-little_0_1_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp + , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "bv-little"; + version = "0.1.1"; + sha256 = "153bd5y55scp6qd9q7vnkhp8zwj3qssyr4qy8wpfj8k9xp8xdrk8"; + libraryHaskellDepends = [ + base deepseq hashable integer-gmp mono-traversable primitive + QuickCheck + ]; + testHaskellDepends = [ + base deepseq hashable mono-traversable QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq hashable ]; + homepage = "https://github.com/recursion-ninja/bv-little"; + description = "Efficient little-endian bit vector library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils , prettyclass, QuickCheck, random @@ -43950,11 +44047,11 @@ self: { }: mkDerivation { pname = "cautious"; - version = "0.0.0.0"; - sha256 = "0kr9aipbi95hz97lbidifsfm51rsjlpjgkbvnyiwrh1cckh6q0zw"; + version = "0.1.0.0"; + sha256 = "054n9vy4h4qs208gfi7ryvb40y50pmaxcrslxplk95vg0pvg4k1w"; libraryHaskellDepends = [ - aeson base genvalidity-hspec-aeson hspec hspec-discover QuickCheck - transformers validity + aeson base genvalidity genvalidity-hspec-aeson hspec hspec-discover + QuickCheck transformers validity ]; testHaskellDepends = [ aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson @@ -46113,6 +46210,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cisco-spark-api_0_1_0_3" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 + , bytestring, conduit, data-default, hspec, http-conduit + , http-types, network-uri, optparse-applicative, text, utf8-string + , wai, warp + }: + mkDerivation { + pname = "cisco-spark-api"; + version = "0.1.0.3"; + sha256 = "1fi8cadjszb92yih5ilagay8c9fj4aiwdx2qx1pwdc756jgjm5ky"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bitset-word8 bytestring conduit data-default + http-conduit network-uri text + ]; + executableHaskellDepends = [ + aeson base bytestring conduit data-default http-conduit + optparse-applicative text utf8-string + ]; + testHaskellDepends = [ + aeson async attoparsec base bytestring conduit data-default hspec + http-conduit http-types network-uri text wai warp + ]; + homepage = "https://github.com/nshimaza/webex-teams-api#readme"; + description = "A Haskell bindings for Webex Teams API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "citation-resolve" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers , curl, data-default, directory, doctest, download-curl, either @@ -47279,8 +47406,8 @@ self: { }: mkDerivation { pname = "clifm"; - version = "0.3.1.0"; - sha256 = "17kd2cfxc9dswlqv141f2anc0g19xhj9w5mk3xicx7vyr6j43y0y"; + version = "0.4.1.0"; + sha256 = "0q0m662sg4n2k9lgx82d72gi16widm74a7j08psnjmwhk55ir3cb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47681,7 +47808,7 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + }) {inherit (pkgs) glib; mono = null;}; "clr-inline" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive @@ -50120,12 +50247,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_4_0_1" = callPackage + "composition-prelude_1_4_0_3" = callPackage ({ mkDerivation, base, cpphs }: mkDerivation { pname = "composition-prelude"; - version = "1.4.0.1"; - sha256 = "172fnixh4jgmwfsaxg0fyji0i745pbjwk00l3yh5pwng9swzi6ik"; + version = "1.4.0.3"; + sha256 = "0vzd71yqnbx5pk4yvan1sbjdgg3b7k476jiyr36pjyi1ysdm13qj"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ cpphs ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; @@ -54102,8 +54229,8 @@ self: { }: mkDerivation { pname = "crc"; - version = "0.0.1.1"; - sha256 = "1swn00ksnqkqfjh1q9ck8zd5y9vb2yaf7rsxyy9i47d8p93m5g74"; + version = "0.1.0.0"; + sha256 = "0cvyzw1c63s1cbs9ypa5xxj7kjl57v0ggkxsxncnl7sqlkpn6s74"; libraryHaskellDepends = [ base bytestring vector ]; testHaskellDepends = [ base bytestring conduit conduit-extra resourcet tasty tasty-golden @@ -54806,6 +54933,8 @@ self: { pname = "crypto-enigma"; version = "0.0.2.11"; sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1"; + revision = "1"; + editedCabalFile = "1wh09ma0xr8lgj0a2ybp6kxisi36cl2kiqz2akhy915v6gpkjkyz"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -54813,6 +54942,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-enigma_0_0_2_12" = callPackage + ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck + , split + }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.0.2.12"; + sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b"; + libraryHaskellDepends = [ base containers MissingH mtl split ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + homepage = "https://github.com/orome/crypto-enigma-hs"; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "crypto-multihash" = callPackage ({ mkDerivation, base, base58-bytestring, bytestring, containers , cryptonite, hspec, memory, QuickCheck, string-conversions @@ -55473,8 +55618,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.1"; - sha256 = "117ih5cssflaa7mvg4a4vz5sfsylivb8n0ri90211pml3d5idwpf"; + version = "0.7.2"; + sha256 = "0c16h2m8zkpyjbclvqpd8kq46ciw6qwc94d6v2d66c3g0ixx53vx"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -55491,8 +55636,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.3.1"; - sha256 = "0fwzsmb9syk144d445cw1d9pjx3vn18pxi161yafv2q7q4m57i3g"; + version = "5.3.2"; + sha256 = "1v3ssy2rfgwz9wwv8kmaifyrphyl5w66p9zmrg1bi0vbzwxnr57q"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -55509,8 +55654,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.2"; - sha256 = "1h827ijkwa5fyg1jphaa19fr4wxs5l76m89xl44989jnb7blbkcd"; + version = "0.3.3"; + sha256 = "0k4pk96cx2f6rhz18mrdkkz7ic2fdzpqkxf1x596990az7pjg7g3"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse hashable transformers wl-pprint @@ -55543,8 +55688,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.1.0"; - sha256 = "0w591ij97i1kkv2z5fix8zlvw9shagxq6lpkic71ldpvv1a4cf8q"; + version = "0.2.2.0"; + sha256 = "19cplqpyd7vhn28z0k8mxmscja05w9xb8q4bbvq5qd0h8liqxsqg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -55560,8 +55705,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.8.1"; - sha256 = "15k5in43w4ivkzi6qs5z19fh3pd2fg5ih1dyd1vk736lawlivx20"; + version = "0.0.9.0"; + sha256 = "0vvsqbnd1yjwijz4g0y9av6d20m73b5swln4v7gna3jd16mrg2k1"; libraryHaskellDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -66066,8 +66211,8 @@ self: { }: mkDerivation { pname = "dtab"; - version = "1.0.0.1"; - sha256 = "0sg0pf8nsy4fdx8gqpqv6k29v01gz4bq5y1id28v9j8rj0mgv5nn"; + version = "1.1"; + sha256 = "18h4876saf2f8k052qf76j5w89x7nay12nlf7hc5dkwf4c9y5hq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66077,7 +66222,7 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring ]; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -66376,6 +66521,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "duration" = callPackage + ({ mkDerivation, base, doctest, hspec, parsec, template-haskell + , time + }: + mkDerivation { + pname = "duration"; + version = "0.1.0.0"; + sha256 = "18qjn97njhra7brps58rl44vyc0hmfc83prgm519q7dyf3159cd0"; + libraryHaskellDepends = [ base parsec template-haskell time ]; + testHaskellDepends = [ + base doctest hspec parsec template-haskell time + ]; + homepage = "https://github.com/ryota-ka/duration#readme"; + description = "A tiny compile-time time utility library inspired by zeit/ms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dustme" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, async, attoparsec , base, bytestring, containers, deepseq, extra, hashable, hspec @@ -69658,6 +69820,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eq_4_2" = callPackage + ({ mkDerivation, base, semigroupoids }: + mkDerivation { + pname = "eq"; + version = "4.2"; + sha256 = "1s3h77i0h4z3dg97sqqjl027rz0k82h48cpzp0c7a75g0qx70q21"; + libraryHaskellDepends = [ base semigroupoids ]; + homepage = "http://github.com/ekmett/eq/"; + description = "Leibnizian equality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "equal-files" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, filemanip , transformers, utility-ht @@ -70263,8 +70438,8 @@ self: { }: mkDerivation { pname = "etc"; - version = "0.3.1.0"; - sha256 = "0l938jhlx1jgb46b9ykdc741r0v7wkklrc1ga5v81r3b52civb1c"; + version = "0.3.2.0"; + sha256 = "1j4qjw1hqw5q9i47ixiwcr3zpcs1x39l46mh5yii5xkqmwlw9gk0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base hashable rio text typed-process unliftio @@ -71803,8 +71978,8 @@ self: { }: mkDerivation { pname = "expiring-containers"; - version = "0.1.0.2"; - sha256 = "006n6zwdgrdh0717wd85kwxrbpv3fl5srbc77acglms41pcn72yz"; + version = "0.1.1.1"; + sha256 = "0v35m5bl6y5l4m8gfs6wrcs0pqmgk52aaa261jg92jkvhji21ki5"; libraryHaskellDepends = [ base containers hashable int-multimap time timestamp unordered-containers @@ -72539,8 +72714,8 @@ self: { }: mkDerivation { pname = "fake"; - version = "0.1.1"; - sha256 = "0xp737s8067bynh03d6zhi8w71pl1q8mrk5si80mykn401dzw7ir"; + version = "0.1.1.1"; + sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -77645,6 +77820,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_0_2" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers + , distributive, exceptions, mtl, profunctors, semigroupoids + , semigroups, template-haskell, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "free"; + version = "5.0.2"; + sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg"; + libraryHaskellDepends = [ + base bifunctors comonad containers distributive exceptions mtl + profunctors semigroupoids semigroups template-haskell transformers + transformers-base transformers-compat + ]; + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-concurrent" = callPackage ({ mkDerivation, base, type-aligned }: mkDerivation { @@ -78221,6 +78417,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "friendly" = callPackage + ({ mkDerivation, base, bifunctors, lens, optparse-applicative }: + mkDerivation { + pname = "friendly"; + version = "0.1.0.0"; + sha256 = "0ikbfki5yvagc3xjbqwmzzp29idfviaylnan6cr39kna6fc8ajgx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bifunctors lens optparse-applicative + ]; + description = "Attempt to pretty-print any input"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "friendly-time" = callPackage ({ mkDerivation, base, hspec, old-locale, time }: mkDerivation { @@ -84458,8 +84669,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180409"; - sha256 = "05cwyh3x432k3czrd59py0jsvl3qjg8ky7nc0rxkw6pbzwpgcb8c"; + version = "6.20180427"; + sha256 = "0pjdb0mk5hmjl0sra37ap3cr5xp9pa7fyikqmz4156hzk925rrds"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -85488,6 +85699,8 @@ self: { pname = "gl"; version = "0.8.0"; sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda"; + revision = "1"; + editedCabalFile = "17m5vagiq1v7zg6409f56qqy28jd0xp13yk44s661rcwj0f4pd14"; setupHaskellDepends = [ base Cabal containers directory filepath hxt transformers ]; @@ -86421,8 +86634,8 @@ self: { ({ mkDerivation, base, gmp, recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.11"; - sha256 = "00sml2d5jbfc0qy0nvrmk9xv31zk66anzz5r4d7h049asq0zh20n"; + version = "0.1.0.12"; + sha256 = "0l3qd8hps55am4ddj4x83f0vyi1rwhh7gj36k465n4m1pz7ndxrx"; libraryHaskellDepends = [ base recursion-schemes ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; @@ -88350,19 +88563,22 @@ self: { }) {}; "google-oauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, http-conduit - , http-types, load-env + ({ mkDerivation, base, bytestring, hoauth2, hspec, http-client-tls + , http-conduit, load-env, safe-exceptions, text, transformers + , uri-bytestring }: mkDerivation { pname = "google-oauth2"; - version = "0.2.2"; - sha256 = "0n408kh48d7ky09j9zw9ad4mhbv1v7gq6i3ya4f6fhkjqqgw8c1j"; + version = "0.3.0.0"; + sha256 = "119p792prspir2vxk53jzkr90rava2qnixr1jkbmx5si63h9l01z"; libraryHaskellDepends = [ - aeson base bytestring HTTP http-conduit + base bytestring hoauth2 http-client-tls safe-exceptions text + transformers uri-bytestring ]; testHaskellDepends = [ - base bytestring hspec http-conduit http-types load-env + base bytestring hoauth2 hspec http-conduit load-env text ]; + homepage = "https://github.com/pbrisbin/google-oauth2#readme"; description = "Google OAuth2 token negotiation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -90710,19 +90926,19 @@ self: { "gtk-sni-tray" = callPackage ({ mkDerivation, base, bytestring, containers, dbus, directory , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut - , gtk3, hslogger, optparse-applicative, status-notifier-item, text - , transformers, unix + , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative + , status-notifier-item, text, transformers, unix }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.0.0"; - sha256 = "0a9yxhir33zg1bkv9nyazkrjawv2w9qr43n4prrifib7r976b7pj"; + version = "0.1.1.0"; + sha256 = "16wif6b94ipw49810jyjgl6h8mhx7bkz0pkl8ri6ir9ljp0mnvp0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk - gi-gdkpixbuf gi-glib gi-gtk hslogger status-notifier-item text - transformers unix + gi-gdkpixbuf gi-glib gi-gtk gtk-strut haskell-gi haskell-gi-base + hslogger status-notifier-item text transformers unix ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ @@ -91539,6 +91755,58 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hOpenPGP_2_6_1" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-conduit, bytestring, bzlib, conduit, conduit-extra + , containers, criterion, crypto-cipher-types, cryptonite + , data-default-class, errors, hashable, incremental-parser + , ixset-typed, lens, memory, monad-loops, nettle, network + , network-uri, newtype, openpgp-asciiarmor, QuickCheck + , quickcheck-instances, resourcet, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers + , wl-pprint-extras, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.6.1"; + sha256 = "1al531lrsgfsqjc21117l420pcd7ymv4vdzywka189lkd8p5yzj7"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-conduit bytestring bzlib + conduit conduit-extra containers crypto-cipher-types cryptonite + data-default-class errors hashable incremental-parser ixset-typed + lens memory monad-loops nettle network-uri newtype + openpgp-asciiarmor resourcet semigroups split text time + time-locale-compat transformers unliftio-core unordered-containers + wl-pprint-extras zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype QuickCheck quickcheck-instances + resourcet semigroups split tasty tasty-hunit tasty-quickcheck text + time time-locale-compat transformers unliftio-core + unordered-containers wl-pprint-extras zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bifunctors binary + binary-conduit bytestring bzlib conduit conduit-extra containers + criterion crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype openpgp-asciiarmor resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers wl-pprint-extras zlib + ]; + homepage = "https://salsa.debian.org/clint/hOpenPGP"; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB" = callPackage ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel @@ -96896,8 +97164,8 @@ self: { }: mkDerivation { pname = "haskell-igraph"; - version = "0.4.0"; - sha256 = "19bhfcrfj4jxd6znqzslax6sd4w1icwp4rn3h0w31qpjv54x171f"; + version = "0.5.0"; + sha256 = "1hil0zl4pnvkh0ingp0bgi0m7mhmvf1pqr7qskjxm6pa9kqybrw9"; libraryHaskellDepends = [ base bytestring bytestring-lexing cereal cereal-conduit colour conduit data-default-class hashable hxt primitive split @@ -96920,8 +97188,8 @@ self: { }: mkDerivation { pname = "haskell-import-graph"; - version = "1.0.3"; - sha256 = "1fh3nn4hqcj6lc3m1zlxykxk2dbchh3cdz63k8zfpl7dr2d91132"; + version = "1.0.4"; + sha256 = "17ac5k98aqx77lq398kgvyiylpmkvxdmxzqbh7wk1fl9kphwsdm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106808,8 +107076,8 @@ self: { pname = "hoist-error"; version = "0.1.0.2"; sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; - revision = "2"; - editedCabalFile = "0yg8w9cy4qff8hkv0057qqwiapfhh2sxx43j64wgdp8vb8jar97w"; + revision = "3"; + editedCabalFile = "1f2znb9x4f4m8h3d66pdyi7fqjr6v120mjqswj40dy7p2wmd6dm6"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -108425,18 +108693,20 @@ self: { }) {}; "hpc-threshold" = callPackage - ({ mkDerivation, base, bytestring, interpolate, pcre-heavy }: + ({ mkDerivation, base, bytestring, deepseq, hspec, interpolate + , pcre-heavy + }: mkDerivation { pname = "hpc-threshold"; - version = "0.1.0.0"; - sha256 = "113m7fpm4zffvzwnqjzd45mbc18acgj5c1b9z5hqwklygjjjpx4a"; + version = "0.1.0.3"; + sha256 = "0f16iq5d6d865ifg9lwbli16p5svzy3hjp05fkivqnl3p7hmd297"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring interpolate pcre-heavy ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base deepseq hspec ]; homepage = "https://github.com/eckyputrady/hpc-threshold#readme"; - description = "Small utility for validating whether HPC result is above defined thresholds"; + description = "Ensure the code coverage is above configured thresholds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -109376,23 +109646,24 @@ self: { "hs-multiaddr" = callPackage ({ mkDerivation, base, bytes, bytestring, cereal, either-unwrap - , filepath, hspec, iproute, multihash, sandi + , filepath, hs-multihash, hspec, iproute, sandi }: mkDerivation { pname = "hs-multiaddr"; - version = "0.1.0.1"; - sha256 = "0bac505a3fvz46zbh60vl0m6jj5snjbmj925vxhv6bpdydidi8hw"; + version = "0.1.4"; + sha256 = "0vmyqrgrw1fqm26mgb1bwdivv5iwgypb5186awva665gvp8p30ib"; libraryHaskellDepends = [ - base bytes bytestring cereal filepath iproute multihash sandi + base bytes bytestring cereal filepath hs-multihash iproute sandi ]; testHaskellDepends = [ - base bytestring either-unwrap hspec iproute multihash sandi + base bytestring either-unwrap hs-multihash hspec iproute sandi ]; - homepage = "https://github.com/MatrixAI/haskell-multiaddr#readme"; - description = "Multiaddr Library for LibP2P"; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/MatrixAI/hs-multiaddr#readme"; + description = "Multiaddr library"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {hs-multihash = null;}; "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: @@ -113682,8 +113953,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.1.0.3"; - sha256 = "0bzja2n7hxj530d3pfh58zn29vapl341fy7x6ggvp5sfgsysg7ll"; + version = "1.1.0.4"; + sha256 = "03ffmff09k6aqpd9rv41bfi566pr6hk4vdjm0my2wfypbn2mrgb0"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -114591,6 +114862,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http-reverse-proxy_0_6_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , conduit, conduit-extra, containers, hspec, http-client + , http-conduit, http-types, network, resourcet, streaming-commons + , text, transformers, unliftio, wai, wai-logger, warp, word8 + }: + mkDerivation { + pname = "http-reverse-proxy"; + version = "0.6.0"; + sha256 = "1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive conduit + conduit-extra containers http-client http-types network resourcet + streaming-commons text transformers unliftio wai wai-logger word8 + ]; + testHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra hspec + http-conduit http-types network resourcet streaming-commons + transformers unliftio wai warp + ]; + homepage = "https://github.com/fpco/http-reverse-proxy"; + description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -115502,6 +115799,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hvega" = callPackage + ({ mkDerivation, aeson, base, text, vector }: + mkDerivation { + pname = "hvega"; + version = "0.1.0.0"; + sha256 = "14czd3qhji2aq4x23v0a1fhschnq1azd8spiar9pw5z12z4n9j1l"; + libraryHaskellDepends = [ aeson base text vector ]; + homepage = "https://github.com/DougBurke/hvega"; + description = "Create Vega and Vega-Lite visualizations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-balancedparens" = callPackage ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector @@ -115812,17 +116121,16 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, temporary, transformers - , unix + , either, hspec, monad-loops, rdkafka, transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.4.3"; - sha256 = "18pyayl0xyb045db5584cfbbvzvmkwm3zkpvks30vrz9sb5jx1qd"; + version = "2.4.4"; + sha256 = "1zw35ikrp0r07rvnm3fah3p9xj8h8bw2h4nwv94ih1ff2ab2glhf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors bytestring containers temporary transformers unix + base bifunctors bytestring containers transformers unix ]; librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; @@ -118320,6 +118628,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell-hvega" = callPackage + ({ mkDerivation, aeson, base, hvega, ihaskell, text }: + mkDerivation { + pname = "ihaskell-hvega"; + version = "0.1.0.0"; + sha256 = "0fwn0c7v5g67gkrzq7k3myy3cxk5b176svzcgaidfs7ckl3hbsnm"; + libraryHaskellDepends = [ aeson base hvega ihaskell text ]; + homepage = "https://github.com/githubuser/ihaskell-hvega#readme"; + description = "IHaskell display instance for hvega types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ihaskell-inline-r" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , filepath, ihaskell, ihaskell-blaze, inline-r, template-haskell @@ -119279,6 +119599,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "incremental-parser_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.3.1"; + sha256 = "1nygr5hs547innw9f5wx8ifpkiq01ckbhx34266ds6rmnjsqxzby"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + homepage = "https://github.com/blamario/incremental-parser"; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -120305,8 +120646,8 @@ self: { }: mkDerivation { pname = "int-multimap"; - version = "0.1.0.1"; - sha256 = "0xi0n9hhra6pzqnxahf109qgifxnsgvc9v9jl0qmnxzz5yki1pvg"; + version = "0.2"; + sha256 = "17hwqly7v5224fddan9nkywv4pp478nby7iswaj32x27qwn9p11f"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -120525,8 +120866,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.30"; - sha256 = "0axjmswi9jgyd9kkhyjwbviqbh693vvki4hvwcg7rq6dsgl0lgk8"; + version = "0.1.31"; + sha256 = "0d6pc7mza12889wbzxy7gb5fb86v3b5pm2cdvcvnh6gd6x4ii336"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -125661,6 +126002,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-kafka" = callPackage + ({ mkDerivation, aeson, base, bytestring, hw-kafka-client, katip }: + mkDerivation { + pname = "katip-kafka"; + version = "0.0.1"; + sha256 = "1w5w3sccvh1rl0zd69k0nya0bbf9jwi9ahb7q1c761jq5333gv8q"; + libraryHaskellDepends = [ + aeson base bytestring hw-kafka-client katip + ]; + homepage = "https://github.com/s9gf4ult/katip-kafka"; + description = "Katip scribe to send logs to Kafka"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "katip-rollbar" = callPackage ({ mkDerivation, aeson, async, base, hostname, http-client, katip , rollbar-hs, stm-chans, text, time @@ -128154,8 +128509,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.8"; - sha256 = "0609xpjcq294ypjq4blw1cb3a6jnjzm9gwzr54dnp3afhindbq3m"; + version = "1.2.0.9"; + sha256 = "0narp1zhvyannd627bafh6yhk8y5lfw6f5nqr9wi1qvbynmlmhmg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -130767,8 +131122,8 @@ self: { }: mkDerivation { pname = "lens-utils"; - version = "1.4.4"; - sha256 = "0ry04ghvbyxa236s150hfs5fa0fsip312ivflg70j49n02ypxr91"; + version = "1.4.5"; + sha256 = "00xcwyl12w95k14rc12ww2i0kgbrv39q1lvq5kfj3z7l5hv4fg0g"; libraryHaskellDepends = [ aeson base containers data-default lens monoid split template-haskell @@ -137885,6 +138240,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mapalgebra" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, deepseq, hmatrix, HUnit-approx, massiv, massiv-io + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "mapalgebra"; + version = "0.1.0"; + sha256 = "1d4cdwkrbvkh53h3vkzghikmbnba3x1j84r0wgsc90cnr2im5san"; + libraryHaskellDepends = [ + base bytestring containers data-default deepseq hmatrix massiv + massiv-io vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq hmatrix + HUnit-approx massiv massiv-io QuickCheck tasty tasty-hunit + tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default deepseq hmatrix + massiv massiv-io vector + ]; + homepage = "https://github.com/fosskers/mapalgebra"; + description = "Efficient, polymorphic Map Algebra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mappy" = callPackage ({ mkDerivation, ansi-terminal, base, containers, directory , haskeline, hspec, parsec, QuickCheck @@ -137930,10 +138312,11 @@ self: { ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "marihana"; - version = "0.2.1.0"; - sha256 = "03aw0chicgmyj3ix7nz0dc5mpck0409bv1d7lfs5wn9z4mmynqiv"; + version = "0.2.2.0"; + sha256 = "0xg2ldcm01b352zjv9rh0vvdbhxbcwfvi8464ymh4ms8nh3x4hb6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath process ]; executableHaskellDepends = [ base directory filepath process ]; testHaskellDepends = [ base directory filepath process ]; @@ -138759,26 +139142,27 @@ self: { , config-ini, connection, containers, directory, filepath, gitrev , hashable, Hclip, mattermost-api, mattermost-api-qc , microlens-platform, mtl, process, quickcheck-text, semigroups - , skylighting, stm, stm-delay, strict, string-conversions, tasty - , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time - , timezone-olson, timezone-series, transformers, Unique, unix - , unordered-containers, utf8-string, vector, vty, word-wrap - , xdg-basedir + , skylighting-core, stm, stm-delay, strict, string-conversions + , tasty, tasty-hunit, tasty-quickcheck, temporary, text + , text-zipper, time, timezone-olson, timezone-series, transformers + , Unique, unix, unordered-containers, utf8-string, vector, vty + , word-wrap, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40800.0.2"; - sha256 = "0fgk0my3r0vcw545xqjcda8ikj5cbfzgg9vxfs3jzdcnsa0rgcyf"; + version = "40900.0.1"; + sha256 = "1ygnh27dv5hprb5fqqxwjxsf43ik784pwdagndn3sdiddy2k3yf7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers directory filepath gitrev hashable Hclip mattermost-api microlens-platform - mtl process semigroups skylighting stm stm-delay strict temporary - text text-zipper time timezone-olson timezone-series transformers - unix unordered-containers utf8-string vector vty word-wrap - xdg-basedir + mtl process semigroups skylighting-core stm stm-delay strict + temporary text text-zipper time timezone-olson timezone-series + transformers unix unordered-containers utf8-string vector vty + word-wrap xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -138803,8 +139187,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40800.0.2"; - sha256 = "1l2yb9nvy2haw5kyjjij465g45w8xm8vm97jbkx5jb3p4cs44xl8"; + version = "40900.1.0"; + sha256 = "1ngpinpal50s8bizwvnpafx6zh8zqb7m0yc21lcp7ybh4yhwikad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138828,8 +139212,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40800.0.2"; - sha256 = "04whpcbcd5cqnwfrskk3r2gjmyvap2m7d8xsjdry56kil6iqznk5"; + version = "40900.1.0"; + sha256 = "0mdwi6130hz508bxbhriyg7fr6rqpbalmjwwizvj9nb7cz1dmrsl"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -141043,26 +141427,25 @@ self: { }) {}; "mighttpd2" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , byteorder, bytestring, case-insensitive, conduit, conduit-extra - , directory, filepath, hspec, http-client, http-date, http-types - , io-choice, network, old-locale, parsec, resourcet - , streaming-commons, time, transformers, unix, unix-time - , unordered-containers, wai, wai-app-file-cgi, wai-http2-extra - , wai-logger, warp + ({ mkDerivation, array, async, auto-update, base, byteorder + , bytestring, case-insensitive, conduit, conduit-extra, directory + , filepath, hspec, http-client, http-date, http-types, io-choice + , network, old-locale, parsec, resourcet, streaming-commons, time + , transformers, unix, unix-time, unordered-containers, wai + , wai-app-file-cgi, wai-http2-extra, wai-logger, warp }: mkDerivation { pname = "mighttpd2"; - version = "3.4.2"; - sha256 = "0a5i9cs0rjap7i4gyda6dgglckn3ys0ldl0qkvnxvm87bcyyfc3k"; + version = "3.4.3"; + sha256 = "0afa25kaagdznfg1kbm5hbmlfk75p7rws0x9fjb505wrr12jipbh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async auto-update base blaze-builder byteorder bytestring - case-insensitive conduit conduit-extra directory filepath http-date - http-types io-choice network parsec resourcet streaming-commons - unix unix-time unordered-containers wai wai-app-file-cgi warp + array async auto-update base byteorder bytestring case-insensitive + conduit conduit-extra directory filepath http-date http-types + io-choice network parsec resourcet streaming-commons unix unix-time + unordered-containers wai wai-app-file-cgi warp ]; executableHaskellDepends = [ base bytestring conduit-extra directory filepath http-client @@ -151074,8 +151457,8 @@ self: { pname = "np-extras"; version = "0.3.1.1"; sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; - revision = "1"; - editedCabalFile = "1m4sfcpb9dcawckfk6nb2qib402s958zjgspd4svxrzdyaqqg4i3"; + revision = "2"; + editedCabalFile = "01jp7y4lsdxlfrbi5vqsc5iyjzzc996w7g88amkkfg5k6amlxb9r"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -155493,7 +155876,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_1_3" = callPackage + "pandoc_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , Cabal, case-insensitive, cmark-gfm, containers, criterion @@ -155508,8 +155891,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.1.3"; - sha256 = "023h0jdn996q37p8b5wdi1hifq17drrwbfq92c6imxwk2a4rl3jf"; + version = "2.2"; + sha256 = "0sc51sw7g9jni9jamj7rcdn9fqf5476gzp7cahhkjj29xak88a8g"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -155579,6 +155962,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_14_3_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat + , bytestring, Cabal, containers, data-default, directory, filepath + , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec + , process, rfc5051, setenv, split, syb, tagsoup, temporary, text + , time, unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.14.3.1"; + sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers data-default directory + filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec + rfc5051 setenv split syb tagsoup text time unordered-containers + vector xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base base-compat bytestring filepath + pandoc pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base base-compat bytestring containers directory filepath mtl + pandoc pandoc-types process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -157554,8 +157973,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.6.1.0"; - sha256 = "1i6vql76j5439bwdd1z7haphgm4x82rh08s22fc70hmfzkrln733"; + version = "0.6.1.1"; + sha256 = "153d2ij27jjsh0h014d1v3y06diri1njbmwzvq2kgwdbdqgkhf0y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158556,8 +158975,8 @@ self: { }: mkDerivation { pname = "pedersen-commitment"; - version = "0.1.0"; - sha256 = "10flwinxxs1vg2giqqyazcgxrykqsj6m0kgd62b8f4wzmygws4r1"; + version = "0.2.0"; + sha256 = "1dxh20abilyf29jg6dbl9al300v7wzd1avv36p4hf8x2xwvwr4v7"; libraryHaskellDepends = [ base bytestring containers cryptonite memory mtl protolude text ]; @@ -158567,7 +158986,7 @@ self: { ]; homepage = "https://github.com/adjoint-io/pedersen-commitment#readme"; description = "An implementation of Pedersen commitment schemes"; - license = stdenv.lib.licenses.asl20; + license = stdenv.lib.licenses.mit; }) {}; "peg" = callPackage @@ -158946,6 +159365,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perhaps" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, mtl + , transformers, transformers-compat + }: + mkDerivation { + pname = "perhaps"; + version = "0"; + sha256 = "16bm069pqrdsbscyp9m1r7cciqppkvlmgn4xgzp3yyfh69z095gn"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/perhaps/"; + description = "Perhaps, a monad"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "period" = callPackage ({ mkDerivation, base, hspec, HUnit, old-locale , optparse-applicative, parsec, text, text-show, time @@ -159077,6 +159514,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-types-HDBC-pg_0_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, convertible, dlist, HDBC + , persistable-record, relational-query, relational-query-HDBC + , text-postgresql + }: + mkDerivation { + pname = "persistable-types-HDBC-pg"; + version = "0.0.3.1"; + sha256 = "1dmvwr21q5g15v50b5ycnyvqbrfg75pw5kdvmi4sp03yldk0fsdc"; + libraryHaskellDepends = [ + base bytestring convertible dlist HDBC persistable-record + relational-query relational-query-HDBC text-postgresql + ]; + testHaskellDepends = [ + base relational-query relational-query-HDBC text-postgresql + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "HDBC and Relational-Record instances of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -165616,6 +166075,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-relative-time" = callPackage + ({ mkDerivation, base, genvalidity-hspec, genvalidity-time, hspec + , QuickCheck, time, validity, validity-time + }: + mkDerivation { + pname = "pretty-relative-time"; + version = "0.0.0.0"; + sha256 = "0k28jh5mw5qfw4d1hfdj2f53qwmn3apy1yxwyxjbr50m2924j8f2"; + libraryHaskellDepends = [ base time validity validity-time ]; + testHaskellDepends = [ + base genvalidity-hspec genvalidity-time hspec QuickCheck time + validity validity-time + ]; + homepage = "https://github.com/NorfairKing/pretty-relative-time#readme"; + description = "Pretty relative time"; + license = stdenv.lib.licenses.mit; + }) {}; + "pretty-show" = callPackage ({ mkDerivation, array, base, filepath, ghc-prim, happy , haskell-lexer, pretty @@ -168063,6 +168540,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20180426" = callPackage + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20180426"; + sha256 = "0pfxsh2ds3dwm6mq6g85vhq8rdgc93bn84pq1b4lk3sf71sqs2ii"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion random ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -171981,8 +172475,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.0.8"; - sha256 = "05rad5dckya26mai39623n5bvhvk13yjxikrc6r7yc6nvlkkh8zb"; + version = "4.0.9"; + sha256 = "0wz36zclpckkm8w7mmdzbklrr08ggyqsk7j4wfxbh4gxa0ry7yj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179148,16 +179642,16 @@ self: { }: mkDerivation { pname = "runmany"; - version = "0.1.2"; - sha256 = "1c672mxmgw3d7r3fbnjm9i7b74v00xrf95riwl2a52a1lpkmb0ip"; + version = "0.1.3"; + sha256 = "19pgmq009f5kpsilixbnsx5frl9c12v6in0blifandr9q3n9is9c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ async base bytestring optparse-applicative process stm ]; - homepage = "https://github.com/jwiegley/runmany"; + homepage = "https://github.com/jwiegley/runmany#readme"; description = "Run multiple commands, interleaving output and errors"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -185009,8 +185503,8 @@ self: { }: mkDerivation { pname = "servant-tracing"; - version = "0.1.0.1"; - sha256 = "0dff51fywa1z1png1hhwpn4f8av2jxdsplin8h80aad459czaid2"; + version = "0.1.0.2"; + sha256 = "0qpamaf3ydfb8197iz2prjh9nxwxi03cdfsp3jl28rhbqrc2xpry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188224,16 +188718,16 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-discover + ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.1"; - sha256 = "17nvwph2g5xzi8lqgyrsbskdm9flwr7h3ch7yf4rnbx3bg37bvsh"; + version = "0.4.0.2"; + sha256 = "0zqy3ffndyvz97wfs0ha0d5j6045gfdh0p6rmz6dv87j9mqmfpl0"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ - base doctest doctest-discover tasty tasty-quickcheck + base doctest doctest-driver-gen tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/dzhus/simple-vec3#readme"; @@ -188931,6 +189425,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skeletal-set" = callPackage + ({ mkDerivation, base, containers, mtl, smallcheck, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "skeletal-set"; + version = "0.1.0.0"; + sha256 = "0f8mc705bk6nc6l95y65fvcxi772fwvqy3cgm0sb3rv13h4rn468"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers mtl smallcheck tasty tasty-discover tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + description = "Skeletal set - a set with equivalence relation different from equality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "skeleton" = callPackage ({ mkDerivation, argparser, attoparsec, base, bytestring, filepath , hex, posix-escape, process, time @@ -192105,6 +192616,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sorted-list_0_2_1_0" = callPackage + ({ mkDerivation, base, criterion, deepseq }: + mkDerivation { + pname = "sorted-list"; + version = "0.2.1.0"; + sha256 = "1x2ygkh32q2kk5g7b7hnrl8z8azvgwsj36f3ndg79pzhghapdr5l"; + libraryHaskellDepends = [ base deepseq ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; + description = "Type-enforced sorted lists and related functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sorting" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -192779,6 +193304,8 @@ self: { pname = "species"; version = "0.4.0.1"; sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; + revision = "1"; + editedCabalFile = "1pvk34n7lsbpng9b6m6nrhhr44z1pilh292j3lfnx69hvxhvaq93"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -194223,86 +194750,82 @@ self: { "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base64-bytestring, bindings-uname - , blaze-builder, bytestring, Cabal, clock, conduit, conduit-extra - , containers, cryptonite, cryptonite-conduit, deepseq, directory - , echo, exceptions, extra, fast-logger, file-embed, filelock - , filepath, fsnotify, generic-deriving, gitrev, hackage-security - , hashable, hastache, hpack, hpc, hspec, http-client - , http-client-tls, http-conduit, http-types, memory, microlens - , microlens-mtl, mintty, monad-logger, mono-traversable, mtl + , attoparsec, base, base64-bytestring, bindings-uname, bytestring + , Cabal, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, deepseq, directory, echo, exceptions, extra + , file-embed, filelock, filepath, fsnotify, generic-deriving + , gitrev, hackage-security, hashable, hpack, hpc, hspec + , http-client, http-client-tls, http-conduit, http-types, memory + , microlens, mintty, monad-logger, mono-traversable, mtl, mustache , neat-interpolation, network-uri, open-browser , optparse-applicative, optparse-simple, path, path-io, persistent - , persistent-sqlite, persistent-template, pid1, pretty, primitive + , persistent-sqlite, persistent-template, pretty, primitive , process, project-template, QuickCheck, regex-applicative-text - , resourcet, retry, semigroups, smallcheck, split, stm, store + , resourcet, retry, rio, semigroups, smallcheck, split, stm, store , store-core, streaming-commons, tar, template-haskell, temporary , text, text-metrics, th-reify-many, time, tls, transformers - , unicode-transforms, unix, unix-compat, unliftio + , typed-process, unicode-transforms, unix, unix-compat, unliftio , unordered-containers, vector, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.6.5"; - sha256 = "0f5a0znxwmib03vhqkw0yiv89a82z43wlm7zwfyx30gfz6iqqp7f"; + version = "1.7.1"; + sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r"; revision = "1"; - editedCabalFile = "11bmzlf3gxbz2gij0l2999a296z4c12l27f7jfyfka8l1k15d6b1"; + editedCabalFile = "12ym80mwlvg3zwbjhmby4k467hxa0yip0314w658ivn0sq6vgycw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - hackage-security hashable hastache hpack hpc http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving hackage-security hashable hpack hpc + http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template pid1 + path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template regex-applicative-text - resourcet retry semigroups split stm store store-core + resourcet retry rio semigroups split stm store store-core streaming-commons tar template-haskell temporary text text-metrics - th-reify-many time tls transformers unicode-transforms unix - unix-compat unliftio unordered-containers vector yaml zip-archive - zlib + th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; executableHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - gitrev hackage-security hashable hastache hpack hpc http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving gitrev hackage-security hashable hpack + hpc http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative optparse-simple path path-io persistent persistent-sqlite - persistent-template pid1 pretty primitive process project-template - regex-applicative-text resourcet retry semigroups split stm store - store-core streaming-commons tar template-haskell temporary text - text-metrics th-reify-many time tls transformers unicode-transforms - unix unix-compat unliftio unordered-containers vector yaml - zip-archive zlib + persistent-template pretty primitive process project-template + regex-applicative-text resourcet retry rio semigroups split stm + store store-core streaming-commons tar template-haskell temporary + text text-metrics th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; testHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - hackage-security hashable hastache hpack hpc hspec http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving hackage-security hashable hpack hpc hspec + http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template pid1 + path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template QuickCheck - regex-applicative-text resourcet retry semigroups smallcheck split - stm store store-core streaming-commons tar template-haskell + regex-applicative-text resourcet retry rio semigroups smallcheck + split stm store store-core streaming-commons tar template-haskell temporary text text-metrics th-reify-many time tls transformers - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -194386,6 +194909,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stack-network" = callPackage + ({ mkDerivation, ansi-terminal, async, base, binary, bytestring + , Cabal, clock, configurator, directory, dirstream + , distributed-process-lifted, distributed-process-simplelocalnet + , exceptions, filepath, hspec, lifted-base, mtl + , optparse-applicative, pipes, pipes-safe, process, raw-strings-qq + , system-fileio, system-filepath, temporary, text, transformers + , yaml + }: + mkDerivation { + pname = "stack-network"; + version = "0.1.0.0"; + sha256 = "0l2r6r89lj1197ybsfgjxikhpgravw12zjpaz62gcsvdhdcflsak"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath lifted-base + mtl optparse-applicative pipes pipes-safe process system-fileio + system-filepath temporary text transformers + ]; + executableHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath lifted-base + mtl optparse-applicative pipes pipes-safe process system-fileio + system-filepath temporary text transformers + ]; + testHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath hspec + lifted-base mtl optparse-applicative pipes pipes-safe process + raw-strings-qq system-fileio system-filepath temporary text + transformers yaml + ]; + homepage = "https://github.com/McGizzle/stack-network#readme"; + description = "A program for extending Stack to add distributed capabilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stack-prism" = callPackage ({ mkDerivation, base, profunctors, tagged, template-haskell , transformers @@ -198072,18 +198637,18 @@ self: { "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , file-embed, filepath, haskell-src-exts, HUnit, mtl - , optparse-applicative, strict, syb, test-framework + , optparse-applicative, semigroups, strict, syb, test-framework , test-framework-hunit, yaml }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.0.2"; - sha256 = "0w0hh08b1zlp3disxp20yrg20vblqgk5y3arf8xbfiznzf05x5zr"; + version = "0.9.1.1"; + sha256 = "0qvaxivxvgaz4zpgc6275j9psdipj2p7y3msv9py11z1y6r5izss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath - haskell-src-exts mtl syb yaml + haskell-src-exts mtl semigroups syb yaml ]; executableHaskellDepends = [ aeson base bytestring containers directory file-embed filepath @@ -200802,6 +201367,8 @@ self: { pname = "taffybar"; version = "1.0.2"; sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9"; + revision = "1"; + editedCabalFile = "02ip0c6fq3ra6zhhq2adxjx8j4w07x19zndkk0jj6jn6kj5qggf3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -200988,16 +201555,14 @@ self: { }: mkDerivation { pname = "tagged-transformer"; - version = "0.8"; - sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7"; - revision = "1"; - editedCabalFile = "06h1v2q35dzc69vfshzvwcpai176dd3bp89hvgcm5r6dyii6bqlg"; + version = "0.8.1"; + sha256 = "1ffwxr312vi3fqhgnad5b6gqkgz3j27c30z551j8zisjx0hn3zx0"; libraryHaskellDepends = [ base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged ]; homepage = "http://github.com/ekmett/tagged-transformer"; - description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; + description = "Monad transformer carrying an extra phantom type tag"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -202610,14 +203175,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "teardown_0_4_0_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, criterion, rio, tasty + "teardown_0_4_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, gauge, rio, tasty , tasty-hunit, typed-process, unliftio }: mkDerivation { pname = "teardown"; - version = "0.4.0.0"; - sha256 = "0y2ihw74fnnygzp22nyy7285d3rcp6kw2gjkzys82blwrbdwdlsk"; + version = "0.4.1.0"; + sha256 = "1w8yblzn0i8i03bfg97qgq4c6i6l2p04krvwg41q157rcgb91gq0"; libraryHaskellDepends = [ ansi-wl-pprint base rio typed-process unliftio ]; @@ -202625,10 +203190,10 @@ self: { base rio tasty tasty-hunit typed-process unliftio ]; benchmarkHaskellDepends = [ - base criterion rio typed-process unliftio + base gauge rio typed-process unliftio ]; homepage = "https://github.com/roman/Haskell-teardown#readme"; - description = "Build composable components for your application with clear teardown semantics"; + description = "Build safe and composable teardown sub-routines for resources"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -204230,6 +204795,30 @@ self: { license = "GPL"; }) {}; + "texmath_0_10_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.10.1.2"; + sha256 = "08fqlnl7r2izsl3rasa27ybnnijmn8ypvi0lbzsb3vs8rsq318px"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -210650,8 +211239,8 @@ self: { ({ mkDerivation, base, generics-sop }: mkDerivation { pname = "tuple-sop"; - version = "0.1.0.0"; - sha256 = "08g0jzqngw1bkrn212rj6d5h7ppfar7q1p8b79049ivrich6zspj"; + version = "0.2.0.1"; + sha256 = "1l2llpn3b3v5hly3bpzyhzagnrrs830xgpqaab8w1rcbhkmqby12"; libraryHaskellDepends = [ base generics-sop ]; testHaskellDepends = [ base generics-sop ]; homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme"; @@ -210902,8 +211491,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.38"; - sha256 = "19k1z6wrizym21a29hx31yhv4y5m1w0474iqm8idyxih4fya3k7s"; + version = "1.0.1.39"; + sha256 = "148lan5d4mzngkfq5l5rsz20s9dcgn71y145d1y59pr7nnlg3ipw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211951,8 +212540,8 @@ self: { }: mkDerivation { pname = "type-natural"; - version = "0.8.0.1"; - sha256 = "0ybcivp219h8xw9k31f5cimlnj63y5s2br3rahxgdacvhdb678zg"; + version = "0.8.1.0"; + sha256 = "0gp0bkcc3zx2mi8pi0j6vqigif6sy2w54pkb2qv7dlmvvijm6ra2"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger singletons template-haskell @@ -213661,8 +214250,8 @@ self: { }: mkDerivation { pname = "uniprot-kb"; - version = "0.1.1.2"; - sha256 = "15mlmappp5k8lamgmpkmyahi5vimxk3a1821c6cabs28r4d9rywy"; + version = "0.1.2.0"; + sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -218424,8 +219013,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.1.0"; - sha256 = "17209hslyqfx3lyh1a8sii3gn1ygsb5a81nampx1ym6f6gx9g3lh"; + version = "1.1.2.0"; + sha256 = "0l52494zi9r3fq3nx21r8pkbb7zkynz1gbrn58k8pramx7nhksb1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/achirkin/vulkan#readme"; description = "Low-level low-overhead vulkan api bindings"; @@ -218545,20 +219134,19 @@ self: { "wai-app-file-cgi" = callPackage ({ mkDerivation, array, attoparsec, attoparsec-conduit, base - , blaze-builder, blaze-html, bytestring, case-insensitive, conduit - , conduit-extra, containers, data-default-class, directory, doctest - , filepath, hspec, HTTP, http-client, http-conduit, http-date - , http-types, io-choice, lifted-base, mime-types, network, process - , sockaddr, static-hash, text, transformers, unix, wai, wai-conduit - , warp, word8 + , bytestring, case-insensitive, conduit, conduit-extra, containers + , data-default-class, directory, doctest, filepath, hspec, HTTP + , http-client, http-conduit, http-date, http-types, io-choice + , lifted-base, mime-types, network, process, sockaddr, static-hash + , text, transformers, unix, wai, wai-conduit, warp, word8 }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.4"; - sha256 = "1gcrfcvll4lpd8qrpcai00cn2zs8ql46z1chlqkbi7jk31r14qy0"; + version = "3.1.6"; + sha256 = "1w2hmy0q8dvg575sxmc69f9x7pcf1fx6lypzxsaxyfyazvhi4krc"; libraryHaskellDepends = [ - array attoparsec attoparsec-conduit base blaze-builder blaze-html - bytestring case-insensitive conduit conduit-extra containers + array attoparsec attoparsec-conduit base bytestring + case-insensitive conduit conduit-extra containers data-default-class directory filepath http-client http-conduit http-date http-types io-choice lifted-base mime-types network process sockaddr static-hash text transformers unix wai wai-conduit @@ -219700,6 +220288,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-throttle_0_2_2_1" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder, containers + , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm + , text, token-bucket, transformers, wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-throttle"; + version = "0.2.2.1"; + sha256 = "1z4n7ja5kq7cl2117w8wx0kz3fjdzr3mlvx6m76jbgp0504vjgja"; + libraryHaskellDepends = [ + base bytestring bytestring-builder containers hashable http-types + mtl network stm text token-bucket transformers wai + ]; + testHaskellDepends = [ + base bytestring hspec http-types HUnit QuickCheck stm transformers + wai wai-extra + ]; + description = "WAI Middleware for Request Throttling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-verbs" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, http-types , mmorph, monad-control, monad-control-aligned, monad-logger, mtl @@ -220334,6 +220944,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_22" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.22"; + sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network unix unix-compat + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -220971,20 +221617,26 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, cryptonite, http-client, http-client-tls, memory - , template-haskell, text, transformers, vector + ({ mkDerivation, aeson, async, base, basement, bytestring, cereal + , cryptonite, data-default, exceptions, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations, http-client + , http-client-tls, machines, memory, mtl, parsec, split, stm + , tagged, template-haskell, text, time, transformers }: mkDerivation { pname = "web3"; - version = "0.6.0.0"; - sha256 = "1dwwxvh11867f18lw9g2rjqsjawqa92p6063x64izdl1qj5qnwv9"; + version = "0.7.0.0"; + sha256 = "0mlrscl6f6l2jcsgw4x97p2qcd26d73wy8m13gbnhrh04d4kmd9h"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring cryptonite - http-client http-client-tls memory template-haskell text - transformers vector + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop http-client http-client-tls machines memory + mtl parsec tagged template-haskell text transformers + ]; + testHaskellDepends = [ + async base bytestring data-default generics-sop hspec hspec-contrib + hspec-discover hspec-expectations memory split stm tagged text time + transformers ]; - testHaskellDepends = [ base memory text ]; homepage = "https://github.com/airalab/hs-web3#readme"; description = "Ethereum API for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -227406,6 +228058,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-bin_1_6_0_2" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, Cabal, conduit, conduit-extra, containers + , data-default-class, directory, file-embed, filepath, fsnotify + , http-client, http-client-tls, http-reverse-proxy, http-types + , network, optparse-applicative, parsec, process, project-template + , resourcet, say, shakespeare, split, stm, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp + , warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.0.2"; + sha256 = "0x1lr6xm4h3x1ld42xs946aq4sn0g5x147bxqjxr5bfswj7vjk5k"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base base64-bytestring blaze-builder bytestring Cabal + conduit conduit-extra containers data-default-class directory + file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types network optparse-applicative parsec + process project-template resourcet say shakespeare split stm + streaming-commons tar template-haskell text time transformers + transformers-compat unix-compat unliftio unordered-containers wai + wai-extra warp warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -227588,6 +228273,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_4" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec + , hspec-expectations, http-types, HUnit, monad-logger, mtl, network + , old-locale, parsec, path-pieces, primitive, QuickCheck, random + , resourcet, safe, semigroups, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.4"; + sha256 = "09r714ibpml8mqbqhnckync5a0kb7fyz079m9lapmvhq1yvl4zld"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq deepseq-generics directory fast-logger + http-types monad-logger mtl old-locale parsec path-pieces primitive + random resourcet safe semigroups shakespeare template-haskell text + time transformers unix-compat unliftio unordered-containers vector + wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces QuickCheck random resourcet shakespeare + streaming-commons template-haskell text transformers unliftio wai + wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -227888,6 +228614,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-bootstrap4_1_0_0" = callPackage + ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }: + mkDerivation { + pname = "yesod-form-bootstrap4"; + version = "1.0.0"; + sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq"; + libraryHaskellDepends = [ + base shakespeare text yesod-core yesod-form + ]; + homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme"; + description = "renderBootstrap4"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -228821,6 +229562,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_3" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , network, persistent, pretty-show, semigroups, text, time + , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.3"; + sha256 = "0mxjkk6bkxgjpdifvz7qlqg0ms1xh19b8r7f96lp0pcnfksnil4d"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network persistent pretty-show semigroups text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit text + unliftio wai wai-extra xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test -- GitLab From e39a75cd350f03d13b3bded2bb605629f5031330 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:16:17 +0200 Subject: [PATCH 153/785] haskell-pandoc: update override for ghc-8.4.x --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index b38b17e3475..09de2116098 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -575,7 +575,7 @@ self: super: { brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; matrix = self.matrix_0_3_6_1; - pandoc = self.pandoc_2_1_3; + pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; # https://github.com/xmonad/xmonad/issues/155 -- GitLab From 99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:27:21 +0200 Subject: [PATCH 154/785] haskell-hpack: use latest version for ghc-8.4.x to fix the build --- .../configuration-ghc-8.4.x.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 09de2116098..2440e3b7a9d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -293,23 +293,6 @@ self: super: { }; }); - ## Unmerged. PR: https://github.com/sol/hpack/pull/277 - ## Issue: https://github.com/sol/hpack/issues/276 - hpack = overrideCabal super.hpack (drv: { - ## • No instance for (Semigroup Dependencies) - ## arising from the 'deriving' clause of a data type declaration - ## Possible fix: - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "hpack"; - rev = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6"; - sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y"; - }; - ## Setup: Encountered missing dependencies: - ## http-client -any, http-client-tls -any, http-types -any - libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ http-client http-client-tls http-types ]); - }); - ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 monadplus = overrideCabal super.monadplus (drv: { ## • No instance for (Semigroup (Partial a b)) @@ -574,6 +557,7 @@ self: super: { # Older versions don't compile. brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; + hpack = self.hpack_0_28_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; -- GitLab From c60c6a2443ab45169996aba33ae883622bbc1026 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:30:57 +0200 Subject: [PATCH 155/785] git-annex: update sha256 hash for new 6.2018042 version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cfa80062e3b..82ac96d2c85 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -82,7 +82,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "011kiyy1anj99ab70npl5i7pcqri0pdk04s4cvdm39zyas5m9lbd"; + sha256 = "05rygb8jm4nh7ggzihz6664hcgwkbqspi8gbpkpf7l7wwvzdm1rd"; }; })).overrideScope (self: super: { aws = dontCheck (self.aws_0_18); -- GitLab From f0549be090185a07da2be4b26f654a487c45243f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:32:01 +0200 Subject: [PATCH 156/785] haskell-stack: update overrides for the new 1.7.1 version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 82ac96d2c85..ec8e7a1bc2b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -863,8 +863,8 @@ self: super: { testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); - # https://github.com/fpco/stackage/issues/3126 - stack = doJailbreak super.stack; + # Needs newer versions than what we have in LTS-11.x at the moment. + stack = super.stack.overrideScope (self: super: { hpack = self.hpack_0_28_2; }); # These packages depend on each other, forming an infinite loop. scalendar = markBroken (super.scalendar.override { SCalendar = null; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index b6fdb75e550..d1bb60e8395 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -84,10 +84,11 @@ self: super: { purescript = doJailbreak (super.purescript); # These packages need Cabal 2.2.x, which is not the default. - distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); -- GitLab From 8564e93d2d695c08b1cfd8f5df9e6ca3928ead4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:43:19 +0200 Subject: [PATCH 157/785] haskell-c2hs: drop hacky override and try the current version again --- .../haskell-modules/configuration-common.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ec8e7a1bc2b..8c7ef561f17 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -845,17 +845,8 @@ self: super: { # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 stack2nix = doJailbreak super.stack2nix; - # Hacks to work around https://github.com/haskell/c2hs/issues/192. - c2hs = (overrideCabal super.c2hs { - version = "0.26.2-28-g8b79823"; - doCheck = false; - src = pkgs.fetchFromGitHub { - owner = "deech"; - repo = "c2hs"; - rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; - sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; - }; - }); + # Work around https://github.com/haskell/c2hs/issues/192. + c2hs = dontCheck super.c2hs; # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { -- GitLab From 9f144e857870d706e85c6655d563258a291c3963 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:45:52 +0200 Subject: [PATCH 158/785] haskell-hspec-smallcheck: use latest version for ghc-8.4.x to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 2440e3b7a9d..da65c269822 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -558,6 +558,7 @@ self: super: { brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; + hspec-smallcheck = self.hspec-smallcheck_0_5_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; -- GitLab From 65adfc73ad6226c01d80ed2a19aefd02225e453d Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 28 Apr 2018 14:19:15 +0100 Subject: [PATCH 159/785] zerotierone: 1.2.4 -> 1.2.8 --- pkgs/tools/networking/zerotierone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 77df8cbf6f7..ec6c9c19678 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.8"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "0n035f2qslw1srxjlm0szrnvb3va3sspbpxqqhng08dp68vmn9wz"; + sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8"; }; preConfigure = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; license = licenses.gpl3; - maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ]; + maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ]; platforms = platforms.x86_64 ++ platforms.aarch64; }; } -- GitLab From 75cfbdf33b0423c2bd8f9fb20393267ef02bbf9d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 15 Apr 2018 13:43:42 +0100 Subject: [PATCH 160/785] buildFHSUserEnv: change to root directory after chroot Fixes #38525 --- pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c index c03a1710f45..7e49e9e78d7 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -118,6 +118,7 @@ int main(gint argc, gchar **argv) { bind("/", prefix); fail_if(chroot(prefix)); + fail_if(chdir("/")); fail_if(execvp(*argv, argv)); } -- GitLab From eaf0592498070e3184316c9c63c3dd1c5264cd95 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Feb 2018 07:51:23 +0000 Subject: [PATCH 161/785] ocamlPackages.ocsigen_server: 2.8 -> 2.9 --- .../ocaml-modules/ocsigen-server/default.nix | 33 ++++++++++++++----- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 081f9edbecf..efbb1230497 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, which, react, ssl, -lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, +{ stdenv, fetchurl, ocaml, findlib, which, react, ssl +, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 -, camlzip, pgocaml +, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl }: let mkpath = p: n: @@ -9,17 +9,32 @@ let mkpath = p: n: "${p}/lib/ocaml/${v}/site-lib/${n}"; in +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "2.9"; + sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd"; + buildInputs = [ lwt_react lwt_ssl ]; + ldpath = ""; + } else { + version = "2.8"; + sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; + buildInputs = [ lwt2 ]; + ldpath = "${mkpath lwt2 "lwt"}"; + } +; in + stdenv.mkDerivation { - name = "ocsigenserver-2.8"; + name = "ocsigenserver-${param.version}"; src = fetchurl { - url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz; - sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; + url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz"; + inherit (param) sha256; }; - buildInputs = [ocaml which findlib react ssl lwt + buildInputs = [ocaml which findlib react ssl ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; + ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ] + ++ (param.buildInputs or []); configureFlags = "--root $(out) --prefix /"; @@ -31,7 +46,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 741a58ce588..22efb8a8a35 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -504,7 +504,7 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; -- GitLab From 8994fff8bb06b86c42aff28b8ef6f9cc77cb81af Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 31 Mar 2018 05:41:24 +0000 Subject: [PATCH 162/785] ocamlPackages.eliom: 6.2.0 -> 6.3.0 --- .../ocaml-modules/eliom/default.nix | 40 ++++++++++++------- pkgs/top-level/ocaml-packages.nix | 5 +-- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 42afec7e439..da9383c4e95 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,35 +1,47 @@ -{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, - js_of_ocaml, react, lwt, calendar, cryptokit, tyxml, - ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp, - reactivedata, opam, ppx_tools, ppx_deriving, findlib -, ocamlbuild +{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, + js_of_ocaml, lwt_react, cryptokit, + ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, + opam, ppx_tools, ppx_deriving, findlib +, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json +, js_of_ocaml-lwt +, js_of_ocaml-tyxml }: -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; +assert stdenv.lib.versionAtLeast ocaml.version "4.03"; stdenv.mkDerivation rec { pname = "eliom"; - version = "6.2.0"; + version = "6.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx"; + sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v"; }; patches = [ ./camlp4.patch ]; - buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ]; + buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opam ppx_tools + ocsigen_deriving + ]; - propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving - ocsigen_deriving js_of_ocaml - calendar cryptokit ocamlnet react ssl ocaml_pcre ]; + propagatedBuildInputs = [ + camlp4 + cryptokit + ipaddr + js_of_ocaml-lwt + js_of_ocaml-ppx + js_of_ocaml-tyxml + lwt_react + lwt_ssl + ocamlnet ocaml_pcre + ocsigen_server + ppx_deriving + ]; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; - createFindlibDestdir = true; - setupHook = [ ./setup-hook.sh ]; meta = { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 22efb8a8a35..92f772bb25e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,10 +217,7 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; - eliom = callPackage ../development/ocaml-modules/eliom { - lwt = lwt2; - js_of_ocaml = js_of_ocaml_2; - }; + eliom = callPackage ../development/ocaml-modules/eliom { }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; -- GitLab From 9a170f5bdfbf87d6e31ab070528d78b4ea7d405b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Apr 2018 06:54:23 +0000 Subject: [PATCH 163/785] ocamlPackages.ocsigen-toolkit: 1.0.0 -> 1.1.0 --- .../ocaml-modules/ocsigen-toolkit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 00416c92bb9..556c343241c 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }: +{ stdenv, fetchurl, buildOcaml, ocaml, opam +, calendar, eliom, js_of_ocaml-ppx_deriving_json +}: buildOcaml rec { name = "ocsigen-toolkit"; - version = "1.0.0"; + version = "1.1.0"; - propagatedBuildInputs = [ eliom ]; + propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; buildInputs = [ opam ]; - createFindlibDestdir = true; - installPhase = '' export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH @@ -18,7 +18,7 @@ buildOcaml rec ''; src = fetchurl { - sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2"; + sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a"; url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; }; -- GitLab From 7d7afdde4a9b5e9853ac4e0ff8477debdfc302b4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Apr 2018 07:00:07 +0000 Subject: [PATCH 164/785] ocamlPackages.ocsigen-start: 1.0.0 -> 1.1.0 --- .../ocaml-modules/ocsigen-start/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 13794602af4..ba7e3e93c98 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }: +{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +, js_of_ocaml-camlp4 +}: buildOcaml rec { name = "ocsigen-start"; - version = "1.0.0"; + version = "1.1.0"; - buildInputs = [ eliom ]; - propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ]; + buildInputs = [ eliom js_of_ocaml-camlp4 ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ]; patches = [ ./templates-dir.patch ]; @@ -16,7 +18,7 @@ buildOcaml rec src = fetchurl { url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; - sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll"; + sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq"; }; createFindlibDestdir = true; -- GitLab From 1b1b76f70a9dbf59ad8e833f9de3a60f14cf5471 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 17:24:31 +0200 Subject: [PATCH 165/785] nixos/tests/chromium: Wait 10s after new window This is a very very very ugly workaround and it's because Chromium seems to eat keystroke for a few seconds after a new window is created. I haven't found a better solution yet, so let's at least unbreak the test until we come up with a better way. Thanks to @vcunat for bringing this to my attention and also doing the initial bisect. The change that brought up this problem was 2b29e401531306d044f797a5dfa, which updated Chromium from version 65.0.3325.181 to version 66.0.3359.117. Unfortunately the upstream changelog[1] is way too large to actually guess what the breaking change is. [1]: https://chromium.googlesource.com/chromium/src/+log/65.0.3325.181..66.0.3359.117?pretty=fuller&n=10000 Signed-off-by: aszlig Cc: @bendlas, @vcunat --- nixos/tests/chromium.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 65c314e22e1..c341e83961a 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -94,6 +94,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { ''}"); if ($status == 0) { $ret = 1; + + # XXX: Somehow Chromium is not accepting keystrokes for a few + # seconds after a new window has appeared, so let's wait a while. + $machine->sleep(10); + last; } $machine->sleep(1); -- GitLab From 3b8c7424d1948e52bc2afe0e41e3b64db3f2c22b Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sat, 28 Apr 2018 16:52:46 +0100 Subject: [PATCH 166/785] pull the ssh host keys from the metadata service as expected by NixOps. Issues: #38623 https://github.com/NixOS/nixops/issues/930. --- .../modules/virtualisation/google-compute-image.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 0b6bec786da..e0d8027c67a 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -221,7 +221,7 @@ in echo "Obtaining SSH keys..." mkdir -m 0700 -p /root/.ssh AUTH_KEYS=$(${mktemp}) - ${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys + ${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys if [ -s $AUTH_KEYS ]; then # Read in key one by one, split in case Google decided @@ -246,6 +246,17 @@ in false fi rm -f $AUTH_KEYS + SSH_HOST_KEYS_DIR=$(${mktemp} -d) + ${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key + ${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key_pub + if [ -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key -a -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub ]; then + mv -f $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key* /etc/ssh/ + chmod 600 /etc/ssh/ssh_host_ed25519_key + chmod 644 /etc/ssh/ssh_host_ed25519_key.pub + else + echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed." + fi + rm -f $SSH_HOST_KEYS_DIR/* ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; -- GitLab From 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sat, 28 Apr 2018 17:06:25 +0100 Subject: [PATCH 167/785] remove the entire temporary directory --- nixos/modules/virtualisation/google-compute-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index e0d8027c67a..f175be673ba 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -256,7 +256,7 @@ in else echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed." fi - rm -f $SSH_HOST_KEYS_DIR/* + rm -f $SSH_HOST_KEYS_DIR ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; -- GitLab From f514a6896919f090cd811ebd9866ace1bb4b2b54 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sat, 28 Apr 2018 17:07:54 +0100 Subject: [PATCH 168/785] barf if pulling the ssh host keys fails --- nixos/modules/virtualisation/google-compute-image.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index f175be673ba..374a8433235 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -255,6 +255,7 @@ in chmod 644 /etc/ssh/ssh_host_ed25519_key.pub else echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed." + false fi rm -f $SSH_HOST_KEYS_DIR ''; -- GitLab From c7713e9775ba66a1685fb52dc632114b352790d4 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 28 Apr 2018 19:39:15 +0200 Subject: [PATCH 169/785] mono: change default version to "latest" (5.8), because 4.0 does not evaluate due to security --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac46ff0f4c..788d346684b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6706,12 +6706,12 @@ with pkgs; mlton = callPackage ../development/compilers/mlton { }; - mono = mono40; + mono = mono58; - mono40 = callPackage ../development/compilers/mono/4.0.nix { + mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; - }; + }); mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix { inherit (darwin) libobjc; @@ -6738,10 +6738,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }); - mono58 = lowPrio (callPackage ../development/compilers/mono/5.8.nix { + mono58 = callPackage ../development/compilers/mono/5.8.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; - }); + }; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; -- GitLab From d71df79998c59522634073b252210392d482da28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Apr 2018 19:58:03 +0200 Subject: [PATCH 170/785] home-assistant: 0.67.1 -> 0.68.0 --- pkgs/servers/home-assistant/component-packages.nix | 13 +++++++++---- pkgs/servers/home-assistant/default.nix | 8 ++++---- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3a74a43d14d..c2f06cd6a8e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.67.1"; + version = "0.68.0"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -86,7 +86,7 @@ "device_tracker.unifi" = ps: with ps; [ pyunifi ]; "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; - "device_tracker.xiaomi_miio" = ps: with ps; [ ]; + "device_tracker.xiaomi_miio" = ps: with ps; [ construct ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "discovery" = ps: with ps; [ netdisco ]; "dominos" = ps: with ps; [ ]; @@ -99,10 +99,12 @@ "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "enocean" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; + "eufy" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ construct ]; "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "folder_watcher" = ps: with ps; [ watchdog ]; + "fritzbox" = ps: with ps; [ ]; "frontend" = ps: with ps; [ ]; "gc100" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; @@ -110,6 +112,7 @@ "hdmi_cec" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; "homekit" = ps: with ps; [ ]; + "homekit_controller" = ps: with ps; [ ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; "http" = ps: with ps; [ aiohttp-cors ]; @@ -166,6 +169,7 @@ "media_extractor" = ps: with ps; [ ]; "media_player.anthemav" = ps: with ps; [ ]; "media_player.aquostv" = ps: with ps; [ ]; + "media_player.blackbird" = ps: with ps; [ ]; "media_player.bluesound" = ps: with ps; [ xmltodict ]; "media_player.braviatv" = ps: with ps; [ ]; "media_player.cast" = ps: with ps; [ PyChromecast ]; @@ -294,7 +298,6 @@ "sensor.dovado" = ps: with ps; [ ]; "sensor.dsmr" = ps: with ps; [ ]; "sensor.dweet" = ps: with ps; [ ]; - "sensor.ebox" = ps: with ps; [ ]; "sensor.eddystone_temperature" = ps: with ps; [ construct ]; "sensor.eliqonline" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; @@ -354,6 +357,7 @@ "sensor.serial" = ps: with ps; [ ]; "sensor.serial_pm" = ps: with ps; [ ]; "sensor.shodan" = ps: with ps; [ ]; + "sensor.sht31" = ps: with ps; [ ]; "sensor.sma" = ps: with ps; [ ]; "sensor.snmp" = ps: with ps; [ pysnmp ]; "sensor.sochain" = ps: with ps; [ ]; @@ -378,6 +382,7 @@ "sensor.twitch" = ps: with ps; [ ]; "sensor.uber" = ps: with ps; [ ]; "sensor.ups" = ps: with ps; [ ]; + "sensor.uscis" = ps: with ps; [ ]; "sensor.vasttrafik" = ps: with ps; [ ]; "sensor.waqi" = ps: with ps; [ ]; "sensor.waze_travel_time" = ps: with ps; [ ]; @@ -434,7 +439,7 @@ "twilio" = ps: with ps; [ twilio ]; "upcloud" = ps: with ps; [ ]; "updater" = ps: with ps; [ distro ]; - "upnp" = ps: with ps; [ miniupnpc ]; + "upnp" = ps: with ps; [ ]; "usps" = ps: with ps; [ ]; "vacuum.roomba" = ps: with ps; [ ]; "vacuum.xiaomi_miio" = ps: with ps; [ construct ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0f15b21e468..0751ffb3c9e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -8,10 +8,10 @@ let py = python3.override { packageOverrides = self: super: { aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.1.1"; + version = "3.1.3"; src = oldAttrs.src.override { inherit version; - sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f"; + sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad"; }; }); pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { @@ -58,7 +58,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.67.1"; + hassVersion = "0.68.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -73,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "02czbqdsdar8rjkr0r5g6j1x9caazcir2w1hp595z4cn90c0342f"; + sha256 = "037gc2sghg5n0li087vvjcf6657rd31wv0m5r23b2cdfds8lxk4w"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index fbafa87e622..678b5d3826c 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180404.0"; + version = "20180426.0"; src = fetchPypi { inherit pname version; - sha256 = "ac36d4f5e30e93b02dadd2ecdc07218fde3d97ffc2f69a6f1acf5e601cd4e5ad"; + sha256 = "60ff4e0b0c4538fa0be0db9407f95333546940e119a8d3edb9b0d7e1c86b1f3b"; }; propagatedBuildInputs = [ user-agents ]; -- GitLab From e22ba26c7b33cb262e8c393c5fbaea6579100acd Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Tue, 17 Apr 2018 16:21:28 +0100 Subject: [PATCH 171/785] binutils: apply patch on aarch64 to fix https://sourceware.org/bugzilla/show_bug.cgi?id=22764 (cherry picked from commit 5ce2d3355d4bcda5e1393b0cfb52b834e82d2546) --- .../tools/misc/binutils/default.nix | 8 +- ...RCH64_ABS32-R_AARCH64_ABS16-absolute.patch | 130 ++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e65736a3e88..ac055171658 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -64,7 +64,13 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch - ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch; + ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch + ++ stdenv.lib.optionals targetPlatform.isAarch64 [ + # Version 2.30 introduced strict requirements on ELF relocations which cannot + # be satisfied on aarch64 platform. Add backported fix from bugzilla. + # https://sourceware.org/bugzilla/show_bug.cgi?id=22764 + ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch + ]; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch new file mode 100644 index 00000000000..6a04b3cc558 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch @@ -0,0 +1,130 @@ +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index c310da6ed3..d31f46171f 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,10 @@ ++2018-02-05 Renlin Li ++ ++ PR ld/22764 ++ * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the ++ R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the ++ check for writeable section as well. ++ + 2018-01-27 Nick Clifton + + This is the 2.30 release: +diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c +index d5711e0eb1..973188220b 100644 +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -7074,10 +7074,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, + #if ARCH_SIZE == 64 + case BFD_RELOC_AARCH64_32: + #endif +- if (bfd_link_pic (info) +- && (sec->flags & SEC_ALLOC) != 0 +- && (sec->flags & SEC_READONLY) != 0) ++ if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0) + { ++ if (h != NULL ++ /* This is an absolute symbol. It represents a value instead ++ of an address. */ ++ && ((h->root.type == bfd_link_hash_defined ++ && bfd_is_abs_section (h->root.u.def.section)) ++ /* This is an undefined symbol. */ ++ || h->root.type == bfd_link_hash_undefined)) ++ break; ++ ++ /* For local symbols, defined global symbols in a non-ABS section, ++ it is assumed that the value is an address. */ + int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; + _bfd_error_handler + /* xgettext:c-format */ +diff --git a/ld/ChangeLog b/ld/ChangeLog +index 6337cd0cb6..1aaa6da3b5 100644 +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -1,3 +1,11 @@ ++2018-02-05 Renlin Li ++ ++ PR ld/22764 ++ * testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address. ++ * testsuite/ld-aarch64/emit-relocs-259.s: Likewise. ++ * testsuite/ld-aarch64/pr22764.s: New. ++ * testsuite/ld-aarch64/pr22764.d: New. ++ + 2018-01-27 Nick Clifton + + This is the 2.30 release: +diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp +index f31089361b..d766f3736b 100644 +--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp ++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp +@@ -275,6 +275,7 @@ run_dump_test "pr17415" + run_dump_test_lp64 "tprel_g2_overflow" + run_dump_test "tprel_add_lo12_overflow" + run_dump_test "protected-data" ++run_dump_test_lp64 "pr22764" + + # ifunc tests + run_dump_test "ifunc-1" +diff --git a/ld/testsuite/ld-aarch64/emit-relocs-258.s b/ld/testsuite/ld-aarch64/emit-relocs-258.s +index f724776243..87bb657c5d 100644 +--- a/ld/testsuite/ld-aarch64/emit-relocs-258.s ++++ b/ld/testsuite/ld-aarch64/emit-relocs-258.s +@@ -1,5 +1,6 @@ ++.global dummy + .text +- ++dummy: + ldr x0, .L1 + + .L1: +diff --git a/ld/testsuite/ld-aarch64/emit-relocs-259.s b/ld/testsuite/ld-aarch64/emit-relocs-259.s +index 7e1ba3ceb4..0977c9d869 100644 +--- a/ld/testsuite/ld-aarch64/emit-relocs-259.s ++++ b/ld/testsuite/ld-aarch64/emit-relocs-259.s +@@ -1,5 +1,6 @@ ++.global dummy + .text +- ++dummy: + ldr x0, .L1 + + .L1: +diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d +new file mode 100644 +index 0000000000..997519f469 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/pr22764.d +@@ -0,0 +1,18 @@ ++#source: pr22764.s ++#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs ++#notarget: aarch64_be-*-* ++#objdump: -dr ++#... ++ ++Disassembly of section \.text: ++ ++0000000000010000 \<\.text\>: ++ 10000: d503201f nop ++ ... ++ 10004: R_AARCH64_ABS64 sym_abs1 ++ 1000c: 00000002 \.word 0x00000002 ++ 1000c: R_AARCH64_ABS32 sym_abs2 ++ 10010: 0003 \.short 0x0003 ++ 10010: R_AARCH64_ABS16 sym_abs3 ++ 10012: 0000 \.short 0x0000 ++ 10014: d503201f nop +diff --git a/ld/testsuite/ld-aarch64/pr22764.s b/ld/testsuite/ld-aarch64/pr22764.s +new file mode 100644 +index 0000000000..25e36b4a12 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/pr22764.s +@@ -0,0 +1,6 @@ ++ .text ++ nop ++ .xword sym_abs1 ++ .word sym_abs2 ++ .short sym_abs3 ++ nop -- GitLab From e8012dd2ddf0bc84bc8f76aaf2b958f553536da5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 19:01:55 +0000 Subject: [PATCH 172/785] scala: 2.12.5 -> 2.12.6 --- pkgs/development/compilers/scala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index bfbd9d05d05..a25d4f6e654 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.5"; + name = "scala-2.12.6"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "18bah2n3jfvc3cb10n4b3d6pwm3rwlqp7lrfvafjxccmlklzyqdj"; + sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs"; }; propagatedBuildInputs = [ jre ] ; -- GitLab From 2eb42290e7fbe634a87720d7d954864049729a00 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 19:05:46 +0000 Subject: [PATCH 173/785] linux-copperhead: 4.14.36.a -> 4.14.37.a --- pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index dfe58119da2..76b59ee75fb 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.36"; + version = "4.14.37"; revision = "a"; - sha256 = "052ck8giy5nxy7871crhx6cdkgzzzpffdm8ilq1ys0rd3vldzl9b"; + sha256 = "0dwi17hx13kkccqc2315dnb8sfdc0jgv9v4b1xd10v2pnq7qb0x8"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); -- GitLab From 844c08ec0a5b79abb16d9de5bd39ed492f4fc214 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 19:46:25 +0000 Subject: [PATCH 174/785] linux-copperhead: Add 4.16.5.a Separate LTS and stable kernel releases --- ...-hardened.nix => linux-copperhead-lts.nix} | 0 .../linux/kernel/linux-copperhead-stable.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 21 ++++++++----- 3 files changed, 44 insertions(+), 7 deletions(-) rename pkgs/os-specific/linux/kernel/{linux-copperhead-hardened.nix => linux-copperhead-lts.nix} (100%) create mode 100644 pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix similarity index 100% rename from pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix rename to pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix new file mode 100644 index 00000000000..86b7eaa8823 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: + +with stdenv.lib; + +let + version = "4.16.5"; + revision = "a"; + sha256 = "150cwq51x3cnnvnd7izizi93jmiqs0na15p8ip4vkm5frspmnks7"; + + # modVersion needs to be x.y.z, will automatically add .0 if needed + modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); + + # branchVersion needs to be x.y + branchVersion = concatStrings (intersperse "." (take 2 (splitString "." version))); + + modDirVersion = "${modVersion}-hardened"; +in +buildLinux (args // { + inherit modDirVersion; + + version = "${version}-${revision}"; + extraMeta.branch = "${branchVersion}"; + + src = fetchFromGitHub { + inherit sha256; + owner = "copperhead"; + repo = "linux-hardened"; + rev = "${version}.${revision}"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afd6a60ee06..3bc6ca6e96c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13321,11 +13321,19 @@ with pkgs; ]; }; - linux_copperhead = callPackage ../os-specific/linux/kernel/linux-copperhead-hardened.nix { + linux_copperhead_lts = callPackage ../os-specific/linux/kernel/linux-copperhead-lts.nix { kernelPatches = with kernelPatches; [ - kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.tag_hardened + bridge_stp_helper + modinst_arg_list_too_long + tag_hardened + ]; + }; + + linux_copperhead_stable = callPackage ../os-specific/linux/kernel/linux-copperhead-stable.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + modinst_arg_list_too_long + tag_hardened ]; }; @@ -13661,9 +13669,8 @@ with pkgs; linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - linuxPackages_copperhead_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead); - linux_copperhead_hardened = linuxPackages_copperhead_hardened.kernel; - linux_hardened_copperhead = linux_copperhead_hardened; # alias for backward compatibility + linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts); + linuxPackages_copperhead_stable = recurseIntoAttr (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable); # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); -- GitLab From 094683ac36e9595a9997a40cd155db5705c0266c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Feb 2018 18:48:15 +0100 Subject: [PATCH 175/785] =?UTF-8?q?syncthing-gtk:=200.9.2.7=20=E2=86=92=20?= =?UTF-8?q?0.9.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/syncthing-gtk/default.nix | 12 +++--- ...sable-syncthing-binary-configuration.patch | 40 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index ae715aa4321..4db546651dd 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: buildPythonApplication rec { - version = "0.9.2.7"; + version = "0.9.3.1"; name = "syncthing-gtk-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; + sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb"; }; nativeBuildInputs = [ @@ -18,8 +18,8 @@ buildPythonApplication rec { ]; buildInputs = [ - gtk3 librsvg - libnotify + gtk3 librsvg libappindicator-gtk3 + libnotify gnome3.adwaita-icon-theme # Schemas with proxy configuration gnome3.gsettings-desktop-schemas ]; @@ -32,7 +32,7 @@ buildPythonApplication rec { ./disable-syncthing-binary-configuration.patch (substituteAll { src = ./paths.patch; - killall = "${psmisc}/bin/killall"; + killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall"; syncthing = "${syncthing}/bin/syncthing"; }) ]; diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch index 6c516e98acb..14c2b62e6e3 100644 --- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch +++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch @@ -1,5 +1,5 @@ ---- a/find-daemon.glade -+++ b/find-daemon.glade +--- a/glade/find-daemon.glade ++++ b/glade/find-daemon.glade @@ -112,6 +112,7 @@ True @@ -16,6 +16,24 @@ True True 0.51999998092651367 +--- a/glade/ui-settings.glade ++++ b/glade/ui-settings.glade +@@ -943,6 +943,7 @@ + _Browse... + True + True ++ False + True + True + 0.51999998092651367 +@@ -974,6 +975,7 @@ + + True + True ++ False + True + + --- a/syncthing_gtk/configuration.py +++ b/syncthing_gtk/configuration.py @@ -168,6 +168,8 @@ @@ -57,21 +75,3 @@ self.add_page(GenerateKeysPage()) self.add_page(HttpSettingsPage()) self.add_page(SaveSettingsPage()) ---- a/ui-settings.glade -+++ b/ui-settings.glade -@@ -943,6 +943,7 @@ - _Browse... - True - True -+ False - True - True - 0.51999998092651367 -@@ -974,6 +975,7 @@ - - True - True -+ False - True - - -- GitLab From 5c8c4710bae57549b4c4dfd4c772cb67a6e7a7e3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 20:19:00 +0000 Subject: [PATCH 176/785] openjdk: 10.0.0 -> 10.0.1 --- pkgs/development/compilers/openjdk/10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 9cc774727b7..7882fa49b07 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -17,8 +17,8 @@ let "i386" else "amd64"; - update = "10"; - build = "46"; + update = "10.0.1"; + build = "10"; repover = "jdk-${update}+${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz"; - sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg"; + sha256 = "1fg0rl5pd3f2y3v3bq8p3zdkrpa1pyslwdln4s64clyr7spvxkjw"; }; outputs = [ "out" "jre" ]; -- GitLab From 9774c8a0dedce5d07f5247eff5582122e6b620ac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 20:20:13 +0000 Subject: [PATCH 177/785] linux-copperhead: Fix test --- nixos/tests/kernel-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix index 0af978f1851..aa133c9b0aa 100644 --- a/nixos/tests/kernel-copperhead.nix +++ b/nixos/tests/kernel-copperhead.nix @@ -6,14 +6,14 @@ import ./make-test.nix ({ pkgs, ...} : { machine = { config, lib, pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_copperhead_hardened; + boot.kernelPackages = pkgs.linuxPackages_copperhead_lts; }; testScript = '' $machine->succeed("uname -a"); $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_hardened.kernel.modDirVersion}'"); + $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_lts.kernel.modDirVersion}'"); $machine->succeed("uname -a | grep 'hardened'"); ''; }) -- GitLab From 1cf5aad65bc087d71e8c7ba000e34ccc01f723c8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 16:32:15 -0400 Subject: [PATCH 178/785] linux-copperhead: Fix all-packages reference --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bc6ca6e96c..3ba524aa722 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13670,7 +13670,7 @@ with pkgs; linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts); - linuxPackages_copperhead_stable = recurseIntoAttr (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable); + linuxPackages_copperhead_stable = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable); # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); -- GitLab From 7cd7e4ce267faac9acfa2dd421d3583ec6f43d01 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 28 Apr 2018 22:35:19 +0200 Subject: [PATCH 179/785] weechat: 2.0 -> 2.1 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b2ea28f0cf8..dec933489af 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -29,12 +29,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn"; + sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; -- GitLab From f5268994be469e66d0967d5a45eccb5e0976f690 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 28 Apr 2018 22:36:22 +0200 Subject: [PATCH 180/785] weechat-matrix-bridge: 2018-01-10 -> 2017-03-29 --- .../instant-messengers/weechat-matrix-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix index f1338bc0df3..85faebf95a3 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix @@ -1,12 +1,12 @@ { stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { - name = "weechat-matrix-bridge-2017-03-28"; + name = "weechat-matrix-bridge-2018-01-10"; src = fetchFromGitHub { owner = "torhve"; repo = "weechat-matrix-protocol-script"; - rev = "0052e7275ae149dc5241226391c9b1889ecc3c6b"; - sha256 = "14x58jd44g08sfnp1gx74gq2na527v5jjpsvv1xx4b8mixwy20hi"; + rev = "a8e4ce04665c09ee7f24d6b319cd85cfb56dfbd7"; + sha256 = "0822xcxvwanwm8qbzqhn3f1m6hhxs29pyf8lnv6v29bl8136vcq3"; }; patches = [ -- GitLab From 4797fe8da41c4fa4291ce4e1ac3434ea4e04fb1e Mon Sep 17 00:00:00 2001 From: Ilya Kolpakov Date: Sat, 28 Apr 2018 21:02:49 +0200 Subject: [PATCH 181/785] pythonPackages.patsy: 0.3.0 -> 0.5.0 --- .../python-modules/patsy/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +--------- 2 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/patsy/default.nix diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix new file mode 100644 index 00000000000..9efa3126ce3 --- /dev/null +++ b/pkgs/development/python-modules/patsy/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchPypi +, buildPythonPackage +, nose +, six +, numpy +, scipy # optional, allows spline-related features (see patsy's docs) +, parameterized +}: + +buildPythonPackage rec { + pname = "patsy"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fw888zd2s7f5zxm9f98ss93qhwv0sqnbdy21ipj33ccqgakhpz0"; + }; + + checkInputs = [ nose parameterized ]; + checkPhase = "nosetests -v"; + + propagatedBuildInputs = [ + six + numpy + scipy + ]; + + meta = { + description = "A Python package for describing statistical models"; + homepage = https://github.com/pydata/patsy; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ilya-kolpakov ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f24d6ff955b..50589b6938d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9673,24 +9673,7 @@ in { }; }; - patsy = buildPythonPackage rec { - name = "patsy-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/p/patsy/${name}.zip"; - sha256 = "a55dd4ca09af4b9608b81f30322beb450510964c022708ab50e83a065ccf15f0"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [six numpy]; - - meta = { - description = "A Python package for describing statistical models"; - homepage = "https://github.com/pydata/patsy"; - license = licenses.bsd2; - }; - }; + patsy = callPackage ../development/python-modules/patsy { }; paste = buildPythonPackage rec { name = "paste-${version}"; -- GitLab From f2adf2059a8cce0e7619f65ba1f2d8f38f5efad5 Mon Sep 17 00:00:00 2001 From: Ilya Kolpakov Date: Sat, 28 Apr 2018 21:06:12 +0200 Subject: [PATCH 182/785] pythonPackages.pymc3: init at 3.2 --- .../python-modules/pymc3/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/pymc3/default.nix diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix new file mode 100644 index 00000000000..308958abb6d --- /dev/null +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -0,0 +1,64 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, Theano +, pandas +, patsy +, joblib +, tqdm +, six +, h5py +, pytest +, nose +, parameterized +, matplotlib +}: + +buildPythonPackage rec { + pname = "pymc3"; + version = "3.2"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hpzhkpv7sbwkcva7x914yvzcf1d1a952ynbcx6mvlgv5lqghc39"; + }; + + # No need for coverage stats in Nix builds + postPatch = '' + substituteInPlace setup.py --replace ", 'pytest-cov'" "" + ''; + + propagatedBuildInputs = [ + Theano + pandas + patsy + joblib + tqdm + six + h5py + ]; + + checkInputs = [ + pytest + nose + parameterized + ]; + + # The test suite is computationally intensive and test failures are not + # indicative for package usability hence tests are disabled by default. + doCheck = false; + + # For some reason tests are run as a part of the *install* phase if enabled. + # Theano writes compiled code to ~/.theano hence we set $HOME. + preInstall = "export HOME=$(mktemp -d)"; + postInstall = "rm -rf $HOME"; + + meta = { + description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; + homepage = http://github.com/pymc-devs/pymc3; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ilya-kolpakov ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50589b6938d..93444be7302 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8244,6 +8244,8 @@ in { pygraphviz = callPackage ../development/python-modules/pygraphviz { }; + pymc3 = callPackage ../development/python-modules/pymc3 { }; + pympler = buildPythonPackage rec { pname = "Pympler"; version = "0.4.3"; -- GitLab From 3c4efe448d96693cd370b3994c0b9087970e1e83 Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 29 Apr 2018 00:58:17 +0200 Subject: [PATCH 183/785] xen_4_10: fix build (qemu-xen memfd patch) --- pkgs/applications/virtualization/xen/4.10.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index c3280cbda94..dab90a1ed78 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -29,6 +29,12 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + qemuMemfdBuildFix = fetchpatch { + name = "xen-4.8-memfd-build-fix.patch"; + url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib glib python2 @@ -53,6 +59,9 @@ callPackage (import ./generic.nix (rec { rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2"; sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w"; }; + patches = [ + qemuMemfdBuildFix + ]; buildInputs = qemuDeps; postPatch = '' # needed in build but /usr/bin/env is not available in sandbox -- GitLab From 15268306febdc338ec6a00e8099c1904287f598a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:19:23 +0800 Subject: [PATCH 184/785] libtoxcore: introduce 0.2.2 in addition to 0.1.11 --- .../libraries/libtoxcore/default.nix | 81 ++++++++++--------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 47 insertions(+), 39 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 9af8718dc5f..42d2fe11f7b 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,46 +1,51 @@ { stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack , libvpx, check, libconfig, pkgconfig }: -stdenv.mkDerivation rec { - name = "libtoxcore-${version}"; - version = "0.1.11"; - - src = fetchFromGitHub { - owner = "TokTok"; - repo = "c-toxcore"; - rev = "v${version}"; - sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; +let + generic = { version, sha256 }: + stdenv.mkDerivation rec { + name = "libtoxcore-${version}"; + + src = fetchFromGitHub { + owner = "TokTok"; + repo = "c-toxcore"; + rev = "v${version}"; + inherit sha256; + }; + + cmakeFlags = [ + "-DBUILD_NTOX=ON" + "-DDHT_BOOTSTRAP=ON" + "-DBOOTSTRAP_DAEMON=ON" + ]; + + buildInputs = [ + libsodium libmsgpack ncurses libconfig + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + libopus libvpx + ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "P2P FOSS instant messaging application aimed to replace Skype"; + homepage = https://tox.chat; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; }; - cmakeFlags = [ - "-DBUILD_NTOX=ON" - "-DDHT_BOOTSTRAP=ON" - "-DBOOTSTRAP_DAEMON=ON" - ]; - - buildInputs = [ - libsodium libmsgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ - libopus - libvpx - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - enableParallelBuilding = true; - - checkInputs = [ check ]; - - checkPhase = "ctest"; - - # for some reason the tests are not running - it says "No tests found!!" - doCheck = true; +in rec { + libtoxcore_0_1 = generic { + version = "0.1.11"; + sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; + }; - meta = with stdenv.lib; { - description = "P2P FOSS instant messaging application aimed to replace Skype"; - homepage = https://tox.chat; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + libtoxcore_0_2 = generic { + version = "0.2.2"; + sha256 = "1463grbbv009pj2g6dbnyk4lr871vw41962m63v21mmp6dkrr7r5"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac46ff0f4c..fea7f1e3441 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10358,9 +10358,12 @@ with pkgs; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; - libtoxcore = callPackage ../development/libraries/libtoxcore { }; + inherit (callPackages ../development/libraries/libtoxcore {}) + libtoxcore_0_1 libtoxcore_0_2; + libtoxcore = libtoxcore_0_2; libtap = callPackage ../development/libraries/libtap { }; -- GitLab From 058df14f81482e05fad93b017e8a8d45cea10db5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:19:48 +0800 Subject: [PATCH 185/785] ratox: 0.4 -> 0.4.20180303 --- .../instant-messengers/ratox/default.nix | 18 ++++++++++-------- .../instant-messengers/ratox/ldlibs.patch | 5 ----- 2 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 5d004db60e3..add337d3f08 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -5,22 +5,24 @@ with stdenv.lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); -in -stdenv.mkDerivation rec { - name = "ratox-0.4"; +in stdenv.mkDerivation rec { + name = "ratox-0.4.20180303"; src = fetchgit { url = "git://git.2f30.org/ratox.git"; - rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c"; - sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5"; + rev = "269f7f97fb374a8f9c0b82195c21de15b81ddbbb"; + sha256 = "0bpn37h8jvsqd66fkba8ky42nydc8acawa5x31yxqlxc8mc66k74"; }; - patches = [ ./ldlibs.patch ]; - buildInputs = [ libtoxcore ]; - preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; + preConfigure = '' + substituteInPlace config.mk \ + --replace '-lsodium -lopus -lvpx ' "" + + ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch deleted file mode 100644 index 1406e714310..00000000000 --- a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib --LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread -+LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread -- GitLab From 88454d73b0c72137eb04f30c0e053db139d71b2a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:20:27 +0800 Subject: [PATCH 186/785] qtox: 1.13.1 -> 1.15.0 --- .../instant-messengers/qtox/default.nix | 31 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index bbad5a68180..f7a56d47dbf 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,19 +1,23 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, - libtoxcore, - libpthreadstubs, libXdmcp, libXScrnSaver, - qtbase, qtsvg, qttools, qttranslations, - ffmpeg, filter-audio, libexif, libsodium, libopus, - libvpx, openal, pcre, qrencode, sqlcipher }: - -mkDerivation rec { +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, libtoxcore +, libpthreadstubs, libXdmcp, libXScrnSaver +, qtbase, qtsvg, qttools, qttranslations +, ffmpeg, filter-audio, libexif, libsodium, libopus +, libvpx, openal, pcre, qrencode, sqlcipher +, AVFoundation ? null }: + +let + version = "1.15.0"; + rev = "v${version}"; + +in mkDerivation rec { name = "qtox-${version}"; - version = "1.13.0"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - rev = "v${version}"; - sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y"; + sha256 = "1garwnlmg452b0bwx36rsh08s15q3zylb26l01iiwg4l9vcaldh9"; + inherit rev; }; buildInputs = [ @@ -22,17 +26,18 @@ mkDerivation rec { qtbase qtsvg qttranslations ffmpeg filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ]; + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; cmakeFlags = [ - "-DGIT_DESCRIBE=${version}" + "-DGIT_DESCRIBE=${rev}" "-DENABLE_STATUSNOTIFIER=False" "-DENABLE_GTK_SYSTRAY=False" "-DENABLE_APPINDICATOR=False" + "-DTIMESTAMP=1" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fea7f1e3441..e9224ecbe66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17461,7 +17461,7 @@ with pkgs; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; - qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { ffmpeg = ffmpeg_2; }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; -- GitLab From 3f454bc90f2c569f237b9df56db75bbedd2feae3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:20:46 +0800 Subject: [PATCH 187/785] toxic: 0.7.2 -> 0.8.2 --- .../networking/instant-messengers/toxic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4934a737405..8a45e988c07 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "toxic-${version}"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc"; + sha256 = "0fwmk945nip98m3md58y3ibjmzfq25hns3xf0bmbc6fjpww8d5p5"; }; makeFlags = [ "PREFIX=$(out)"]; -- GitLab From 1b1be29bf827fc177100ae175030b2fda4132e47 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 20:09:17 -0400 Subject: [PATCH 188/785] openjdk: 8u172-b02 -> 8u172-b11 --- pkgs/development/compilers/openjdk/8.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 705898a74f3..7798418ebfd 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -22,41 +22,41 @@ let throw "openjdk requires i686-linux or x86_64 linux"; update = "172"; - build = "02"; + build = "11"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0y28by4ifsaxhfrzq35654i8h9jjgvrw51hbxyg8pgfink0n30r2"; + sha256 = "08mgfqbbgnx9n6prczwm4m8pgsakya45iai1gfslqnb0adh33jpi"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0rxp4920xpd9khdg2ia1v1djcw1nndsjfis68whawi7s95zwpxy5"; + sha256 = "0dph17mpr5ni280z8rmiwlw0v46dnzyph6fq132xvxiw2i1203zg"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0sdf6rww290wgfqhaix1vjac244drdgg7hapb67wgj733kkdl711"; + sha256 = "181ixh75xjvlj0l3a58d9iqf50ivq77993yzfv0463dm44h6b8pp"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0vl3aryw3nclqprc35b2iriwfyr9fch3x8snjry1z5ajbdyd5c8b"; + sha256 = "097azhdmr7ph1gvlzjgx6s2hyxmi2s5293d5hs23dl5i9f55b6x8"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1y5fnzxdll3q0jgqxsap3xb21bm1napdlqzs7h6c2l5qldyvw692"; + sha256 = "1lvk2brd9yclzd7cdk1kvnv4mbdxzjxd595pqhdaxdxxr5anhsvm"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1yg1ik1klg8pl4b7izi2waqhs7vr6ln3fzc4k1siir4va5qhrhlm"; + sha256 = "0cl4b4c2qjyhlsa5khlxinilfaj6ai1mzji3y0263klc8q6bglwa"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "03srcj6hhvbdg1iqw85mfm1pwd6yvpykyz5nn4ydf930g4dyxfkf"; + sha256 = "00s6wm62v7gmkwy46js0lisijng40lnxscndczbgfvvz2q9zz4q1"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "12nn02jiq3vqgwhqh5yvxq1k92fy3n0jpvfpj1npq9fvimywry2k"; + sha256 = "0ab0rrmmf145nh4mibvknjni4whvzmk6fsnl7ihcn8m0zi6zyfra"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; -- GitLab From cd0aee5cbceba576b61d932601702b8740ed3b8c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 28 Apr 2018 23:07:10 -0400 Subject: [PATCH 189/785] buildbot: 1.1.0 -> 1.1.1 --- .../tools/build-managers/buildbot/default.nix | 4 ++-- .../tools/build-managers/buildbot/plugins.nix | 10 +++++----- .../tools/build-managers/buildbot/worker.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 98adaf1c1aa..bc2cd978f67 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "1.1.0"; + version = "1.1.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1rhmlcvw0dsr4f37sb3xmb9xcn76lsrsw2g1z611g339nmxzi0sc"; + sha256 = "1vcmanx3ma3cfyiddjcmsnx6qmxd3m5blqax04rcsiq2zq4dmzir"; }; buildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 35c8ed8c71c..c8a12c19264 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj"; + sha256 = "01v9w8iy9q6fwrmz6db7fanjixax7whn74k67bj0czrbjjkpfzvb"; }; meta = with stdenv.lib; { @@ -29,7 +29,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll"; + sha256 = "1cwxkzpgwzk9b361rj980bbnmhzzsr46pgf94zqpg3na8xm6hpwj"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -49,7 +49,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi"; + sha256 = "0ival58f50128315d0nck63pzya2zm7q6hvgmxfbjl0my8il9p2l"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -69,7 +69,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr"; + sha256 = "0jiwfb699nqbmpcm88y187ig4ha6p7d4v98mjwa9blhm54dk8kh1"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -89,7 +89,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp"; + sha256 = "00mfn24gbwr2p3n7nsijzv949l7hiksiafhma18nnh40r8f4l5f2"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 59d3c93bb87..b1cfb6aeaf2 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.1.0"; + version = "1.1.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y"; + sha256 = "02xfzlcy3cnvc3cmpl9gs6209a3qm71yz5pahbws9jcyhv6fbrrm"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; -- GitLab From 6e8118b2395ab928594e20585dba1e83c8354820 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 28 Apr 2018 22:11:30 -0500 Subject: [PATCH 190/785] nix: fix stdenv.system check -- should be hostPlatform (stdenv.system is the system running the build, apparently) --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index aee6678d116..23099489723 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -41,7 +41,7 @@ let propagatedBuildInputs = [ boehmgc ]; # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; configureFlags = [ "--with-store-dir=${storeDir}" -- GitLab From 7b6433b0eb3f1acf03b964636ef1bd12fac0bda5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 29 Apr 2018 12:34:38 +0800 Subject: [PATCH 191/785] gcalcli: pin older versions of needed python packages --- pkgs/applications/misc/gcalcli/default.nix | 63 +++++++++++++++------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index d3ba5a97333..6a7a7ae604d 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -1,7 +1,38 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages +{ stdenv, lib, fetchFromGitHub, python2 , libnotify ? null }: -pythonPackages.buildPythonApplication rec { +let + py = python2.override { + packageOverrides = self: super: { + google_api_python_client = super.google_api_python_client.overridePythonAttrs (oldAttrs: rec { + version = "1.5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; + }; + }); + + oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec { + version = "1.4.12"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; + }; + }); + + uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec { + version = "0.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; + }; + # there are no checks in this version + doCheck = false; + }); + }; + }; + +in with py.pkgs; buildPythonApplication rec { version = "3.4.0"; name = "gcalcli-${version}"; @@ -12,27 +43,21 @@ pythonPackages.buildPythonApplication rec { sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; }; - propagatedBuildInputs = with pythonPackages; [ - dateutil - gflags - google_api_python_client - httplib2 - oauth2client - parsedatetime - six - vobject - ] - ++ lib.optional (!pythonPackages.isPy3k) futures; - - # there are no tests as of 3.4.0 - doCheck = false; + propagatedBuildInputs = [ + dateutil gflags httplib2 parsedatetime six vobject + # overridden + google_api_python_client oauth2client uritemplate + ] ++ lib.optional (!isPy3k) futures; postInstall = lib.optionalString stdenv.isLinux '' - substituteInPlace $out/bin/gcalcli \ - --replace "command = 'notify-send -u critical -a gcalcli %s'" \ - "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" + substituteInPlace $out/bin/gcalcli --replace \ + "command = 'notify-send -u critical -a gcalcli %s'" \ + "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" ''; + # There are no tests as of 3.4.0 + doCheck = false; + meta = with lib; { homepage = https://github.com/insanum/gcalcli; description = "CLI for Google Calendar"; -- GitLab From b0d3ed348474f02dd79d63149706be66231dff55 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 22 Dec 2017 08:59:08 +0100 Subject: [PATCH 192/785] =?UTF-8?q?gimp:=202.8.22=20=E2=86=92=202.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/gimp/2.8.nix | 57 ----------- pkgs/applications/graphics/gimp/default.nix | 95 +++++++++++++++++++ .../graphics/gimp/plugins/default.nix | 8 +- pkgs/applications/graphics/gimp/wrapper.nix | 5 +- pkgs/applications/graphics/sane/xsane.nix | 6 +- pkgs/top-level/all-packages.nix | 8 +- 6 files changed, 108 insertions(+), 71 deletions(-) delete mode 100644 pkgs/applications/graphics/gimp/2.8.nix create mode 100644 pkgs/applications/graphics/gimp/default.nix diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix deleted file mode 100644 index 3802fff2ad2..00000000000 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf -, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff -, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python2Packages, libexif, gettext, xorg -, AppKit, Cocoa, gtk-mac-integration }: - -let - inherit (python2Packages) pygtk wrapPython python; -in stdenv.mkDerivation rec { - name = "gimp-${version}"; - version = "2.8.22"; - - # This declarations for `gimp-with-plugins` wrapper, - # (used for determining $out/lib/gimp/${majorVersion}/ paths) - majorVersion = "2.0"; - targetPluginDir = "$out/lib/gimp/${majorVersion}/plug-ins"; - targetScriptDir = "$out/lib/gimp/${majorVersion}/scripts"; - - src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"; - }; - - buildInputs = - [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo - freetype fontconfig lcms libpng libjpeg poppler libtiff webkit - libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libexif gettext xorg.libXpm - wrapPython - ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; - - pythonPath = [ pygtk ]; - - postFixup = '' - wrapPythonProgramsIn $out/lib/gimp/2.0/plug-ins/ - wrapProgram $out/bin/gimp \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" - ''; - - passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ? - - #configureFlags = [ "--disable-print" ]; - - enableParallelBuilding = true; - - # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"; - - meta = { - description = "The GNU Image Manipulation Program"; - homepage = https://www.gimp.org/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix new file mode 100644 index 00000000000..2536367f6ce --- /dev/null +++ b/pkgs/applications/graphics/gimp/default.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff +, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info +, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 +, harfbuzz, mypaint-brushes, libwebp, libgudev, openexr +, AppKit, Cocoa, gtk-mac-integration }: + +let + inherit (python2Packages) pygtk wrapPython python; +in stdenv.mkDerivation rec { + name = "gimp-${version}"; + version = "2.10.0"; + + src = fetchurl { + url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z"; + }; + + patches = [ + # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=371482; + sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc"; + }) + + # fix absolute paths stored in configuration + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6; + sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris"; + }) + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df; + sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh"; + }) + + # fix pc file (needed e.g. for building plug-ins) + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe; + sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; + propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc + buildInputs = [ + babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev + freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr + libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp + python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; + + pythonPath = [ pygtk ]; + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk_pixbuf.moduleDir}"; + + preConfigure = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/ + wrapProgram $out/bin/gimp-${stdenv.lib.versions.majorMinor version} \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = rec { + # The declarations for `gimp-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "${stdenv.lib.versions.major version}.0"; + targetPluginDir = "lib/gimp/${majorVersion}/plug-ins"; + targetScriptDir = "lib/gimp/${majorVersion}/scripts"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + }; + + configureFlags = [ + "--without-webkit" # old version is required + ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The GNU Image Manipulation Program"; + homepage = https://www.gimp.org/; + maintainers = with maintainers; [ jtojnar ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 0d4215dd5bc..a19a5487b42 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -12,12 +12,12 @@ let prePhases = "extraLib"; extraLib = '' installScripts(){ - mkdir -p ${targetScriptDir}; - for p in "$@"; do cp "$p" ${targetScriptDir}; done + mkdir -p $out/${targetScriptDir}; + for p in "$@"; do cp "$p" $out/${targetScriptDir}; done } installPlugins(){ - mkdir -p ${targetPluginDir}; - for p in "$@"; do cp "$p" ${targetPluginDir}; done + mkdir -p $out/${targetPluginDir}; + for p in "$@"; do cp "$p" $out/${targetPluginDir}; done } ''; } diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 7455a69dde9..6e450b25c04 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -4,6 +4,7 @@ let allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins); selectedPlugins = if plugins == null then allPlugins else plugins; extraArgs = map (x: x.wrapArgs or "") selectedPlugins; +versionBranch = stdenv.lib.versions.majorMinor gimp.version; in symlinkJoin { name = "gimp-with-plugins-${gimp.version}"; @@ -13,14 +14,14 @@ in symlinkJoin { buildInputs = [ makeWrapper ]; postBuild = '' - for each in gimp-2.8 gimp-console-2.8; do + for each in gimp-${versionBranch} gimp-console-${versionBranch}; do wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ ${toString extraArgs} done set +x for each in gimp gimp-console; do - ln -sf "$each-2.8" $out/bin/$each + ln -sf "$each-${versionBranch}" $out/bin/$each done ''; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index ad02e1a8023..ca0f49e0c94 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb ? null -, gimpSupport ? false, gimp_2_8 ? null +, gimpSupport ? false, gimp ? null }: -assert gimpSupport -> gimp_2_8 != null; +assert gimpSupport -> gimp != null; stdenv.mkDerivation rec { name = "xsane-0.999"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb != null then [libusb] else []) - ++ stdenv.lib.optional gimpSupport gimp_2_8; + ++ stdenv.lib.optional gimpSupport gimp; meta = { homepage = http://www.sane-project.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9513d60db4..9a667a2911f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15868,16 +15868,14 @@ with pkgs; ghq = gitAndTools.ghq; - gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { - webkit = null; + gimp = callPackage ../applications/graphics/gimp { + gegl = gegl_0_4; lcms = lcms2; + inherit (gnome3) gexiv2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; - gimp = gimp_2_8; - gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { - gimp = gimp_2_8; plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied }; -- GitLab From 882682827a0c23537951d3ad0241df11b3dbb36e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 12 Apr 2018 22:02:37 +0200 Subject: [PATCH 193/785] gimpPlugins.lqrPlugin: use liblqr1 from pkgs --- pkgs/applications/graphics/gimp/plugins/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index a19a5487b42..444fb37ae33 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -35,15 +35,6 @@ let installPhase = "installScripts ${src}"; }; - libLQR = pluginDerivation { - name = "liblqr-1-0.4.1"; - # required by lqrPlugin, you don't havet to install this lib explicitely - src = fetchurl { - url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2; - sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; - }; - }; - in rec { gap = pluginDerivation { @@ -166,12 +157,12 @@ rec { Layer/Liquid Rescale */ name = "lqr-plugin-0.6.1"; - buildInputs = with pkgs; [ libLQR ]; + buildInputs = with pkgs; [ liblqr1 ]; src = fetchurl { url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; }; - #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; + #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; installPhase = "installPlugins src/gimp-lqr-plugin"; }; -- GitLab From 63a234c4a720f3457801043276e1884e451d3b85 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 02:59:26 +0200 Subject: [PATCH 194/785] ufraw: build gimp plugin --- .../graphics/gimp/plugins/default.nix | 27 +------------------ pkgs/applications/graphics/ufraw/default.nix | 24 ++++++++++++++--- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 444fb37ae33..86e3c4e20c5 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -179,32 +179,7 @@ rec { installPhase = "installPlugins gmic_gimp"; }; - # this is more than a gimp plugin ! - # either load the raw image with gimp (and the import dialog will popup) - # or use the binary - ufraw = pluginDerivation rec { - name = "ufraw-0.19.2"; - buildInputs = with pkgs; [ gtkimageview lcms ]; - # --enable-mime - install mime files, see README for more information - # --enable-extras - build extra (dcraw, nikon-curve) executables - # --enable-dst-correction - enable DST correction for file timestamps. - # --enable-contrast - enable the contrast setting option. - # --enable-interp-none: enable 'None' interpolation (mostly for debugging). - # --with-lensfun: use the lensfun library - experimental feature, read this before using it. - # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build - # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window - configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; - - src = fetchurl { - url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; - }; - installPhase = " - installPlugins ufraw-gimp - mkdir -p $out/bin - cp ufraw $out/bin - "; - }; + ufraw = pkgs.ufraw.gimpPlugin; gimplensfun = pluginDerivation rec { version = "0.2.4"; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index fc8e7a62c2b..cb1c37aefeb 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,6 +1,9 @@ { fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib +, withGimpPlugin ? true, gimp ? null , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: +assert withGimpPlugin -> gimp != null; + stdenv.mkDerivation rec { name = "ufraw-0.22"; @@ -10,10 +13,23 @@ stdenv.mkDerivation rec { sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp"; }; - buildInputs = - [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib - libjpeg libtiff cfitsio exiv2 lcms2 lensfun - ]; + outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; + + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ + gtk2 gtkimageview bzip2 zlib + libjpeg libtiff cfitsio exiv2 lcms2 lensfun + ] ++ stdenv.lib.optional withGimpPlugin gimp; + + configureFlags = [ + "--enable-extras" + "--enable-dst-correction" + "--enable-contrast" + ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; + + postInstall = stdenv.lib.optionalString withGimpPlugin '' + moveToOutput "lib/gimp" "$gimpPlugin" + ''; meta = { homepage = http://ufraw.sourceforge.net/; -- GitLab From 4f420c6802575855a342d00c6685ac493c54139c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 06:05:04 +0200 Subject: [PATCH 195/785] =?UTF-8?q?gmic:=202.2.1=20=E2=86=92=202.2.2=20+?= =?UTF-8?q?=20build=20gimpPlugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../graphics/gimp/plugins/default.nix | 13 +---- pkgs/tools/graphics/gmic/default.nix | 51 +++++++++++-------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 86e3c4e20c5..600938645df 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -166,18 +166,7 @@ rec { installPhase = "installPlugins src/gimp-lqr-plugin"; }; - gmic = - pluginDerivation rec { - inherit (pkgs.gmic) name src meta; - - buildInputs = with pkgs; [ fftw opencv curl ]; - - sourceRoot = "${name}/src"; - - buildFlags = "gimp"; - - installPhase = "installPlugins gmic_gimp"; - }; + gmic = pkgs.gmic.gimpPlugin; ufraw = pkgs.ufraw.gimpPlugin; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index a8c491b049f..008f9af3685 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,36 +1,45 @@ -{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng, pkgconfig }: +{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig +, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng +, withGimpPlugin ? true, gimp ? null}: -stdenv.mkDerivation rec { +assert withGimpPlugin -> gimp != null; + +let + version = "2.2.2"; + + # CMakeLists.txt is missing from the tarball and Makefile is terrible + CMakeLists = fetchurl { + url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt"; + sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg"; + }; +in stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "2.2.1"; + + outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0iac1zaix2zv1dfp45ca0wk9pj6k02gf8l1vmg820z8jd12pa19w"; + sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ fftw zlib libjpeg libtiff libpng ]; + buildInputs = [ + fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick + ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ]; - sourceRoot = "${name}/src"; + cmakeFlags = [ + "-DBUILD_LIB_STATIC=OFF" + "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}" + "-DENABLE_DYNAMIC_LINKING=ON" + ]; - preBuild = '' - buildFlagsArray=( \ - CURL_CFLAGS= CURL_LIBS= \ - OPENEXR_CFLAGS= OPENEXR_LIBS= \ - OPENCV_CFLAGS= OPENCV_LIBS= \ - X11_CFLAGS="-Dcimg_display=0" X11_LIBS= \ - cli \ - ) + postPatch = '' + cp ${CMakeLists} CMakeLists.txt ''; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - - cp -v gmic $out/bin/ - cp -v ../man/gmic.1.gz $out/share/man/man1/ + preConfigure = stdenv.lib.optionalString withGimpPlugin '' + cmakeFlags="$cmakeFlags -DPLUGIN_INSTALL_PREFIX=$gimpPlugin/${gimp.targetPluginDir}" ''; meta = with stdenv.lib; { -- GitLab From 33615ccfa5a7c324a694f630f0b48fba8d40f9ba Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 29 Apr 2018 12:00:16 +0200 Subject: [PATCH 196/785] linux_hardened: enforce usercopy whitelisting The default is to warn only --- pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 3a82c00c501..a00ba9ab7b8 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -78,6 +78,9 @@ ${optionalString (versionAtLeast version "4.13") '' # Perform usercopy bounds checking. HARDENED_USERCOPY y +${optionalString (versionAtLeast version "4.16") '' + HARDENED_USERCOPY_FALLBACK n +''} # Randomize allocator freelists. SLAB_FREELIST_RANDOM y -- GitLab From 9df35787f16636628a2c7392cc4bfeff0e815242 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 15 Apr 2018 13:26:38 +0200 Subject: [PATCH 197/785] tor-browser-bundle-bin: allow unset XAUTHORITY Apparently this can happen on e.g., fedora. Closes https://github.com/NixOS/nixpkgs/issues/38671 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8a8abb42f55..a2094305db5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -340,7 +340,7 @@ stdenv.mkDerivation rec { \ TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ - XAUTHORITY="\$XAUTHORITY" \ + XAUTHORITY="\''${XAUTHORITY:-}" \ DISPLAY="\$DISPLAY" \ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ \ -- GitLab From 49003e880c3659ecd0479cfb6b227e99b650db0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Steinpa=C3=9F?= Date: Sun, 29 Apr 2018 13:26:40 +0200 Subject: [PATCH 198/785] gnunet: Add gnunet_git. --- .../networking/p2p/gnunet/git.nix | 92 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/applications/networking/p2p/gnunet/git.nix diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix new file mode 100644 index 00000000000..6a0063dfb87 --- /dev/null +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -0,0 +1,92 @@ +{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt +, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig +, libxml2, ncurses, gettext, libunistring, libidn +, makeWrapper, autoconf, automake, texinfo, which +, withVerbose ? false }: + +let + rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; +in +stdenv.mkDerivation rec { + name = "gnunet-git-${rev}"; + + src = fetchgit { + url = https://gnunet.org/git/gnunet.git; + inherit rev; + sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; + }; + + buildInputs = [ + libextractor libmicrohttpd libgcrypt gmp curl libtool + zlib adns sqlite libxml2 ncurses libidn + pkgconfig gettext libunistring makeWrapper + autoconf automake texinfo which + ]; + + configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; + + preConfigure = '' + # Brute force: since nix-worker chroots don't provide + # /etc/{resolv.conf,hosts}, replace all references to `localhost' + # by their IPv4 equivalent. + for i in $(find . \( -name \*.c -or -name \*.conf \) \ + -exec grep -l '\' {} \;) + do + echo "$i: substituting \`127.0.0.1' to \`localhost'..." + sed -i "$i" -e's/\/127.0.0.1/g' + done + + # Make sure the tests don't rely on `/tmp', for the sake of chroot + # builds. + for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ + -exec grep -l /tmp {} \;) + do + echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." + substituteInPlace "$i" --replace "/tmp" "$TMPDIR" + done + + # Ensure NSS installation works fine + configureFlags="$configureFlags --with-nssdir=$out/lib" + + sh contrib/pogen.sh + sh bootstrap + ''; + + doCheck = false; + + /* FIXME: Tests must be run this way, but there are still a couple of + failures. + + postInstall = + '' export GNUNET_PREFIX="$out" + export PATH="$out/bin:$PATH" + make -k check + ''; + */ + + meta = { + description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + + longDescription = '' + GNUnet is a framework for secure peer-to-peer networking that + does not use any centralized or otherwise trusted services. A + first service implemented on top of the networking layer + allows anonymous censorship-resistant file-sharing. Anonymity + is provided by making messages originating from a peer + indistinguishable from messages that the peer is routing. All + peers act as routers and use link-encrypted connections with + stable bandwidth utilization to communicate with each other. + GNUnet uses a simple, excess-based economic model to allocate + resources. Peers in GNUnet monitor each others behavior with + respect to resource usage; peers that contribute to the + network are rewarded with better service. + ''; + + homepage = https://gnunet.org/; + + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ba524aa722..b4b0f4098c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16026,6 +16026,8 @@ with pkgs; gnunet = callPackage ../applications/networking/p2p/gnunet { }; + gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); + gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { }); gocr = callPackage ../applications/graphics/gocr { }; -- GitLab From 518fb36dcbd4473055ff34480a8c1fa45604d03b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 14:23:36 +0200 Subject: [PATCH 199/785] gimpPlugins.focusblur: mark as broken --- pkgs/applications/graphics/gimp/plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 600938645df..b950ae7b2dd 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -88,6 +88,7 @@ rec { url = "http://registry.gimp.org/files/${name}.tar.bz2"; sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h"; }; + meta.broken = true; }; resynthesizer = pluginDerivation { -- GitLab From 4779556ed16e95c807784285a64248cf6048da41 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 14:23:46 +0200 Subject: [PATCH 200/785] gimpPlugins.texturize: mark as broken --- pkgs/applications/graphics/gimp/plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b950ae7b2dd..f491f5dc914 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -139,6 +139,7 @@ rec { sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw"; }; installPhase = "installPlugins src/texturize"; + meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1 }; waveletSharpen = pluginDerivation { -- GitLab From 5c4b687a88c9f4d2b4fa75c1919e96260d6f2e7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 14:29:36 +0200 Subject: [PATCH 201/785] gimp-with-plugins: filter out broken plugins from default selection --- pkgs/applications/graphics/gimp/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 6e450b25c04..ec529519159 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,7 +1,7 @@ { stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}: let -allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins); +allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation" && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); selectedPlugins = if plugins == null then allPlugins else plugins; extraArgs = map (x: x.wrapArgs or "") selectedPlugins; versionBranch = stdenv.lib.versions.majorMinor gimp.version; -- GitLab From a3b69a52c58baa8e9f801e227f85c8502dd21669 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 29 Apr 2018 20:34:41 +0800 Subject: [PATCH 202/785] uchiwa: 1.1.2 -> 1.2.0 --- pkgs/servers/monitoring/uchiwa/bower-packages.nix | 12 ++++++------ pkgs/servers/monitoring/uchiwa/src.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 618c3a33cd7..f18ea387551 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,15 +1,15 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "1.1.2" "1.1.2" "174flmnqjm0avpvi71ii5cvas2wkgz42is38r7n4zyrhagzlj66k") - (fetchbower "angular" "1.6.8" "~1.6.3" "07bwbahxaz5myjj7sqv7k211avs23a9j7msl373h1qvp05fblajf") + (fetchbower "uchiwa-web" "1.2.0" "1.2.0" "0733ha6bahzg9qlvhz75agi8hwwqdk99hfx9j8dhpdf1v5xkj2fz") + (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") - (fetchbower "angular-cookies" "1.6.8" "~1.6.3" "0p3skdg2pmzgwm9a0gyl1vhq4lcwyrymmii7lxlrmypjhwm83il6") + (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn") (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi") (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj") - (fetchbower "angular-resource" "1.6.8" "~1.6.3" "0pnv12c61i8giwj0fmzf38f3x6ckf24g6izrak9y7zy28nlb3y5q") - (fetchbower "angular-route" "1.6.8" "~1.6.3" "0k8sy5dkn589w8ykn65fhrcrfi7wkn7gagwwl5j5zgzj4m91wlar") - (fetchbower "angular-sanitize" "1.6.8" "~1.6.3" "0q7hy5iyjlf745yisphwa5b8rvkhc43zwwmiwfkqcdcbf3w6564l") + (fetchbower "angular-resource" "1.6.10" "~1.6.3" "1gplq8kd49qakk7ardg5xr5amwvspaz9n71kf8x49xfllda61rm0") + (fetchbower "angular-route" "1.6.10" "~1.6.3" "0vwbn7i45yvsn8c469nj141ahrn7iw85j7hy3vvhh2r373j94mai") + (fetchbower "angular-sanitize" "1.6.10" "~1.6.3" "066gsdl19s27w00wafg2skf5abdsdrlzhkcagkk1ma39dyqyl4i3") (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh") (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8") (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9") diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 3e0ead7b495..0cf6815fbe5 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "1.1.2-1"; - sha256 = "0fmzpjwmv7fkl0ihy2gzcgfd384k3wnifg42gzap770d6kl6yj1c"; + version = "1.2.0-1"; + sha256 = "1gj9cr0gkiivxdlq7ha6gxq9s8s26j79crijkrlrsqpg59jz063p"; } -- GitLab From 97adb03a9e542c9966712b9d88c84b4ed6d1a6b6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 29 Apr 2018 15:28:33 +0200 Subject: [PATCH 203/785] nixos/tests/predictable-interface-names: Refactor The Nix expression here is really hard to read with multiple (and unnecessarily) nested lets and it also generates attribute names based on the derivation generated by makeTest, which will result in these attribute names: * vm-test-run-predictableInterfaceNames * vm-test-run-predictableInterfaceNames-with-networkd * vm-test-run-unpredictableInterfaceNames * vm-test-run-unpredictableInterfaceNames-with-networkd With the refactor the attribute names are now: * predictable * predictableNetworkd * unpredictable * unpredictableNetworkd So now the code is even shorter and IMHO slightly more readable. Signed-off-by: aszlig Cc: @symphorien, @fpletz, @adisbladis --- nixos/tests/predictable-interface-names.nix | 47 ++++++++++----------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index b4c2039923c..0b431034a7a 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -1,27 +1,24 @@ -{ system ? builtins.currentSystem -, pkgs ? import ../.. { inherit system; } -}: -with import ../lib/testing.nix { inherit system; }; -let boolToString = x: if x then "yes" else "no"; in -let testWhenSetTo = predictable: withNetworkd: -makeTest { - name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; - meta = {}; +{ system ? builtins.currentSystem }: - machine = { config, pkgs, ... }: { - networking.usePredictableInterfaceNames = pkgs.stdenv.lib.mkForce predictable; - networking.useNetworkd = withNetworkd; - networking.dhcpcd.enable = !withNetworkd; - }; +let + inherit (import ../lib/testing.nix { inherit system; }) makeTest pkgs; +in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { + name = pkgs.lib.optionalString (!predictable) "un" + "predictable" + + pkgs.lib.optionalString withNetworkd "Networkd"; + value = makeTest { + name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; + meta = {}; + + machine = { config, lib, ... }: { + networking.usePredictableInterfaceNames = lib.mkForce predictable; + networking.useNetworkd = withNetworkd; + networking.dhcpcd.enable = !withNetworkd; + }; - testScript = '' - print $machine->succeed("ip link"); - $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); - $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); - ''; -}; in -with pkgs.stdenv.lib.lists; -with pkgs.stdenv.lib.attrsets; -listToAttrs (map (drv: nameValuePair drv.name drv) ( -crossLists testWhenSetTo [[true false] [true false]] -)) + testScript = '' + print $machine->succeed("ip link"); + $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); + $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); + ''; + }; +}) [[true false] [true false]]) -- GitLab From e55677bffa05c8e1f08e33b4bc08533684c20a50 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sun, 29 Apr 2018 17:09:11 +0300 Subject: [PATCH 204/785] tiled: 1.1.4 -> 1.1.5 --- pkgs/applications/editors/tiled/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 8444ff6eaec..b23db38e0f4 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "0ln8lis9g23wp3w70xwbkzqmmbkd02cdx6z7msw9lrpkjzkj7mlr"; + sha256 = "1l8sx0qfkm7n2ag0ns01vrs8mzcxzva00in4xqz4zgd505qx5q9v"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free, easy to use and flexible tile map editor"; - homepage = http://www.mapeditor.org/; + homepage = https://www.mapeditor.org/; license = with licenses; [ bsd2 # libtiled and tmxviewer gpl2Plus # all the rest -- GitLab From 067ed1c5eb0f8620f51338f061c412621c63191d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 29 Apr 2018 16:47:59 +0200 Subject: [PATCH 205/785] instead: 3.2.0 -> 3.2.1 --- pkgs/games/instead/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 343b2948d5e..697791d3857 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: let - version = "3.2.0"; + version = "3.2.1"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "0l57qdngxv9nbfj4ixr4fyanlazmdib2kr1nzv3g578308xzjv6a"; + sha256 = "1lnsawbrdhdixbdhm49hc4c9vz2l3fvrpbxyk1mia2hf4pdmc594"; }; NIX_LDFLAGS = "-llua -lgcc_s"; -- GitLab From 2085b88c01ed49b9d3d1fbc7e234cfb217fe14fd Mon Sep 17 00:00:00 2001 From: Philipp Steinpass Date: Sun, 29 Apr 2018 13:50:58 +0200 Subject: [PATCH 206/785] dehydrated: 0.6.1 -> 0.6.2 --- pkgs/tools/admin/dehydrated/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index d4211328b95..38b70d1b5d0 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,7 +1,7 @@ { stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: let pkgName = "dehydrated"; - version = "0.6.1"; + version = "0.6.2"; in stdenv.mkDerivation rec { name = pkgName + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "lukas2511"; repo = "dehydrated"; rev = "v${version}"; - sha256 = "0390fnycl3l4yqacwvaf7dp08rx2vvs27s06q7b478qzrn59flz4"; + sha256 = "19d4kam0dl6l9wfd0v54w4d085jdgi1ljksnqpjj67d6sm23f2l4"; }; buildInputs = [ makeWrapper ]; -- GitLab From a07881c8b83ecf08d1cca03d9c185fd940fe23f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 28 Apr 2018 01:40:57 +0200 Subject: [PATCH 207/785] chromium: skia patch appears to be still needed with 66 on aarch64 Cc @chaoflow @bendlas Replaces #39628 --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b591d5d7ba0..ad28d829157 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,7 +160,7 @@ let sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z"; }) ] ++ optional enableWideVine ./patches/widevine.patch - ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [ + ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch ]; -- GitLab From 905b03bce29601c23848ea6bdb4d7b879750041f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 29 Apr 2018 00:13:03 +0200 Subject: [PATCH 208/785] chromium: fix build on aarch64 chromium build on aarch64 failed with: ``` FAILED: obj/skia/skia/convolver_neon.o g++ -MMD -MF obj/skia/skia/convolver_neon.o.d -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_SUPPORT_GPU=1 -DSK_FREETYPE_MINIMUM_RUNTIME_VERSION=\(\(\(FREETYPE_MAJOR\)\ \*\ 0x01000000\)\ \|\ \(\(FREETYPE_MINOR\)\ \*\ 0x00010000\)\ \|\ \(\(FREETYPE_PATCH\)\ \*\ 0x00000100\)\) -DSK_GAMMA_EXPONENT=1.2 -DSK_GAMMA_CONTRAST=0.2 -DSK_DEFAULT_FONT_CACHE_LIMIT=20971520 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DFT_CONFIG_CONFIG_H=\"freetype-custom-config/ftconfig.h\" -DFT_CONFIG_MODULES_H=\"freetype-custom-config/ftmodule.h\" -DFT_CONFIG_OPTIONS_H=\"freetype-custom-config/ftoption.h\" -DPDFIUM_REQUIRED_MODULES -DCHROMIUM_RESTRICT_VISIBILITY -DUSE_LIBJPEG_TURBO=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DUSE_SYSTEM_ZLIB=1 -I../.. -Igen -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/encode -I../../third_party/skia/include/gpu -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/src/gpu -I../../third_party/skia/src/sksl -I../../third_party/skia/include/codec -I../../third_party/skia/include/private -I../../third_party/skia/include/client/android -I../../third_party/skia/src/codec -I../../third_party/skia/src/core -I../../third_party/skia/src/image -I../../third_party/skia/src/images -I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf -I../../third_party/skia/src/ports -I../../third_party/skia/src/shaders -I../../third_party/skia/src/shaders/gradients -I../../third_party/skia/src/sfnt -I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy -I../../third_party/skia/third_party/gif -I../../third_party/skia/src/effects/gradients -Igen/shim_headers/libpng_shim -Igen/shim_headers/zlib_shim -I../../third_party/freetype/include -I../../third_party/freetype/src/include -I../../third_party/harfbuzz-ng/src -I../../third_party/libjpeg_turbo -I../../third_party/fontconfig/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../third_party/sfntly/src/cpp/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -pthread -fno-omit-frame-pointer -g0 -fno-builtin-abs -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -isystem/nix/store/smmxgfkqaqqh43d5gmv5p3abcq19hkzy-glib-2.56.0-dev/include/glib-2.0 -isystem/nix/store/yn3bbw1sxg19h07wzn16k0ja58wr9yiz-glib-2.56.0/lib/glib-2.0/include -isystem/nix/store/f82jgynysk9mvhyfavfzims41zkskb3c-libpng-apng-1.6.34-dev/include/libpng16 -isystem/nix/store/56i89kfi2nmjrv8hifsz6zikr6pq1avw-zlib-1.2.11-dev/include -std=gnu++14 -fno-exceptions -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -fvisibility-inlines-hidden -Wno-narrowing -c ../../skia/ext/convolver_neon.cc -o obj/skia/skia/convolver_neon.o ../../skia/ext/convolver_neon.cc: In function 'int32x4_t skia::AccumRemainder(const unsigned char*, const Fixed*, int)': ../../skia/ext/convolver_neon.cc:26:65: error: cannot convert '' to 'int32x4_t {aka __vector(4) int}' in return return {remainder[0], remainder[1], remainder[2], remainder[3]}; ^ ``` The following patch appears to fix this build issue. Source: https://chromium.googlesource.com/chromium/src.git/+/b84682f31dc99b9c90f5a04947075815697c68d9%5E%21/#F0 Suggested-by: @dezgeg --- .../networking/browsers/chromium/common.nix | 1 + .../chromium/patches/neon_buildfix.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ad28d829157..6403f5441f3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -162,6 +162,7 @@ let ] ++ optional enableWideVine ./patches/widevine.patch ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch + ./patches/neon_buildfix.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch new file mode 100644 index 00000000000..b44487ca634 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch @@ -0,0 +1,21 @@ +diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc +index 26b91b9..cae6bc2 100644 +--- a/skia/ext/convolver_neon.cc ++++ b/skia/ext/convolver_neon.cc + +@@ -23,7 +23,7 @@ + remainder[2] += coeff * pixels_left[i * 4 + 2]; + remainder[3] += coeff * pixels_left[i * 4 + 3]; + } +- return {remainder[0], remainder[1], remainder[2], remainder[3]}; ++ return vld1q_s32(remainder); + } + + // Convolves horizontally along a single row. The row data is given in +@@ -336,4 +336,4 @@ + } + } + +-} // namespace skia +\ No newline at end of file ++} // namespace skia -- GitLab From 0e5eafc1fd0e58fb4bca6d0defff36e168eacc08 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Apr 2018 17:40:18 +0200 Subject: [PATCH 209/785] awscli: 1.14.50 -> 1.15.10; fix build As reported in #39676 the build broke because of ca52152 as the bump of `pythonPackages.botocore` to 1.10.9 clashed with the wanted dependencies in `awscli`. In order to reduce the risk of accidental bugs because of loosened version constraints I bumped the AWS CLI to `1.15.10` which depends on `botocore@1.10` as well. Fixes #39676 --- pkgs/tools/admin/awscli/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 23908a8b66f..4e7e2d402e9 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.14.50"; + version = "1.15.10"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1yiwj7cl9r1k9226mdq6pcmrs044k7p3d133lzgv9rb1dgp4053c"; + sha256 = "0nwpanbfx5h0bad8wwvvbhpjf9r6n885bbv2w8mw7vijdgclkq8x"; }; # No tests included @@ -42,6 +42,12 @@ in py.pkgs.buildPythonApplication rec { less ]; + postPatch = '' + for i in {py,cfg}; do + substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11" + done + ''; + postInstall = '' mkdir -p $out/etc/bash_completion.d echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli -- GitLab From 80b7298420f0ce6327f9d75f63f416d6db22231e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 28 Apr 2018 22:13:12 -0400 Subject: [PATCH 210/785] =?UTF-8?q?ldb:=201.1.27=20=E2=86=92=201.1.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #39572 --- pkgs/development/libraries/ldb/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 4f2785675f0..c178f2f76a4 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, pkgconfig, readline, tdb, talloc, tevent -, popt, libxslt, docbook_xsl, docbook_xml_dtd_42 +, popt, libxslt, docbook_xsl, docbook_xml_dtd_42, cmocka }: stdenv.mkDerivation rec { - name = "ldb-1.1.27"; + name = "ldb-1.1.31"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d"; + sha256 = "04d53e2ab5b35688f5ed7a4471f5b273da121016e1af0630b36a36506afaeb46" ; }; outputs = [ "out" "dev" ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ python readline tdb talloc tevent popt libxslt docbook_xsl docbook_xml_dtd_42 + cmocka ]; preConfigure = '' -- GitLab From 7d68eadf373f9962b0e6c9f9299563c543245396 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Apr 2018 13:30:09 -0400 Subject: [PATCH 211/785] nixos/acme: Fix broken post-stop script Previously the script would contain an empty `if` block (which is invalid syntax) if both `data.activationDelay == null` and `data.postRun == ""`. Fix this by adding a no-op `true`. --- nixos/modules/security/acme.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e430c2ddb90..9e5d636241e 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -257,7 +257,7 @@ in if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then ${if data.activationDelay != null then '' - + ${data.preDelay} if [ -d '${lpath}' ]; then @@ -266,6 +266,10 @@ in systemctl --wait start acme-setlive-${cert}.service fi '' else data.postRun} + + # noop ensuring that the "if" block is non-empty even if + # activationDelay == null and postRun == "" + true fi ''; @@ -294,7 +298,7 @@ in chown '${data.user}:${data.group}' '${cpath}' fi ''; - script = + script = '' workdir="$(mktemp -d)" -- GitLab From 80bf73b11c6e5b4f9fdf499d85a7d66f6be04f90 Mon Sep 17 00:00:00 2001 From: Matan Shenhav Date: Sun, 29 Apr 2018 21:22:12 +0300 Subject: [PATCH 212/785] pythonPackages.hdbscan: init at 0.8.12 (#37762) --- .../python-modules/hdbscan/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/hdbscan/default.nix diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix new file mode 100644 index 00000000000..3d57ff37166 --- /dev/null +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, cython +, numpy +, nose +, scipy +, scikitlearn +, fetchPypi +}: + +buildPythonPackage rec { + pname = "hdbscan"; + version = "0.8.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yxi34frg2jwyvjl942qy4gq5pbx8dq4pf4p28d1xah8njchfqir"; + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ cython numpy scipy scikitlearn ]; + + meta = with lib; { + description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; + homepage = http://github.com/scikit-learn-contrib/hdbscan; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93444be7302..6635721ee95 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6342,6 +6342,8 @@ in { propagatedBuildInputs = with self; [ requests webob ]; }; + hdbscan = callPackage ../development/python-modules/hdbscan { }; + hmmlearn = callPackage ../development/python-modules/hmmlearn { }; hcs_utils = callPackage ../development/python-modules/hcs_utils { }; -- GitLab From 8a07916fa965d752d929890c4621823401862ab6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 20:30:51 +0000 Subject: [PATCH 213/785] hplip: 3.17.11 -> 3.18.3 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b18ae7762df..91be6cf743a 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -11,16 +11,16 @@ let name = "hplip-${version}"; - version = "3.17.11"; + version = "3.18.3"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g"; + sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "0vqhwqc33vxncdhbzdchbgrcrxvkwnp7rc2hkswwn9da112s0c9w"; + sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw"; }; hplipState = substituteAll { -- GitLab From 0be5637139970d5ae6aef1999769b600765a95f6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 14:27:26 -0500 Subject: [PATCH 214/785] netbsd.games: disable more games on darwin --- pkgs/os-specific/bsd/netbsd/default.nix | 33 +++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 343b61bab38..ecd09eaff80 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -381,19 +381,26 @@ in rec { # to build but need to look at how to implement stuff in # Linux. macOS is missing gettime. TODO try to get these # working. - substituteInPlace Makefile \ - ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \ - --replace atc "" \ - --replace boggle "" \ - --replace dm "" \ - --replace fortune "" \ - --replace hunt "" \ - --replace larn "" \ - --replace phantasia "" \ - --replace rogue "" \ - --replace sail "" \ - --replace trek "" \ - --replace dab "" + disableGame() { + substituteInPlace Makefile --replace $1 "" + } + + disableGame atc + disableGame boggle + disableGame dm + disableGame fortune + disableGame hunt + disableGame larn + disableGame phantasia + disableGame rogue + disableGame sail + disableGame trek + disableGame dab + ${lib.optionalString stdenv.isDarwin "disableGame adventure"} + ${lib.optionalString stdenv.isDarwin "disableGame factor"} + ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} + ${lib.optionalString stdenv.isDarwin "disableGame mille"} + substituteInPlace Makefile.inc \ --replace 2555 555 \ --replace 2550 550 -- GitLab From c2148482c2b4d479017d94c5e8b80bdc9bdb9a03 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 14:46:54 -0500 Subject: [PATCH 215/785] libressl: move netcat stuff to '.nc' output I still feel weird about doing this because it seems a little hacky but this was requested by @Mic92 and seems understandable to not want to mix up libressl outputs with netcat stuff. --- pkgs/development/libraries/libressl/default.nix | 11 ++++++++--- pkgs/top-level/aliases.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 8f028bcb546..b65c813f230 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib }: let @@ -15,11 +15,16 @@ let enableParallelBuilding = true; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" "nc" ]; + + postFixup = '' + moveToOutput "bin/nc" "$nc" + moveToOutput "share/man/man1/nc.1${lib.optionalString (!dontGzipMan) ".gz"}" "$nc" + ''; dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong - meta = with stdenv.lib; { + meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; platforms = platforms.all; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a7f59d1268f..334905b79f2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,7 +138,7 @@ mapAliases (rec { mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 ncat = nmap; # added 2016-01-26 - netcat-openbsd = libressl.bin; # added 2018-04-25 + netcat-openbsd = libressl.nc; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 -- GitLab From e8672c8b3751622c5d603bc7bb144377d1d3498c Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 29 Apr 2018 15:14:34 -0500 Subject: [PATCH 216/785] libressl: fix eval --- pkgs/development/libraries/libressl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index b65c813f230..51162979e63 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -19,7 +19,7 @@ let postFixup = '' moveToOutput "bin/nc" "$nc" - moveToOutput "share/man/man1/nc.1${lib.optionalString (!dontGzipMan) ".gz"}" "$nc" + moveToOutput "share/man/man1/nc.1${lib.optionalString (dontGzipMan==null) ".gz"}" "$nc" ''; dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong -- GitLab From caed1877ebf7a84f16ac1eb6af641af155e47b5b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 Apr 2018 20:51:39 +0200 Subject: [PATCH 217/785] cryptsetup-generator: add postFixup This makes cryptsetup-generator link correctly to the shared systemd library. --- .../linux/systemd/cryptsetup-generator.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index f69269347e3..5c6efb44013 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -13,6 +13,17 @@ stdenv.lib.overrideDerivation systemd (p: { ninja systemd-cryptsetup systemd-cryptsetup-generator ''; + # As ninja install is not used here, the rpath needs to be manually fixed. + # Otherwise the resulting binary doesn't properly link against systemd-shared.so + postFixup = '' + sharedLib=libsystemd-shared-${p.version}.so + for prog in `find $out -type f -executable`; do + (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog + ) || true + done + ''; + installPhase = '' mkdir -p $out/lib/systemd/ cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup -- GitLab From 87b51a1e670e1f973c48d1f8d896b2098e8769ca Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sun, 29 Apr 2018 22:22:19 +0200 Subject: [PATCH 218/785] wine-{Unstable,Staging}: 3.5 -> 3.7 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index f86e34a5d54..817241fbe0f 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.5"; + version = "3.7"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl"; + sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn"; + sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; -- GitLab From 146cb02542989d67f6bb11e1206562f44c0e1eec Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 29 Apr 2018 23:39:25 +0200 Subject: [PATCH 219/785] nixos/tests/hibernate: Fix netcat flags I'm not sure why 024b501907eafbd89624e465ff21afbc96e9fec6 used -q 0 because even netcat-openbsd has the -N flag which IMO is the better way to shutdown the socket on EOF. Our default netcat implementation has changed once again[1] in 3c3b82234a6faa5a4c07323d0066452055d1ea81 and we're now using LibreSSL's implementation, which doesn't have a -q flag. See https://github.com/NixOS/nixpkgs/pull/39634 for the pull request introducing the switch. [1]: https://github.com/NixOS/nixpkgs/pull/19982 Signed-off-by: aszlig Cc: @matthewbauer, @dtzWill, @Mic92 --- nixos/tests/hibernate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index a95235887e8..3ae2bdffed9 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -37,7 +37,7 @@ import ./make-test.nix (pkgs: { $machine->waitForShutdown; $machine->start; $probe->waitForUnit("network.target"); - $probe->waitUntilSucceeds("echo test | nc machine 4444 -q 0"); + $probe->waitUntilSucceeds("echo test | nc machine 4444 -N"); ''; }) -- GitLab From f12b93162a134cf9bfa4fcdaf10966922fbec6f7 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 29 Apr 2018 18:30:42 -0500 Subject: [PATCH 220/785] rl-1809: add netcat note --- nixos/doc/manual/release-notes/rl-1809.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 2e53f0563ba..62f1b769463 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -68,6 +68,15 @@ following incompatible changes: points to the package which is bundled with the unfree libspotify package. + + + The netcat package is now taken directly from OpenBSD's + libressl, instead of relying on Debian's fork. The new + version should be very close to the old version, but there are some minor + differences. Importantly, flags like -b, -q, -C, and -Z are no longer + accepted by the nc command. + + -- GitLab From 62eb285a621e1b09ea82387c15a817cf07d61d9e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 28 Mar 2018 12:48:31 +0200 Subject: [PATCH 221/785] qpdfview: port to qt5 --- pkgs/applications/misc/qpdfview/default.nix | 24 ++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index e3e7ff950b0..a4fd1d35674 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups +{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups , file, ghostscript }: let @@ -10,9 +10,9 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - qt4 poppler_qt4 djvulibre libspectre cups file ghostscript + qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { @@ -21,13 +21,17 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - configurePhase = '' - qmake *.pro - for i in *.pro; do - qmake "$i" -o "Makefile.$(basename "$i" .pro)" - done - sed -e "s@/usr/@$out/@g" -i Makefile* - ''; + qmakeFlags = [ + "*.pro" + "TARGET_INSTALL_PATH=${placeholder "out"}/bin" + "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview" + "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview" + "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1" + "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps" + "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications" + "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata" + ]; + meta = { inherit (s) version; description = "A tabbed document viewer"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c..34e13559c64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18213,7 +18213,7 @@ with pkgs; vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); - qpdfview = callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; -- GitLab From 8ce6587966040ab03a2f7d1d26223bed59c65cbe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:21:01 +0800 Subject: [PATCH 222/785] utox: 0.16.1 -> 0.17.0 --- .../instant-messengers/utox/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 9c208dd52a8..e139904fee5 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }: +{ stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig +, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }: stdenv.mkDerivation rec { name = "utox-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828"; + sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"; + fetchSubmodules = true; }; buildInputs = [ @@ -20,16 +22,20 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake git pkgconfig check + check cmake pkgconfig ]; cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + "-DENABLE_AUTOUPDATE=OFF" + ] ++ lib.optional (doCheck) "-DENABLE_TESTS=ON"; - doCheck = true; + doCheck = stdenv.isLinux; - checkTarget = "test"; + checkPhase = '' + runHook preCheck + ctest -VV + runHook postCheck + ''; meta = with stdenv.lib; { description = "Lightweight Tox client"; -- GitLab From 8811d1d384d38962927450cf8f69d675f72ee80a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:21:25 +0800 Subject: [PATCH 223/785] toxvpn: 2017-06-25 -> 2018-04-17 --- pkgs/tools/networking/toxvpn/default.nix | 19 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c7fa1c7a271..ccb9f3bc0d6 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,25 +1,22 @@ { stdenv, fetchFromGitHub, cmake, nlohmann_json, -libtoxcore, libsodium, systemd, libcap, zeromq }: + libtoxcore, libsodium, libcap, zeromq, + systemd ? null }: with stdenv.lib; -let - systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd; - if_systemd = optional (systemdOrNull != null); -in stdenv.mkDerivation rec { - name = "toxvpn-${version}"; - version = "2017-06-25"; +stdenv.mkDerivation rec { + name = "toxvpn-2018-04-17"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "7bd6f169d69c511affa8c9672e8f794e4e205a44"; - sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0"; + rev = "dc766f98888f500ea51f002f59007eac3f3a0a06"; + sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz"; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ if_systemd systemd - ++ optional (stdenv.system != "x86_64-darwin") libcap; + ++ optionals stdenv.isLinux [ libcap systemd ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9224ecbe66..c60f99b82cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5220,7 +5220,7 @@ with pkgs; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; - toxvpn = callPackage ../tools/networking/toxvpn { }; + toxvpn = callPackage ../tools/networking/toxvpn { libtoxcore = libtoxcore_0_1; }; tpmmanager = callPackage ../applications/misc/tpmmanager { }; -- GitLab From 841643796a8efc8c3412eb7488646094cb607ef7 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 29 Apr 2018 20:03:05 -0400 Subject: [PATCH 224/785] rclone: 1.40 -> 1.41 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index aa2a971b15f..405ff2fde73 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.40"; + version = "1.41"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9"; + sha256 = "0kvqzrj7kbr9mhg023lkvk320qhkf4widcv6yph1cx701935brhr"; }; outputs = [ "bin" "out" "man" ]; -- GitLab From 47a738339553e5416e9edb4c5bc71c3497911fb1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 19:14:00 -0500 Subject: [PATCH 225/785] darling: fix src Darling has a case conflict which means that its src hash will be different between case sensitive and case insensitive file systems. This is not ideal and the only way around it is basically to remove the offending files from the output. I use fetchzip here to do that but I hope there is a better fix available eventually. --- pkgs/os-specific/darwin/darling/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index b9d806cded2..c1e29843147 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -1,14 +1,19 @@ -{stdenv, lib, fetchFromGitHub, cmake, bison, flex}: +{stdenv, lib, fetchzip, cmake, bison, flex}: stdenv.mkDerivation rec { pname = "darling"; name = pname; - src = fetchFromGitHub { - repo = pname; - owner = "darlinghq"; - rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b"; - sha256 = "1sdl0ysa3yfdvkq0x7vkdl64g7mcfy3qx70saf1d8rnhycbxjgjg"; + src = fetchzip { + url = "https://github.com/darlinghq/darling/archive/d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b.tar.gz"; + sha256 = "11b51fw47nl505h63bgx5kqiyhf3glhp1q6jkpb6nqfislnzzkrf"; + postFetch = '' + # Get rid of case conflict + mkdir $out + cd $out + tar -xzf $downloadedFile --strip-components=1 + rm -r $out/src/libm + ''; }; # only packaging sandbox for now -- GitLab From 9e503e039b6adce89bc0b99cbf6e5b24d3b75118 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Apr 2018 02:22:54 +0200 Subject: [PATCH 226/785] qpdfview: remove placeholder usage --- pkgs/applications/misc/qpdfview/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index a4fd1d35674..f836ce5b808 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -21,16 +21,11 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - qmakeFlags = [ - "*.pro" - "TARGET_INSTALL_PATH=${placeholder "out"}/bin" - "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview" - "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview" - "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1" - "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps" - "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications" - "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata" - ]; + + # TODO: revert this once placeholder is supported + preConfigure = '' + qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata" + ''; meta = { inherit (s) version; -- GitLab From 82080d77a0f135ddb6a980e110d7e67282bc8be3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 29 Apr 2018 20:32:41 -0400 Subject: [PATCH 227/785] wire-desktop: correct desktopItem --- .../networking/instant-messengers/wire-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 9e946152c19..f0123024fe2 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -61,7 +61,7 @@ in }; desktopItem = makeDesktopItem { - name = "Wire"; + name = "wire-desktop"; exec = "wire-desktop %U"; icon = "wire-desktop"; comment = "Secure messenger for everyone"; -- GitLab From 1907120f23ada097ccf00ba8ac040097c911e9e6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 30 Apr 2018 00:21:36 +0200 Subject: [PATCH 228/785] nixos/tests/udisks2: Fix USB device hotplug The usb_add and usb_del monitor commands have been removed in QEMU version 2.12 (introduced in 3e3b39f173f9abc99da84084a1f4657c9de885bd). Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes: > The deprecated HMP commands "usb_add" and "usb_del" have been removed. > Use "device_add" and "device_del" as replacement instead. So we're doing exactly that and the udisks2 test now works again. Signed-off-by: aszlig Cc: @edolstra --- nixos/tests/udisks2.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 72d51c0051c..70a999267a5 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -37,7 +37,8 @@ in $machine->fail("udisksctl info -b /dev/sda1"); # Attach a USB stick and wait for it to show up. - $machine->sendMonitorCommand("usb_add disk:$stick"); + $machine->sendMonitorCommand("drive_add 0 id=stick,if=none,file=$stick,format=raw"); + $machine->sendMonitorCommand("device_add usb-storage,id=stick,drive=stick"); $machine->waitUntilSucceeds("udisksctl info -b /dev/sda1"); $machine->succeed("udisksctl info -b /dev/sda1 | grep 'IdLabel:.*USBSTICK'"); @@ -52,7 +53,7 @@ in $machine->fail("[ -d /run/media/alice/USBSTICK ]"); # Remove the USB stick. - $machine->sendMonitorCommand("usb_del 0.3"); # FIXME + $machine->sendMonitorCommand("device_del stick"); $machine->waitUntilFails("udisksctl info -b /dev/sda1"); $machine->fail("[ -e /dev/sda ]"); ''; -- GitLab From f148c5c4a1ffa353836bfd18a94d457acf83bd36 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 30 Apr 2018 01:43:17 +0200 Subject: [PATCH 229/785] nixos/tests: Fix QEMU flags for SCSI disks The ability to specify "-drive if=scsi" has been removed in QEMU version 2.12 (introduced in 3e3b39f173f9abc99da84084a1f4657c9de885bd). Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes: > The deprecated way of configuring SCSI devices with "-drive if=scsi" > on x86 has been removed. Use an appropriate SCSI controller together > "-device scsi-hd" or "-device scsi-cd" and a corresponding "-blockdev" > parameter instead. So whenever the diskInterface is "scsi" we use the new way to specify the drive and fall back to the deprecated way for the time being. The reason why I'm not using the new way for "virtio" and "ide" as well is because there is no simple generic way anymore to specify these. This also turns the type of the virtualisation.qemu.diskInterface option to be an enum, so the user knows which values are allowed but we can also make sure the right value is provided to prevent typos. I've tested this against a few non-disk-related NixOS VM tests but also the installer.grub1 test (because it uses "ide" as its drive interface), the installer.simple test (just to be sure it still works with "virtio") and all the tests in nixos/tests/boot.nix. In order to be able to run the grub1 test I had to go back to 8b1cf100cd8badad6e1b6d4650b904b88aa870db (which is a known commit where that test still works) and apply the QEMU update and this very commit, because right now the test is broken. Apart from the tests here in nixpkgs, I also ran another[1] test in another repository which uses the "scsi" disk interface as well (in comparison to most of the installer tests, this one actually failed prior to this commit). All of them now succeed. [1]: https://github.com/openlab-aux/vuizvui/blob/9b5a119972e9c2d327500638d89063f4fce243ec/tests/system/kernel/bfq.nix Signed-off-by: aszlig Cc: @edostra, @grahamc, @dezgeg, @abbradar, @ts468 --- nixos/lib/test-driver/Machine.pm | 17 +++++++++++--- nixos/modules/virtualisation/qemu-vm.nix | 30 +++++++++++++++++------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 7e269b43e70..b18f48464ce 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -33,9 +33,20 @@ sub new { $startCommand = "qemu-kvm -m 384 " . "-net nic,model=virtio \$QEMU_OPTS "; - my $iface = $args->{hdaInterface} || "virtio"; - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,werror=report " - if defined $args->{hda}; + + if (defined $args->{hda}) { + if ($args->{hdaInterface} eq "scsi") { + $startCommand .= "-drive id=hda,file=" + . Cwd::abs_path($args->{hda}) + . ",werror=report,if=none " + . "-device scsi-hd,drive=hda "; + } else { + $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) + . ",if=" . $args->{hdaInterface} + . ",werror=report "; + } + } + $startCommand .= "-cdrom $args->{cdrom} " if defined $args->{cdrom}; $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk " diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 3d4bd315f81..66ff43c8547 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -27,6 +27,21 @@ let kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; + # XXX: This is very ugly and in the future we really should use attribute + # sets to build ALL of the QEMU flags instead of this mixed mess of Nix + # expressions and shell script stuff. + mkDiskIfaceDriveFlag = idx: driveArgs: let + inherit (cfg.qemu) diskInterface; + # The drive identifier created by incrementing the index by one using the + # shell. + drvId = "drive$((${idx} + 1))"; + # NOTE: DO NOT shell escape, because this may contain shell variables. + commonArgs = "index=${idx},id=${drvId},${driveArgs}"; + isSCSI = diskInterface == "scsi"; + devArgs = "${diskInterface}-hd,drive=${drvId}"; + args = "-drive ${commonArgs},if=none -device lsi53c895a -device ${devArgs}"; + in if isSCSI then args else "-drive ${commonArgs},if=${diskInterface}"; + # Shell script to start the VM. startVM = '' @@ -68,7 +83,7 @@ let if ! test -e "empty$idx.qcow2"; then ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" fi - extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=${cfg.qemu.diskInterface},werror=report" + extraDisks="$extraDisks ${mkDiskIfaceDriveFlag "$idx" "file=$(pwd)/empty$idx.qcow2,werror=report"}" idx=$((idx + 1)) '')} @@ -83,14 +98,14 @@ let -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ ${if cfg.useBootLoader then '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ - -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \ + ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ + ${mkDiskIfaceDriveFlag "1" "file=$TMPDIR/disk.img,media=disk"} \ ${if cfg.useEFIBoot then '' -pflash $TMPDIR/bios.bin \ '' else '' ''} '' else '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ + ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \ @@ -338,11 +353,8 @@ in mkOption { default = "virtio"; example = "scsi"; - type = types.str; - description = '' - The interface used for the virtual hard disks - (virtio or scsi). - ''; + type = types.enum [ "virtio" "scsi" "ide" ]; + description = "The interface used for the virtual hard disks."; }; }; -- GitLab From cf194a93115ac1354f0e49f49c1f44aac74b3d6d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 29 Apr 2018 22:29:10 -0400 Subject: [PATCH 230/785] linux: 4.17-rc2 -> 4.17-rc3 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6370f82235a..d02ab415719 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc2"; - modDirVersion = "4.17.0-rc2"; + version = "4.17-rc3"; + modDirVersion = "4.17.0-rc3"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1z4kl25x8m498wicbzhx21kvksp63ab8l2s0nfxf7fwj7dd13cld"; + sha256 = "1divgjzmpl98b5j416vhkq53li0y9v5vvdwbgwpr2xznspzbkygq"; }; # Should the testing kernels ever be built on Hydra? -- GitLab From d0c8bf86e4bb6839b3567178bae2d0bba2ebb8ac Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 29 Apr 2018 23:19:19 -0400 Subject: [PATCH 231/785] dbeaver: 5.0.3 -> 5.0.4 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 002d8fc8f23..edc1497294f 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.0.3"; + version = "5.0.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0pk40jzmd23cv690a8wslxbb4xp4msq2zwh7xm0hvs64ykm9a581"; + sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3"; }; installPhase = '' -- GitLab From d207e043d3315330e5011be63783a335f645c9d0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 29 Apr 2018 22:46:16 -0400 Subject: [PATCH 232/785] asymptote: move Emacs Lisp files to $out/share/emacs/site-lisp/asymptote/ This way, emacs can find the 'asymptote' mode. --- pkgs/tools/graphics/asymptote/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 7337cd227a2..01ddd6ba7fc 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -51,7 +51,9 @@ stdenv.mkDerivation { rmdir $out/share/info/asymptote rm $out/share/info/dir - rm -rf "$out"/share/texmf + rm -rfv "$out"/share/texmf + mkdir -pv "$out"/share/emacs/site-lisp/${s.name} + mv -v "$out"/share/asymptote/*.el "$out"/share/emacs/site-lisp/${s.name} ''; enableParallelBuilding = true; -- GitLab From b3d5ca8359d3fac0f21ccece79c202557a9433b5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 30 Apr 2018 05:53:38 +0200 Subject: [PATCH 233/785] nixos/dhparams: Set default bit size to 2048 @Ekleog writes in https://github.com/NixOS/nixpkgs/pull/39526: > I think a default of 4096 is maybe too much? See certbot/certbot#4973; > Let's Encrypt supposedly know what they are doing and use a > pre-generated 2048-bit DH params (and using the same DH params as > others is quite bad, even compared to lower bit size, if I correctly > remember the attacks available -- because it increases by as much the > value of breaking the group). > Basically I don't have anything personal against 4096, but fear it may > re-start the arms race: people like having "more security" than their > distributions, and having NixOS already having more security than is > actually useful (I personally don't know whether a real-size quantum > computer will come before or after our being able to break 2048-bit > keys, let alone 3072-bit ones -- see wikipedia for some numbers). > So basically, I'd have set it to 3072 in order to both decrease build > time and avoid having people setting it to 8192 and complaining about > how slow things are, but that's just my opinion. :) While he suggests is 3072 I'm using 2048 now, because it's the default of "openssl dhparam". If users want to have a higher value, they can still change it. Signed-off-by: aszlig --- nixos/modules/security/dhparams.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 481d4c5db51..beac125fc6e 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -10,7 +10,7 @@ let name = "bits"; description = "integer of at least 16 bits"; }; - default = 4096; + default = 2048; description = '' The bit size for the prime that is used during a Diffie-Hellman key exchange. -- GitLab From f3062702096f42c6a2349693bf776e17fb8dd4d9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 23:11:37 -0500 Subject: [PATCH 234/785] netbsd.games: cleanup This gets a few more games working. --- pkgs/os-specific/bsd/netbsd/default.nix | 73 ++++++++++++++++++++----- 1 file changed, 59 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index ecd09eaff80..4961ab6080a 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,5 +1,5 @@ { stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils -, yacc, flex, libressl, bash }: +, yacc, flex, libressl, bash, more }: let fetchNetBSD = path: version: sha256: fetchcvs { @@ -42,6 +42,7 @@ let LIBCURSES = ""; LIBTERMINFO = ""; LIBM = ""; + LIBL = ""; "LIBDO.terminfo" = "_external"; "LIBDO.curses" = "_external"; _GCC_CRTBEGIN = ""; @@ -370,6 +371,14 @@ in rec { version = "7.1.2"; }; + dict = netBSDDerivation { + path = "share/dict"; + version = "7.1.2"; + sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; + preBuild = "mkdir -p $out/share/dict"; + makeFlags = [ "BINDIR=/share" ]; + }; + games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; @@ -377,6 +386,21 @@ in rec { patchPhase = '' sed -i '1i #include ' adventure/save.c + for f in $(find . -name pathnames.h); do + substituteInPlace $f \ + --replace /usr/share/games $out/share/games \ + --replace /usr/games $out/bin \ + --replace /usr/libexec $out/libexec \ + --replace /var/games $out/var/games \ + --replace /usr/bin/more ${more}/bin/more \ + --replace /usr/share/dict ${dict}/share/dict + done + substituteInPlace ching/ching/ching.sh \ + --replace /usr/share $out/share \ + --replace /usr/libexec $out/libexec + substituteInPlace hunt/huntd/driver.c \ + --replace "(void) setpgrp(getpid(), getpid());" "" + # Disable some games that don't build. They should be possible # to build but need to look at how to implement stuff in # Linux. macOS is missing gettime. TODO try to get these @@ -386,16 +410,10 @@ in rec { } disableGame atc - disableGame boggle disableGame dm - disableGame fortune - disableGame hunt - disableGame larn - disableGame phantasia - disableGame rogue - disableGame sail - disableGame trek disableGame dab + ${lib.optionalString stdenv.isDarwin "disableGame sail"} + ${lib.optionalString stdenv.isDarwin "disableGame trek"} ${lib.optionalString stdenv.isDarwin "disableGame adventure"} ${lib.optionalString stdenv.isDarwin "disableGame factor"} ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} @@ -405,6 +423,17 @@ in rec { --replace 2555 555 \ --replace 2550 550 ''; + + # HACK strfile needs to be installed first & in the path + preBuild = '' + pushd fortune/strfile + mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8 + make + make BINDIR=/bin install + popd + export PATH=$out/bin:$PATH + ''; + NIX_CFLAGS_COMPILE = [ "-D__noinline=" "-D__scanflike(a,b)=" @@ -412,24 +441,29 @@ in rec { "-DOXTABS=XTABS" "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" - (if hostPlatform.isMusl then "-include sys/ttydefaults.h -include sys/file.h" else "") + (lib.optionalString hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h") + "-DBE32TOH(x)=((void)0)" + "-DBE64TOH(x)=((void)0)" + "-D__c99inline=__inline" ]; + postBuild = '' mkdir -p $out/usr/games $out/usr/share/games/ching \ + $out/usr/share/games/fortune \ $out/usr/share/games/quiz.db \ + $out/usr/share/games/boggle \ $out/usr/libexec/ching $out/var/games/hackdir touch $out/var/games/hackdir/perm ''; + preFixup = '' mkdir -p $out/bin mv $out/games/* $out/bin rmdir $out/games ''; + buildInputs = [ compat libcurses libterminfo libressl ]; - extraPaths = [ - (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4") - who.src - ]; + extraPaths = [ dict.src who.src ]; }; # finger = netBSDDerivation { @@ -477,6 +511,17 @@ in rec { sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; MKPIC = if stdenv.isDarwin then "no" else "yes"; + patchPhase = '' + substituteInPlace term.c \ + --replace /usr/share $out/share + ''; + postBuild = '' + pushd $NETBSDSRCDIR/share/terminfo + mkdir -p $out/share/misc + make + make BINDIR=/share install + popd + ''; extraPaths = [ (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") ]; -- GitLab From 5f5257dbce61d8fd417b64b59ddaffc62c695f4f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 30 Apr 2018 13:31:09 +0800 Subject: [PATCH 235/785] go-ethereum: 1.8.3 -> 1.8.6 --- pkgs/applications/altcoins/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 65e1dbc9b19..a47b7fa3168 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.3"; + version = "1.8.6"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1vdrf3fi4arr6aivyp5myj4jy7apqbiqa6brr3jplmc07q1yijnf"; + sha256 = "1n6f34r7zlc64l1q8xzcjk5sljdznjwp81d9naapprhpqb8g01gl"; }; meta = with stdenv.lib; { -- GitLab From 6a560f499c5a1038a573ea961ef1d1166e1b3677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 30 Apr 2018 07:43:57 +0100 Subject: [PATCH 236/785] gperftools: suppress compilation warning on macOS --- pkgs/development/libraries/gperftools/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 2a2710531e0..de71704cff8 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { substituteInPlace libtool --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isDarwin "-D_XOPEN_SOURCE"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ + "-D_XOPEN_SOURCE" "-Wno-aligned-allocation-unavailable" + ]; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools -- GitLab From 8ce6db16244b2fb312a2cfb7a8ba425dc3b4a18a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 16:11:37 +0800 Subject: [PATCH 237/785] grc: 1.11.1 -> 1.11.3 --- pkgs/tools/misc/grc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index c554c13bb4a..451828b0f47 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "grc-${version}"; - version = "1.11.1"; + version = "1.11.3"; src = fetchFromGitHub { owner = "garabik"; repo = "grc"; rev = "v${version}"; - sha256 = "10h65qmv2cymixzfsckfcn6f01xsjzfq1x303rv01nibniwbq5z9"; + sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; }; buildInputs = with python3Packages; [ wrapPython makeWrapper ]; -- GitLab From 6a32965e17910c18bd166a79502c0a3639854ea7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Apr 2018 22:09:25 +0200 Subject: [PATCH 238/785] notary: fix build The package is broken on master for some time now: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.notary.x86_64-linux/all The main reason for the breackage is that the `Makefile` script attempts to retrieve the latest git commit by using `git rev-parse` which breaks as `git` is not in the build environment. This could be fixed by using `?=` rather than `:=` for the `GITCOMMIT` variable in the `make` script to easily override `GITCOMMIT` in the `buildPhase`. See the Hydra logs for reference: https://nix-cache.s3.amazonaws.com/log/ib4qp8h4r8d830ra4fah38l7ybb82gp7-notary-0.6.0.drv Furthermore some refactoring was applied: * Activated the test suite for `cmd/notary` to confirm the basic functionality when building for NixOS. * Added {pre,post} hooks for `{build,install}Phase` * Added myself as maintainer to have more people available in case of further breakage. --- pkgs/tools/security/notary/default.nix | 32 ++++++++++++------- pkgs/tools/security/notary/no-git-usage.patch | 15 +++++++++ 2 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 pkgs/tools/security/notary/no-git-usage.patch diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 4a42c9162e1..071bfdaea00 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -1,32 +1,42 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, git, libtool }: +{ stdenv, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { name = "notary-${version}"; - version = "0.6.0"; - gitcommit = "34f53ad"; + version = "0.6.1"; + gitcommit = "d6e1431f"; src = fetchFromGitHub { owner = "theupdateframework"; repo = "notary"; rev = "v${version}"; - sha256 = "0lg7ab2agkk3rnladcvpdzk8cnf3m49qfm4sanh7yjvlvlv1wm4a"; + sha256 = "1ak9dk6vjny5069hp3w36dbjawcnaq82l3i2qvf7mn7zfglbsnf9"; }; - buildInputs = [ libtool ]; - - goPackagePath = "github.com/theupdateframework/notary"; + patches = [ ./no-git-usage.patch ]; + buildInputs = [ libtool ]; buildPhase = '' + runHook preBuild cd go/src/github.com/theupdateframework/notary - make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client + make client GITCOMMIT=${gitcommit} + runHook postBuild ''; + goPackagePath = "github.com/theupdateframework/notary"; + installPhase = '' + runHook preInstall install -D bin/notary $bin/bin/notary + runHook postInstall + ''; + + doCheck = true; + checkPhase = '' + make test PKGS=github.com/theupdateframework/notary/cmd/notary ''; meta = with stdenv.lib; { - description = " Notary is a project that allows anyone to have trust over arbitrary collections of data"; + description = "Notary is a project that allows anyone to have trust over arbitrary collections of data"; longDescription = '' The Notary project comprises a server and a client for running and interacting with trusted collections. See the service architecture @@ -49,7 +59,7 @@ buildGoPackage rec { ''; license = licenses.asl20; homepage = https://github.com/theupdateframework/notary; - maintainers = with maintainers; [ vdemeester ]; - platforms = with platforms; unix; + maintainers = with maintainers; [ vdemeester ma27 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/notary/no-git-usage.patch b/pkgs/tools/security/notary/no-git-usage.patch new file mode 100644 index 00000000000..363eefe3692 --- /dev/null +++ b/pkgs/tools/security/notary/no-git-usage.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index ab794165..0cbd047f 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,8 +5,8 @@ PREFIX?=$(shell pwd) + # Add to compile time flags + NOTARY_PKG := github.com/theupdateframework/notary + NOTARY_VERSION := $(shell cat NOTARY_VERSION) +-GITCOMMIT := $(shell git rev-parse --short HEAD) +-GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no) ++GITCOMMIT ?= $(shell git rev-parse --short HEAD) ++GITUNTRACKEDCHANGES := + ifneq ($(GITUNTRACKEDCHANGES),) + GITCOMMIT := $(GITCOMMIT)-dirty + endif -- GitLab From 2fcf50a323a8fe695e3ad0520eb25bdcff976e2e Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 30 Apr 2018 10:59:57 +0200 Subject: [PATCH 239/785] luafilesystem: 1.6.3 -> 1.7.0 --- pkgs/top-level/lua-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3da44309803..e6ec2f8ed9d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -267,14 +267,14 @@ let }; luafilesystem = buildLuaPackage rec { - version = "1.6.3"; + version = "1.7.0"; name = "filesystem-${version}"; src = fetchFromGitHub { owner = "keplerproject"; repo = "luafilesystem"; rev = "v${stdenv.lib.replaceChars ["."] ["_"] version}"; - sha256 = "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; + sha256 = "0fibrasshlgpa71m9wkpjxwmylnxpcf06rpqbaa0qwvqh94nhwby"; }; preConfigure = '' -- GitLab From 9786bd06a621dbb2c0cd7de696df5ed269e54ddd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 17:22:01 +0800 Subject: [PATCH 240/785] libqmatrixclient: 0.2 -> 0.2.1 --- .../libraries/libqmatrixclient/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f537013d2fe..7d8ec42700c 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -1,40 +1,26 @@ { stdenv, fetchFromGitHub, cmake , qtbase }: -# This doesn't actually do anything really yet as it doesn't support dynamic building -# When it does, quaternion and tensor should use it - stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; - rev = "v${version}-q0.0.5"; - sha256 = "1m53yxsqjxv2jq0h1xipwsgaj5rca4fk4cl3azgvmf19l9yn00ck"; + rev = "v${version}"; + sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv"; }; buildInputs = [ qtbase ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - install -Dm644 -t $out/lib *.a - - runHook postInstall - ''; - meta = with stdenv.lib; { description= "A Qt5 library to write cross-platfrom clients for Matrix"; homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; - hydraPlatforms = [ ]; }; } -- GitLab From dbcdcb63d886b8ded089b06e7f727a2d16739664 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 17:22:20 +0800 Subject: [PATCH 241/785] quaternion: 0.0.5 -> 0.0.9 --- .../instant-messengers/quaternion/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 768ab24c2f3..6c716cc3e1c 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,24 +2,21 @@ stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.5"; - - # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source + version = "0.0.9"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = "v${version}"; - sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; + sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408"; }; buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - # take the source from libqmatrixclient + # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet + # https://github.com/QMatrixClient/Quaternion/issues/239 postPatch = '' rm -rf lib ln -s ${libqmatrixclient.src} lib -- GitLab From d5eef36abb2914a98c25475409b71819d4c94162 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:12:37 -0400 Subject: [PATCH 242/785] linux: 4.4.129 -> 4.4.130 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index fe8633ed0da..ccc8b4ba2dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.129"; + version = "4.4.130"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0aviyky8f73l6jpi1d4by947rj78d5vckxkyf9aj73bavaxc8rd1"; + sha256 = "1rad8fa25hzifpxqxsc7wzhcssbbv32rc03nvljygvlxcn8dz6xj"; }; } // (args.argsOverride or {})) -- GitLab From 24a7d14ab43d2366f917397e4a42715e1245fa10 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:00 -0400 Subject: [PATCH 243/785] linux: 4.9.96 -> 4.9.97 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 63fe3db3b57..cc4609676d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.96"; + version = "4.9.97"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zw7x86c8qa2kzkwlxlhqzsnddyp1ncw4ja660bqnzqrnmp5jvw2"; + sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4"; }; } // (args.argsOverride or {})) -- GitLab From 6cbded6551e4d6c8608814a6752774807d1cc67a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:17 -0400 Subject: [PATCH 244/785] linux: 4.14.37 -> 4.14.38 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d9aef3a2193..177a5c878f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.37"; + version = "4.14.38"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14lfj2vfxw36k8cbmzs280w4h81yz5xhlhq5550kww906vnyg5w1"; + sha256 = "00ibrl633d4cqnn4i0z7kj1ddj1243dh7ap783bwlicw9hkddwzg"; }; } // (args.argsOverride or {})) -- GitLab From cf994a3d3d14272f624e20d1c3c64f86a27904a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:32 -0400 Subject: [PATCH 245/785] linux: 4.16.5 -> 4.16.6 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 3da2cda30e2..46bdcff66a1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.5"; + version = "4.16.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0f1a8ggjb2jxc8n3hvypc81xbwylwkqi0mnynd9q316ay152zb1r"; + sha256 = "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs"; }; } // (args.argsOverride or {})) -- GitLab From a7ce93955d962ecaa263f04ef3c87a1fe6799f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 29 Apr 2018 23:41:36 -0300 Subject: [PATCH 246/785] uget-integrator: init at 1.0.0 --- .../networking/browsers/firefox/wrapper.nix | 3 +- .../networking/uget-integrator/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/uget-integrator/default.nix diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 45917bf65c1..ed6cf712ed9 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , vlc_npapi -, browserpass, chrome-gnome-shell +, browserpass, chrome-gnome-shell, uget-integrator , libudev , kerberos }: @@ -64,6 +64,7 @@ let ([ ] ++ lib.optional (cfg.enableBrowserpass or false) browserpass ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix new file mode 100644 index 00000000000..cc93da7f253 --- /dev/null +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, uget, python3Packages }: + +stdenv.mkDerivation rec { + name = "uget-integrator-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ugetdm"; + repo = "uget-integrator"; + rev = "v${version}"; + sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp"; + }; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + buildInputs = [ uget python3Packages.python ]; + + installPhase = '' + for f in conf/com.ugetdm.{chrome,firefox}.json; do + substituteInPlace $f --replace "/usr" "$out" + done + + install -D -t $out/bin bin/uget-integrator + install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json + + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Native messaging host to integrate uGet Download Manager with web browsers"; + homepage = https://github.com/ugetdm/uget-integrator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77f54000df8..be80fc69933 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5306,6 +5306,8 @@ with pkgs; uget = callPackage ../tools/networking/uget { }; + uget-integrator = callPackage ../tools/networking/uget-integrator { }; + uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; umlet = callPackage ../tools/misc/umlet { }; -- GitLab From 2cc9da33af1db5750fdf41b8ed397ff48f318d28 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 30 Apr 2018 13:15:25 +0200 Subject: [PATCH 247/785] pcsc-scm-scl011: clean up unpack phase --- pkgs/tools/security/pcsc-scm-scl011/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index 88b5c147f30..1418a4ead58 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -17,10 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; unpackPhase = '' - echo ${stdenv.system} unzip $src tar xf "Linux Driver Ver${version}/sclgeneric_${version}_linux_${arch}bit.tar.gz" - cd sclgeneric_${version}_linux_${arch}bit; export sourceRoot=`pwd` + export sourceRoot=$(readlink -e sclgeneric_${version}_linux_${arch}bit) ''; # Add support for SCL011 nPA (subsidized model for German eID) -- GitLab From 480da10f30b5855aee3433365c5b3065437c9074 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 24 Oct 2016 23:54:18 +0200 Subject: [PATCH 248/785] open-ecard: init at 1.2.4 --- pkgs/tools/security/open-ecard/default.nix | 64 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/tools/security/open-ecard/default.nix diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix new file mode 100644 index 00000000000..a0af51186ed --- /dev/null +++ b/pkgs/tools/security/open-ecard/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, jre, pcsclite, makeDesktopItem, makeWrapper }: + +let + version = "1.2.4"; + + srcs = { + richclient = fetchurl { + url = "https://jnlp.openecard.org/richclient-${version}-20171212-0958.jar"; + sha256 = "1ckhyhszp4zhfb5mn67lz603b55z814jh0sz0q5hriqzx017j7nr"; + }; + cifs = fetchurl { + url = "https://jnlp.openecard.org/cifs-${version}-20171212-0958.jar"; + sha256 = "0rc862lx3y6sw87r1v5xjmqqpysyr1x6yqhycqmcdrwz0j3wykrr"; + }; + logo = fetchurl { + url = https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg; + sha256 = "0rpmyv10vjx2yfpm03mqliygcww8af2wnrnrppmsazdplksaxkhs"; + }; + }; +in stdenv.mkDerivation rec { + appName = "open-ecard"; + name = "${appName}-${version}"; + + src = srcs.richclient; + + phases = "installPhase"; + + buildInputs = [ makeWrapper ]; + + desktopItem = makeDesktopItem { + name = appName; + desktopName = "Open eCard App"; + genericName = "eCard App"; + comment = "Client side implementation of the eCard-API-Framework"; + icon = "oec_logo_bg-transparent.svg"; + exec = appName; + categories = "Utility;Security;"; + }; + + installPhase = '' + mkdir -p $out/share/java + cp ${srcs.richclient} $out/share/java/richclient-${version}.jar + cp ${srcs.cifs} $out/share/java/cifs-${version}.jar + + mkdir -p $out/share/applications $out/share/pixmaps + cp $desktopItem/share/applications/* $out/share/applications + cp ${srcs.logo} $out/share/pixmaps/oec_logo_bg-transparent.svg + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/${appName} \ + --add-flags "-cp $out/share/java/cifs-${version}.jar" \ + --add-flags "-jar $out/share/java/richclient-${version}.jar" \ + --suffix LD_LIBRARY_PATH ':' ${pcsclite}/lib + ''; + + meta = with stdenv.lib; { + description = "Client side implementation of the eCard-API-Framework (BSI + TR-03112) and related international standards, such as ISO/IEC 24727"; + homepage = https://www.openecard.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ sephalon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 719a5c66db7..3317e254834 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4076,6 +4076,8 @@ with pkgs; opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; + open-ecard = callPackage ../tools/security/open-ecard { }; + openjade = callPackage ../tools/text/sgml/openjade { }; openmvg = callPackage ../applications/science/misc/openmvg { }; -- GitLab From e12cc85b070ec62144c5bfc8036041fee4b3692e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Apr 2018 11:59:53 +0200 Subject: [PATCH 249/785] nixos/osquery: add test Some time ago I fixed the broken package `osquery` (see #39336). I had to test the package manually by starting the daemon locally, however this doesn't ensure that the module is still functional. In order to cover the package *and* the integration with the NixOS module I thought that adding a testcase might be the best idea. The current testcase does the following things: * Starts an `osqueryd` service in a test machine with customized logger path and PID file * Ensures that the `osqueryd.service` unit is running * Checks if the customized flags (`pidfile`, `logger_path`) are applied to `osquery`. * Performs a simple test query against the `etc_hosts` database to check if the basic funcitonality of `osquery` (storing system information into a database) works fine. --- nixos/release.nix | 1 + nixos/tests/osquery.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 nixos/tests/osquery.nix diff --git a/nixos/release.nix b/nixos/release.nix index 4994cd98302..4ad947f11d1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -307,6 +307,7 @@ in rec { tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; + tests.osquery = callTest tests/osquery.nix {}; tests.plasma5 = callTest tests/plasma5.nix {}; tests.plotinus = callTest tests/plotinus.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix new file mode 100644 index 00000000000..281dbcff664 --- /dev/null +++ b/nixos/tests/osquery.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "osquery"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + machine = { + services.osquery.enable = true; + services.osquery.loggerPath = "/var/log/osquery/logs"; + services.osquery.pidfile = "/var/run/osqueryd.pid"; + }; + + testScript = '' + $machine->start; + $machine->waitForUnit("osqueryd.service"); + + $machine->succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | grep '127.0.0.1'"); + $machine->succeed( + "echo 'SELECT value FROM osquery_flags WHERE name = \"logger_path\";' | osqueryi | grep /var/log/osquery/logs" + ); + + $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /var/run/osqueryd.pid"); + ''; +}) -- GitLab From 8446ba26a8f098c98d06b24acce7588eac63eb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 30 Apr 2018 16:55:27 +0200 Subject: [PATCH 250/785] added lost entry in all-packages.nix --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac46ff0f4c..7f035ad89b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13508,6 +13508,8 @@ with pkgs; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + tbs = callPackage ../os-specific/linux/tbs { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; -- GitLab From ccb7e5488e879de3645ca66081f3cb8a638783a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 30 Apr 2018 16:01:07 +0100 Subject: [PATCH 251/785] pdf-quench: no manual shebang patch --- pkgs/applications/misc/pdf-quench/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 5b80fb16122..291ab241b08 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -12,17 +12,17 @@ pythonPackages.buildPythonApplication rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ]; + buildInputs = with pkgs; [ + gtk3 + gobjectIntrospection + goocanvas2 + (poppler.override { introspectionSupport = true; }) + ]; propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; - dontBuild = true; + format = "other"; doCheck = false; - postPatch = '' - substituteInPlace src/pdf_quench.py \ - --replace /usr/bin/python "${pythonPackages.python}/bin/python" - ''; - installPhase = '' install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench ''; -- GitLab From 1478878caba8c9c73780d3615cd1dea6a1686593 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 30 Apr 2018 17:26:59 +0200 Subject: [PATCH 252/785] pdf-quench: use poppler_gi from top-level --- pkgs/applications/misc/pdf-quench/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 291ab241b08..c567a7903b8 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { gtk3 gobjectIntrospection goocanvas2 - (poppler.override { introspectionSupport = true; }) + poppler_gi ]; propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; -- GitLab From bb12277049769a6d626959f569e14c979c74cd05 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 18 Mar 2018 01:14:24 -0400 Subject: [PATCH 253/785] pythonPackages.pyslurm: 20170302 -> 20180427 Fixes build against slurm 17.11.5 Fixes: 0e0b80d4b42 ('slurm: 17.11.3 -> 17.11.5') --- pkgs/development/python-modules/pyslurm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 74ff0be3833..1bc08d63418 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20170302"; + version = "20180427"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff"; - sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx"; + rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7"; + sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls"; }; buildInputs = [ cython slurm ]; -- GitLab From 3520fef779dbdfc145214294673c47aeac4ddeab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 08:43:52 -0700 Subject: [PATCH 254/785] x42-plugins: 20170428 -> 20180320 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/x42-plugins/versions. These checks were done: - built on NixOS - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fat1 -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fat1 --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fil4 -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fil4 --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-meter -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-meter --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-mixtri -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-mixtri --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-scope -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-scope --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-stepseq -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-stepseq --help’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-tuna -h’ got 0 exit code - ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-tuna --help’ got 0 exit code - directory tree listing: https://gist.github.com/b5bff61b6a034a2f1ebe040e1e3155d0 --- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 4c4f958ec49..6bf45f451a5 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20170428"; + version = "20180320"; name = "x42-plugins-${version}"; src = fetchurl { url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; + sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From dc6cda78fb1aa77bdc2c80b6401821628aa64cae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 10:57:52 -0500 Subject: [PATCH 255/785] gllvm: 2018-02-09 -> 2018-04-28 (~= 1.0.2) --- pkgs/development/tools/gllvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 58ee7699b45..da8f90cd940 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "gllvm-${version}"; - version = "2018-02-09"; + version = "2018-04-28"; # ~= 1.0.2, but no release tags yet goPackagePath = "github.com/SRI-CSL/gllvm"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "gllvm"; - rev = "ef83222afd22452dd1277329df227a326db9f84f"; - sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a"; + rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e"; + sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl"; }; meta = with stdenv.lib; { -- GitLab From 751aa3dff2ad43b1cc872f33b859c62cd671812e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 08:58:49 -0700 Subject: [PATCH 256/785] linuxPackages.wireguard: 0.0.20180413 -> 0.0.20180420 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireguard/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/62dbb660d0b10010e5638c9be376d68b --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index b88646424be..6e3e444240a 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180413"; + version = "0.0.20180420"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1"; + sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m"; }; meta = with stdenv.lib; { -- GitLab From 02cb787c0cf4d38c9eb64e7110201a19ab6469cd Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Mon, 30 Apr 2018 11:47:18 +0300 Subject: [PATCH 257/785] flow: 0.70.0 -> 0.71.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 042b338b2b1..31bc1848d58 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,14 +4,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.70.0"; + version = "0.71.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76"; + sha256 = "1z9qf3kahaincy3i3ynqx7gr1sf470ym8h690a0kc7ah5fwsyr5w"; }; installPhase = '' -- GitLab From 89001d8d158ca0040084811c6f517416ddc2c7d9 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 30 Apr 2018 12:18:14 -0400 Subject: [PATCH 258/785] hplipWithPlugin_3_16_11: Refer to correct base derivation This appears to be a cut-and-paste error. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06e..cf2d9e9db3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20632,7 +20632,7 @@ with pkgs; hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; - hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; }; + hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; hyperfine = callPackage ../tools/misc/hyperfine { }; -- GitLab From eaf71dd33e8ec5836193f27717139be44c0ada3d Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 30 Apr 2018 12:20:01 -0400 Subject: [PATCH 259/785] notmuch: 0.26.1 -> 0.26.2 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index d89219cce5f..13add2690db 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26.1"; + version = "0.26.2"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"; + sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 99964ff49336a782f7ff67f39d61a608347c7507 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 09:35:47 -0700 Subject: [PATCH 260/785] wesnoth-dev: 1.13.13 -> 1.14.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wesnoth/versions. These checks were done: - built on NixOS - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnoth -h’ got 0 exit code - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnoth --help’ got 0 exit code - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd -h’ got 0 exit code - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd --help’ got 0 exit code - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd -V’ and found version 1.14.0 - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd --version’ and found version 1.14.0 - found 1.14.0 with grep in /nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0 - directory tree listing: https://gist.github.com/faf1d8fe4a47781eb51e8a411a546099 --- pkgs/games/wesnoth/dev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index c9cd7119d8f..81ffd6b135f 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.13"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1jn3gvw0x8ndwvdm4bqpki1p1cxg2ij02s6w0frhfi4kz706al0c"; + sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"; }; nativeBuildInputs = [ cmake pkgconfig ]; -- GitLab From 92f00a58533b7fd58b0ed6efbe86ccd387682b7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 09:39:09 -0700 Subject: [PATCH 261/785] utf8proc: 2.1.0 -> 2.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/utf8proc/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.1.1 with grep in /nix/store/bzpfz4cpf1lf7269ymwdblz2kn0iwf2b-utf8proc-2.1.1 - directory tree listing: https://gist.github.com/bc9fd69cddc0fd9435fab30a0abcae97 --- pkgs/development/libraries/utf8proc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 48c2428bbcd..89dbeaab04a 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "utf8proc-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; - sha256 = "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15"; + sha256 = "1cnpigrazhslw65s4j1a56j7p6d7d61wsxxjf1218i9mkwv2yw17"; }; makeFlags = [ "prefix=$(out)" ]; -- GitLab From b405a6537c79a00f3d754dfd9b7a3b3ca467b4f0 Mon Sep 17 00:00:00 2001 From: Milo Date: Mon, 30 Apr 2018 13:03:05 -0400 Subject: [PATCH 262/785] nixos/bspwm: spawn bpswm process in the background and properly set waiPID (#39707) --- nixos/modules/services/x11/window-managers/bspwm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index 6783ac3479e..23cd4f6529a 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -59,7 +59,7 @@ in start = '' export _JAVA_AWT_WM_NONREPARENTING=1 SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} & - ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} + ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} & waitPID=$! ''; }; -- GitLab From dc2f012215f15dc05e447ce6611039fcaede3910 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 10:12:01 -0700 Subject: [PATCH 263/785] riot-web: 0.14.0 -> 0.14.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riot-web/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.14.1 with grep in /nix/store/77d4rg2yy4gj8m1mvrw6zqhdi7jv7cg8-riot-web-0.14.1 - directory tree listing: https://gist.github.com/4606f4af0dcfc7ef1ece43dfe4b38abe --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 0d3342e6668..ce558130a6c 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi"; + sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf"; }; installPhase = '' -- GitLab From 078b764f38cb779e32f7be4f1e614157b72cac2d Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 30 Apr 2018 19:22:42 +0200 Subject: [PATCH 264/785] highlight: 3.42 -> 3.43 --- pkgs/tools/text/highlight/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 1fcfdd85e7a..c2fe3fcd576 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.42"; + version = "3.43"; src = fetchFromGitHub { owner = "andre-simon"; repo = "highlight"; - rev = "${version}"; - sha256 = "1fxx827igzqjn5rri57b8980hnd3ixz3j7smfxwi1ivfhlfznzgr"; + rev = "v${version}"; + sha256 = "126nsf4cjxflg2kiv72qf1xl5fsilk0jqcncs6qqgm72cpjfmlsy"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; -- GitLab From 1022dc54bab9fa076fe3033a0c1e3f7f9549345d Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 30 Apr 2018 13:28:46 -0400 Subject: [PATCH 265/785] strongswan: include curl plugin by default (#39506) This is necessary for OCSP and/or remote CRL verification of server certificates to work, which is a fairly common thing to need. --- pkgs/tools/networking/strongswan/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 042f8bea3d6..eb466745ef8 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -3,11 +3,15 @@ , gmp, python, iptables, ldns, unbound, openssl, pcsclite , openresolv , systemd, pam - -, enableTNC ? false, curl, trousers, sqlite, libxml2 +, curl +, enableTNC ? false, trousers, sqlite, libxml2 , enableNetworkManager ? false, networkmanager }: +# Note on curl support: If curl is built with gnutls as its backend, the +# strongswan curl plugin may break. +# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. + with stdenv.lib; stdenv.mkDerivation rec { @@ -23,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = - [ gmp python iptables ldns unbound openssl pcsclite ] - ++ optionals enableTNC [ curl trousers sqlite libxml2 ] + [ curl gmp python iptables ldns unbound openssl pcsclite ] + ++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals stdenv.isLinux [ systemd.dev pam ] ++ optionals enableNetworkManager [ networkmanager ]; @@ -61,12 +65,12 @@ stdenv.mkDerivation rec { "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth" "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" - "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] + "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" + "--enable-curl" ] ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ optional (stdenv.system == "i686-linux") "--enable-padlock" ++ optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" - "--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" -- GitLab From ecc7f83e75b48ee04c4c7cac1386e370921060f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 11:07:54 -0700 Subject: [PATCH 266/785] spidermonkey_52: 52.6.0 -> 52.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spidermonkey/versions. These checks were done: - built on NixOS - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 -h’ got 0 exit code - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 --help’ got 0 exit code - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 -v’ and found version 52.7.4 - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 --version’ and found version 52.7.4 - ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52-config --version’ and found version 52.7.4 - found 52.7.4 with grep in /nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4 - directory tree listing: https://gist.github.com/7e5182415a0a1bce8071576312c08a3a --- pkgs/development/interpreters/spidermonkey/52.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 4992ea04f11..35dcff95029 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: let - version = "52.6.0"; + version = "52.7.4"; in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q"; + sha256 = "0dn3hbc95qhvcgzbibhy17xwn5m0340f64bq5byvx22c2rf40xwz"; }; buildInputs = [ readline icu zlib nspr ]; -- GitLab From 49ef9019f149f9051d4b1da4190f078c19980921 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 13:12:01 -0500 Subject: [PATCH 267/785] psstop: init at 1.3 --- pkgs/tools/system/psstop/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/system/psstop/default.nix diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix new file mode 100644 index 00000000000..178e08938fe --- /dev/null +++ b/pkgs/tools/system/psstop/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "psstop-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "clearlinux"; + repo = "psstop"; + rev = "v${version}"; + sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/clearlinux/psstop; + description = "Show processes' memory usage by looking into pss"; # upstream summary + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77b7a822c5c..49160d59ac4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1358,6 +1358,8 @@ with pkgs; ps_mem = callPackage ../tools/system/ps_mem { }; + psstop = callPackage ../tools/system/psstop { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; socklog = callPackage ../tools/system/socklog { }; -- GitLab From a8f3b1ad752c6552245f42e7428319642d7ca627 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 13:27:36 -0500 Subject: [PATCH 268/785] openmw: update hash missed in update to 0.43.0 Fixes #39712 --- pkgs/games/openmw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index f64bbe4c125..8080c959638 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0lj8v81hk807dy0wcdhfp0iyn4l5yag53hx1a6xm44gh2dpyil43"; + sha256 = "1nybxwp77qswjayf0g9xayp4x1xxq799681rhjlggch127r07ifi"; }; enableParallelBuilding = true; -- GitLab From 4e5cecabcfcb2fcb70c8f992e7686fb2ced65a45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 11:41:45 -0700 Subject: [PATCH 269/785] pqiv: 2.10.3 -> 2.10.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pqiv/versions. These checks were done: - built on NixOS - ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv -h’ got 0 exit code - ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv --help’ got 0 exit code - ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv help’ got 0 exit code - found 2.10.4 with grep in /nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4 - directory tree listing: https://gist.github.com/4743505ebdeb4ef63b3c2637f5d6879d --- pkgs/applications/graphics/pqiv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 757ce52e9c4..e4f565b3b05 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01"; + sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 4ea3841d7f9fbed0aaee83bde0227b09384e50fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 11:43:21 -0700 Subject: [PATCH 270/785] picard-tools: 2.18.2 -> 2.18.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/picard-tools/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.18.3 with grep in /nix/store/q67hqz7716nf3c4f8rjmlpf2dqbb06rz-picard-tools-2.18.3 - directory tree listing: https://gist.github.com/6b71ce718f18ef6a48c05457cd0e583b --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 7af1669dc45..ed90ed5aa04 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.2"; + version = "2.18.3"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0w3b2jz4n9irslsg85r4x9dc3y4ziykn8fs4iqqiq4sfdcz259fz"; + sha256 = "0w4v30vnyr549hd9lhj1sm69whssabqvhfrbavxfjbl2k9fw83qf"; }; buildInputs = [ jre makeWrapper ]; -- GitLab From b45a5a1801d677d67b9e20a8b216719b914bc9ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 12:43:38 -0700 Subject: [PATCH 271/785] nextcloud: 13.0.1 -> 13.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nextcloud/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 13.0.2 with grep in /nix/store/370na6b77ds8vj2qjxij4id8r5ihjpiq-nextcloud-13.0.2 - directory tree listing: https://gist.github.com/bb7d1d9b3be5379cba2c2852ec4b8e56 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index e6baf9e64d8..7513d3c71d2 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "048x3x6d11m75ghxjcjzm8amjm6ljirv6djbl53awwp9f5532hsp"; + sha256 = "0zf4z4cn4wwsybxirvzyk7l6xjw9gkc60lzm8jqz9aak3a5gk5kk"; }; installPhase = '' -- GitLab From 3e37981ae3601aa29e72d307c6d51d550af207d2 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 30 Apr 2018 22:22:18 +0200 Subject: [PATCH 272/785] i3lock-color: 2.10.1-1-c -> 2.11-c --- pkgs/applications/window-managers/i3/lock-color.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index edaa88bde23..66a6af2fbb0 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.10.1-1-c"; + version = "2.11-c"; name = "i3lock-color-${version}"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; - rev = "01476c56333cccae80cdd3f125b0b9f3a0fe2cb3"; - sha256 = "06ca8496fkdkvh4ycg0b7kd3r1bjdqdwfimb51v4nj1lm87pdkdf"; + rev = version; + sha256 = "1myq9fazkwd776agrnj27bm5nwskvss9v9a5qb77n037dv8d0rdw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- GitLab From 4f715a5690d28cf74068de823cbb793194a0b2ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 13:48:48 -0700 Subject: [PATCH 273/785] palemoon: 27.8.3 -> 27.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/palemoon/versions. These checks were done: - built on NixOS - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -h’ got 0 exit code - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon --help’ got 0 exit code - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -V’ and found version 27.9.0 - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -v’ and found version 27.9.0 - ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon --version’ and found version 27.9.0 - found 27.9.0 with grep in /nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0 - directory tree listing: https://gist.github.com/d3039819d96bec3615450de44abbffc4 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 0c0ef501e99..aa77f084734 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.8.3"; + version = "27.9.0"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh"; + sha256 = "181g1hy4k9xr6nlrw8jamp541gr5znny4mmpwwaa1lzq5v1w1sw6"; }; desktopItem = makeDesktopItem { -- GitLab From b0989d3c76439277198557375893c29d8b0bcf2f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 13:49:46 -0700 Subject: [PATCH 274/785] pam_u2f: 1.0.5 -> 1.0.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pam_u2f/versions. These checks were done: - built on NixOS - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg -h’ got 0 exit code - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg --help’ got 0 exit code - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg -V’ and found version 1.0.6 - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg --version’ and found version 1.0.6 - found 1.0.6 with grep in /nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6 - directory tree listing: https://gist.github.com/7d4bb96a876d359bc67f88a024a674f8 --- pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 0f0b6ebb37a..5cc235c3104 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "0bbwy9k3002anhkv67zwck3dry7blqnnp291dc4qsjrca0blw217"; + sha256 = "0fpdb49596zywnbx1cfcx1k83rbs1ylhi1cnn25pq9d3b92hj50h"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 49e4a597cb2eed29cf8abe6852dc142119cb5d7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:17:03 -0700 Subject: [PATCH 275/785] mopidy-iris: 3.17.1 -> 3.17.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/Mopidy-Iris/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.17.5 with grep in /nix/store/ih97pncwmlk71wa9cv49aa9hx7mxc156-Mopidy-Iris-3.17.5 - directory tree listing: https://gist.github.com/0f0187f3e9d60193ebddabe0b082e78f --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index f3a9b73aabe..cfd2a4173da 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.17.1"; + version = "3.17.5"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "02k1br077v9c5x6nn0391vh28pvn1zjbkjv8h508vy7k6ch2xjyq"; + sha256 = "011bccvjy1rdrc43576hgfb7md404ziqmkam6na2z6v9km1b9gwr"; }; propagatedBuildInputs = [ -- GitLab From 7ce53bee97d55dab2c3fe8ccdf06e6b3461432e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:42:45 -0700 Subject: [PATCH 276/785] mwic: 0.7.4 -> 0.7.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mwic/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.7.5 with grep in /nix/store/3r91cbyw9xi6iy67l5nalznb7rkq1idq-mwic-0.7.5 - directory tree listing: https://gist.github.com/0513e07e310449f5f9f06de443e90f43 --- pkgs/applications/misc/mwic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 02c18109abc..67e6ed3fa9c 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q"; + sha256 = "1b4fz9vs0aihg9nj9aj6d2jmykpa9nxi9rvz06v50wwk515plpmc"; }; makeFlags=["PREFIX=\${out}"]; -- GitLab From 1fe6cca2db75e24f3e23ab645baf4a349447a903 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:53:47 -0700 Subject: [PATCH 277/785] miniupnpd: 2.0.20180410 -> 2.0.20180422 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/miniupnpd/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/f8b4c06f4c61efa13671b5156550d7b5 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 129db56dc55..99e12084ccb 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180410"; + name = "miniupnpd-2.0.20180422"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1w4crmsmrygagh0v9phx8aicbyh6nypfjh2fdmknijngvx05biaq"; + sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy"; name = "${name}.tar.gz"; }; -- GitLab From acdbf504e3f756de9964123b355a8c4f2d60e133 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:57:13 -0700 Subject: [PATCH 278/785] ipmiutil: 3.0.9 -> 3.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ipmiutil/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/706664f90d887aff46e82433584920a1 --- pkgs/tools/system/ipmiutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 6b206ea8761..bace31a17bd 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.9"; + version = "3.1.0"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0j4lsfdj2bk1b1vw9l00zv1g4jan05p09szqbzxgqqw2lpnca4i7"; + sha256 = "1vvdydql5gmq103wr0ris2fvr3l5an2a8zgg2mmgdi88pxi11xfx"; }; buildInputs = [ openssl ]; -- GitLab From 2034ef073fe0490a7dbabbde81a4c39f91850064 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:00:53 -0700 Subject: [PATCH 279/785] jackett: 0.8.886 -> 0.8.929 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions. These checks were done: - built on NixOS - ran ‘/nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929/bin/Jackett -h’ got 0 exit code - ran ‘/nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929/bin/Jackett help’ got 0 exit code - found 0.8.929 with grep in /nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929 - directory tree listing: https://gist.github.com/abeee550859eff26afc80fcec3b0ec15 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index f2d38111d5d..8324af8b3d0 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.886"; + version = "0.8.929"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "18agnavhch29pi1w6vp374cs6bz2j7bf55mh4ym0cs038h5xkdvv"; + sha256 = "1dq69734f6x8iw1jpvln5lq7bykpwky6iiwz8iwwamwg8143f20p"; }; buildInputs = [ makeWrapper ]; -- GitLab From d50a31a7106bb6d38fb3f594652a862de8f71281 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:01:58 -0700 Subject: [PATCH 280/785] html-xml-utils: 7.6 -> 7.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/html-xml-utils/versions. These checks were done: - built on NixOS - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxaddid help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxaddid -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxcite -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract --help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxcopy -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxincl -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxpipe -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxremove help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxremove -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxselect help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxselect -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxtabletrans -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxuncdata --help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxwls -h’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxref -v’ and found version 7.7 - found 7.7 with grep in /nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7 - directory tree listing: https://gist.github.com/f303211f05f8424805b5314ae0ff7c9e --- pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 987d192bafc..f681ae62aea 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "html-xml-utils-${version}"; - version = "7.6"; + version = "7.7"; src = fetchurl { url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; - sha256 = "0l97ps089byy62838wf2jwvvc465iw29z9r5kwmwcq7f3bn11y3m"; + sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr"; }; buildInputs = [curl libiconv]; -- GitLab From bf49200102a19a34bc619bfa7643cf9037dea4e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:37:14 -0700 Subject: [PATCH 281/785] kotlin: 1.2.40 -> 1.2.41 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kotlin/versions. These checks were done: - built on NixOS - ran ‘/nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41/bin/kotlin -h’ got 0 exit code - ran ‘/nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41/bin/.kotlin-wrapped -h’ got 0 exit code - found 1.2.41 with grep in /nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41 - directory tree listing: https://gist.github.com/927e0c1e045ca7c165603ae8b1961beb --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index d5ce240b4a5..e589611505f 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.40"; + version = "1.2.41"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0n4na0ddnjgc573szk5bpd34v5gib71pah62xq7vwdf34q8mg61l"; + sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg"; }; propagatedBuildInputs = [ jre ] ; -- GitLab From eb8e6f1f014577295f1cf9e53ad89a25cdce9f92 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 30 Apr 2018 17:44:42 -0500 Subject: [PATCH 282/785] vit: enable on all Fixes #39762 --- pkgs/applications/misc/vit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 37d7aeb88e6..40a399247e9 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; maintainers = with pkgs.lib.maintainers; [ ]; - platforms = pkgs.lib.platforms.linux; + platforms = pkgs.lib.platforms.all; license = pkgs.lib.licenses.gpl3; }; } -- GitLab From 67b3dcde4c259897b1909dcef795309a33413deb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:58:28 -0700 Subject: [PATCH 283/785] goxel: 0.7.3 -> 0.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/goxel/versions. These checks were done: - built on NixOS - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel --help’ got 0 exit code - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel -V’ and found version 0.8.0 - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel --version’ and found version 0.8.0 - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped --help’ got 0 exit code - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped -V’ and found version 0.8.0 - ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped --version’ and found version 0.8.0 - found 0.8.0 with grep in /nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0 - directory tree listing: https://gist.github.com/ee8a96a0b785c0293e1e477b693c483b --- pkgs/applications/graphics/goxel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 8df630d582c..03f7b515747 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9"; + sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17"; }; nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; -- GitLab From 855e0463abe182e4cb481db8246ae5cd029c1298 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:43:54 -0500 Subject: [PATCH 284/785] tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux "platforms.gnu" has been linux-only since at least 17.03: $ nix eval -f channel:nixos-17.03 lib.platforms.gnu [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ] Unlike platforms.linux, platforms.gnu indicates "must use glibc" which for the most part is not intended. Replacing platforms.gnu with platforms.linux would be the same "today" but let's err on preserving existing behavior and be optimistic about platforms these packages work on. --- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/graphics/geeqie/default.nix | 2 +- pkgs/applications/graphics/ocrad/default.nix | 2 +- pkgs/applications/graphics/scantailor/advanced.nix | 2 +- .../networking/instant-messengers/bitlbee/default.nix | 2 +- .../networking/instant-messengers/telepathy/logger/default.nix | 2 +- .../networking/instant-messengers/telepathy/salut/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/development/guile-modules/guile-lib/default.nix | 2 +- pkgs/development/guile-modules/guile-ncurses/default.nix | 2 +- pkgs/development/libraries/libchamplain/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/vcdimager/default.nix | 2 +- pkgs/tools/graphics/logstalgia/default.nix | 2 +- pkgs/tools/misc/grub/pvgrub_image/default.nix | 2 +- pkgs/tools/misc/grub/trusted.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/tools/security/gnupg/1.nix | 2 +- pkgs/tools/text/numdiff/default.nix | 2 +- pkgs/tools/video/dvgrab/default.nix | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ee0ebf234ce..3ffc5265f7a 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://mpg321.sourceforge.net/; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index d034f5d64d9..a1ea88da84b 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; maintainers = with maintainers; [ jfrankenau pSub ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ac67759c258..d8811791627 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index bea4fe9b2c6..1fb8d572e95 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index fa1c64ba0ad..fa3c66e67b6 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 111970ab711..f1b3c55d14c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.gnu; # Arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index e060eaabf28..17cd20c09cb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; - platforms = platforms.gnu; # Random choice + platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index d1834217724..e15c3588c29 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ viric vrthra ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 95741e07600..35eb4667bd6 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -40,6 +40,6 @@ in stdenv.mkDerivation { homepage = "http://www.nongnu.org/guile-lib/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 152a3488304..8f601858267 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -39,6 +39,6 @@ in stdenv.mkDerivation { homepage = "https://www.gnu.org/software/guile-ncurses/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 74e5bbc952a..418e9cf0b57 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; maintainers = gnome3.maintainers; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 1be3a74fbff..5790672d8e5 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://nongnu.org/libchop/; license = licenses.gpl3Plus; maintainers = with maintainers; [ viric ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 48ad33424f6..77956be3b12 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = platforms.gnu; # random choice + platforms = platforms.gnu ++ platforms.linux; # random choice license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 0fa99163845..be4cf0f493b 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { a Miscellaneous section. ''; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index ee6e5065f40..df5e3f15e95 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { Xen guests ''; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; }) diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index e57c98bf51b..2bf7e3dcf43 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; homepage = https://github.com/Sirrix-AG/TrustedGRUB2; license = licenses.gpl3Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 26bfd27bf9a..4df7f80fff6 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -116,6 +116,6 @@ in stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mailutils/; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index fa4555dcafb..9a147caa7e2 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { other applications. A wealth of frontend applications and libraries are available. ''; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 96c91def9ac..4741fecb90c 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/numdiff/; license = licenses.gpl3Plus; maintainers = with maintainers; [ ndowens ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index cec4fc1ce8b..752a6f31432 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://kinodv.org/; license = licenses.gpl2Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } -- GitLab From 4b7b083bcbfffe0cddc79eb618fbf316918dea6b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:47:47 -0500 Subject: [PATCH 285/785] treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux Include all linux platforms. --- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/editors/emacs-modes/calfw/default.nix | 2 +- pkgs/applications/editors/emacs-modes/jdee/default.nix | 2 +- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/panotools/default.nix | 2 +- pkgs/applications/graphics/qtpfsgui/default.nix | 2 +- pkgs/applications/graphics/scantailor/default.nix | 2 +- pkgs/applications/graphics/ufraw/default.nix | 2 +- pkgs/applications/graphics/viewnior/default.nix | 2 +- pkgs/applications/graphics/xfig/default.nix | 2 +- .../networking/instant-messengers/telepathy/gabble/default.nix | 2 +- .../networking/instant-messengers/telepathy/haze/default.nix | 2 +- .../networking/instant-messengers/telepathy/idle/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/git.nix | 2 +- pkgs/applications/networking/p2p/gnunet/svn.nix | 2 +- pkgs/applications/office/gnucash/2.6.nix | 2 +- pkgs/applications/office/gnucash/default.nix | 2 +- .../science/machine-learning/torch/torch-distro.nix | 2 +- pkgs/applications/science/misc/megam/default.nix | 2 +- pkgs/applications/science/misc/tulip/default.nix | 2 +- pkgs/applications/video/qstopmotion/default.nix | 2 +- pkgs/desktops/gnome-3/core/folks/default.nix | 2 +- pkgs/development/compilers/gprolog/default.nix | 2 +- pkgs/development/libraries/clutter-gst/default.nix | 2 +- pkgs/development/libraries/clutter-gtk/default.nix | 2 +- pkgs/development/libraries/libcanberra/default.nix | 2 +- pkgs/development/libraries/libgpod/default.nix | 2 +- pkgs/development/libraries/libxmi/default.nix | 2 +- pkgs/development/libraries/tokyo-tyrant/default.nix | 2 +- pkgs/development/tools/misc/complexity/default.nix | 2 +- pkgs/os-specific/gnu/mig/default.nix | 2 +- pkgs/servers/pies/default.nix | 2 +- pkgs/tools/X11/xnee/default.nix | 2 +- pkgs/tools/misc/picocom/default.nix | 2 +- pkgs/tools/misc/urjtag/default.nix | 2 +- pkgs/tools/networking/connect/default.nix | 2 +- pkgs/tools/networking/inetutils/default.nix | 2 +- pkgs/tools/networking/p2p/amule/default.nix | 2 +- pkgs/tools/networking/p2p/seeks/default.nix | 2 +- pkgs/tools/networking/telnet/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 2 +- pkgs/tools/system/freeipmi/default.nix | 2 +- pkgs/tools/text/namazu/default.nix | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index ac945bee7f7..efaef97257e 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index c173684fab4..091635feda6 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index e47da7a4193..306fe66823c 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -92,7 +92,7 @@ in license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; }; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 447e729d4f9..d3d95e5886a 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation { meta = common.meta // { maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index f491f5dc914..01d086cc4ed 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -196,7 +196,7 @@ rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; }; diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 9ca90d2f5df..719aca5096a 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "Free software suite for authoring and displaying virtual reality panoramas"; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index d3edc40cbea..4be7d230b5f 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index ec7af882907..395179ff70a 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index cb1c37aefeb..50cd9485a3e 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # needs GTK+ + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # needs GTK+ }; } diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index c655cadef40..5afd7a0237d 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index c70b1029b79..545675ab154 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { meta = { description = "An interactive drawing tool for X11"; homepage = http://xfig.org; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 2d880bef753..4fa4967c898 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index a1669183bb3..89be42781a4 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = stdenv.lib.platforms.gnu; # Random choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 7894554eee4..4607961cdf0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "IRC connection manager for the Telepathy framework"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index 6a0063dfb87..9763c0ee97f 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index 8c8d95169c8..688bb11acd0 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index c768f4c7fa3..4d85374ee9a 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d17cd2a7ab7..252c6d878d0 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index a4247eac627..d8ce1d2c628 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -9,7 +9,7 @@ let homepage = http://torch.ch; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; distro_src = src; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index a0ee505dc97..8cd119c7b7b 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = "non-commercial"; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 8560d900a4f..7db2e6a12c2 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 412cc1ad272..2454044bb48 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 776f7664222..beb40209bc8 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -45,6 +45,6 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = gnome3.maintainers; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 0e3eb88f537..b12b055342c 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 962ca9ff9b5..a06691d5c71 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -30,6 +30,6 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 71789b45a28..22f205cdcec 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 1b2cf4084f9..54f2273c2fc 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 60400712e30..fbe421e9974 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { homepage = http://gtkpod.sourceforge.net/; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 46d38b16ccf..81c5b5e2891 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index ccd619e8bc1..7bf08a3560a 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 60a0370e86e..41bfa520e62 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/complexity/; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 34426b45d55..2855f5b4240 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; - # platforms = stdenv.lib.platforms.gnu; # really GNU/Hurd + # platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # really GNU/Hurd maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index c472f767d52..73af60e55c4 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/pies/; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 63abc31e007..b31a512e84a 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/xnee/; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 57be275d32a..bb66b97039d 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Minimal dumb-terminal emulation program"; homepage = https://github.com/npat-efault/picocom/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 99cd407a9ae..25687a3dbe1 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; homepage = http://urjtag.org/; license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 387987c588a..f7a0c00fb48 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index c5ecb5eb6da..04045615a9b 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index c278cc98935..ac440fc6d33 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -65,7 +65,7 @@ mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index f11c0a63b07..2a89e419b2e 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index 3a5117653c8..c38f3c46fa4 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/pkgs/tools/networking/telnet/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { description = "A client and daemon for the Telnet protocol"; homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/; license = "BSD"; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index eb05c374807..f9dced33ed4 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication { license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ fuuzetsu kierdavis ]; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index fd70dce4edf..6996d66abe0 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice updateWalker = true; inherit version; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 21548de5efb..67a26cb41aa 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://namazu.org/; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; broken = true; # File-MMagic is not compatible with our Perl version }; -- GitLab From 9bbac8b3bf8daa22d3b632eacd625328396243c0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:48:58 -0500 Subject: [PATCH 286/785] mtools: optimistically extend platforms (gnu + darwin) => unix --- pkgs/tools/filesystems/mtools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index ff311b9fae2..e7a9963f650 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; } -- GitLab From d86866cd678178ead6039ee7a131f2a6c49402bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:09:11 -0700 Subject: [PATCH 287/785] gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-remote-gcrypt/versions. These checks were done: - built on NixOS - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt -h’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt --help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped -h’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped --help’ got 0 exit code - ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped help’ got 0 exit code - found 1.1 with grep in /nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1 - directory tree listing: https://gist.github.com/f375e7b41aa0075f2c539d2c32748c12 --- .../git-and-tools/git-remote-gcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 5e41db0e03f..adfdb9a541c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-remote-gcrypt-${version}"; - version = "1.0.3"; + version = "1.1"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1"; + sha256 = "0mhz5mqnr35rk7j4wyhp7hzmqgv8r554n9qlm4iw565bz7acvq24"; }; outputs = [ "out" "man" ]; -- GitLab From 9bde5abedd34add6fdc579635cd4d522cad1a299 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:51:17 -0500 Subject: [PATCH 288/785] more platforms.gnu -> gnu ++ linux changes, manually --- pkgs/development/compilers/mit-scheme/default.nix | 2 +- pkgs/servers/http/myserver/default.nix | 2 +- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 4670f39eac1..f254e91e5c6 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation { # Build fails on Cygwin and Darwin: # . - platforms = platforms.gnu ++ platforms.freebsd; + platforms = platforms.gnu ++ platforms.linux ++ platforms.freebsd; }; } diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 3e1c94e79b4..fa3b57a0b22 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; # libevent fails to build on Cygwin and Guile has troubles on Darwin. - platforms = lib.platforms.gnu; + platforms = lib.platforms.gnu ++ lib.platforms.linux; broken = true; # needs patch for gets() }; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 8c0c4a6c566..c682100b438 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -89,6 +89,6 @@ pythonPackages.buildPythonApplication rec { homepage = http://tahoe-lafs.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; - platforms = lib.platforms.gnu; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } -- GitLab From 1e295ccaf75cceff8b4949cf785a9b8e253f452f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:16:51 -0700 Subject: [PATCH 289/785] graphicsmagick: 1.3.28 -> 1.3.29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/graphicsmagick/versions. These checks were done: - built on NixOS - ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/gm help’ got 0 exit code - ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick++-config --version’ and found version 1.3.29 - ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick-config --version’ and found version 1.3.29 - ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagickWand-config --version’ and found version 1.3.29 - found 1.3.29 with grep in /nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29 - directory tree listing: https://gist.github.com/014b06393c82c79d1f5dfeea620b71f3 --- pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f086a8f5ba6..4258d91b42a 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.28"; in +let version = "1.3.29"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall"; + sha256 = "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1"; }; patches = [ -- GitLab From 52a9b6e896508e3794dff8b102da65e23596ed05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:18:09 -0700 Subject: [PATCH 290/785] encfs: 1.9.4 -> 1.9.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/encfs/versions. These checks were done: - built on NixOS - ran ‘/nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5/bin/encfs --version’ and found version 1.9.5 - ran ‘/nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5/bin/encfsctl --version’ and found version 1.9.5 - found 1.9.5 with grep in /nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5 - directory tree listing: https://gist.github.com/43f0591cfbd83d8f0ed7349f3b2cbec2 --- pkgs/tools/filesystems/encfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 03da84f7c73..1a9951a33fd 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "encfs-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { - sha256 = "1hp2l4yk7fsimlrrd6a675vigmyikd323l1n3mybcdng58skj2ag"; + sha256 = "099rjb02knr6yz7przlnyj62ic0ag5ncs7vvcc36ikyqrmpqsdch"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; -- GitLab From 02d34f7d9e72bc8c4373784d3d23a2c86cc25cef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:33:57 -0700 Subject: [PATCH 291/785] guake: 3.2.0 -> 3.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guake/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/guake -h’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/guake --help’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/..guake-wrapped-wrapped -h’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/..guake-wrapped-wrapped --help’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/.guake-wrapped -h’ got 0 exit code - ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/.guake-wrapped --help’ got 0 exit code - found 3.2.1 with grep in /nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1 - directory tree listing: https://gist.github.com/507c9c542414dc20262767a01f4ba0d9 --- pkgs/applications/misc/guake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 17837c6c254..9ae4ca0be03 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -2,7 +2,7 @@ , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.2.0"; + version = "3.2.1"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "1qghapg9sslj9fdrl2mnbi10lgqgqa36gdag74wn7as9wak4qc3d"; + sha256 = "0qzrkmjizpc3kirvhml62wya1sr3pbig25nfcrfhk1hhr3jxq17s"; }; nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; -- GitLab From e9d67529f7c83530e6caf1cc2e807dd33994653a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 18:45:22 -0500 Subject: [PATCH 292/785] nss-mdns: fix build w/musl --- pkgs/tools/networking/nss-mdns/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index b3d4ec95e06..9f83949e8de 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, fetchpatch }: stdenv.mkDerivation rec { name = "nss-mdns-0.10"; @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + ( + fetchpatch + { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; + sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; + } + ); + + meta = { description = "The mDNS Name Service Switch (NSS) plug-in"; longDescription = '' @@ -34,7 +44,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; maintainers = [ ]; }; -- GitLab From 369a7e598539887cd5065b39ed38434620dab0a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:58:59 -0700 Subject: [PATCH 293/785] folly: 2018.04.16.00 -> 2018.04.23.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2018.04.23.00 with grep in /nix/store/gdpqjqzr8vyisbqsklghaj7lzbbld8a7-folly-2018.04.23.00 - directory tree listing: https://gist.github.com/07bd48be1a92119ed9366c9d83b6a9d1 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index d3ba4b88909..17c6f75a59d 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.04.16.00"; + version = "2018.04.23.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "10wivnszpqcbg2hbvfal94lcjw20pjz0d8p0m4qa7i4v4z90q37p"; + sha256 = "0wfp4pxi71bi3bz3h5jxsvdd5wa8q6wqdgsx0jvyvaiiy7v884sv"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; -- GitLab From e6f9103afcab0b7bf2fd64c2f4de2950d97eb4b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:15:47 -0700 Subject: [PATCH 294/785] eclib: 20171002 -> 20171219 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/eclib/versions. These checks were done: - built on NixOS - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/qexp --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/qexp help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap --help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/nfcount -h’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/nfcount help’ got 0 exit code - ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/aplist --help’ got 0 exit code - found 20171219 with grep in /nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219 - directory tree listing: https://gist.github.com/65ae32e270027abb20516fbca4766d48 --- pkgs/development/libraries/eclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index dbe487368dc..b2a224e10b1 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -17,12 +17,12 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20171002"; + version = "20171219"; src = fetchFromGitHub { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "092an90405q9da0k0z5jfp5rng9jl0mqbvsbv4fx6jc9ykfcahsj"; + sha256 = "1yw488ng0labpxqqpxq0710qnndxl8plvcaqklpbwwd62a47knlr"; }; buildInputs = [ pari -- GitLab From 6cad5785ea0fc6d3d5f3dba2172e9d885b1c3661 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:24:48 -0700 Subject: [PATCH 295/785] extremetuxracer: 0.7.4 -> 0.7.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/extremetuxracer/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.7.5 with grep in /nix/store/aqs72fzhj8mlf9dlcrh0nsmwczsxa0il-extremetuxracer-0.7.5 - directory tree listing: https://gist.github.com/af25592b4861fd5c1e67e48c17da69d9 --- pkgs/games/extremetuxracer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index d1bf190be57..26703b8288e 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; name = "extremetuxracer-${version}"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "0d2j4ybdjmimg67v2fndgahgq4fvgz3fpfb3a4l1ar75n6hy776s"; + sha256 = "1ly63316c07i0gyqqmyzsyvygsvygn0fpk3bnbg25fi6li99rlsg"; }; buildInputs = [ -- GitLab From 71594fa9a28a6bf128d5b4041fd6d805aa8d9a32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:41:01 -0700 Subject: [PATCH 296/785] acpica-tools: 20180313 -> 20180427 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acpica-tools/versions. These checks were done: - built on NixOS - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpibin help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpidump -h’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpidump --help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpiexec -h’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpiexec --help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpihelp help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpinames -h’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpinames --help’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpixtract -h’ got 0 exit code - ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpixtract --help’ got 0 exit code - directory tree listing: https://gist.github.com/3a2dd151709bad304f81a4c4c7d3715e --- pkgs/tools/system/acpica-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index a8fb57b2fba..f26142260fe 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20180313"; + version = "20180427"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; + sha256 = "05hczn82dpn7irh8zy9m17hm8r3ngwrbmk69zsldr4k1w3cv40df"; }; NIX_CFLAGS_COMPILE = "-O3"; -- GitLab From f66a510db8ce6f4012db368052a4154bf42b9b22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:48:52 -0700 Subject: [PATCH 297/785] cni-plugins: 0.7.0 -> 0.7.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cni-plugins/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.7.1 with grep in /nix/store/ddh9jrgh4df6s6kj6ywc6clnprfggp75-cni-plugins-0.7.1 - directory tree listing: https://gist.github.com/2260aa864704a4bc411b23f3147315e9 --- pkgs/applications/networking/cluster/cni/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 9f6b6fcb7e1..8a006edda6a 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cni-plugins-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf"; + sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; }; buildInputs = [ go ]; -- GitLab From 07c025424ee0685801ed76cc6b9bd243e435a6e7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 30 Apr 2018 20:52:09 -0400 Subject: [PATCH 298/785] xmlformat: init at 1.04 --- pkgs/tools/text/xml/xmlformat/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/text/xml/xmlformat/default.nix diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix new file mode 100644 index 00000000000..5982aa3828e --- /dev/null +++ b/pkgs/tools/text/xml/xmlformat/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + name = "xmlformat-${version}"; + version = "1.04"; + + src = fetchurl { + url = "http://www.kitebird.com/software/xmlformat/xmlformat-${version}.tar.gz"; + sha256 = "1vwgzn4ha0az7dx0cyc6dx5nywwrx9gxhyh08mvdcq27wjbh79vi"; + }; + + buildInputs = [ perl ]; + buildPhase = '' + patchShebangs ./xmlformat.pl + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./xmlformat.pl $out/bin/xmlformat + cp ./LICENSE $out/ + ''; + + meta = { + description = "a configurable formatter (or 'pretty-printer') for XML documents"; + homepage = "http://www.kitebird.com/software/xmlformat/"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fea7117310..b20cf36a05f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5736,6 +5736,8 @@ with pkgs; xml2 = callPackage ../tools/text/xml/xml2 { }; + xmlformat = callPackage ../tools/text/xml/xmlformat { }; + xmlroff = callPackage ../tools/typesetting/xmlroff { }; xmloscopy = callPackage ../tools/text/xml/xmloscopy { }; -- GitLab From 1c86f0cc4683e055df981cded464464cb48e05aa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 19:59:33 -0500 Subject: [PATCH 299/785] netbsd: cleanup bootstrapping --- pkgs/os-specific/bsd/netbsd/default.nix | 242 +++++++++++++----------- 1 file changed, 133 insertions(+), 109 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 4961ab6080a..aea0ddac302 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -10,10 +10,11 @@ let }; netBSDDerivation = attrs: stdenv.mkDerivation ((rec { - name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + name = "bsd-${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; + setOutputFlags = false; nativeBuildInputs = [ makeMinimal mandoc groff install stat yacc flex tsort lorder ]; @@ -25,17 +26,24 @@ let DESTDIR = "$(out)"; TOOLDIR = "$(out)"; USETOOLS = "never"; - NOCLANGERROR="yes"; - NOGCCERROR="yes"; + NOCLANGERROR = "yes"; + NOGCCERROR = "yes"; LEX = "flex"; + MKUNPRIVED = "yes"; + INSTPRIV = '' ''${INSTPRIV.unpriv}''; + HOST_SH = "${bash}/bin/sh"; + OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; + PRESERVE = "-p"; + MACHINE_ARCH = hostPlatform.parsed.cpu.name; + MACHINE_CPU = hostPlatform.parsed.cpu.name; # libs will be provided by cc-wrapper - LIBCRT0=""; - LIBCRTI=""; - LIBCRTEND=""; - LIBCRTBEGIN=""; - LIBC=""; - LIBUTIL=""; + LIBCRT0 = ""; + LIBCRTI = ""; + LIBCRTEND = ""; + LIBCRTBEGIN = ""; + LIBC = ""; + LIBUTIL = ""; LIBSSL = ""; LIBCRYPTO = ""; LIBCRYPT = ""; @@ -43,8 +51,6 @@ let LIBTERMINFO = ""; LIBM = ""; LIBL = ""; - "LIBDO.terminfo" = "_external"; - "LIBDO.curses" = "_external"; _GCC_CRTBEGIN = ""; _GCC_CRTBEGINS = ""; _GCC_CRTEND = ""; @@ -54,10 +60,14 @@ let _GCC_CRTDIR = ""; _GCC_CRTN = ""; + "LIBDO.terminfo" = "_external"; + "LIBDO.curses" = "_external"; + # all dirs will be prefixed with DESTDIR BINDIR = "/bin"; LIBDIR = "/lib"; SHLIBDIR = "/lib"; + INCSDIR = "/include"; MANDIR = "/share/man"; INFODIR = "/share/info"; DOCDIR = "/share/doc"; @@ -65,22 +75,12 @@ let X11BINDIR = "/bin"; X11USRLIBDIR = "/lib"; X11MANDIR = "/share/man"; - SHLINKDIR = "/usr/libexec"; - - HOST_SH = "${bash}/bin/sh"; - - SHLIB_WARNTEXTREL = "no"; - SHLIB_MKMAP = "no"; - PRESERVE = "-p"; - OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - - MACHINE_ARCH = hostPlatform.parsed.cpu.name; - MACHINE_CPU = hostPlatform.parsed.cpu.name; # NetBSD makefiles should be able to detect this # but without they end up using gcc on Darwin stdenv preConfigure = '' export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} + # Parallel building. Needs the space. export makeFlags+=" -j $NIX_BUILD_CORES" ''; @@ -91,6 +91,7 @@ let sourceRoot=$PWD/$sourceRoot export NETBSDSRCDIR=$sourceRoot export BSDSRCDIR=$NETBSDSRCDIR + export _SRC_TOP_=$NETBSDSRCDIR chmod -R u+w $sourceRoot for path in $extraPaths; do cd $path @@ -109,15 +110,14 @@ let # will be removed in the postInstall. preInstall = '' mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR + $out$DOCDIR $out$LOCALEDIR $out$INCSDIR for i in 1 2 3 4 5 6 7 8 9; do mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ $out$DOCDIR/reference/ref$i done - mkdir -p $out/usr/include ''; - postInstall = '' + preFixup = '' # Remove lingering /usr references if [ -d $out/usr ]; then cd $out/usr @@ -125,6 +125,10 @@ let find . -type f -exec mv \{} $out/\{} \; fi + if [ -f $out/METALOG ]; then + rm $out/METALOG + fi + find $out -type d -empty -delete ''; @@ -135,7 +139,9 @@ let }; }) // attrs); - # BOOTSTRAPPING + ## + ## BOOTSTRAPPING + ## makeMinimal = netBSDDerivation rec { path = "tools/make"; sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb"; @@ -144,16 +150,26 @@ let buildInputs = []; nativeBuildInputs = []; - patchPhase = '' + postPatch = '' patchShebangs configure - ${make.patchPhase} + ${make.postPatch} + ''; + buildPhase = '' + runHook prePatch + + sh ./buildmake.sh + + runHook postPatch ''; - buildPhase = "sh ./buildmake.sh"; installPhase = '' + runHook preInstall + install -D nbmake $out/bin/nbmake ln -s $out/bin/nbmake $out/bin/make mkdir -p $out/share - cp -r ../../share/mk $out/share/mk + cp -r $NETBSDSRCDIR/share/mk $out/share/mk + + runHook postInstall ''; extraPaths = [ make.src ] ++ make.extraPaths; }; @@ -171,7 +187,8 @@ let # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = "INSTALL=${coreutils}/bin/install"; + makeFlags = [ "INSTALL=${coreutils}/bin/install" ]; + installFlags = []; RENAME = "-D"; postInstall = '' @@ -219,7 +236,17 @@ let extraPaths = [ mtree.src make.src ]; nativeBuildInputs = [ makeMinimal mandoc groff ]; buildInputs = [ compat fts ]; - RENAME = "-D"; + installPhase = '' + runHook preInstall + + install -D install.1 $out/share/man/man1/install.1 + install -D xinstall $out/bin/install + ln -s $out/bin/install $out/bin/xinstall + ln -s $out/bin/install $out/bin/binstall + + runHook postInstall + ''; + # INSTALL_FILE = "install -D"; }; fts = netBSDDerivation { @@ -240,10 +267,14 @@ let ar -rsc libfts.a lib/libc/gen/fts.o ''; installPhase = '' + runHook preInstall + install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 install -D include/fts.h $out/include/fts.h install -D lib/libc/include/namespace.h $out/include/namespace.h install -D libfts.a $out/lib/libfts.a + + runHook postInstall ''; setupHook = ./fts-setup-hook.sh; }; @@ -268,7 +299,9 @@ let sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = [ makeMinimal mandoc groff install ]; }; - # END BOOTSTRAPPING + ## + ## END BOOTSTRAPPING + ## libutil = netBSDDerivation { path = "lib/libutil"; @@ -292,44 +325,31 @@ let path = "usr.bin/make"; sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar"; version = "7.1.2"; - patchPhase = '' + postPatch = '' # make needs this to pick up our sys make files export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - # can't set owner or group in Nix build - # maybe there is a better way to trick it? substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-o ''${SCRIPTSOWN_''${.ALLSRC:T}:U''${SCRIPTSOWN}}' "" \ - --replace '-g ''${SCRIPTSGRP_''${.ALLSRC:T}:U''${SCRIPTSGRP}}' "" \ - --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \ - --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \ - --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \ - --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \ - --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.links.mk \ - --replace '-o ''${LINKSOWN_''${.ALLSRC:T}:U''${LINKSOWN}}' "" \ - --replace '-g ''${LINKSGRP_''${.ALLSRC:T}:U''${LINKSGRP}}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \ - --replace '-o ''${MANOWN} -g ''${MANGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \ - --replace '-o ''${FILESOWN_''${.ALLSRC:T}:U''${FILESOWN}}' "" \ - --replace '-g ''${FILESGRP_''${.ALLSRC:T}:U''${FILESGRP}}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.inc.mk \ - --replace '-o ''${BINOWN} -g ''${BINGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \ - --replace '-o ''${LIBOWN} -g ''${LIBGRP}' "" + --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ --replace '-Wl,--whole-archive' "" \ - --replace '-Wl,--no-whole-archive' "" + --replace '-Wl,--no-whole-archive' "" \ + --replace '-Wl,--warn-shared-textrel' "" \ + --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" + ''; + preInstall = '' + mkdir -p $out$BINDIR $out$DOCDIR/reference/ref1/make \ + $out$MANDIR/man1 $out$MANDIR/html1 $out/share/mk ''; postInstall = '' - (cd $NETBSDSRCDIR/share/mk && make install) + (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) ''; extraPaths = [ (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa") @@ -346,17 +366,23 @@ let path = "usr.bin/who"; version = "7.1.2"; sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; - patchPhase = '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ - --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \ --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ - --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" \ - --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" + --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ + --replace "timespeccmp(&st.st_mtimespec, &utmpxtime, >)" "st.st_mtimespec.tv_sec == utmpxtime.tv_sec ? st.st_mtimespec.tv_nsec > utmpxtime.tv_nsec : st.st_mtimespec.tv_sec > utmpxtime.tv_sec" + '' + '' + substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ + --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \ + --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" \ + --replace "timespecclear(&utmpxtime)" "utmpxtime.tv_sec = utmpxtime.tv_nsec = 0" ''; }; in rec { - inherit compat install netBSDDerivation fts; + inherit compat install netBSDDerivation fts make; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -375,23 +401,26 @@ in rec { path = "share/dict"; version = "7.1.2"; sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; - preBuild = "mkdir -p $out/share/dict"; makeFlags = [ "BINDIR=/share" ]; + preInstall = "mkdir -p $out/share/dict"; }; games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; version = "7.1.2"; - patchPhase = '' + makeFlags = [ "BINDIR=/bin" + "SCRIPTSDIR=/bin" + "FILESDIR=/share/games" ]; + postPatch = '' sed -i '1i #include ' adventure/save.c for f in $(find . -name pathnames.h); do substituteInPlace $f \ + --replace /usr/share/games/fortune $out/share/games \ --replace /usr/share/games $out/share/games \ --replace /usr/games $out/bin \ --replace /usr/libexec $out/libexec \ - --replace /var/games $out/var/games \ --replace /usr/bin/more ${more}/bin/more \ --replace /usr/share/dict ${dict}/share/dict done @@ -424,13 +453,11 @@ in rec { --replace 2550 550 ''; - # HACK strfile needs to be installed first & in the path + # HACK strfile needs to be installed first & in the path. The + # Makefile should do this for us but haven't gotten it to work preBuild = '' - pushd fortune/strfile mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8 - make - make BINDIR=/bin install - popd + (cd fortune/strfile && make && make BINDIR=/bin install) export PATH=$out/bin:$PATH ''; @@ -447,38 +474,37 @@ in rec { "-D__c99inline=__inline" ]; - postBuild = '' - mkdir -p $out/usr/games $out/usr/share/games/ching \ - $out/usr/share/games/fortune \ - $out/usr/share/games/quiz.db \ - $out/usr/share/games/boggle \ - $out/usr/libexec/ching $out/var/games/hackdir + preInstall = '' + mkdir -p $out/var/games/hackdir \ + $out/share/games \ + $out$DOCDIR/reference/ref6/rogue \ + $out$MANDIR/man6 $out$MANDIR/html6 touch $out/var/games/hackdir/perm ''; - preFixup = '' - mkdir -p $out/bin - mv $out/games/* $out/bin - rmdir $out/games - ''; - buildInputs = [ compat libcurses libterminfo libressl ]; extraPaths = [ dict.src who.src ]; }; - # finger = netBSDDerivation { - # path = "usr.bin/finger"; - # sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; - # version = "7.1.2"; - # extraPaths = [ who.src ]; - # NIX_CFLAGS_COMPILE = [ - # "-DSUPPORT_UTMP" - # "-USUPPORT_UTMPX" - # ]; - # patchPhase = '' - # ${who.patchPhase} - # ''; - # }; + finger = netBSDDerivation { + path = "usr.bin/finger"; + sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; + version = "7.1.2"; + NIX_CFLAGS_COMPILE = [ + (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP") + (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX") + ]; + postPatch = '' + NIX_CFLAGS_COMPILE+=" -I$NETBSDSRCDIR/include" + + substituteInPlace extern.h \ + --replace psort _psort + + ${who.postPatch} + ''; + extraPaths = [ who.src ] + ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "7.1.2" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px"); + }; fingerd = netBSDDerivation { path = "libexec/fingerd"; @@ -490,8 +516,8 @@ in rec { path = "lib/libedit"; buildInputs = [ libterminfo libcurses ]; propagatedBuildInputs = [ compat ]; - postBuild = "mkdir -p $out/usr/include/readline"; - patchPhase = '' + makeFlags = [ "INCSDIR=/include" ]; + postPatch = '' sed -i '1i #undef bool_t' el.h substituteInPlace config.h \ --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" @@ -511,16 +537,13 @@ in rec { sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; MKPIC = if stdenv.isDarwin then "no" else "yes"; - patchPhase = '' - substituteInPlace term.c \ - --replace /usr/share $out/share + makeFlags = [ "INCSDIR=/include" ]; + postPatch = '' + substituteInPlace term.c --replace /usr/share $out/share ''; - postBuild = '' - pushd $NETBSDSRCDIR/share/terminfo + postInstall = '' mkdir -p $out/share/misc - make - make BINDIR=/share install - popd + (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) ''; extraPaths = [ (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") @@ -532,6 +555,7 @@ in rec { version = "7.1.2"; sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; buildInputs = [ libterminfo ]; + makeFlags = [ "INCSDIR=/include" ]; NIX_CFLAGS_COMPILE = [ "-D__scanflike(a,b)=" "-D__va_list=va_list" @@ -540,7 +564,7 @@ in rec { propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr MKPIC = if stdenv.isDarwin then "no" else "yes"; - patchPhase = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' -- GitLab From ab1648bf0d13afc19bdf7e3d092a3f7ce15a4de1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 30 Apr 2018 22:35:54 -0400 Subject: [PATCH 300/785] nixpkgs doc: add format Make target --- doc/Makefile | 7 +++- doc/default.nix | 3 +- doc/shell.nix | 1 + nixos/doc/xmlformat.conf | 72 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 nixos/doc/xmlformat.conf diff --git a/doc/Makefile b/doc/Makefile index 952ef4bfcbb..8a4612e95f1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,12 +1,17 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md))) .PHONY: all -all: validate out/html/index.html out/epub/manual.epub +all: validate format out/html/index.html out/epub/manual.epub .PHONY: debug debug: nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml" +.PHONY: format +format: + find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ + xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {} + .PHONY: clean clean: rm -f ${MD_TARGETS} .version manual-full.xml diff --git a/doc/default.nix b/doc/default.nix index e5be364506f..0d95d3f0457 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -7,7 +7,7 @@ in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; - buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ]; + buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ]; src = ./.; @@ -18,6 +18,7 @@ pkgs.stdenv.mkDerivation { HIGHLIGHTJS = pkgs.documentation-highlighter; XSL = "${pkgs.docbook5_xsl}/xml/xsl"; RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; + XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; xsltFlags = lib.concatStringsSep " " [ "--param section.autolabel 1" "--param section.label.includes.component.label 1" diff --git a/doc/shell.nix b/doc/shell.nix index 22590142ee1..e8da2eaf16b 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,4 +1,5 @@ { pkgs ? import ../. {} }: (import ./default.nix).overrideAttrs (x: { buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ]; + }) diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf new file mode 100644 index 00000000000..50255857b24 --- /dev/null +++ b/nixos/doc/xmlformat.conf @@ -0,0 +1,72 @@ +# +# DocBook Configuration file for "xmlformat" +# see http://www.kitebird.com/software/xmlformat/ +# 10 Sept. 2004 +# + +# Only block elements +ackno address appendix article biblioentry bibliography bibliomixed \ +biblioset blockquote book bridgehead callout calloutlist caption caution \ +chapter chapterinfo classsynopsis cmdsynopsis colophon constraintdef \ +constructorsynopsis dedication destructorsynopsis entry epigraph equation example \ +figure formalpara funcsynopsis glossary glossdef glossdiv glossentry glosslist \ +glosssee glossseealso graphic graphicco highlights imageobjectco important \ +index indexdiv indexentry indexinfo info informalequation informalexample \ +informalfigure informaltable legalnotice literallayout lot lotentry mediaobject \ +mediaobjectco msgmain msgset note orderedlist para part preface primaryie \ +procedure qandadiv qandaentry qandaset refentry refentrytitle reference \ +refnamediv refsect1 refsect2 refsect3 refsection revhistory screenshot sect1 \ +sect2 sect3 sect4 sect5 section seglistitem set setindex sidebar simpara \ +simplesect step substeps synopfragment synopsis table term title \ +toc variablelist varlistentry warning itemizedlist listitem \ +footnote colspec partintro row simplelist subtitle tbody tgroup thead tip + format block + normalize no + + +#appendix bibliography chapter glossary preface reference +# element-break 3 + +sect1 section + element-break 2 + + +# +para abstract + format block + entry-break 1 + exit-break 1 + normalize yes + wrap-length 79 + +title + format block + normalize = yes + entry-break = 0 + exit-break = 0 + +# Inline elements +abbrev accel acronym action application citation citebiblioid citerefentry citetitle \ +classname co code command computeroutput constant country database date email emphasis \ +envar errorcode errorname errortext errortype exceptionname fax filename \ +firstname firstterm footnoteref foreignphrase funcdef funcparams function \ +glossterm group guibutton guiicon guilabel guimenu guimenuitem guisubmenu \ +hardware holder honorific indexterm inlineequation inlinegraphic inlinemediaobject \ +interface interfacename \ +keycap keycode keycombo keysym lineage link literal manvolnum markup medialabel \ +menuchoice methodname methodparam modifier mousebutton olink ooclass ooexception \ +oointerface option optional otheraddr othername package paramdef parameter personname \ +phrase pob postcode productname prompt property quote refpurpose replaceable \ +returnvalue revnumber sgmltag state street structfield structname subscript \ +superscript surname symbol systemitem token trademark type ulink userinput \ +uri varargs varname void wordasword xref year mathphrase member tag + format inline + +programlisting screen + format verbatim + entry-break = 0 + exit-break = 0 + + +#term +# format inline -- GitLab From 5c1b3d93bfc70d14fba94afb2e824ab88faa0aef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 02:43:01 +0000 Subject: [PATCH 301/785] netbsd.games: disable some broken linux games --- pkgs/os-specific/bsd/netbsd/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index aea0ddac302..188d9709ee0 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -382,7 +382,7 @@ let }; in rec { - inherit compat install netBSDDerivation fts make; + inherit compat install netBSDDerivation fts; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -441,16 +441,17 @@ in rec { disableGame atc disableGame dm disableGame dab - ${lib.optionalString stdenv.isDarwin "disableGame sail"} - ${lib.optionalString stdenv.isDarwin "disableGame trek"} + disableGame sail + disableGame trek + ${lib.optionalString stdenv.isLinux "disableGame boggle"} + ${lib.optionalString stdenv.isLinux "disableGame hunt"} + ${lib.optionalString stdenv.isLinux "disableGame larn"} + ${lib.optionalString stdenv.isLinux "disableGame phantasia"} + ${lib.optionalString stdenv.isLinux "disableGame rogue"} ${lib.optionalString stdenv.isDarwin "disableGame adventure"} ${lib.optionalString stdenv.isDarwin "disableGame factor"} ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} ${lib.optionalString stdenv.isDarwin "disableGame mille"} - - substituteInPlace Makefile.inc \ - --replace 2555 555 \ - --replace 2550 550 ''; # HACK strfile needs to be installed first & in the path. The -- GitLab From 8838533ec12db36483a6e3aee903075b62b14130 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:11 -0500 Subject: [PATCH 302/785] dejagnu: supports darwin --- pkgs/development/tools/misc/dejagnu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 0cb483027c1..b734eadae90 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/dejagnu/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington vrthra ]; }; } -- GitLab From 85e1f22b98a022fb3a3fb0be15bee6771cd81c25 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:42 -0500 Subject: [PATCH 303/785] inetutils: cleanup - supports darwin (only when servers are disabled) - pass SUIDMODE= to avoid setuid - add myself as maintainer --- pkgs/tools/networking/inetutils/default.nix | 23 ++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 04045615a9b..c050758a8ee 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, help2man }: +{ stdenv, lib, fetchurl, ncurses, perl, help2man }: stdenv.mkDerivation rec { name = "inetutils-1.9.4"; @@ -16,25 +16,20 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd + ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd "--disable-rcp" "--disable-rsh" "--disable-rlogin" "--disable-rexec" - ]; + ] ++ lib.optional stdenv.isDarwin "--disable-servers"; # Test fails with "UNIX socket name too long", probably because our # $TMPDIR is too long. - #doCheck = true; - + doCheck = false; - postInstall = '' - # XXX: These programs are normally installed setuid but since it - # fails, they end up being non-executable, hence this hack. - chmod +x $out/bin/{ping,ping6,${stdenv.lib.optionalString (!stdenv.hostPlatform.isMusl) ''rcp,rlogin,rsh,''}traceroute} - ''; + installFlags = [ "SUIDMODE=" ]; - meta = { + meta = with lib; { description = "Collection of common network programs"; longDescription = @@ -45,9 +40,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/inetutils/; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.unix; }; } -- GitLab From e1bc2fbfdd18ae04343ebe50f736d2601e751b8e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:44:14 -0500 Subject: [PATCH 304/785] moe: supports darwin --- pkgs/applications/editors/moe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 751b78ab674..764877a11cb 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/moe/; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } # TODO: a configurable, global moerc file -- GitLab From 426a9acf1e266308b05975694d2125381b27ae94 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:54:42 -0500 Subject: [PATCH 305/785] dirmngr: supports darwin --- pkgs/tools/security/dirmngr/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index bd94c6786d7..888fa48eab9 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap }: +{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap +, libiconv}: stdenv.mkDerivation rec { name = "dirmngr-1.1.1"; @@ -6,9 +7,10 @@ stdenv.mkDerivation rec { url = "mirror://gnupg/dirmngr/${name}.tar.bz2"; sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j"; }; - buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ]; + buildInputs = [ libgpgerror libgcrypt libassuan libksba + pth openldap libiconv ]; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } -- GitLab From 884babe32431ba40e9aa1d7160bc42daaf926f13 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:07:57 -0500 Subject: [PATCH 306/785] ballandpaddle: supports darwin --- pkgs/games/ball-and-paddle/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index 4a7eb9376da..dbd2814a6fb 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; - # The fancy libs aren't available on {Cyg,Dar}win. - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } -- GitLab From d424d34bf7faa42277e9ec506647e25128d54eaf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:15:33 -0500 Subject: [PATCH 307/785] jwhois: supports darwin - also set license to gpl3 --- pkgs/tools/networking/jwhois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index cd0821ef9ef..be8e9e210d1 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = http://www.gnu.org/software/jwhois/; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } -- GitLab From 262fdca5e90eb7fb8d0ca994b834a401dada0acf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:16:14 -0500 Subject: [PATCH 308/785] gcal: supports darwin --- pkgs/applications/misc/gcal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 67bb5feff8c..f3f7fe2aacb 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.gnu.org/software/gcal/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } -- GitLab From 7cbf40808631996d5fca0785026c31e09e4413b1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:30:42 -0500 Subject: [PATCH 309/785] vcdimager: supports darwin --- pkgs/development/libraries/vcdimager/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 77956be3b12..ddecf4a96a7 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt }: +{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt +, libiconv, darwin }: stdenv.mkDerivation rec { name = "vcdimager-2.0.1"; @@ -10,14 +11,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 popt ]; + buildInputs = [ libxml2 popt libiconv ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); propagatedBuildInputs = [ libcdio ]; meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = platforms.gnu ++ platforms.linux; # random choice + platforms = platforms.unix; license = licenses.gpl2; }; } -- GitLab From ccaebf04c15ce3b0c8f054d2e48826c68e7cbee0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:33:49 -0500 Subject: [PATCH 310/785] ocrad: supports darwin --- pkgs/applications/graphics/ocrad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index d8811791627..2ff62cc9eef 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } -- GitLab From 038a0c9a603166eada74e930859ccd7e0197f78d Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 30 Apr 2018 20:03:23 -0700 Subject: [PATCH 311/785] treewide: http to https --- pkgs/applications/audio/gmpc/default.nix | 2 +- pkgs/applications/graphics/digikam/default.nix | 2 +- pkgs/applications/graphics/dosage/default.nix | 2 +- pkgs/applications/graphics/gimp/plugins/default.nix | 4 ++-- pkgs/applications/misc/chirp/default.nix | 4 ++-- pkgs/applications/misc/gramps/default.nix | 2 +- pkgs/applications/misc/lilyterm/default.nix | 4 ++-- .../networking/cluster/kubernetes/default.nix | 2 +- pkgs/applications/networking/ids/snort/default.nix | 2 +- .../networking/instant-messengers/franz/default.nix | 2 +- pkgs/applications/networking/irc/irssi/default.nix | 2 +- pkgs/applications/video/mpv/default.nix | 4 ++-- pkgs/applications/window-managers/i3/default.nix | 2 +- pkgs/applications/window-managers/i3/status.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-menus/default.nix | 2 +- pkgs/development/compilers/hhvm/default.nix | 2 +- pkgs/development/libraries/LASzip/default.nix | 2 +- pkgs/development/libraries/fcppt/default.nix | 2 +- pkgs/development/libraries/libLAS/default.nix | 2 +- pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix | 2 +- pkgs/development/libraries/libmsgpack/generic.nix | 2 +- pkgs/development/libraries/liboil/default.nix | 2 +- pkgs/development/libraries/libssh2/default.nix | 2 +- pkgs/development/libraries/movit/default.nix | 2 +- .../tools/analysis/include-what-you-use/default.nix | 2 +- pkgs/development/tools/build-managers/cmake/2.8.nix | 8 ++++---- pkgs/development/tools/castxml/default.nix | 2 +- pkgs/development/tools/gauge/default.nix | 2 +- pkgs/games/assaultcube/default.nix | 2 +- pkgs/misc/emulators/emulationstation/default.nix | 2 +- pkgs/servers/firebird/default.nix | 2 +- pkgs/servers/xmpp/ejabberd/default.nix | 4 ++-- pkgs/tools/backup/burp/default.nix | 2 +- pkgs/tools/filesystems/bindfs/default.nix | 2 +- pkgs/tools/filesystems/irods/common.nix | 2 +- pkgs/tools/misc/gparted/default.nix | 2 +- pkgs/tools/networking/easyrsa/2.x.nix | 2 +- pkgs/tools/networking/easyrsa/default.nix | 2 +- pkgs/tools/networking/openvpn/default.nix | 4 ++-- pkgs/tools/security/clamav/default.nix | 2 +- pkgs/tools/security/mpw/default.nix | 2 +- 41 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index c2adc58f9ce..099e4428016 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://gmpclient.org; + homepage = https://gmpclient.org; description = "A GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 633a1d9bd6e..5c6a4bab930 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -116,7 +116,7 @@ mkDerivation rec { meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; - homepage = http://www.digikam.org; + homepage = https://www.digikam.org; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index f95370e39e7..4bc0e93a3b4 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -23,6 +23,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; - homepage = http://dosage.rocks/; + homepage = https://dosage.rocks/; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 01d086cc4ed..5b21b349764 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -43,7 +43,7 @@ rec { */ name = "gap-2.6.0"; src = fetchurl { - url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; + url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; patchPhase = '' @@ -53,7 +53,7 @@ rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; - homepage = http://www.gimp.org; + homepage = https://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # falls inside "free". license = with licenses; [ gpl3 free ]; diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 22d659dd10e..b8fc63c2c9e 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20180412"; src = fetchurl { - url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; + url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source tool for programming your amateur radio"; - homepage = http://chirp.danplanet.com/; + homepage = https://chirp.danplanet.com/; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 5f219dc4752..50f575d15ce 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -51,7 +51,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { description = "Genealogy software"; - homepage = http://gramps-project.org; + homepage = https://gramps-project.org; license = licenses.gpl2; }; } diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 36527cdbe7c..662ca9761fb 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -15,7 +15,7 @@ let then rec { version = "0.9.9.4"; src = fetchurl { - url = "http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; + url = "https://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; }; } @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { longDescription = '' LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. ''; - homepage = http://lilyterm.luna.com.tw/; + homepage = https://lilyterm.luna.com.tw/; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 2b555435327..1a7ba3cf93d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; - homepage = http://kubernetes.io; + homepage = https://kubernetes.io; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index e3a917a12eb..ff19a62ef30 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; - homepage = http://www.snort.org; + homepage = https://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index c2e6528e637..95e01e586ec 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; - homepage = http://meetfranz.com; + homepage = https://meetfranz.com; license = licenses.free; maintainers = [ maintainers.gnidorah ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b03673a00b6..b5bab3585c5 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://irssi.org; + homepage = https://irssi.org; description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 421e0dbb8a3..aa17cf183e3 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -77,7 +77,7 @@ let # for purity reasons this behavior should be avoided. wafVersion = "1.9.15"; waf = fetchurl { - urls = [ "http://waf.io/waf-${wafVersion}" + urls = [ "https://waf.io/waf-${wafVersion}" "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5"; }; @@ -200,7 +200,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; - homepage = http://mpv.io; + homepage = https://mpv.io; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 46c87b0b189..986639c947b 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager"; - homepage = "http://i3wm.org"; + homepage = "https://i3wm.org"; maintainers = with maintainers; [ garbas modulistic fpletz ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index b54f6e8def3..fa964e86974 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A tiling window manager"; - homepage = http://i3wm.org; + homepage = https://i3wm.org; maintainers = [ stdenv.lib.maintainers.garbas ]; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix index fdd23d13459..8a316b60f02 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool glib gobjectIntrospection ]; meta = { - homepage = http://www.gnome.org; + homepage = https://www.gnome.org; description = "Gnome menu specification"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 1cb28118ccb..749e4125a0b 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "High-performance JIT compiler for PHP/Hack"; - homepage = "http://hhvm.com"; + homepage = "https://hhvm.com"; license = "PHP/Zend"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index 384178d2c8d..4a166242eb3 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; - homepage = http://www.laszip.org; + homepage = https://www.laszip.org; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.michelk ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index c4332df5a3d..660cdfa6414 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { programming (which is both efficient and syntactically affordable in C++11). ''; - homepage = http://fcppt.org; + homepage = https://fcppt.org; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 272a9774a7f..1e7720b0656 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; - homepage = http://www.liblas.org; + homepage = https://www.liblas.org; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 75cf69035cb..9c25757efb0 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libdbusmenu-qt-0.9.3+14"; src = fetchbzr { - url = "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; + url = "https://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2"; sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; }; diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix index 7bca8f21c6b..889ef134773 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; + homepage = https://msgpack.org; license = licenses.asl20; maintainers = with maintainers; [ redbaron wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index a8d2953cad0..fb2dad60525 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of simple functions that are optimized for various CPUs"; - homepage = http://liboil.freedesktop.org; + homepage = https://liboil.freedesktop.org; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 4d754dc8086..a09a7670739 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A client-side C library implementing the SSH2 protocol"; - homepage = http://www.libssh2.org; + homepage = https://www.libssh2.org; platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 3766140eea1..b5188cb66d2 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; - homepage = http://movit.sesse.net; + homepage = https://movit.sesse.net; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index ec4d19423e6..9aac638d0a8 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { actually needed for this file (for both .cc and .h files), and by replacing #includes with forward-declares when possible. ''; - homepage = http://include-what-you-use.org; + homepage = https://include-what-you-use.org; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 5fcd6b34165..e014276cd67 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -28,16 +28,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = - [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 + [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959 name = "FindFreetype-2.5.patch"; - url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + url = "https://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in our libc. [ ./search-path.patch ] ++ optional (hostPlatform != buildPlatform) (fetchurl { name = "fix-darwin-cross-compile.patch"; - url = "http://public.kitware.com/Bug/file_download.php?" + url = "https://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; }); @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.cmake.org/; + homepage = https://cmake.org; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f8389786b9d..f42adffc5f4 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.kitware.com; + homepage = https://www.kitware.com; license = licenses.asl20; description = "Abstract syntax tree XML output tool"; platforms = platforms.unix; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 58bc24e1ec6..12152e98866 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Light weight cross-platform test automation"; - homepage = http://gauge.org; + homepage = https://gauge.org; license = licenses.gpl3; maintainers = [ maintainers.vdemeester ]; platforms = platforms.unix; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index cef48978b6d..6f742bb64f7 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast and fun first-person-shooter based on the Cube fps"; - homepage = http://assault.cubers.net; + homepage = https://assault.cubers.net; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; # should work on darwin with a little effort. license = stdenv.lib.licenses.zlib; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 16cb7af3d60..9dec1ecacae 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; - homepage = http://emulationstation.org; + homepage = https://emulationstation.org; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index da54936092b..24ed1dffd4d 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = { description = "SQL relational database management system"; - homepage = http://www.firebirdnews.org; + homepage = https://www.firebirdnews.org; license = ["IDPL" "Interbase-1.0"]; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index f95b5efe3d3..6a0bedeab26 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { name = "ejabberd-${version}"; src = fetchurl { - url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; + url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6"; }; @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source XMPP application server written in Erlang"; license = licenses.gpl2; - homepage = http://www.ejabberd.im; + homepage = https://www.ejabberd.im; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ]; broken = withElixir; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index c079d8272b1..4133478dbf9 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; - homepage = http://burp.grke.org; + homepage = https://burp.grke.org; license = licenses.agpl3; maintainers = with maintainers; [ tokudan ]; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a83ee771d69..1499e81b624 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; - homepage = http://bindfs.org; + homepage = https://bindfs.org; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index c7267aca107..902d7d7d1a1 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -47,7 +47,7 @@ with stdenv; important in data management. The development infrastructure supports exhaustive testing on supported platforms; plug-in support for microservices, storage resources, drivers, and databases; and extensive documentation, training and support services.''; - homepage = http://irods.org; + homepage = https://irods.org; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 451bcae1efd..ca078c16ab6 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { partitions. GParted enables you to change the partition organization while preserving the partition contents. ''; - homepage = http://gparted.org; + homepage = https://gparted.org; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index b33034515fb..3c6c5f3d299 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 59d97a4a18b..fcc6c1d86bd 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index d96652e456d..358c53f453b 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "2.4.6"; src = fetchurl { - url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; + url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz"; sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "A robust and highly flexible tunneling application"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 8c12e4e30c3..c3aa92bf4b0 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.clamav.net; + homepage = https://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom robberer qknight fpletz ]; diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 3e1e3a88283..0994c649c83 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://masterpasswordapp.com/; + homepage = https://masterpasswordapp.com/; description = "A stateless password management solution"; license = licenses.gpl3; platforms = platforms.unix; -- GitLab From 1beb4236a21f2e9e7adcad1aa97191a4420295da Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:07:39 -0500 Subject: [PATCH 312/785] gpa: supports darwin --- pkgs/applications/misc/gpa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index ef805a31567..149092c70d3 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Graphical user interface for the GnuPG"; homepage = https://www.gnupg.org/related_software/gpa/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } -- GitLab From 0c3efb9ba05828822ba61105aead64ee3d6dd12c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 01:13:44 -0400 Subject: [PATCH 313/785] openssl: Support iOS cross compilation (in theory) --- pkgs/development/libraries/openssl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5a9052222cb..1eac225387d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -48,6 +48,8 @@ let then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}" else if hostPlatform.isLinux then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}" + else if hostPlatform.isiOS + then "./Configure ios${toString hostPlatform.parsed.cpu.bits}-cross" else throw "Not sure what configuration to use for ${hostPlatform.config}" ); -- GitLab From 9a845de873dfcc31f360a08f1b1f786c6f649c7d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 01:14:58 -0400 Subject: [PATCH 314/785] lib/systems: Update iOS examples The commented-out configs are @shlevy's old known-good ones. I changed them as needed to play nice with lib.systems.parse but did not test so leaving them as comments for now. --- lib/systems/examples.nix | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 848737700b0..e229cccb365 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -88,16 +88,36 @@ rec { # iphone64 = { - config = "aarch64-apple-darwin14"; - arch = "arm64"; - libc = "libSystem"; + config = "aarch64-apple-ios"; + # config = "aarch64-apple-darwin14"; + sdkVer = "10.2"; + useiOSPrebuilt = true; platform = {}; }; iphone32 = { - config = "arm-apple-darwin10"; - arch = "armv7-a"; - libc = "libSystem"; + config = "armv7-apple-ios"; + # config = "arm-apple-darwin10"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + platform = {}; + }; + + iphone64-simulator = { + config = "x86_64-apple-ios"; + # config = "x86_64-apple-darwin14"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + isiPhoneSimulator = true; + platform = {}; + }; + + iphone32-simulator = { + config = "i686-apple-ios"; + # config = "i386-apple-darwin11"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + isiPhoneSimulator = true; platform = {}; }; -- GitLab From 57a4db244995c9852cf5a202bd7540a5c1e7c410 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:45:05 -0500 Subject: [PATCH 315/785] pspp: supports darwin --- pkgs/applications/science/math/pspp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 486a2e69d26..957a4cf6421 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { more traditional syntax commands. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } -- GitLab From 24761ef5d4a48be1ddd409db7604b8718fc9de56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 23:08:21 -0700 Subject: [PATCH 316/785] atlas: 3.10.2 -> 3.10.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/atlas/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.10.3 with grep in /nix/store/bgqampvgm3zdncg3206n7qnvyvl0jipj-atlas-3.10.3 - directory tree listing: https://gist.github.com/a7dd287df10b13796423e3c2df0850eb --- pkgs/development/libraries/science/math/atlas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 8cca5565bf6..8b740bdb6f6 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -47,7 +47,7 @@ let inherit (stdenv.lib) optional optionalString; # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44 # is resolved. - version = "3.10.2"; + version = "3.10.3"; in stdenv.mkDerivation { @@ -55,7 +55,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; - sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars"; + sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216"; }; buildInputs = [ gfortran ]; -- GitLab From d13572817e30bddff97979c93aebc27a7cacb2ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 23:32:00 -0700 Subject: [PATCH 317/785] adapta-gtk-theme: 3.93.0.258 -> 3.93.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/5796929fde76fddc1465d9cfbc2ace7b --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index c0c67eeb6ab..f524c7d9579 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.0.258"; + version = "3.93.1.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "114rryaqr97f7qlwxn3fdspzigxx1jgpsbhypdn265511rsh30hx"; + sha256 = "00k67qpq62swz7p6dk4g8ak31h97lxyddpyr6xii1jpbygwkk9zc"; }; preferLocalBuild = true; -- GitLab From 152454d9875cc1df645c5aa01ec41451d985199f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 1 May 2018 07:36:35 +0100 Subject: [PATCH 318/785] nixos-install manual: remove --chroot option This option has been removed from the tool in favour of nixos-enter. --- nixos/doc/manual/man-nixos-install.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index c9887146989..d6e70d16098 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -57,9 +57,6 @@ - - - @@ -177,14 +174,6 @@ it. - - - - Chroot into given installation. Any additional arguments passed are going to be executed inside the chroot. - - - - -- GitLab From 800c46b24bda32efbc30faf6c7fcf63b1f8758ff Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 30 Apr 2018 23:45:30 -0700 Subject: [PATCH 319/785] dolphinEmuMaster: 20171218 -> 20180430 also fix build --- pkgs/misc/emulators/dolphin-emu/master.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index e2bac5d3884..5d4e22fefae 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib -, pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline +, pcre, gettext, libpthreadstubs, libXrandr, libXext, libXxf86vm, libXinerama, libSM, readline , openal, libXdmcp, portaudio, libusb, libevdev , libpulseaudio ? null , curl @@ -20,12 +20,12 @@ assert dolphin-wxgui || dolphin-qtgui; assert !(dolphin-wxgui && dolphin-qtgui); stdenv.mkDerivation rec { - name = "dolphin-emu-20171218"; + name = "dolphin-emu-20180430"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa"; - sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc"; + rev = "ad098283c023b0f5f0d314c646bc5d5756c35e3d"; + sha256 = "17fv3vz0nc5jax1bbl4wny1kzsshbbhms82dxd8rzcwwvd2ad1g7"; }; cmakeFlags = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre - gettext libpthreadstubs libXrandr libXext libSM readline openal + gettext libpthreadstubs libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp portaudio libusb libpulseaudio libpng hidapi ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ] ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev ] -- GitLab From 79897e15ab405c884b864b9196e0f9d94cd2cf43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Apr 2018 20:50:34 +0200 Subject: [PATCH 320/785] LTS Haskell 11.7 --- .../configuration-hackage2nix.yaml | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5e12e90a3c3..6b18694dc8d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.6 + # LTS Haskell 11.7 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -141,7 +141,7 @@ default-package-overrides: - avwx ==0.3.0.2 - axiom ==0.4.6 - b9 ==0.5.47 - - backprop ==0.1.5.1 + - backprop ==0.1.5.2 - bank-holidays-england ==0.1.0.6 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 @@ -157,7 +157,7 @@ default-package-overrides: - basic-prelude ==0.7.0 - bbdb ==0.8 - bcrypt ==0.0.11 - - beam-core ==0.7.2.0 + - beam-core ==0.7.2.1 - beam-migrate ==0.3.1.0 - beam-sqlite ==0.3.2.0 - bench ==1.0.9 @@ -242,7 +242,7 @@ default-package-overrides: - buffer-pipe ==0.0 - butcher ==1.3.0.0 - bv ==0.5 - - bv-little ==0.1.0.0 + - bv-little ==0.1.1 - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 @@ -306,7 +306,7 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - cisco-spark-api ==0.1.0.2 + - cisco-spark-api ==0.1.0.3 - clang-compilation-database ==0.1.0.1 - classyplate ==0.3.0.2 - classy-prelude ==1.4.0 @@ -400,7 +400,7 @@ default-package-overrides: - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - cryptocompare ==0.1.1 - - crypto-enigma ==0.0.2.11 + - crypto-enigma ==0.0.2.12 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -670,7 +670,7 @@ default-package-overrides: - foundation ==0.0.20 - FPretty ==1.1 - Frames ==0.3.0.2 - - free ==5.0.1 + - free ==5.0.2 - freenect ==1.2.1 - freer-simple ==1.1.0.0 - freetype2 ==0.1.2 @@ -800,12 +800,12 @@ default-package-overrides: - haddock-library ==1.4.5 - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - - hakyll ==4.12.1.0 + - hakyll ==4.12.2.0 - half ==0.2.2.3 - hamilton ==0.1.0.2 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.4 + - hapistrano ==0.3.5.5 - happstack-jmacro ==7.0.12 - happstack-server ==7.5.1 - happstack-server-tls ==7.1.6.5 @@ -906,7 +906,7 @@ default-package-overrides: - hmpfr ==0.4.4 - hocilib ==0.2.0 - Hoed ==0.5.1 - - hOpenPGP ==2.6 + - hOpenPGP ==2.6.1 - hopfli ==0.2.2.1 - hosc ==0.16 - hostname ==1.0 @@ -931,8 +931,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1013,7 +1013,7 @@ default-package-overrides: - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.5.0.2 + - hw-prim ==0.5.0.3 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 @@ -1046,7 +1046,7 @@ default-package-overrides: - immortal ==0.2.2.1 - imprint ==0.0.1.0 - include-file ==0.1.0.3 - - incremental-parser ==0.2.5.3 + - incremental-parser ==0.2.5.4 - indentation-core ==0.0.0.1 - indentation-parsec ==0.0.0.1 - indents ==0.4.0.1 @@ -1285,6 +1285,7 @@ default-package-overrides: - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.7 - minimorph ==0.1.6.1 + - minio-hs ==1.0.0 - miniutter ==0.4.7.0 - mintty ==0.1.1 - misfortune ==0.1.1.2 @@ -1468,7 +1469,7 @@ default-package-overrides: - pagination ==0.2.1 - palette ==0.1.0.5 - pandoc ==2.1.2 - - pandoc-citeproc ==0.14.3 + - pandoc-citeproc ==0.14.3.1 - pandoc-types ==1.17.3.1 - pango ==0.13.5.0 - papillon ==0.1.0.5 @@ -1507,7 +1508,7 @@ default-package-overrides: - perf ==0.3.1.1 - perfect-hash-generator ==0.2.0.6 - persistable-record ==0.6.0.3 - - persistable-types-HDBC-pg ==0.0.1.5 + - persistable-types-HDBC-pg ==0.0.3.2 - persistent ==2.8.2 - persistent-mongoDB ==2.8.0 - persistent-mysql ==2.8.1 @@ -1753,8 +1754,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.16 - sbv ==7.5 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1887,6 +1888,7 @@ default-package-overrides: - Spock-core ==0.12.0.0 - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 + - spoon ==0.3.1 - spreadsheet ==0.1.3.7 - sqlite-simple ==0.4.15.0 - sql-words ==0.1.6.0 @@ -2012,7 +2014,7 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - testing-feat ==0.4.0.3 - - texmath ==0.10.1.1 + - texmath ==0.10.1.2 - text ==1.2.3.0 - text-binary ==0.2.1.1 - text-conversions ==0.3.0 @@ -2140,8 +2142,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - Unique ==0.4.7.2 - unique ==0 + - Unique ==0.4.7.2 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2154,7 +2156,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.0.1 - unix-time ==0.3.8 - - unliftio ==0.2.6.0 + - unliftio ==0.2.7.0 - unliftio-core ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.9.0 @@ -2232,7 +2234,7 @@ default-package-overrides: - wai-middleware-prometheus ==0.3.0 - wai-middleware-rollbar ==0.10.0 - wai-middleware-static ==0.8.2 - - wai-middleware-throttle ==0.2.2.0 + - wai-middleware-throttle ==0.2.2.1 - wai-predicates ==0.10.0 - wai-route ==0.3.1.2 - wai-routing ==0.13.0 @@ -2241,7 +2243,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.2 - - warp ==3.2.19 + - warp ==3.2.22 - warp-tls ==3.2.4.3 - wave ==0.1.5 - wavefront ==0.7.1.2 @@ -2264,7 +2266,7 @@ default-package-overrides: - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 - wild-bind ==0.1.2.0 - - wild-bind-x11 ==0.2.0.2 + - wild-bind-x11 ==0.2.0.3 - Win32 ==2.5.4.1 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 @@ -2341,13 +2343,13 @@ default-package-overrides: - yesod-auth ==1.6.3 - yesod-auth-fb ==1.9.0 - yesod-auth-hashdb ==1.7 - - yesod-bin ==1.6.0 - - yesod-core ==1.6.3 + - yesod-bin ==1.6.0.2 + - yesod-core ==1.6.4 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - yesod-form ==1.6.1 - - yesod-form-bootstrap4 ==0.1.0.2 + - yesod-form-bootstrap4 ==0.1.1 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 - yesod-newsfeed ==1.6.1.0 @@ -2356,7 +2358,7 @@ default-package-overrides: - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0 - yesod-table ==2.0.3 - - yesod-test ==1.6.2 + - yesod-test ==1.6.3 - yesod-websockets ==0.3.0 - yes-precure5-command ==5.5.3 - yi-core ==0.17.1 -- GitLab From e9c955fb8477c30f0e9bbf9f9f96065e38dd81d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Apr 2018 02:30:52 +0200 Subject: [PATCH 321/785] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4fb888414b6e1d312df6e38bc41ee5289154aeeb. --- .../haskell-modules/hackage-packages.nix | 1324 ++++++++--------- 1 file changed, 631 insertions(+), 693 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8b035359730..f3ea3b8954f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -13317,6 +13317,27 @@ self: { license = "unknown"; }) {}; + "Network-NineP_0_4_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, convertible + , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl + , network, NineP, regex-posix, stateref, transformers + }: + mkDerivation { + pname = "Network-NineP"; + version = "0.4.3"; + sha256 = "1hsfcicijzqy7vxvknxxq9qa4qx3d1smg6mw4mpvk46nvxny8sc1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers convertible exceptions hslogger + monad-loops monad-peel mstate mtl network NineP regex-posix + stateref transformers + ]; + description = "High-level abstraction over 9P protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "NewBinary" = callPackage ({ mkDerivation, array, base, integer }: mkDerivation { @@ -30450,8 +30471,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.10.0.11"; - sha256 = "09c2nldzaqm8a203gqk6lc81gfhmvz30pxicxi9g1971y1q0nklj"; + version = "2.10.0.20"; + sha256 = "0k73jcj2za79wvb6nki1k02d6rj7zrnl0vz494ajh4d96gwdwacp"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -30463,8 +30484,8 @@ self: { zip-archive zlib ]; executableHaskellDepends = [ - base composition-prelude directory lens optparse-applicative shake - shake-ats temporary text + base composition-prelude directory lens optparse-applicative + parallel-io shake shake-ats temporary text ]; homepage = "https://github.com/vmchale/atspkg#readme"; description = "A build tool for ATS"; @@ -32486,29 +32507,6 @@ self: { }) {}; "backprop" = callPackage - ({ mkDerivation, base, bifunctors, binary, criterion, deepseq - , directory, hmatrix, lens, microlens, mnist-idx, mwc-random - , primitive, reflection, time, transformers, type-combinators - , vector - }: - mkDerivation { - pname = "backprop"; - version = "0.1.5.1"; - sha256 = "1jii5nwnkh44jxxyfkgm14695ah7p3rpbydcgj84g5ijmhdnmks0"; - libraryHaskellDepends = [ - base binary deepseq microlens primitive reflection transformers - type-combinators vector - ]; - benchmarkHaskellDepends = [ - base bifunctors criterion deepseq directory hmatrix lens mnist-idx - mwc-random time transformers vector - ]; - homepage = "https://github.com/mstksg/backprop#readme"; - description = "Heterogeneous automatic differentation (backpropagation)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "backprop_0_1_5_2" = callPackage ({ mkDerivation, base, bifunctors, binary, criterion, deepseq , directory, hmatrix, lens, microlens, mnist-idx, mwc-random , primitive, random, reflection, time, transformers @@ -32529,7 +32527,6 @@ self: { homepage = "https://github.com/mstksg/backprop#readme"; description = "Heterogeneous automatic differentation (backpropagation)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backtracking-exceptions" = callPackage @@ -33822,28 +33819,6 @@ self: { }) {}; "beam-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, dlist, free - , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty - , tasty-hunit, text, time, vector-sized - }: - mkDerivation { - pname = "beam-core"; - version = "0.7.2.0"; - sha256 = "1m3jyz1wh9g14cv5nyklqi6v8rqxi73xnppk308lrjh00iwrvgvb"; - libraryHaskellDepends = [ - aeson base bytestring containers dlist free ghc-prim hashable - microlens mtl network-uri tagged text time vector-sized - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit text time - ]; - homepage = "http://travis.athougies.net/projects/beam.html"; - description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "beam-core_0_7_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist, free , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty , tasty-hunit, text, time, vector-sized @@ -39185,7 +39160,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_36_2" = callPackage + "brick_0_36_3" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, QuickCheck, stm, template-haskell, text @@ -39193,8 +39168,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.36.2"; - sha256 = "0zzd3lwlb60n3zdcyyqf89b066337f6qny5m4clf1fbvqiw7g771"; + version = "0.36.3"; + sha256 = "1j53pj4axgyah3qj9zkaicbccmypm8cjfrpdjzarpcnb1za9y60n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40295,29 +40270,6 @@ self: { }) {}; "bv-little" = callPackage - ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp - , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "bv-little"; - version = "0.1.0.0"; - sha256 = "0gll7czp8xcm8lcvlxqxfx1gn8wj6cvqm5c9xh0g1s445ykrs93w"; - libraryHaskellDepends = [ - base deepseq hashable integer-gmp mono-traversable primitive - QuickCheck - ]; - testHaskellDepends = [ - base hashable mono-traversable QuickCheck tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - homepage = "https://github.com/recursion-ninja/bv-little"; - description = "Efficient little-endian bit vector library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bv-little_0_1_1" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit , tasty-quickcheck @@ -40338,7 +40290,6 @@ self: { homepage = "https://github.com/recursion-ninja/bv-little"; description = "Efficient little-endian bit vector library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv-sized" = callPackage @@ -41330,8 +41281,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.36.2"; - sha256 = "142y8ng64qcykyjp1yz989ksznhippgij3m5qy5rgh77kdncbpb1"; + version = "4.38"; + sha256 = "0c5c3xd3lipnwdyvnvlxk4wk8gi2akbjwmhnc1bsdyr6g6ihai81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41493,6 +41444,8 @@ self: { pname = "cabal-helper"; version = "0.8.0.2"; sha256 = "0yhsyq2z660qj5vp38lak2cz90r5jy69ifvz6dfipj6miyh2vmm6"; + revision = "1"; + editedCabalFile = "0hzjhnb9iyvk2qs3zbyj6rjhf3dbjksq0jqi8is522sph20zavvk"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -44041,22 +43994,12 @@ self: { }) {}; "cautious" = callPackage - ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec - , genvalidity-hspec-aeson, hspec, hspec-discover, QuickCheck - , transformers, validity - }: + ({ mkDerivation, aeson, base, transformers, validity }: mkDerivation { pname = "cautious"; - version = "0.1.0.0"; - sha256 = "054n9vy4h4qs208gfi7ryvb40y50pmaxcrslxplk95vg0pvg4k1w"; - libraryHaskellDepends = [ - aeson base genvalidity genvalidity-hspec-aeson hspec hspec-discover - QuickCheck transformers validity - ]; - testHaskellDepends = [ - aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson - hspec hspec-discover QuickCheck transformers validity - ]; + version = "0.3.0.0"; + sha256 = "0kydmb5f714pfgjz6drqi91m43bgs2sfap2nbww92xxyjbcls3j6"; + libraryHaskellDepends = [ aeson base transformers validity ]; homepage = "https://github.com/Nickske666/cautious#readme"; description = "Keep track of warnings and errors during calculations"; license = stdenv.lib.licenses.bsd3; @@ -44077,6 +44020,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cautious-gen" = callPackage + ({ mkDerivation, base, cautious, genvalidity, genvalidity-hspec + , genvalidity-hspec-aeson, hspec, QuickCheck + }: + mkDerivation { + pname = "cautious-gen"; + version = "0.0.0.0"; + sha256 = "1i9cmqkh1n6s3dkqr0f9slm6frslw82rwvngx80iw9rc95anhykl"; + libraryHaskellDepends = [ base cautious genvalidity ]; + testHaskellDepends = [ + base cautious genvalidity genvalidity-hspec genvalidity-hspec-aeson + hspec QuickCheck + ]; + homepage = "https://github.com/Nickske666/cautious#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cayley-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson @@ -44247,10 +44207,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.0.0"; - sha256 = "1klj3cx7cx39iyskv7fs6s28jplyn13dwv4khz79kxgg1sxd9gv5"; - revision = "2"; - editedCabalFile = "1r2ihgk5yj6xv4qc276b29gfzblksf82qdp0qg06cz590kxb8v2x"; + version = "0.1.0.1"; + sha256 = "16pzba0zc346d3azw4wd90apz7ldx68d5vd3q13dd3s9f3gqy4wv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46182,35 +46140,6 @@ self: { }) {}; "cisco-spark-api" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 - , bytestring, conduit, data-default, hspec, http-conduit - , http-types, network-uri, optparse-applicative, text, utf8-string - , wai, warp - }: - mkDerivation { - pname = "cisco-spark-api"; - version = "0.1.0.2"; - sha256 = "0cgs3d4dlc5vxz51d8c6hjvi1zxsvxzni4nqhqrc0rxnxkimc7bw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bitset-word8 bytestring conduit data-default - http-conduit network-uri text - ]; - executableHaskellDepends = [ - aeson base bytestring conduit data-default http-conduit - optparse-applicative text utf8-string - ]; - testHaskellDepends = [ - aeson async attoparsec base bytestring conduit data-default hspec - http-conduit http-types network-uri text wai warp - ]; - homepage = "https://github.com/nshimaza/cisco-spark-api#readme"; - description = "A Haskell bindings for Cisco Spark API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cisco-spark-api_0_1_0_3" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 , bytestring, conduit, data-default, hspec, http-conduit , http-types, network-uri, optparse-applicative, text, utf8-string @@ -46237,7 +46166,6 @@ self: { homepage = "https://github.com/nshimaza/webex-teams-api#readme"; description = "A Haskell bindings for Webex Teams API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "citation-resolve" = callPackage @@ -49007,6 +48935,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colorful-monoids_0_2_1_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "colorful-monoids"; + version = "0.2.1.1"; + sha256 = "0n1f9x6kyb3fcg1fbs80wrlm3c897l089ma4cxm47v1dcgczix8b"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/minad/colorful-monoids#readme"; + description = "Styled console text output using ANSI escape sequences"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colorize-haskell" = callPackage ({ mkDerivation, ansi-terminal, base, haskell-lexer }: mkDerivation { @@ -54926,23 +54868,6 @@ self: { }) {}; "crypto-enigma" = callPackage - ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck - , split - }: - mkDerivation { - pname = "crypto-enigma"; - version = "0.0.2.11"; - sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1"; - revision = "1"; - editedCabalFile = "1wh09ma0xr8lgj0a2ybp6kxisi36cl2kiqz2akhy915v6gpkjkyz"; - libraryHaskellDepends = [ base containers MissingH mtl split ]; - testHaskellDepends = [ base HUnit QuickCheck ]; - homepage = "https://github.com/orome/crypto-enigma-hs"; - description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crypto-enigma_0_0_2_12" = callPackage ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck , split }: @@ -54955,7 +54880,6 @@ self: { homepage = "https://github.com/orome/crypto-enigma-hs"; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -60562,6 +60486,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "deferred-folds" = callPackage + ({ mkDerivation, base, foldl }: + mkDerivation { + pname = "deferred-folds"; + version = "0.2.1"; + sha256 = "0i8wzih07532zw276h271lzdk3lkinjsjyhn8lks04yqkgq4b2x8"; + libraryHaskellDepends = [ base foldl ]; + homepage = "https://github.com/metrix-ai/deferred-folds"; + description = "Abstractions over deferred folds"; + license = stdenv.lib.licenses.mit; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -60719,17 +60655,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_5_0_0" = callPackage - ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, profunctors, random, transformers + "dejafu_1_5_1_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.5.0.0"; - sha256 = "1d32y12mzd9vfj2ww2cqn4jsvkc4yysnada6wijk5hm6ax7in822"; + version = "1.5.1.0"; + sha256 = "0whxbn6h5k7n38w0wzm5iwqc20yyvzri88zsp3hhp8pdfj34df7d"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck - profunctors random transformers + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers ]; homepage = "https://github.com/barrucadu/dejafu"; description = "A library for unit-testing concurrent programs"; @@ -60967,18 +60903,18 @@ self: { }) {}; "dependency" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, containers - , criterion, deepseq, hspec, lens, recursion-schemes, tardis - , transformers + ({ mkDerivation, ansi-wl-pprint, base, binary, containers, cpphs + , criterion, deepseq, hspec, lens, recursion-schemes, transformers }: mkDerivation { pname = "dependency"; - version = "0.1.0.11"; - sha256 = "0nazbm1mf3agjkfc1ll0fy4jxdkb65dzx92jz15jp7xp5y10866h"; + version = "1.0.0.0"; + sha256 = "08n38sqcnljja235cv4xlvfmir7cbcmb53rayc81nl3km292hr8i"; libraryHaskellDepends = [ ansi-wl-pprint base binary containers deepseq lens - recursion-schemes tardis transformers + recursion-schemes transformers ]; + libraryToolDepends = [ cpphs ]; testHaskellDepends = [ base containers hspec ]; benchmarkHaskellDepends = [ base containers criterion ]; description = "Dependency resolution for package management"; @@ -61593,34 +61529,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_12_0" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base - , base16-bytestring, bytestring, case-insensitive, containers - , contravariant, cryptonite, deepseq, directory, exceptions - , filepath, formatting, haskeline, http-client, http-client-tls - , insert-ordered-containers, lens-family-core, memory, mtl - , optparse-generic, parsers, prettyprinter - , prettyprinter-ansi-terminal, repline, scientific, tasty - , tasty-hunit, text, transformers, trifecta, unordered-containers + "dhall_1_13_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive + , containers, contravariant, cryptonite, deepseq, directory + , exceptions, filepath, formatting, haskeline, http-client + , http-client-tls, insert-ordered-containers, lens-family-core + , megaparsec, memory, mtl, optparse-applicative, parsers + , prettyprinter, prettyprinter-ansi-terminal, repline, scientific + , tasty, tasty-hunit, text, transformers, unordered-containers , vector }: mkDerivation { pname = "dhall"; - version = "1.12.0"; - sha256 = "065cs20v5ps91mygvha5k5348n62vkhacqyv6fdl4m5b2hs0bkab"; + version = "1.13.0"; + sha256 = "1fn3yi2zv2l88jjapk0zhij247cy4yh0w07icyr41g341wx7gfv4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base base16-bytestring bytestring case-insensitive - containers contravariant cryptonite directory exceptions filepath - formatting http-client http-client-tls insert-ordered-containers - lens-family-core memory parsers prettyprinter - prettyprinter-ansi-terminal scientific text transformers trifecta + ansi-terminal base bytestring case-insensitive containers + contravariant cryptonite directory exceptions filepath formatting + http-client http-client-tls insert-ordered-containers + lens-family-core megaparsec memory parsers prettyprinter + prettyprinter-ansi-terminal scientific text transformers unordered-containers vector ]; executableHaskellDepends = [ - ansi-terminal base haskeline mtl optparse-generic prettyprinter - prettyprinter-ansi-terminal repline text trifecta + ansi-terminal base haskeline megaparsec mtl optparse-applicative + prettyprinter prettyprinter-ansi-terminal repline text ]; testHaskellDepends = [ base deepseq insert-ordered-containers prettyprinter tasty @@ -61634,12 +61569,14 @@ self: { "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall, formatting , insert-ordered-containers, neat-interpolation, optparse-generic - , shell-escape, text, trifecta + , shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.11"; - sha256 = "17jgzb43ga8ddmxjp2mliv0zx6zpy0p7m5dihijpya66g7dkm91g"; + version = "1.0.12"; + sha256 = "1q9bwcdxyn2f7zp6r67k3kxqydj54shf0v0liyps7g7c9fixzrij"; + revision = "1"; + editedCabalFile = "12qklhw4jk2i1qiq9wyv23d6bl3yyqyjwf8dda649clby2my0hrc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61647,7 +61584,7 @@ self: { insert-ordered-containers neat-interpolation shell-escape text ]; executableHaskellDepends = [ - base bytestring dhall optparse-generic text trifecta + base bytestring dhall optparse-generic text ]; description = "Compile Dhall to Bash"; license = stdenv.lib.licenses.bsd3; @@ -61693,6 +61630,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-json_1_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall + , optparse-generic, text, unordered-containers, yaml + }: + mkDerivation { + pname = "dhall-json"; + version = "1.1.0"; + sha256 = "13fan1zdgj8zdv1br5vj57iqbfb5grllk8a2xkz6yyfk8kylmrc7"; + revision = "1"; + editedCabalFile = "0k8q44hfhd95k7i92g1zvsw9ys1ak6vl663r2v7pf6k1zl70cyhs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base dhall text unordered-containers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring dhall optparse-generic text yaml + ]; + description = "Compile Dhall to JSON or YAML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-lex" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq , hspec, hspec-dirstream, scientific @@ -61715,12 +61675,12 @@ self: { "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, formatting , hnix, insert-ordered-containers, neat-interpolation - , optparse-generic, scientific, text, trifecta + , optparse-generic, scientific, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.2"; - sha256 = "0ssb2ncycx6ayislqggf3ljnvk5xzq65g63fj658jkpmv2vh2wyj"; + version = "1.1.3"; + sha256 = "0dpkg84qzviasadgif30ivbg6k7azqq9ki8grd3g93zbrdxgv4fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61728,7 +61688,7 @@ self: { insert-ordered-containers neat-interpolation scientific text ]; executableHaskellDepends = [ - base dhall hnix optparse-generic text trifecta + base dhall hnix optparse-generic text ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; @@ -61739,8 +61699,8 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.8"; - sha256 = "05h534bsggz4jysdc4n62l3a0asqr7ba9mpsminisc76f6k5y54d"; + version = "1.0.9"; + sha256 = "0jh2nm26i5gdicsxzvx54rmx7x1g5mpjiwd7c5wfj6pmrpcp606r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; @@ -62619,6 +62579,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diff3_0_3_1" = callPackage + ({ mkDerivation, base, Diff, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "diff3"; + version = "0.3.1"; + sha256 = "0myajph6iv6vddwfsrwzdbjw8di9wpabb393is98jnacjwa9csx3"; + libraryHaskellDepends = [ base Diff ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + homepage = "http://github.com/ocharles/diff3.git"; + description = "Perform a 3-way difference of documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diffarray" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -63797,6 +63775,8 @@ self: { pname = "distributed-process"; version = "0.7.3"; sha256 = "1m771siv3dvrc1i3pxl3iqrnz63wvq6i80wyvi5m64m16xgiisg5"; + revision = "1"; + editedCabalFile = "0vrk3lrrsc7rrzrkfqcc5q36clr8cy51v6dv4hpmi89fyngx6lz5"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -66211,8 +66191,8 @@ self: { }: mkDerivation { pname = "dtab"; - version = "1.1"; - sha256 = "18h4876saf2f8k052qf76j5w89x7nay12nlf7hc5dkwf4c9y5hq9"; + version = "1.1.0.1"; + sha256 = "18p10a2x6ra18aj6cphgswq4sjjkdrq58pk7ikgmpgq9sj4bxgpr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68007,8 +67987,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.12"; - sha256 = "1ashmmm5icv4q3808a5bg64cl4rmcjksm1hcf7ajgn3lggrkbxpq"; + version = "1.0.13"; + sha256 = "0w9zafd8ipq2hpxqmd9iywryjl0ym5gwwrv90kx80jxmv2dpqpzp"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -68024,8 +68004,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.9"; - sha256 = "00xdyrvwmd9jp59awh9i1yzbnywndzmjmz8qsn87hrcd2848fdnm"; + version = "1.0.10"; + sha256 = "0mvx5qpj5fzdb991gb344a5a34fvgys6xy3xxpr65bddlbpv0mk9"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -72826,20 +72806,16 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, base, combinat-compat - , composition-prelude, criterion, gmpint, hspec, QuickCheck + ({ mkDerivation, arithmoi, base, combinat, composition-prelude + , criterion, gmpint, hspec, QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.0.1"; - sha256 = "1am161zrjaann9pnazsv9ic43cnw1bimqcy6vvh5qinigc33p08f"; + version = "0.6.0.3"; + sha256 = "1q9fdx61wpznpw551id09xg1yw8vyh77cvcwswmi0grld4hqn17g"; libraryHaskellDepends = [ base composition-prelude gmpint ]; - testHaskellDepends = [ - arithmoi base combinat-compat hspec QuickCheck - ]; - benchmarkHaskellDepends = [ - arithmoi base combinat-compat criterion - ]; + testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; + benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; @@ -74800,6 +74776,8 @@ self: { pname = "filtrable"; version = "0.1.0.5"; sha256 = "0znfhi3sxfnrhqnmll7dx9pyw5wcyvlj62b8ir9hz3cznvb7aakd"; + revision = "1"; + editedCabalFile = "0wa848jypc7vvr4y6h7rvfd6m8n1747889rqzybrl3cvm138572v"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/strake/filtrable.hs"; description = "Class of filtrable containers"; @@ -77799,28 +77777,6 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, bifunctors, comonad, containers - , distributive, exceptions, mtl, profunctors, semigroupoids - , semigroups, template-haskell, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "free"; - version = "5.0.1"; - sha256 = "16b29r9f9j7wpd99zbspkxq22rm6r2shqv1isa1ipqfbzn9bap5p"; - revision = "1"; - editedCabalFile = "0d6wzbazlw9yamka4p01scqypl6kcg2kzh00amim40wx6f4sdyqj"; - libraryHaskellDepends = [ - base bifunctors comonad containers distributive exceptions mtl - profunctors semigroupoids semigroups template-haskell transformers - transformers-base transformers-compat - ]; - homepage = "http://github.com/ekmett/free/"; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_5_0_2" = callPackage ({ mkDerivation, base, bifunctors, comonad, containers , distributive, exceptions, mtl, profunctors, semigroupoids , semigroups, template-haskell, transformers, transformers-base @@ -77838,7 +77794,6 @@ self: { homepage = "http://github.com/ekmett/free/"; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-concurrent" = callPackage @@ -83752,8 +83707,8 @@ self: { }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.15"; - sha256 = "0j2bqphjfhgm9nk8pyfpd6zp7i3q4b11s4vlgas9xdwwi9p1md8r"; + version = "2.0.16"; + sha256 = "0vqnskshbfp9nsgyfg4pifrh007rb7k176ci8niik96kxh95zfzx"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -90318,6 +90273,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groot" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-autoscaling + , amazonka-core, amazonka-ec2, amazonka-ecs, ansi-terminal + , attoparsec, base, bytestring, checkers, conduit + , conduit-combinators, directory, exceptions, free, hashable, hspec + , http-conduit, http-types, ini, lens, lifted-base, mmorph + , monad-control, mtl, optparse-applicative, pptable, prettyprinter + , prettyprinter-ansi-terminal, prettyprinter-compat-ansi-wl-pprint + , QuickCheck, quickcheck-text, resourcet, stm, stm-chans + , stm-conduit, stm-delay, text, these, time, transformers + , unordered-containers, uuid, vector, yaml + }: + mkDerivation { + pname = "groot"; + version = "0.0.1.0"; + sha256 = "04klrvsc0j16zhv5a1b80gmv91p0xlbp22ylq1cfh8qbbp5mpf5a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2 + amazonka-ecs ansi-terminal attoparsec base bytestring conduit + conduit-combinators directory exceptions free hashable http-conduit + http-types ini lens lifted-base mmorph monad-control mtl + optparse-applicative pptable prettyprinter + prettyprinter-ansi-terminal prettyprinter-compat-ansi-wl-pprint + resourcet stm stm-chans stm-conduit stm-delay text these time + transformers unordered-containers uuid vector yaml + ]; + executableHaskellDepends = [ + aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2 + amazonka-ecs attoparsec base bytestring conduit conduit-combinators + directory exceptions free hashable http-conduit http-types lens + lifted-base mmorph monad-control mtl resourcet stm stm-chans + stm-conduit stm-delay text these time transformers + unordered-containers uuid vector yaml + ]; + testHaskellDepends = [ + aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2 + amazonka-ecs attoparsec base bytestring checkers conduit + conduit-combinators directory exceptions free hashable hspec + http-conduit http-types lens lifted-base mmorph monad-control mtl + QuickCheck quickcheck-text resourcet stm stm-chans stm-conduit + stm-delay text these time transformers unordered-containers uuid + vector yaml + ]; + homepage = "https://github.com/alonsodomin/groot#readme"; + description = "Command line utility to manage AWS ECS resources"; + license = stdenv.lib.licenses.asl20; + }) {}; + "gross" = callPackage ({ mkDerivation, base, lens, mtl, ncurses }: mkDerivation { @@ -91704,58 +91709,6 @@ self: { }) {}; "hOpenPGP" = callPackage - ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite - , data-default-class, errors, hashable, incremental-parser - , ixset-typed, lens, memory, monad-loops, nettle, network - , network-uri, newtype, openpgp-asciiarmor, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers - , wl-pprint-extras, zlib - }: - mkDerivation { - pname = "hOpenPGP"; - version = "2.6"; - sha256 = "0vsrgyzh7zlx9z27fvpjzk4s4gv1zpxwb68n529hvilsphyz35kf"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - data-default-class errors hashable incremental-parser ixset-typed - lens memory monad-loops nettle network-uri newtype - openpgp-asciiarmor resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - wl-pprint-extras zlib - ]; - testHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring bifunctors - binary binary-conduit bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite data-default-class errors - hashable incremental-parser ixset-typed lens memory monad-loops - nettle network network-uri newtype QuickCheck quickcheck-instances - resourcet semigroups split tasty tasty-hunit tasty-quickcheck text - time time-locale-compat transformers unliftio-core - unordered-containers wl-pprint-extras zlib - ]; - benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite data-default-class errors - hashable incremental-parser ixset-typed lens memory monad-loops - nettle network network-uri newtype openpgp-asciiarmor resourcet - semigroups split text time time-locale-compat transformers - unliftio-core unordered-containers wl-pprint-extras zlib - ]; - homepage = "https://salsa.debian.org/clint/hOpenPGP"; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hOpenPGP_2_6_1" = callPackage ({ mkDerivation, aeson, asn1-encoding, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-conduit, bytestring, bzlib, conduit, conduit-extra @@ -93546,6 +93499,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hailgun_0_4_1_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, email-validate + , exceptions, filepath, http-client, http-client-tls, http-types + , tagsoup, text, time, transformers + }: + mkDerivation { + pname = "hailgun"; + version = "0.4.1.7"; + sha256 = "1ldh6q96xz2a8frvgq29j3gr8jc2m0rx652215bm8w99mbq4pcri"; + libraryHaskellDepends = [ + aeson base bytestring email-validate exceptions filepath + http-client http-client-tls http-types tagsoup text time + transformers + ]; + homepage = "https://bitbucket.org/robertmassaioli/hailgun"; + description = "Mailgun REST api interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hailgun-send" = callPackage ({ mkDerivation, base, bytestring, configurator, hailgun, text }: mkDerivation { @@ -93775,8 +93748,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.12.1.0"; - sha256 = "0hw6j6kq7g9sg03ihw0q1f4d96kkr6dnfg7f2bj4skpwfsslb2cg"; + version = "4.12.2.0"; + sha256 = "1bkr94dakfwq86pm68r61x4g2xmcsliqn8lxgp2jkf8603mjla47"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -94303,6 +94276,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "halves" = callPackage + ({ mkDerivation, base, hedgehog, lens }: + mkDerivation { + pname = "halves"; + version = "0.1.0.0"; + sha256 = "06axsxkfja0p7vki4cnrf3rf3k255f5mk573pzn0zvzi4f8mmadn"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ base hedgehog lens ]; + description = "Splitting/combining data structures to/from halves, quarters, eighths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "halvm-web" = callPackage ({ mkDerivation, async, base, bytestring, cereal, containers , HALVMCore, hans, HTTP, mime-types, network-uri, simple-tar, text @@ -94747,33 +94732,6 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.3.5.4"; - sha256 = "02cc7bgld3cl36wq4n1c0n6gf2kbz0klj6ssfgjmjwvxvl064cg5"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - homepage = "https://github.com/stackbuilders/hapistrano"; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_5_5" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath , formatting, gitrev, hspec, mtl, optparse-applicative, path , path-io, process, stm, temporary, time, transformers, yaml @@ -94798,7 +94756,6 @@ self: { homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -95872,8 +95829,8 @@ self: { pname = "hasbolt"; version = "0.1.3.0"; sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx"; - revision = "1"; - editedCabalFile = "0420drijspw73092rh3mhyrz4i7pph1fz3m0hcshs1zmngqibvv2"; + revision = "2"; + editedCabalFile = "1isygckkasffk06bd6023imr51c7l9cdvk4vf2vgv9x10v8kpp37"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default hex network text transformers @@ -96848,8 +96805,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.3.0"; - sha256 = "0l09s90mfwnyc3nz3xpgja6dh99qm2yvim4r0fxyvh0adfzkmiwn"; + version = "0.0.4.0"; + sha256 = "1nzaf9zwqsx1jgspimkig6vhh2d1iz7kc3hr2kixc52sbr7y9iag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -105173,6 +105130,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hjsonpointer_1_4_0" = callPackage + ({ mkDerivation, aeson, base, hashable, hspec, http-types + , QuickCheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "hjsonpointer"; + version = "1.4.0"; + sha256 = "0hkcaqiich4ap323ir2dmr3v498rlavy34g69m386d4ml1gxm411"; + revision = "1"; + editedCabalFile = "0l84zr0p1ywwn81fdb2z365vrs9xaaz7c7bcmx8pjvb5wfx1g9g4"; + libraryHaskellDepends = [ + aeson base hashable QuickCheck text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base hspec http-types QuickCheck text unordered-containers + vector + ]; + homepage = "https://github.com/seagreen/hjsonpointer"; + description = "JSON Pointer library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hjsonschema" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec @@ -105201,29 +105181,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hjsonschema_1_8_0" = callPackage + "hjsonschema_1_9_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-client-tls, http-types, pcre-heavy, profunctors - , protolude, QuickCheck, safe-exceptions, scientific, semigroups - , text, unordered-containers, vector, wai-app-static, warp + , protolude, QuickCheck, safe-exceptions, scientific, text + , unordered-containers, vector, wai-app-static, warp }: mkDerivation { pname = "hjsonschema"; - version = "1.8.0"; - sha256 = "06jf3f7samp5mq3771ywv6r458kkyav4psagkkdqavrx53s4y4xl"; + version = "1.9.0"; + sha256 = "051i5y557g82hd5zcn63f65jyxk07d9wnvfmwdps391zxza8ifki"; revision = "1"; - editedCabalFile = "0c0y28js9jj10hmbk2syqfv681jp3px2ps02b1n99sz84va70h4i"; + editedCabalFile = "1kxn0smmcmzysvi1bw9v0j6j68fk4s36nqyqmvbkl61pgm6bs803"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-client-tls http-types pcre-heavy - profunctors protolude QuickCheck safe-exceptions scientific - semigroups text unordered-containers vector + profunctors protolude QuickCheck safe-exceptions scientific text + unordered-containers vector ]; testHaskellDepends = [ aeson async base bytestring directory filepath hjsonpointer hspec - profunctors protolude QuickCheck semigroups text - unordered-containers vector wai-app-static warp + profunctors protolude QuickCheck text unordered-containers vector + wai-app-static warp ]; homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; @@ -116218,27 +116198,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.5.0.2"; - sha256 = "0pqg7a46j63n8gp4c2hsxh98f0xppfhaww00zbjy45zx8h2gb1qm"; - libraryHaskellDepends = [ base bytestring mmap vector ]; - testHaskellDepends = [ - base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck vector - ]; - benchmarkHaskellDepends = [ - base bytestring criterion mmap vector - ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_5_0_3" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector }: @@ -116257,7 +116216,6 @@ self: { homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -119349,8 +119307,8 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "impossible"; - version = "1.1.1"; - sha256 = "0drq4rzbljql51hc2d8ldsm6xhsj7imlsxclivmf3lr9lykkp0p1"; + version = "1.1.2"; + sha256 = "13iwy9pn3w3whg8hqy83mgbzcb156pz88nfcx4axkw9hpkh4810s"; libraryHaskellDepends = [ base lens ]; homepage = "https://github.com/luna/impossible"; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; @@ -119584,8 +119542,8 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.2.5.3"; - sha256 = "0646hxjd25hpmffabbdp6bxa5720gd99hgg31ifcx8nprlm8sl7a"; + version = "0.2.5.4"; + sha256 = "0891m40bl9jlblfg3wf6fi3bgzfl9d8lhmab5s755mpp1bw9gr6w"; libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck @@ -119595,7 +119553,7 @@ self: { ]; homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -120055,7 +120013,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_1" = callPackage + "influxdb_1_6_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -120065,8 +120023,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.1"; - sha256 = "14xk27qg5w7pdrmbz7fys96x4yywv0hk82z46802dlnxlfpikyc3"; + version = "1.6.0.2"; + sha256 = "0f5lcwvs4cw7ipqw3da5baf2sw4m1a7g29iw3big5m93wc2flk38"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -130113,6 +130071,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lazy" = callPackage + ({ mkDerivation, base, comonad }: + mkDerivation { + pname = "lazy"; + version = "0.1"; + sha256 = "02a9iw0ns12hszi5rim4x6pa15y3zycmbcmcwmsr6m31rzgz8ryp"; + libraryHaskellDepends = [ base comonad ]; + homepage = "https://github.com/nikita-volkov/lazy"; + description = "Explicit laziness for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -140833,6 +140803,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microaeson" = callPackage + ({ mkDerivation, aeson, alex, array, base, bytestring, containers + , deepseq, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "microaeson"; + version = "0.1.0.0"; + sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; + libraryHaskellDepends = [ + array base bytestring containers deepseq text + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + aeson base bytestring containers QuickCheck quickcheck-instances + tasty tasty-quickcheck text unordered-containers vector + ]; + description = "A tiny JSON library with light dependency footprint"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "microbench" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -149062,6 +149053,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network_2_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit + , unix + }: + mkDerivation { + pname = "network"; + version = "2.7.0.0"; + sha256 = "17qd387vxq2b27k4g56679flnvfvsm7vqf2mnssa0lvghks4c1f1"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ + base bytestring directory doctest hspec HUnit + ]; + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -150622,8 +150631,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.1"; - sha256 = "0xk8ggng32czhy4wxgzw7g28xj18jcbncmfshviqlw17rccrm2fx"; + version = "1.0.2"; + sha256 = "1n1f3p5hamvlc7jhl9m569d8li9kxqwkjmv5nn1mq1n1ldhdlwxj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153006,8 +153015,8 @@ self: { }: mkDerivation { pname = "om-elm"; - version = "1.0.0.1"; - sha256 = "1fvpsiv5xdc7jamhdsaw2kzm32qrbg7c2b5s5zhhhcd7j4vgn3xq"; + version = "1.0.0.3"; + sha256 = "0i674vjbp03nkr76fdi7bjylv264nxwnxw0ija11fkpd1rdg045g"; libraryHaskellDepends = [ base bytestring Cabal containers directory http-types safe safe-exceptions template-haskell text unix wai @@ -155775,6 +155784,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "palette_0_3" = callPackage + ({ mkDerivation, array, base, colour, containers, MonadRandom }: + mkDerivation { + pname = "palette"; + version = "0.3"; + sha256 = "1wpzrhr3b9psa7b56ys34vnaag6z12xam2rymld2g8fd13jlkxh6"; + libraryHaskellDepends = [ + array base colour containers MonadRandom + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Utilities for choosing and creating color schemes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "palindromes" = callPackage ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { @@ -155928,41 +155952,6 @@ self: { }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat - , bytestring, Cabal, containers, data-default, directory, filepath - , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec - , process, rfc5051, setenv, split, syb, tagsoup, temporary, text - , time, unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.14.3"; - sha256 = "1z27x8bd8zxmqrxlapzxkc0g65ix7ig96d0bwzq3i521fzig85bj"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base base-compat bytestring containers data-default directory - filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec - rfc5051 setenv split syb tagsoup text time unordered-containers - vector xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base base-compat bytestring filepath - pandoc pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base base-compat bytestring containers directory filepath mtl - pandoc pandoc-types process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_14_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat , bytestring, Cabal, containers, data-default, directory, filepath , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec @@ -155995,7 +155984,6 @@ self: { homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -156462,27 +156450,27 @@ self: { "pansite" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default , directory, doctest, filepath, Glob, hspec, http-types, MissingH - , optparse-applicative, pandoc, pandoc-types, shake, split - , template-haskell, text, time, unordered-containers, vcs-revision - , vector, wai, wai-logger, warp, yaml + , optparse-applicative, pandoc, pandoc-types, QuickCheck, shake + , split, template-haskell, text, time, unordered-containers + , vcs-revision, vector, wai, wai-logger, warp, yaml }: mkDerivation { pname = "pansite"; - version = "0.1.0.0"; - sha256 = "1hm8lgcrr5my2h3n8yn40qmf9kghsaai1fjh4q8qxqlk4jsblvb5"; + version = "0.2.0.0"; + sha256 = "0y60pk4zryxllpv1h27ja7c7a91vd00g9p29ml2l7rvdgprcy5ar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring data-default split text unordered-containers - vector yaml + aeson base bytestring data-default MissingH shake split text + unordered-containers vector yaml ]; executableHaskellDepends = [ aeson base blaze-html bytestring data-default directory filepath http-types MissingH optparse-applicative pandoc pandoc-types shake - template-haskell text time unordered-containers vcs-revision wai - wai-logger warp + split template-haskell text time unordered-containers vcs-revision + wai wai-logger warp ]; - testHaskellDepends = [ base doctest Glob hspec ]; + testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; homepage = "https://github.com/rcook/pansite#readme"; description = "Pansite: a simple web site management tool"; license = stdenv.lib.licenses.mit; @@ -157567,6 +157555,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parser-combinators_1_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "1.0.0"; + sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mrkkrp/parser-combinators"; + description = "Lightweight package providing commonly useful parser combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -159498,31 +159499,14 @@ self: { }) {}; "persistable-types-HDBC-pg" = callPackage - ({ mkDerivation, base, bytestring, convertible, HDBC - , persistable-record, relational-query-HDBC, text-postgresql - }: - mkDerivation { - pname = "persistable-types-HDBC-pg"; - version = "0.0.1.5"; - sha256 = "0kdrqn6j7vsq748j9j22g3wqxik9pfy3s3dgk4gd5bqnp4gv7949"; - libraryHaskellDepends = [ - base bytestring convertible HDBC persistable-record - relational-query-HDBC text-postgresql - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "HDBC and Relational-Record instances of PostgreSQL extended types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistable-types-HDBC-pg_0_0_3_1" = callPackage ({ mkDerivation, base, bytestring, convertible, dlist, HDBC , persistable-record, relational-query, relational-query-HDBC , text-postgresql }: mkDerivation { pname = "persistable-types-HDBC-pg"; - version = "0.0.3.1"; - sha256 = "1dmvwr21q5g15v50b5ycnyvqbrfg75pw5kdvmi4sp03yldk0fsdc"; + version = "0.0.3.2"; + sha256 = "0ddzmc19in35vxivgqp9yi8p2afvg67q2dwgl39pkw6camrqlh2r"; libraryHaskellDepends = [ base bytestring convertible dlist HDBC persistable-record relational-query relational-query-HDBC text-postgresql @@ -159533,7 +159517,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "HDBC and Relational-Record instances of PostgreSQL extended types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent_2_7_3_1" = callPackage @@ -160592,8 +160575,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.22.0"; - sha256 = "0ala51fps5yd1lk47blsbfby6sysnz2v39frmc53ggqzzlsls2q7"; + version = "0.0.23.0"; + sha256 = "139fjsyximny4ikgqrjxx9pg4spkz8s1fh6b3a9xgrsyya4r1sw7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160997,6 +160980,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pier" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary + , binary-orphans, bytestring, Cabal, containers, cryptohash-sha256 + , directory, hashable, http-client, http-client-tls, http-types + , optparse-applicative, process, shake, split, temporary, text + , transformers, unix, unordered-containers, yaml + }: + mkDerivation { + pname = "pier"; + version = "0.1.0.0"; + sha256 = "19l8ghpik8j8igh0xa8kcmn6zs6r4xa8yks60n8v37d6ksr5k9m6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary binary-orphans bytestring Cabal + containers cryptohash-sha256 directory hashable http-client + http-client-tls http-types process shake temporary text + transformers unix unordered-containers yaml + ]; + executableHaskellDepends = [ + base Cabal directory optparse-applicative shake split + unordered-containers + ]; + homepage = "https://github.com/judah/pier#readme"; + description = "Yet another Haskell build system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "piet" = callPackage ({ mkDerivation, array, base, containers, Imlib, mtl }: mkDerivation { @@ -162861,15 +162872,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "plot-light_0_3_2_1" = callPackage + "plot-light_0_3_3" = callPackage ({ mkDerivation, base, blaze-svg, colour, containers , data-default-class, hspec, mtl, QuickCheck, scientific, text , time }: mkDerivation { pname = "plot-light"; - version = "0.3.2.1"; - sha256 = "00gl17lsavwn1cglaa8jqzl1v3vczskkiz0zg51xg4g7v1v1irr7"; + version = "0.3.3"; + sha256 = "1ymfrrn28l6dbvw6m6j0cqxjb027ynhcc7b7y6i7bq4gq6rd60dz"; libraryHaskellDepends = [ base blaze-svg colour containers data-default-class mtl scientific text time @@ -167571,8 +167582,8 @@ self: { }: mkDerivation { pname = "prologue"; - version = "3.2.0"; - sha256 = "19q61qjmygjah49qjy4a89hpn8ra8z9pq0f72p1c7wzgk38zp55r"; + version = "3.2.2"; + sha256 = "1sswdhbfgh2pnhyixj03khp5ylsxkyisghyg0mqgb039kq1lxxci"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils @@ -168453,6 +168464,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psqueues_0_2_7_0" = callPackage + ({ mkDerivation, array, base, containers, criterion, deepseq + , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue + , QuickCheck, random, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2, unordered-containers + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.7.0"; + sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq fingertree-psqueue ghc-prim + hashable mtl PSQueue random unordered-containers + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pstemmer" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -169776,6 +169811,38 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "qnap-decrypt" = callPackage + ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit + , conduit-extra, crypto-api, directory, filepath, hspec, HUnit + , optparse-applicative, streaming-commons, tagged, temporary + , utf8-string + }: + mkDerivation { + pname = "qnap-decrypt"; + version = "0.3.1"; + sha256 = "1ns5wz427ilw7xn886sw7ip9d1nbfqbs1qcgjm9cvdi5v5v89pi6"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory streaming-commons tagged utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory filepath optparse-applicative + streaming-commons tagged utf8-string + ]; + testHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory filepath hspec HUnit streaming-commons tagged + temporary utf8-string + ]; + homepage = "https://github.com/alexkazik/qnap-decrypt#readme"; + description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "qq-literals" = callPackage ({ mkDerivation, base, network-uri, template-haskell }: mkDerivation { @@ -175595,6 +175662,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_11_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.11.1.0"; + sha256 = "1iydq7jdsizacvanvxdfad52vjaazb2awv2h3lyiqrsmva1y0qmq"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -177921,8 +178012,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.1.0"; - sha256 = "0mr78bd5xcq4gxc7vhz1k70gxbng2rbpip648fs4k0hb7gf2z0ds"; + version = "0.1.2.0"; + sha256 = "0449jjgw38dwf0lw3vq0ri3gh7mlzfjkajz8xdvxr76ffs9kncwq"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -180918,17 +181009,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; - "sbv_7_6" = callPackage + "sbv_7_7" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , crackNum, data-binary-ieee754, deepseq, directory, doctest , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty , process, QuickCheck, random, syb, tasty, tasty-golden - , tasty-hunit, template-haskell, time, z3 + , tasty-hunit, tasty-quickcheck, template-haskell, time, z3 }: mkDerivation { pname = "sbv"; - version = "7.6"; - sha256 = "0ycrwmyi1ba5v71qjladn0mn2hlrxdswy5mlx2dxzhrf2r6k6zd9"; + version = "7.7"; + sha256 = "0yf68qyp29kxgpdx5xdyx64vkn0dvfrizn5hq2xgrik0v9vb1ja0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -180937,8 +181028,8 @@ self: { ]; testHaskellDepends = [ base bytestring containers data-binary-ieee754 directory doctest - filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit - template-haskell + filepath Glob hlint mtl QuickCheck random syb tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell ]; testSystemDepends = [ z3 ]; homepage = "http://leventerkok.github.com/sbv/"; @@ -181714,6 +181805,8 @@ self: { pname = "scotty"; version = "0.11.1"; sha256 = "1xcdfx43v1p2a20jjmnb70v2sm34iprn17ssa81fcfnabcn4blhw"; + revision = "1"; + editedCabalFile = "0msb0ydgga07gicchs8k0f7d35gp18vrin649q6yqah75l5i2f9x"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -181866,8 +181959,8 @@ self: { }: mkDerivation { pname = "scotty-resource"; - version = "0.2.0.1"; - sha256 = "0y39sxvin9ljwk2jxnb18wr79d0ap9363vr2mh8xbc4llq0yjavj"; + version = "0.2.0.2"; + sha256 = "1lhaajsx34hlci76wjvab7a1sjd42silxsvf94ncf0pc0rmjqg1n"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; @@ -183279,7 +183372,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_5_0" = callPackage + "sensu-run_0_5_0_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, filepath , http-client, http-client-tls, http-types, lens, network , optparse-applicative, process, temporary, text, time, unix @@ -183287,8 +183380,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.5.0"; - sha256 = "0826al67dwzdyazqkvrcsbxdv6gg6zk52q32avfz7l8dlpswgr9m"; + version = "0.5.0.1"; + sha256 = "1kxdndaimwgj9mjjhb5z8kb36k4awby8a3h1dpghvas1l64i5dfl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186645,8 +186738,8 @@ self: { }: mkDerivation { pname = "shake-ext"; - version = "2.11.0.1"; - sha256 = "09gg30b8xiq2krz58lkavcgi1gybc5sn6snscdq8nj3qbxcvd0av"; + version = "2.11.0.2"; + sha256 = "1wmvk91gfmrd1cqj3k70h3lc2xypiqs2d2dh4xlq97fsqm2kmfmy"; libraryHaskellDepends = [ base Cabal cdeps composition-prelude cpphs directory shake template-haskell @@ -188575,8 +188668,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.7.1"; - sha256 = "1h7acjqis9qrj4i5k4aspjjrd8a86bkhhcn6ib3aa8s384ar0wfv"; + version = "0.8"; + sha256 = "0w4adm7zjiqbzm0vg8ky4xyldid00grsnjf7n4pkw5a2fw81qi3d"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -190330,8 +190423,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "smtLib"; - version = "1.0.8"; - sha256 = "1a91ml428xxb9pd88vdw5cj076s13k864bk9kp48hb3l4a9ny09p"; + version = "1.0.9"; + sha256 = "19hfw5pgygka2wrnlr8s6wqpw92kz259lli83w1i7igw3v7vyzcc"; libraryHaskellDepends = [ base pretty ]; description = "A library for working with the SMTLIB format"; license = stdenv.lib.licenses.bsd3; @@ -199307,19 +199400,19 @@ self: { }) {}; "superrecord" = callPackage - ({ mkDerivation, aeson, base, bookkeeper, constraints, criterion - , deepseq, ghc-prim, hspec, labels, mtl, text + ({ mkDerivation, aeson, base, bookkeeper, bytestring, constraints + , criterion, deepseq, ghc-prim, hspec, labels, mtl, text }: mkDerivation { pname = "superrecord"; - version = "0.3.0.0"; - sha256 = "1yya0lx3lqhr7pj3p72zi8xgjrqlrsrs9b6ilrskzkh0gjqcfjw5"; + version = "0.5.0.0"; + sha256 = "1bg2kjkwl78lhf34j1xb20lpypp26bavd0h6cnhj4m6d4sq3z86a"; libraryHaskellDepends = [ - aeson base constraints deepseq ghc-prim mtl text + aeson base bytestring constraints deepseq ghc-prim mtl text ]; - testHaskellDepends = [ aeson base hspec ]; + testHaskellDepends = [ aeson base hspec mtl text ]; benchmarkHaskellDepends = [ - aeson base bookkeeper criterion deepseq labels + aeson base bookkeeper criterion deepseq labels text ]; homepage = "https://github.com/agrafix/superrecord#readme"; description = "Supercharged anonymous records"; @@ -204167,11 +204260,14 @@ self: { }: mkDerivation { pname = "tersmu"; - version = "0.2.1"; - sha256 = "10bq2b3nhnpy566i1gbf8iz10nq0z0x4xdi4kr5nlbzrih86ih4n"; - isLibrary = false; + version = "0.2.2"; + sha256 = "1wyrbggpgr6jyskvvkh12g6a440md1aqj405cxqhdmy0bzwz5cfn"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers mtl process syb transformers + ]; executableHaskellDepends = [ base containers mtl process syb transformers ]; @@ -204773,29 +204869,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.10.1.1"; - sha256 = "0q2fld5mdcd6j1n3rrg3bjpndbgbn17cwg0xbnvscrpa0s767jaj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - }) {}; - - "texmath_0_10_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -204816,7 +204889,6 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -214850,27 +214922,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, hspec - , process, stm, time, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.6.0"; - sha256 = "0rmklk2d2ip1mcizqn8j38lbqy58lc8h9hwigvab5ggilxpmnzgq"; - libraryHaskellDepends = [ - async base deepseq directory filepath process stm time transformers - unix unliftio-core - ]; - testHaskellDepends = [ - async base deepseq directory filepath hspec process stm time - transformers unix unliftio-core - ]; - homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_7_0" = callPackage ({ mkDerivation, async, base, deepseq, directory, filepath, hspec , process, stm, time, transformers, unix, unliftio-core }: @@ -214889,7 +214940,6 @@ self: { homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -216085,8 +216135,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.5.0"; - sha256 = "0rll7fv31bamnqcy3hcm8vdgzz5wjzlqhvz5lnbp1gfymx43jrga"; + version = "0.1.6.0"; + sha256 = "0qym7if90kp51f0mf8yxsw3csfpdp2mnp7aah3vc6wdh58gljva5"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -220268,27 +220318,6 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder, containers - , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm - , text, token-bucket, transformers, wai, wai-extra - }: - mkDerivation { - pname = "wai-middleware-throttle"; - version = "0.2.2.0"; - sha256 = "0k5q6vziq67bscfrm1dx6i4wkvw30wa35mgdd7x1dzniibx87dva"; - libraryHaskellDepends = [ - base bytestring bytestring-builder containers hashable http-types - mtl network stm text token-bucket transformers wai - ]; - testHaskellDepends = [ - base bytestring hspec http-types HUnit QuickCheck stm transformers - wai wai-extra - ]; - description = "WAI Middleware for Request Throttling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wai-middleware-throttle_0_2_2_1" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, containers , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm , text, token-bucket, transformers, wai, wai-extra @@ -220307,7 +220336,6 @@ self: { ]; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-verbs" = callPackage @@ -220910,41 +220938,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, doctest - , gauge, ghc-prim, hashable, hspec, http-client, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.19"; - sha256 = "0laggqs2bjf4vn58fjpippbwd1i2z82ssmnyn6l0qb3q54d2fyqb"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory doctest ghc-prim hashable - hspec http-client http-date http-types http2 HUnit iproute - lifted-base network process QuickCheck silently simple-sendfile stm - streaming-commons text time transformers unix unix-compat vault wai - word8 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network unix unix-compat - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_22" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, doctest , gauge, ghc-prim, hashable, hspec, http-client, http-date @@ -220977,7 +220970,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -222296,6 +222288,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weigh_0_0_11" = callPackage + ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: + mkDerivation { + pname = "weigh"; + version = "0.0.11"; + sha256 = "0q4l2npli78w3p74rsh56q1azwh07856ckip9v3vmw53xzx0n42l"; + libraryHaskellDepends = [ + base deepseq mtl process split temporary + ]; + testHaskellDepends = [ base deepseq ]; + homepage = "https://github.com/fpco/weigh#readme"; + description = "Measure allocations of a Haskell functions/values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weighted" = callPackage ({ mkDerivation, base, mtl, semiring-num, transformers }: mkDerivation { @@ -222697,26 +222705,6 @@ self: { }) {}; "wild-bind-x11" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; - version = "0.2.0.2"; - sha256 = "0vf6jm5gw76hcrwrqmfrq8niwh4z5p2wg0j0rh74wn9vbs6cm8cl"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - homepage = "https://github.com/debug-ito/wild-bind"; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_3" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: @@ -222734,7 +222722,6 @@ self: { homepage = "https://github.com/debug-ito/wild-bind"; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -228026,39 +228013,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, Cabal, conduit, conduit-extra, containers - , data-default-class, directory, file-embed, filepath, fsnotify - , http-client, http-client-tls, http-reverse-proxy, http-types - , network, optparse-applicative, parsec, process, project-template - , resourcet, say, shakespeare, split, stm, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp - , warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.6.0"; - sha256 = "096yxpb6dxy44s2ydf137rmd0b7zm5ww4yqkf7mnapslhc25wznn"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring Cabal - conduit conduit-extra containers data-default-class directory - file-embed filepath fsnotify http-client http-client-tls - http-reverse-proxy http-types network optparse-applicative parsec - process project-template resourcet say shakespeare split stm - streaming-commons tar template-haskell text time transformers - transformers-compat unix-compat unliftio unordered-containers wai - wai-extra warp warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yesod-bin_1_6_0_2" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, Cabal, conduit, conduit-extra, containers , data-default-class, directory, file-embed, filepath, fsnotify @@ -228234,46 +228188,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec - , hspec-expectations, http-types, HUnit, monad-logger, mtl, network - , old-locale, parsec, path-pieces, primitive, QuickCheck, random - , resourcet, safe, semigroups, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.3"; - sha256 = "0k2gwnbrpwwbna03bbi53fppgyn7x5g9167jyjcfyjb8qfn4pwxg"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq deepseq-generics directory fast-logger - http-types monad-logger mtl old-locale parsec path-pieces primitive - random resourcet safe semigroups shakespeare template-haskell text - time transformers unix-compat unliftio unordered-containers vector - wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces QuickCheck random resourcet shakespeare - streaming-commons template-haskell text transformers unliftio wai - wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_4" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -228311,7 +228225,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -228606,8 +228519,8 @@ self: { ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: mkDerivation { pname = "yesod-form-bootstrap4"; - version = "0.1.0.2"; - sha256 = "0lsdvs33xsy7ipr44calfhyf375mkq7h3axi39q91f28r76iy6cf"; + version = "0.1.1"; + sha256 = "17bdd0pmhpj85w7vc7vzzb3iggl3azr1jzpkmy9x9mxdl1birgmg"; libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ]; homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme"; description = "renderBootstrap4"; @@ -229536,33 +229449,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, conduit, containers - , cookie, hspec, hspec-core, html-conduit, http-types, HUnit - , network, persistent, pretty-show, semigroups, text, time - , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types - , yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.2"; - sha256 = "172m7nafq8w1j3cm6p110vlxzy14y6pgm8ica357b1qn0wvzd39x"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network persistent pretty-show semigroups text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_3" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, conduit, containers , cookie, hspec, hspec-core, html-conduit, http-types, HUnit @@ -229587,7 +229473,6 @@ self: { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -230626,14 +230511,16 @@ self: { }: mkDerivation { pname = "z3"; - version = "4.2.0"; - sha256 = "1rzdsn54508y6w965a8y2g118ylx6588gxbdi3dd9ihqh9mdzg31"; + version = "4.3"; + sha256 = "1c29zzc6y7l169hdj9278z95530h6hc161fxgfn4zlxs3k5611d1"; + revision = "1"; + editedCabalFile = "0spg0sqqra4h5k5zagmmhh0sh10p3bzrhgrfspcd3i5c7yymwagb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://bitbucket.org/iago/z3-haskell"; + homepage = "https://github.com/IagoAbal/haskell-z3"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; }) {gomp = null; inherit (pkgs) z3;}; @@ -230873,6 +230760,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zeromq;}; + "zeromq4-clone-pattern" = callPackage + ({ mkDerivation, async, base, binary, bytestring, exceptions + , QuickCheck, stm, test-framework, test-framework-quickcheck2 + , transformers, zeromq4-haskell + }: + mkDerivation { + pname = "zeromq4-clone-pattern"; + version = "0.1.0.0"; + sha256 = "1czc3p9s3jqmjmvasqcraqv0fjn2j7s3qj59l35cb1nd8gvxzmyg"; + revision = "1"; + editedCabalFile = "01shrkqnl65lbj3vaj96hm6vbvw0qp0jwdaza5hwzwwlzarfylaa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring exceptions stm transformers + zeromq4-haskell + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + async base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/hverr/zeromq4-clone-pattern#readme"; + description = "Haskell implementation of the ZeroMQ clone pattern"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zeromq4-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, lifted-base , monad-control, mtl, resourcet, semigroups, transformers @@ -230915,6 +230829,30 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) zeromq;}; + "zeromq4-patterns" = callPackage + ({ mkDerivation, async, base, binary, bytestring, exceptions + , QuickCheck, stm, test-framework, test-framework-quickcheck2 + , zeromq4-haskell + }: + mkDerivation { + pname = "zeromq4-patterns"; + version = "0.3.0.0"; + sha256 = "0y5rk13rzmyfxrxbkn38klzxgnbmqi2xg69m5l2gb2gqrza8szy7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring exceptions stm zeromq4-haskell + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + async base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/hverr/zeromq4-patterns#readme"; + description = "Haskell implementation of several ZeroMQ patterns"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath , haskell-src-exts, hskeleton, monoid-record, process, syb -- GitLab From 59490ae47235a6248863c4cb48ea53cdf22d72c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 May 2018 09:30:23 +0200 Subject: [PATCH 322/785] haskell-brick: update override for ghc 8.4.x --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index da65c269822..cf103628312 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -555,7 +555,7 @@ self: super: { }); # Older versions don't compile. - brick = self.brick_0_36_2; + brick = self.brick_0_36_3; HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; hspec-smallcheck = self.hspec-smallcheck_0_5_2; -- GitLab From 16e46207ec55a9610f5f08bb7f07966b13742ff7 Mon Sep 17 00:00:00 2001 From: tilpner Date: Tue, 1 May 2018 10:36:38 +0200 Subject: [PATCH 323/785] goxel: don't save imgui.ini to working directory --- pkgs/applications/graphics/goxel/default.nix | 2 ++ .../graphics/goxel/disable-imgui_ini.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/graphics/goxel/disable-imgui_ini.patch diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 03f7b515747..3d49452cbe6 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17"; }; + patches = [ ./disable-imgui_ini.patch ]; + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; diff --git a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch new file mode 100644 index 00000000000..9427d45487d --- /dev/null +++ b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch @@ -0,0 +1,13 @@ +diff --git a/src/gui.cpp b/src/gui.cpp +index 9b7236c..a8a11b2 100644 +--- a/src/gui.cpp ++++ b/src/gui.cpp +@@ -314,6 +314,8 @@ static void init_ImGui(const inputs_t *inputs) + ImGuiIO& io = ImGui::GetIO(); + io.DeltaTime = 1.0f/60.0f; + ++ io.IniFilename = NULL; ++ + io.KeyMap[ImGuiKey_Tab] = KEY_TAB; + io.KeyMap[ImGuiKey_LeftArrow] = KEY_LEFT; + io.KeyMap[ImGuiKey_RightArrow] = KEY_RIGHT; -- GitLab From b4d0647752cbc50b919fbd6723aa9d4068952c13 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Apr 2018 14:21:21 +0000 Subject: [PATCH 324/785] coqPackages.mathcomp: 1.6.4 -> 1.7.0 --- .../coq-modules/autosubst/default.nix | 5 +++- .../coq-modules/coquelicot/default.nix | 4 ++- .../coq-modules/interval/default.nix | 5 +++- .../coq-modules/mathcomp/default.nix | 26 +++++++++---------- .../coq-modules/mathcomp/generic.nix | 4 +-- .../coq-modules/ssreflect/default.nix | 26 +++++++++---------- .../coq-modules/ssreflect/generic.nix | 4 +-- 7 files changed, 41 insertions(+), 33 deletions(-) diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 75e78d8ac44..9c24e77e0f7 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; - passthru = { inherit (mathcomp) compatibleCoqVersions; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 2e6c95bfe3c..c4dc8b5fc5b 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { inherit (coq.meta) platforms; }; - passthru = { inherit (ssreflect) compatibleCoqVersions; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; } diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index b1036e61f1b..6797a71703b 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation { platforms = coq.meta.platforms; }; - passthru = { inherit (mathcomp) compatibleCoqVersions; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 79bced9ad0e..92c3c87774a 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,29 +1,29 @@ { callPackage, fetchurl, coq }: let param = + + let param_1_7 = { + version = "1.7.0"; + sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; + }; in + { "8.5" = { version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }; - "8.6" = { - version = "1.6.4"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; - sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; - }; - - "8.7" = { - version = "1.6.4"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; - sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; - }; + "8.6" = param_1_7; + "8.7" = param_1_7; + "8.8" = param_1_7; }."${coq.coq-version}" ; in callPackage ./generic.nix { name = "coq${coq.coq-version}-mathcomp-${param.version}"; - src = fetchurl { inherit (param) url sha256; }; + src = fetchurl { + url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; + inherit (param) sha256; + }; } diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 5d39f9b3b0c..1cc5dc368da 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildFlags = stdenv.lib.optionalString withDoc "doc"; preBuild = '' - patchShebangs etc/utils/ssrcoqdep + patchShebangs etc/utils/ssrcoqdep || true cd mathcomp export COQBIN=${coq}/bin/ ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 3b53a2831e8..9e9c3c7957a 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,29 +1,29 @@ { callPackage, fetchurl, coq }: let param = + + let param_1_7 = { + version = "1.7.0"; + sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; + }; in + { "8.5" = { version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }; - "8.6" = { - version = "1.6.4"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; - sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; - }; - - "8.7" = { - version = "1.6.4"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; - sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; - }; + "8.6" = param_1_7; + "8.7" = param_1_7; + "8.8" = param_1_7; }."${coq.coq-version}" ; in callPackage ./generic.nix { name = "coq${coq.coq-version}-ssreflect-${param.version}"; - src = fetchurl { inherit (param) url sha256; }; + src = fetchurl { + url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; + inherit (param) sha256; + }; } diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index ca20e17dd50..a44e81d3c19 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { inherit patches; preBuild = '' - patchShebangs etc/utils/ssrcoqdep + patchShebangs etc/utils/ssrcoqdep || true cd mathcomp/ssreflect export COQBIN=${coq}/bin/ ''; @@ -43,7 +43,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; }; } -- GitLab From 9c01a7745093c8698c60df066bb50e6060ea1168 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 1 May 2018 09:13:59 +0000 Subject: [PATCH 325/785] gron: 0.5.1 -> 0.5.2 --- pkgs/development/tools/gron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index 59f7360df2a..14c8f53a394 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gron-${version}"; - version = "0.5.1"; + version = "0.5.2"; owner = "tomnomnom"; repo = "gron"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchFromGitHub { inherit owner repo; rev = "v${version}"; - sha256 = "1s688ynjddchviwbiggnfbw28s4wsff2941f4b1q1j7mfak7iym2"; + sha256 = "0nxcvih8n5a4f0a53dxaipab5ckqxgnsznzymhfw5kv4inr9v6j6"; }; goDeps = ./deps.nix; -- GitLab From 519b64592d5bd89c0975b44120b88ec2684d8352 Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Tue, 1 May 2018 02:36:36 -0700 Subject: [PATCH 326/785] hitch: init at 1.4.8 + service + test (#39358) Add the Hitch TLS reverse proxy as an option for TLS termination. --- maintainers/maintainer-list.nix | 5 + nixos/modules/module-list.nix | 1 + .../services/web-servers/hitch/default.nix | 108 ++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/hitch/default.nix | 33 ++++++ nixos/tests/hitch/example.pem | 53 +++++++++ nixos/tests/hitch/example/index.txt | 1 + pkgs/servers/hitch/default.nix | 23 ++++ pkgs/top-level/all-packages.nix | 2 + 9 files changed, 227 insertions(+) create mode 100644 nixos/modules/services/web-servers/hitch/default.nix create mode 100644 nixos/tests/hitch/default.nix create mode 100644 nixos/tests/hitch/example.pem create mode 100644 nixos/tests/hitch/example/index.txt create mode 100644 pkgs/servers/hitch/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aec6f67a919..14fd53b2f49 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1760,6 +1760,11 @@ github = "tftio"; name = "James Felix Black"; }; + jflanglois = { + email = "yourstruly@julienlanglois.me"; + github = "jflanglois"; + name = "Julien Langlois"; + }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b0889e62f7c..38f961c0467 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -651,6 +651,7 @@ ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy.nix ./services/web-servers/fcgiwrap.nix + ./services/web-servers/hitch/default.nix ./services/web-servers/jboss/default.nix ./services/web-servers/lighttpd/cgit.nix ./services/web-servers/lighttpd/collectd.nix diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix new file mode 100644 index 00000000000..895d02827f7 --- /dev/null +++ b/nixos/modules/services/web-servers/hitch/default.nix @@ -0,0 +1,108 @@ +{ config, lib, pkgs, ...}: +let + cfg = config.services.hitch; + ocspDir = lib.optionalString cfg.ocsp-stapling.enabled "/var/cache/hitch/ocsp"; + hitchConfig = with lib; pkgs.writeText "hitch.conf" (concatStringsSep "\n" [ + ("backend = \"${cfg.backend}\"") + (concatMapStrings (s: "frontend = \"${s}\"\n") cfg.frontend) + (concatMapStrings (s: "pem-file = \"${s}\"\n") cfg.pem-files) + ("ciphers = \"${cfg.ciphers}\"") + ("ocsp-dir = \"${ocspDir}\"") + "user = \"${cfg.user}\"" + "group = \"${cfg.group}\"" + cfg.extraConfig + ]); +in +with lib; +{ + options = { + services.hitch = { + enable = mkEnableOption "Hitch Server"; + + backend = mkOption { + type = types.str; + description = '' + The host and port Hitch connects to when receiving + a connection in the form [HOST]:PORT + ''; + }; + + ciphers = mkOption { + type = types.str; + default = "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; + description = "The list of ciphers to use"; + }; + + frontend = mkOption { + type = types.either types.str (types.listOf types.str); + default = "[127.0.0.1]:443"; + description = '' + The port and interface of the listen endpoint in the ++ form [HOST]:PORT[+CERT]. + ''; + apply = toList; + }; + + pem-files = mkOption { + type = types.listOf types.path; + default = []; + description = "PEM files to use"; + }; + + ocsp-stapling = { + enabled = mkOption { + type = types.bool; + default = true; + description = "Whether to enable OCSP Stapling"; + }; + }; + + user = mkOption { + type = types.str; + default = "hitch"; + description = "The user to run as"; + }; + + group = mkOption { + type = types.str; + default = "hitch"; + description = "The group to run as"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional configuration lines"; + }; + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.hitch = { + description = "Hitch"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + preStart = '' + ${pkgs.hitch}/sbin/hitch -t --config ${hitchConfig} + '' + (optionalString cfg.ocsp-stapling.enabled '' + mkdir -p ${ocspDir} + chown -R hitch:hitch ${ocspDir} + ''); + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.hitch}/sbin/hitch --daemon --config ${hitchConfig}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "always"; + RestartSec = "5s"; + LimitNOFILE = 131072; + }; + }; + + environment.systemPackages = [ pkgs.hitch ]; + + users.extraUsers.hitch.group = "hitch"; + users.extraGroups.hitch = {}; + }; +} diff --git a/nixos/release.nix b/nixos/release.nix index 4ad947f11d1..5b6640f1d3c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -297,6 +297,7 @@ in rec { tests.graphite = callTest tests/graphite.nix {}; tests.hardened = callTest tests/hardened.nix { }; tests.hibernate = callTest tests/hibernate.nix {}; + tests.hitch = callTest tests/hitch {}; tests.home-assistant = callTest tests/home-assistant.nix { }; tests.hound = callTest tests/hound.nix {}; tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {}; diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix new file mode 100644 index 00000000000..b024306cde5 --- /dev/null +++ b/nixos/tests/hitch/default.nix @@ -0,0 +1,33 @@ +import ../make-test.nix ({ pkgs, ... }: +{ + name = "hitch"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ jflanglois ]; + }; + machine = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.hitch = { + enable = true; + backend = "[127.0.0.1]:80"; + pem-files = [ + ./example.pem + ]; + }; + + services.httpd = { + enable = true; + documentRoot = ./example; + adminAddr = "noone@testing.nowhere"; + }; + }; + + testScript = + '' + startAll; + + $machine->waitForUnit('multi-user.target'); + $machine->waitForUnit('hitch.service'); + $machine->waitForOpenPort(443); + $machine->succeed('curl -k https://localhost:443/index.txt | grep "We are all good!"'); + ''; +}) diff --git a/nixos/tests/hitch/example.pem b/nixos/tests/hitch/example.pem new file mode 100644 index 00000000000..fde6f3cbd19 --- /dev/null +++ b/nixos/tests/hitch/example.pem @@ -0,0 +1,53 @@ +-----BEGIN CERTIFICATE----- +MIIEKTCCAxGgAwIBAgIJAIFAWQXSZ7lIMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD +VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEVMBMGA1UEBwwMUmVkd29vZCBD +aXR5MRkwFwYDVQQKDBBUZXN0aW5nIDEyMyBJbmMuMRQwEgYDVQQLDAtJVCBTZXJ2 +aWNlczEYMBYGA1UEAwwPdGVzdGluZy5ub3doZXJlMSQwIgYJKoZIhvcNAQkBFhVu +b29uZUB0ZXN0aW5nLm5vd2hlcmUwHhcNMTgwNDIzMDcxMTI5WhcNMTkwNDIzMDcx +MTI5WjCBqjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFTATBgNV +BAcMDFJlZHdvb2QgQ2l0eTEZMBcGA1UECgwQVGVzdGluZyAxMjMgSW5jLjEUMBIG +A1UECwwLSVQgU2VydmljZXMxGDAWBgNVBAMMD3Rlc3Rpbmcubm93aGVyZTEkMCIG +CSqGSIb3DQEJARYVbm9vbmVAdGVzdGluZy5ub3doZXJlMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAxQq6AA9o/QErMbQwfgDF4mqXcvglRTwPr2zPE6Rv +1g0ncRBSMM8iKbPapHM6qHNfg2e1fU2SFqzD6HkyZqHHLCgLzkdzswEcEjsMqiUP +OR++5g4CWoQrdTi31itzYzCjnQ45BrAMrLEhBQgDTNwrEE+Tit0gpOGggtj/ktLk +OD8BKa640lkmWEUGF18fd3rYTUC4hwM5qhAVXTe21vj9ZWsgprpQKdN61v0dCUap +C5eAgvZ8Re+Cd0Id674hK4cJ4SekqfHKv/jLyIg3Vsdc9nkhmiC4O6KH5f1Zzq2i +E4Kd5mnJDFxfSzIErKWmbhriLWsj3KEJ983AGLJ9hxQTAwIDAQABo1AwTjAdBgNV +HQ4EFgQU76Mm6DP/BePJRQUNrJ9z038zjocwHwYDVR0jBBgwFoAU76Mm6DP/BePJ +RQUNrJ9z038zjocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAAZzt +VdPaUqrvDAh5rMYqzYMJ3tj6daNYoX6CbTFoevK5J5D4FESM0D/FMKgpNiVz39kB +8Cjaw5rPHMHY61rHz7JRDK1sWXsonwzCF21BK7Tx0G1CIfLpYHWYb/FfdWGROx+O +hPgKuoMRWQB+txozkZp5BqWJmk5MOyFCDEXhMOmrfsJq0IYU6QaH3Lsf1oJRy4yU +afFrT9o3DLOyYLG/j/HXijCu8DVjZVa4aboum79ecYzPjjGF1posrFUnvQiuAeYy +t7cuHNUB8gW9lWR5J7tP8fzFWtIcyT2oRL8u3H+fXf0i4bW73wtOBOoeULBzBNE7 +6rphcSrQunSZQIc+hg== +-----END CERTIFICATE----- +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFCroAD2j9ASsx +tDB+AMXiapdy+CVFPA+vbM8TpG/WDSdxEFIwzyIps9qkczqoc1+DZ7V9TZIWrMPo +eTJmoccsKAvOR3OzARwSOwyqJQ85H77mDgJahCt1OLfWK3NjMKOdDjkGsAyssSEF +CANM3CsQT5OK3SCk4aCC2P+S0uQ4PwEprrjSWSZYRQYXXx93ethNQLiHAzmqEBVd +N7bW+P1layCmulAp03rW/R0JRqkLl4CC9nxF74J3Qh3rviErhwnhJ6Sp8cq/+MvI +iDdWx1z2eSGaILg7oofl/VnOraITgp3mackMXF9LMgSspaZuGuItayPcoQn3zcAY +sn2HFBMDAgMBAAECggEAcaR8HijFHpab+PC5vxJnDuz3KEHiDQpU6ZJR5DxEnCm+ +A8GsBaaRR4gJpCspO5o/DiS0Ue55QUanPt8XqIXJv7fhBznCiw0qyYDxDviMzR94 +FGskBFySS+tIa+dnh1+4HY7kaO0Egl0udB5o+N1KoP+kUsSyXSYcUxsgW+fx5FW9 +22Ya3HNWnWxMCSfSGGlTFXGj2whf25SkL25dM9iblO4ZOx4MX8kaXij7TaYy8hMM +Vf6/OMnXqtPKho+ctZZVKZkE9PxdS4f/pnp5EsdoOZwNBtfQ1WqVLWd3DlGWhnsH +7L8ZSP2HkoI4Pd1wtkpOKZc+yM2bFXWa8WY4TcmpUQKBgQD33HxGdtmtZehrexSA +/ZwWJlMslUsNz4Ivv6s7J4WCRhdh94+r9TWQP/yHdT9Ry5bvn84I5ZLUdp+aA962 +mvjz+GIglkCGpA7HU/hqurB1O63pj2cIDB8qhV21zjVIoqXcQ7IBJ+tqD79nF8vm +h3KfuHUhuu1rayGepbtIyNhLdwKBgQDLgw4TJBg/QB8RzYECk78QnfZpCExsQA/z +YJpc+dF2/nsid5R2u9jWzfmgHM2Jjo2/+ofRUaTqcFYU0K57CqmQkOLIzsbNQoYt +e2NOANNVHiZLuzTZC2r3BrrkNbo3YvQzhAesUA5lS6LfrxBLUKiwo2LU9NlmJs3b +UPVFYI0/1QKBgCswxIcS1sOcam+wNtZzWuuRKhUuvrFdY3YmlBPuwxj8Vb7AgMya +IgdM3xhLmgkKzPZchm6OcpOLSCxyWDDBuHfq5E6BYCUWGW0qeLNAbNdA2wFD99Qz +KIskSjwP/sD1dql3MmF5L1CABf5U6zb0i0jBv8ds50o8lNMsVgJM3UPpAoGBAL1+ +nzllb4pdi1CJWKnspoizfQCZsIdPM0r71V/jYY36MO+MBtpz2NlSWzAiAaQm74gl +oBdgfT2qMg0Zro11BSRONEykdOolGkj5TiMQk7b65s+3VeMPRZ8UTis2d9kgs5/Q +PVDODkl1nwfGu1ZVmW04BUujXVZHpYCkJm1eFMetAoGAImE7gWj+qRMhpbtCCGCg +z06gDKvMrF6S+GJsvUoSyM8oUtfdPodI6gWAC65NfYkIiqbpCaEVNzfui73f5Lnz +p5X1IbzhuH5UZs/k5A3OR2PPDbPs3lqEw7YJdBdLVRmO1o824uaXaJJwkL/1C+lq +8dh1wV3CnynNmZApkz4vpzQ= +-----END PRIVATE KEY----- diff --git a/nixos/tests/hitch/example/index.txt b/nixos/tests/hitch/example/index.txt new file mode 100644 index 00000000000..0478b1c2635 --- /dev/null +++ b/nixos/tests/hitch/example/index.txt @@ -0,0 +1 @@ +We are all good! diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix new file mode 100644 index 00000000000..366934829b8 --- /dev/null +++ b/pkgs/servers/hitch/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig }: +stdenv.mkDerivation rec { + version = "1.4.8"; + name = "hitch-${version}"; + + src = fetchurl { + url = "https://hitch-tls.org/source/${name}.tar.gz"; + sha256 = "1hqs5p69gr1lb3xldbrgq7d6d0vk4za0wpizlzybn98cv68acaym"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ docutils libev openssl ]; + + outputs = [ "out" "doc" "man" ]; + + meta = with stdenv.lib; { + description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software"; + homepage = https://hitch-tls.org/; + license = licenses.bsd2; + maintainers = [ maintainers.jflanglois ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20cf36a05f..4f9644f9bd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5611,6 +5611,8 @@ with pkgs; varnishPackages = varnish5Packages; varnish = varnishPackages.varnish; + hitch = callPackage ../servers/hitch { }; + venus = callPackage ../tools/misc/venus { python = python27; }; -- GitLab From 175705b6ceec23b638965921582f54d3c75e8c65 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 1 May 2018 11:33:24 +0200 Subject: [PATCH 327/785] sshfs: 3.3.1 -> 3.3.2 --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 6fd55c369d5..6f2fb68775d 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -5,14 +5,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.3.2"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv"; + sha256 = "01nrdprkqynk20yw6zdn6w8xv4hdw47g5d0v5qvfw0wls2kmadyr"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; -- GitLab From b8f9b2e55266d7f41b1056fb2238e4bc0b69f36e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 1 May 2018 11:41:50 +0200 Subject: [PATCH 328/785] androidStudioPackages.{dev,canary}: 3.2.0.11 -> 3.2.0.12 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 75385275ec8..630f5dd3447 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk"; }; latestVersion = { - version = "3.2.0.11"; # "Android Studio 3.2 Canary 12" - build = "181.4729833"; - sha256Hash = "1b976m59d230pl35ajhdic46cw8qmnykkbrg3l7am7zmih0zk64c"; + version = "3.2.0.12"; # "Android Studio 3.2 Canary 13" + build = "181.4749738"; + sha256Hash = "0mwsbmxzrs7yavgkckpmfvpz46v7fpa0nxvf8zqa9flmsv8p8l10"; }; in rec { # Old alias -- GitLab From 3434cf40e12d8c99d35bd7ef4272ff7cf0f9a64c Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Tue, 24 Apr 2018 01:27:51 +0900 Subject: [PATCH 329/785] gnucash: 2.4.15 -> 3.1-1 --- pkgs/applications/office/gnucash/default.nix | 100 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 60 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 252c6d878d0..d12b1327e8f 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,63 +1,81 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx -, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui -, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar +{ fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest +, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales +, webkit, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi +, libdbiDrivers, guile, perl, perlPackages }: -/* If you experience GConf errors when running GnuCash on NixOS, see - * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications - * for a possible solution. - */ +let + + # Enable gnc-fq-* to run in command line. + perlWrapper = stdenv.mkDerivation { + name = perl.name + "-wrapper-for-gnucash"; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]); + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/bin + for script in ${perl}/bin/*; do + makeWrapper $script $out''${script#${perl}} \ + --prefix "PERL5LIB" ":" "$PERL5LIB" + done + ''; + }; + +in stdenv.mkDerivation rec { - name = "gnucash-2.4.15"; + name = "gnucash-${version}"; + version = "3.1-1"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx"; + sha256 = "0qfjpmr6hnr0v7l2fi00rilnlyan4kqiyygyidxlpdxqqg76dvx1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; + buildInputs = [ - libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml - libgnomeprint goffice enchant gettext intltool perl guile slibGuile - swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl - perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar + boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales + webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi + libdbiDrivers guile perlWrapper ]; - propagatedUserEnvPkgs = [ gconf ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; + propagatedUserEnvPkgs = [ dconf ]; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; postInstall = '' # Auto-updaters don't make sense in Nix. rm $out/bin/gnc-fq-update - sed -i $out/bin/update-gnucash-gconf \ - -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' - - for prog in $(echo "$out/bin/"*) - do - # Don't wrap the gnc-fq-* scripts, since gnucash calls them as - # "perl