From 2fa1165e89db2c49ccd616a39507c9bdd30c50d2 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 12 Aug 2017 21:14:36 +0200 Subject: [PATCH 001/227] 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 From 869336d6233ec48234278c654f1a39b3746b9bc6 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 14:54:42 +0300 Subject: [PATCH 002/227] 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" + From 1310e23e38a38dbfb8dcab99b04d0cac6a3f31ff Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 14:54:59 +0300 Subject: [PATCH 003/227] 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" From cac10651ea9e96c828d0f032f6ad462a9b088ac1 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 17:15:13 +0300 Subject: [PATCH 004/227] 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" From caec3b9e091c6eb5f765c417396e9969f51a0da4 Mon Sep 17 00:00:00 2001 From: James Kay Date: Thu, 22 Mar 2018 16:30:47 +0000 Subject: [PATCH 005/227] 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 ]; From fc7ed300d1aafec35f9ea8437b0e6ef6f7669b3d Mon Sep 17 00:00:00 2001 From: James Kay Date: Thu, 22 Mar 2018 16:31:06 +0000 Subject: [PATCH 006/227] 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 + ]; +}; From 51a8848f122108f997ac6923f3ec497f5d6391d7 Mon Sep 17 00:00:00 2001 From: James Kay Date: Thu, 22 Mar 2018 17:18:32 +0000 Subject: [PATCH 007/227] 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"; + }; + + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ + six setuptools pyserial appdirs hidapi wxPython xlib wmctrl + ]; }; - src = fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; - }; + dev = with python36Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "4.0.0.dev6"; - buildInputs = [ pytest mock ]; - propagatedBuildInputs = [ - six setuptools pyserial appdirs hidapi wxPython xlib wmctrl - ]; -}; + 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 { }; From d1f7c51d179ac2ebcb7649ca8b7606ec098a0ea2 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 17 Apr 2018 18:34:45 -0700 Subject: [PATCH 008/227] 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/ From efe25f416c7a594c33b8239935a843a6941077b1 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 18 Apr 2018 17:09:48 +0300 Subject: [PATCH 009/227] 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; } From 44342f139ec014442c0b1538099868696e641cb2 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 18 Apr 2018 17:09:57 +0300 Subject: [PATCH 010/227] 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; } From b95a24fdf1f751c44282f6c38b84b763a85eee19 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 20 Apr 2018 11:07:07 +0800 Subject: [PATCH 011/227] 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") { From 94a420b92159ad979b97859a3db4779f91826a9f Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Mon, 23 Apr 2018 21:27:42 +0200 Subject: [PATCH 012/227] 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; }; From e05099fdde718fef86bb7991fa89c69815b7362f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 12:14:08 -0700 Subject: [PATCH 013/227] 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 ]; From f827bd40072c7f275a09ccc57d36a468941c618e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 13:23:53 -0700 Subject: [PATCH 014/227] 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 = '' From 40bb3374e91cbdbace29594a0f620d4402bc703c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 24 Apr 2018 23:12:40 +0200 Subject: [PATCH 015/227] 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 }"; From 72ec248eda744ccdf1233cebbeeb176355f4b0d8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Apr 2018 06:27:21 +0000 Subject: [PATCH 016/227] 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" [ ] { 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 017/227] 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 { 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 018/227] 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 = '' 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 019/227] 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 ]; }; } - From 274579cc95ae33457b5cd643ea030d1f530eb31e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 24 Nov 2016 15:40:04 +0100 Subject: [PATCH 020/227] 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"; From cd3047f313773bbe60df63f512dcf9271c60b34a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:33:31 -0700 Subject: [PATCH 021/227] 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" ]; From 8a3cdb993d1c7e62dc62dd7239852930f2e71997 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 06:18:41 -0700 Subject: [PATCH 022/227] 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" ]; From ff3b88713c4e5bfeb839e59b3ad4753043d3b47c Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Fri, 27 Apr 2018 12:01:24 +1000 Subject: [PATCH 023/227] 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 { }; From 9939fb2cb6ae28e87be6ac38b85d0537eb0a097e Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 27 Apr 2018 15:11:31 +0300 Subject: [PATCH 024/227] 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" ++ From 82f24d65a3c6f58e6c0a14aec1b048cd2f521992 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 27 Apr 2018 15:11:52 +0300 Subject: [PATCH 025/227] 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" From fa850e8fda68c92984760f9ff9086e8cde6ef835 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 27 Apr 2018 18:52:46 -0400 Subject: [PATCH 026/227] 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 { }; From 3b8c7424d1948e52bc2afe0e41e3b64db3f2c22b Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sat, 28 Apr 2018 16:52:46 +0100 Subject: [PATCH 027/227] 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; From 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sat, 28 Apr 2018 17:06:25 +0100 Subject: [PATCH 028/227] 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; From f514a6896919f090cd811ebd9866ace1bb4b2b54 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sat, 28 Apr 2018 17:07:54 +0100 Subject: [PATCH 029/227] 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 ''; From 3c4efe448d96693cd370b3994c0b9087970e1e83 Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 29 Apr 2018 00:58:17 +0200 Subject: [PATCH 030/227] 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 From 2fcf50a323a8fe695e3ad0520eb25bdcff976e2e Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 30 Apr 2018 10:59:57 +0200 Subject: [PATCH 031/227] 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 = '' 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 032/227] 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 { }; From bb12277049769a6d626959f569e14c979c74cd05 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 18 Mar 2018 01:14:24 -0400 Subject: [PATCH 033/227] 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 ]; From 99964ff49336a782f7ff67f39d61a608347c7507 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 09:35:47 -0700 Subject: [PATCH 034/227] 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 ]; From 92f00a58533b7fd58b0ed6efbe86ccd387682b7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 09:39:09 -0700 Subject: [PATCH 035/227] 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)" ]; From acdbf504e3f756de9964123b355a8c4f2d60e133 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:57:13 -0700 Subject: [PATCH 036/227] 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 ]; From 67b3dcde4c259897b1909dcef795309a33413deb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:58:28 -0700 Subject: [PATCH 037/227] 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 ]; From 52a9b6e896508e3794dff8b102da65e23596ed05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:18:09 -0700 Subject: [PATCH 038/227] 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"; From 02d34f7d9e72bc8c4373784d3d23a2c86cc25cef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:33:57 -0700 Subject: [PATCH 039/227] 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 ]; From e6f9103afcab0b7bf2fd64c2f4de2950d97eb4b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:15:47 -0700 Subject: [PATCH 040/227] 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 From 6cad5785ea0fc6d3d5f3dba2172e9d885b1c3661 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:24:48 -0700 Subject: [PATCH 041/227] 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 = [ From ab1648bf0d13afc19bdf7e3d092a3f7ce15a4de1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 30 Apr 2018 22:35:54 -0400 Subject: [PATCH 042/227] 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 From 8838533ec12db36483a6e3aee903075b62b14130 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:11 -0500 Subject: [PATCH 043/227] 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 ]; }; } From 85e1f22b98a022fb3a3fb0be15bee6771cd81c25 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:42 -0500 Subject: [PATCH 044/227] 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; + installFlags = [ "SUIDMODE=" ]; - 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} - ''; - - 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; }; } From e1bc2fbfdd18ae04343ebe50f736d2601e751b8e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:44:14 -0500 Subject: [PATCH 045/227] 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 From 426a9acf1e266308b05975694d2125381b27ae94 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:54:42 -0500 Subject: [PATCH 046/227] 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; }; } From 884babe32431ba40e9aa1d7160bc42daaf926f13 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:07:57 -0500 Subject: [PATCH 047/227] 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; }; } From d424d34bf7faa42277e9ec506647e25128d54eaf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:15:33 -0500 Subject: [PATCH 048/227] 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; }; } From 262fdca5e90eb7fb8d0ca994b834a401dada0acf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:16:14 -0500 Subject: [PATCH 049/227] 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 ]; }; } From 7cbf40808631996d5fca0785026c31e09e4413b1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:30:42 -0500 Subject: [PATCH 050/227] 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; }; } From ccaebf04c15ce3b0c8f054d2e48826c68e7cbee0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:33:49 -0500 Subject: [PATCH 051/227] 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; }; } From 038a0c9a603166eada74e930859ccd7e0197f78d Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 30 Apr 2018 20:03:23 -0700 Subject: [PATCH 052/227] 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; From 1beb4236a21f2e9e7adcad1aa97191a4420295da Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:07:39 -0500 Subject: [PATCH 053/227] 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; }; } From 57a4db244995c9852cf5a202bd7540a5c1e7c410 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:45:05 -0500 Subject: [PATCH 054/227] 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; }; } From 152454d9875cc1df645c5aa01ec41451d985199f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 1 May 2018 07:36:35 +0100 Subject: [PATCH 055/227] 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. - - - - From 800c46b24bda32efbc30faf6c7fcf63b1f8758ff Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 30 Apr 2018 23:45:30 -0700 Subject: [PATCH 056/227] 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 ] From 79897e15ab405c884b864b9196e0f9d94cd2cf43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Apr 2018 20:50:34 +0200 Subject: [PATCH 057/227] 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 From e9c955fb8477c30f0e9bbf9f9f96065e38dd81d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Apr 2018 02:30:52 +0200 Subject: [PATCH 058/227] 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 From 59490ae47235a6248863c4cb48ea53cdf22d72c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 May 2018 09:30:23 +0200 Subject: [PATCH 059/227] 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; From 16e46207ec55a9610f5f08bb7f07966b13742ff7 Mon Sep 17 00:00:00 2001 From: tilpner Date: Tue, 1 May 2018 10:36:38 +0200 Subject: [PATCH 060/227] 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; From b4d0647752cbc50b919fbd6723aa9d4068952c13 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Apr 2018 14:21:21 +0000 Subject: [PATCH 061/227] 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" ]; }; } From 9c01a7745093c8698c60df066bb50e6060ea1168 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 1 May 2018 09:13:59 +0000 Subject: [PATCH 062/227] 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; From 519b64592d5bd89c0975b44120b88ec2684d8352 Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Tue, 1 May 2018 02:36:36 -0700 Subject: [PATCH 063/227] 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; }; From 175705b6ceec23b638965921582f54d3c75e8c65 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 1 May 2018 11:33:24 +0200 Subject: [PATCH 064/227] 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 ]; From b8f9b2e55266d7f41b1056fb2238e4bc0b69f36e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 1 May 2018 11:41:50 +0200 Subject: [PATCH 065/227] 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 From 3434cf40e12d8c99d35bd7ef4272ff7cf0f9a64c Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Tue, 24 Apr 2018 01:27:51 +0900 Subject: [PATCH 066/227] gnucash: 2.4.15 -> 3.1-1 --- pkgs/applications/office/gnucash/default.nix | 102 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 61 insertions(+), 47 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 ]; - 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 - ]; - propagatedUserEnvPkgs = [ gconf ]; + nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; + buildInputs = [ + boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales + webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi + libdbiDrivers guile perlWrapper + ]; + + 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|' + # Unnecessary in the release build. + rm $out/bin/gnucash-valgrind - for prog in $(echo "$out/bin/"*) - do - # Don't wrap the gnc-fq-* scripts, since gnucash calls them as - # "perl