From 1cc97befd5550732fd155d04cdd9eca3f5024dbc Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 8 Nov 2017 21:55:40 -0800 Subject: [PATCH 001/491] lib/eval-config: document NIXOS_EXTRA_MODULE_PATH This adds some documentation about importing modules external to Nixpkgs, which provides context for documenting NIXOS_EXTRA_MODULE_PATH. Closes #30376 --- .../manual/development/importing-modules.xml | 59 +++++++++++++++++++ .../manual/development/writing-modules.xml | 1 + 2 files changed, 60 insertions(+) create mode 100644 nixos/doc/manual/development/importing-modules.xml diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml new file mode 100644 index 000000000000..ec1da09b9507 --- /dev/null +++ b/nixos/doc/manual/development/importing-modules.xml @@ -0,0 +1,59 @@ +
+ +Importing Modules + + + Sometimes NixOS modules need to be used in configuration but exist + outside of Nixpkgs. These modules can be imported: + + + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Use a locally-available module definition in + # ./example-module/default.nix + ./example-module + ]; + + services.exampleModule.enable = true; +} + + + + The environment variable NIXOS_EXTRA_MODULE_PATH is + an absolute path to a NixOS module that is included alongside the + Nixpkgs NixOS modules. Like any NixOS module, this module can import + additional modules: + + + +# ./module-list/default.nix +[ + ./example-module1 + ./example-module2 +] + + + +# ./extra-module/default.nix +{ imports = import ./module-list.nix; } + + + +# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module +{ config, lib, pkgs, ... }: + +{ + # No `imports` needed + + services.exampleModule1.enable = true; +} + + +
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index cb363b45675b..a49f99cb2669 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -180,6 +180,7 @@ in { + From 7654f8fa3a144847be04c071354eb8ba10d2612f Mon Sep 17 00:00:00 2001 From: Olivier Bourdoux Date: Mon, 19 Feb 2018 16:50:54 +0100 Subject: [PATCH 002/491] yarssr: init at git-2017-12-01 --- pkgs/applications/misc/yarssr/default.nix | 68 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/misc/yarssr/default.nix diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix new file mode 100644 index 000000000000..cadf5ccb6a48 --- /dev/null +++ b/pkgs/applications/misc/yarssr/default.nix @@ -0,0 +1,68 @@ +{ +fetchFromGitHub, stdenv, lib, +autoreconfHook, intltool, pkgconfig, makeWrapper, pkgs, +perl, perlPackages, +gnome2 }: + +let + perlDeps = with perlPackages; [ + Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon + XMLLibXML XMLSAXBase XMLParser XMLRSS + HTMLParser + DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone + ParamsValidate + ModuleImplementation ModuleRuntime + TryTiny + ClassSingleton + URI + AnyEvent AnyEventHTTP + CommonSense + FileSlurp + JSON + Guard + LocaleGettext + ]; + libs = [ + stdenv.cc.cc.lib + pkgs.gtk2 + ]; +in +stdenv.mkDerivation rec { + version = "git-2017-12-01"; + name = "yarssr-${version}"; + + src = fetchFromGitHub { + owner = "JGRennison"; + repo = "yarssr"; + rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d"; + sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45"; + }; + + nativeBuildInputs = [ perl pkgs.gettext makeWrapper ]; + buildInputs = perlDeps ++ [gnome2.libglade]; + propagatedBuildInputs = libs ++ perlDeps; + + installPhase = '' + DESTDIR=$out make install + mv $out/usr/* $out/ + rm -R $out/usr + sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr + sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr + sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm + chmod a+x $out/bin/yarssr + ''; + + postFixup = '' + wrapProgram $out/bin/yarssr \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \ + --set PERL5LIB "${lib.makePerlPath perlDeps}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tsyrogit/zxcvbn-c; + description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes."; + license = licenses.gpl1; + platforms = platforms.linux; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffc8abcdf236..b10c0e790f1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18310,6 +18310,8 @@ with pkgs; yarp = callPackage ../applications/science/robotics/yarp {}; + yarssr = callPackage ../applications/misc/yarssr { }; + yate = callPackage ../applications/misc/yate { }; yed = callPackage ../applications/graphics/yed {}; From 844c468b8f53e8bb84c75bb944ee9b4ad6b025ce Mon Sep 17 00:00:00 2001 From: Olivier Bourdoux Date: Mon, 19 Feb 2018 21:47:36 +0100 Subject: [PATCH 003/491] postman : 5.5.2 -> 5.5.3 --- pkgs/development/web/postman/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 605e5de03119..eb5287a3ece9 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "postman-${version}"; - version = "5.5.2"; + version = "5.5.3"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha1 = "68886197A8375E860AB880547838FEFC9E12FC64"; + sha1 = "BC0C6117BEC6D1638FD18A0E2A580617669A9297"; name = "${name}.tar.gz"; }; @@ -16,10 +16,15 @@ stdenv.mkDerivation rec { buildPhase = ":"; # nothing to build + icon = fetchurl { + url = "https://www.getpostman.com/img-rebrand/logo.png"; + sha256 = "0jdhl9c07b1723j2f172z3s5p5lh8sqa1rcvdzz3h6z5zwn21g7v"; + }; + desktopItem = makeDesktopItem { name = "postman"; exec = "postman"; - icon = "$out/share/postman/resources/app/assets/icon.png"; + icon = "${icon}"; comment = "API Development Environment"; desktopName = "Postman"; genericName = "Postman"; @@ -28,10 +33,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/postman - mkdir -p $out/share/applications cp -R * $out/share/postman + mkdir -p $out/bin ln -s $out/share/postman/Postman $out/bin/postman + + mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; From c26bf1cb6004e2f4d3535c8def72bf9963fea071 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 21 Feb 2018 08:11:16 +0100 Subject: [PATCH 004/491] logkeys: 2017-10-10 -> 2018-01-22 --- pkgs/tools/security/logkeys/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index e30ad30a4dc1..8a73d056b1ed 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, autoconf, automake, which, procps, kbd }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }: stdenv.mkDerivation rec { name = "logkeys-${version}"; - version = "2017-10-10"; + version = "2018-01-22"; - src = fetchgit { - url = https://github.com/kernc/logkeys; - rev = "5c368327a2cd818efaed4794633c260b90b87abf"; - sha256 = "0akj7j775y9c0p53zq5v12jk3fy030fpdvn5m1x9w4rdj47vxdpg"; + src = fetchFromGitHub { + owner = "kernc"; + repo = "logkeys"; + rev = "7a9f19fb6b152d9f00a0b3fe29ab266ff1f88129"; + sha256 = "1k6kj0913imwh53lh6hrhqmrpygqg2h462raafjsn7gbd3vkgx8n"; }; buildInputs = [ autoconf automake which procps kbd ]; From 1c3c80360b914ff8eacdabeb6d05565721121b1e Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 21 Feb 2018 08:11:33 +0100 Subject: [PATCH 005/491] logkeys.service: Add 'device' option --- nixos/modules/services/misc/logkeys.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix index df0b3ae24c90..ad13d9eaa674 100644 --- a/nixos/modules/services/misc/logkeys.nix +++ b/nixos/modules/services/misc/logkeys.nix @@ -7,6 +7,13 @@ let in { options.services.logkeys = { enable = mkEnableOption "logkeys service"; + + device = mkOption { + description = "Use the given device as keyboard input event device instead of /dev/input/eventX default."; + default = null; + type = types.nullOr types.string; + example = "/dev/input/event15"; + }; }; config = mkIf cfg.enable { @@ -14,7 +21,7 @@ in { description = "LogKeys Keylogger Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.logkeys}/bin/logkeys -s"; + ExecStart = "${pkgs.logkeys}/bin/logkeys -s${lib.optionalString (cfg.device != null) " -d ${cfg.device}"}"; ExecStop = "${pkgs.logkeys}/bin/logkeys -k"; Type = "forking"; }; From 8c5da2713cda9e31197e1cd9f4fba20bc32fc239 Mon Sep 17 00:00:00 2001 From: Sebastian Conybeare Date: Thu, 22 Feb 2018 14:02:52 -0600 Subject: [PATCH 006/491] monkeysphere: wrap the monkeysphere executable with the necessary crypto libraries for ssh-proxycommand --- pkgs/tools/security/monkeysphere/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index f0d3a870676c..d1266ca495ed 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { CryptOpenSSLRSA CryptOpenSSLBignum ]}" + wrapProgram $out/bin/monkeysphere --prefix PERL5LIB :\ + "${with perlPackages; stdenv.lib.makePerlPath [ + CryptOpenSSLRSA + CryptOpenSSLBignum + ]}" ''; meta = with stdenv.lib; { From d37b43f434e5752bdcd2262365dcfedd15b622b5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 15:38:46 -0800 Subject: [PATCH 007/491] rtaudio: 4.1.2 -> 5.0.0 Semi-automatic update. These checks were performed: - built on NixOS - found 5.0.0 with grep in /nix/store/sxxwa9mma9933vxb4w3d2szxjqx5w773-rtaudio-5.0.0 - found 5.0.0 in filename of file in /nix/store/sxxwa9mma9933vxb4w3d2szxjqx5w773-rtaudio-5.0.0 cc "@magnetophon" --- pkgs/development/libraries/audio/rtaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 326572996b48..1df696c0ec64 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, rtmidi }: stdenv.mkDerivation rec { - version = "4.1.2"; + version = "5.0.0"; name = "rtaudio-${version}"; src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; rev = "${version}"; - sha256 = "09j84l9l3q0g238z5k89rm8hgk0i1ir8917an7amq474nwjp80pq"; + sha256 = "0jkqnhc2pq31nmq4daxhmqdjgv2qi4ib27hwms2r5zhnmvvzlr67"; }; buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ]; From 76a1e39e1213f6d0ce262226445c18747cc64294 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 17:29:26 -0800 Subject: [PATCH 008/491] thin-provisioning-tools: 0.6.3 -> 0.7.5 Semi-automatic update. These checks were performed: - built on NixOS - found 0.7.5 with grep in /nix/store/7y3a77lh1w5ghqlmy5l00bsx90dpwyy4-thin-provisioning-tools-0.7.5 - found 0.7.5 in filename of file in /nix/store/7y3a77lh1w5ghqlmy5l00bsx90dpwyy4-thin-provisioning-tools-0.7.5 cc "@globin" --- pkgs/tools/misc/thin-provisioning-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 5d43679b6fe6..8b9fa4f2f3fc 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "thin-provisioning-tools-${version}"; - version = "0.6.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "jthornber"; repo = "thin-provisioning-tools"; rev = "v${version}"; - sha256 = "0glwhfzwj9afbqdv59ppgfqy7rik8m0vcap7279fpnvwpr1c2p5n"; + sha256 = "1ibg5wxrbqg4pr3f6aacqm42fxpwn5q00j8ldy9mw4an3ck41cwa"; }; nativeBuildInputs = [ autoreconfHook ]; From 88d34b1dda9094516c0fc6ae9f17b44c8247e848 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Mar 2018 13:55:38 -0800 Subject: [PATCH 009/491] gperftools: 2.6.1 -> 2.6.3 Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` got 0 exit code - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` and found version 2.6.3 - found 2.6.3 with grep in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3 - found 2.6.3 in filename of file in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3 --- pkgs/development/libraries/gperftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 5c863cf26cbe..2a2710531e06 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.6.1"; + name = "gperftools-2.6.3"; src = fetchurl { url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; - sha256 = "10cxd6s5pkm2d934gh47hrn9xcrw4qlc9yr7s99z4a508bmngd1q"; + sha256 = "17zfivp6n00rlqbrx6q6h71y2f815nvlzysff1ihgk4mxpv2yjri"; }; buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; From 869336d6233ec48234278c654f1a39b3746b9bc6 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 14:54:42 +0300 Subject: [PATCH 010/491] 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 fe2c2c628275..991799321094 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 3239df63de30..000000000000 --- 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 d1f6520d706b..31c12d83fafd 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 011/491] 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 ee4203fa88c9..ed78133a759c 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 000000000000..3e8e032f30c2 --- /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 012/491] 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 31c12d83fafd..d91b103c6cef 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 a683d2cd00780cf7d20caeeef44deb4cc60d2add Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Thu, 5 Apr 2018 09:18:20 +1000 Subject: [PATCH 013/491] Modified .editorconfig to apply indentation style to docbook files --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7b40ff1ff568..f272739f240a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,8 +13,8 @@ charset = utf-8 # see https://nixos.org/nixpkgs/manual/#chap-conventions -# Match nix/ruby files, set indent to spaces with width of two -[*.{nix,rb}] +# Match nix/ruby/docbook files, set indent to spaces with width of two +[*.{nix,rb,xml}] indent_style = space indent_size = 2 From cc1ab7413d588f5dc3956b4c705a23f6af474e56 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 29 Mar 2018 22:15:01 +0300 Subject: [PATCH 014/491] calibre: remove unnecessary patch In addition to bumping the version, remove a patch which made self.update_checker None. This caused errors that showed on the terminal after closing Calibre (if it was launched from a terminal). --- .../misc/calibre/no_updates_dialog.patch | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch index 4d37c3b642f5..faaaf2c19949 100644 --- a/pkgs/applications/misc/calibre/no_updates_dialog.patch +++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch @@ -13,15 +13,3 @@ diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre parser.add_option('--ignore-plugins', default=False, action='store_true', help=_('Ignore custom plugins, useful if you installed a plugin' ' that is preventing calibre from starting')) -diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py ---- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800 -+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800 -@@ -154,6 +154,8 @@ - self.update_checker.signal.update_found.connect(self.update_found, - type=Qt.QueuedConnection) - self.update_checker.start() -+ else: -+ self.update_checker = None - - def recalc_update_label(self, number_of_plugin_updates): - self.update_found(self.last_newest_calibre_version, number_of_plugin_updates) From 4ae2488e80e71c41b2aaa98e82e7d37b5df19eaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 23:20:33 -0700 Subject: [PATCH 015/491] grpc: 1.10.0 -> 1.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grpc/versions. These checks were done: - built on NixOS - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables help’ got 0 exit code - found 1.10.1 with grep in /nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1 - directory tree listing: https://gist.github.com/dc70d4a21aaa0b79ffe8dca6d80841f0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 9f9166e43c9f..fc1f186a219e 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.10.0"; + version = "1.10.1"; name = "grpc-${version}"; src = fetchurl { url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; - sha256 = "0wngrb44bpryrvrnx5y1ncrhi2097qla929wqjwvs0razbk3v9rr"; + sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; From a45dad98119c69644d61e77e3c011e975aa7f4cb Mon Sep 17 00:00:00 2001 From: davidak Date: Wed, 11 Apr 2018 14:12:47 +0200 Subject: [PATCH 016/491] tealdeer: init at 1.0.0 --- pkgs/tools/misc/tealdeer/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/tealdeer/default.nix diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix new file mode 100644 index 000000000000..fe0aa6cc3089 --- /dev/null +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -0,0 +1,34 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }: + +rustPlatform.buildRustPackage rec { + name = "tealdeer-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "dbrgn"; + repo = "tealdeer"; + rev = "v${version}"; + sha256 = "0mkcja9agkbj2i93hx01r77w66ca805v4wvivcnrqmzid001717v"; + }; + + cargoSha256 = "1qrvic7b6g3f3gjzx7x97ipp7ppa79c0aawn0lsav0c9xxzl44jq"; + + buildInputs = [ openssl cacert curl ]; + + nativeBuildInputs = [ pkgconfig ]; + + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + # disable tests for now since one needs network + # what is unavailable in sandbox build + # and i can't disable just this one + doCheck = false; + + meta = with stdenv.lib; { + description = "An implementation of tldr in Rust"; + homepage = "https://github.com/dbrgn/tealdeer"; + maintainers = with maintainers; [ davidak ]; + license = with licenses; [ asl20 mit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c5..2ebd27c93f22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2089,6 +2089,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + tealdeer = callPackage ../tools/misc/tealdeer/default.nix { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { From 42a84598fb7baacc991c03e228a07a536bc0624a Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Thu, 5 Apr 2018 18:43:56 +1000 Subject: [PATCH 017/491] Added cross-references to NixOS manual --- .../manual/administration/cleaning-store.xml | 4 +- .../administration/container-networking.xml | 6 +- .../manual/administration/control-groups.xml | 4 +- .../administration/declarative-containers.xml | 14 +-- .../administration/imperative-containers.xml | 10 +-- .../doc/manual/configuration/abstractions.xml | 12 +-- .../configuration/ad-hoc-network-config.xml | 4 +- .../configuration/adding-custom-packages.xml | 6 +- .../doc/manual/configuration/config-file.xml | 26 +++--- .../configuration/customizing-packages.xml | 6 +- .../configuration/declarative-packages.xml | 6 +- .../doc/manual/configuration/file-systems.xml | 8 +- nixos/doc/manual/configuration/firewall.xml | 14 +-- .../doc/manual/configuration/ipv4-config.xml | 10 +-- .../doc/manual/configuration/ipv6-config.xml | 8 +- .../doc/manual/configuration/linux-kernel.xml | 14 +-- .../configuration/luks-file-systems.xml | 6 +- nixos/doc/manual/configuration/modularity.xml | 36 ++++---- .../manual/configuration/network-manager.xml | 4 +- nixos/doc/manual/configuration/ssh.xml | 6 +- nixos/doc/manual/configuration/user-mgmt.xml | 26 +++--- nixos/doc/manual/configuration/wireless.xml | 4 +- nixos/doc/manual/configuration/x-windows.xml | 46 +++++----- nixos/doc/manual/configuration/xfce.xml | 24 +++--- .../manual/installation/changing-config.xml | 2 +- .../installing-from-other-distro.xml | 4 +- .../installing-virtualbox-guest.xml | 4 +- nixos/doc/manual/installation/installing.xml | 85 ++++++++++--------- nixos/doc/manual/installation/upgrading.xml | 4 +- nixos/modules/i18n/input-method/default.xml | 78 ++++++++--------- nixos/modules/programs/digitalbitbox/doc.xml | 38 ++++----- nixos/modules/programs/plotinus.xml | 2 +- nixos/modules/security/acme.xml | 22 ++--- nixos/modules/security/hidepid.xml | 12 +-- .../modules/services/databases/postgresql.xml | 12 +-- nixos/modules/services/editors/emacs.xml | 20 ++--- nixos/modules/services/misc/gitlab.xml | 59 +++++++------ .../modules/services/misc/taskserver/doc.xml | 12 +-- .../services/networking/dnscrypt-proxy.xml | 20 ++--- 39 files changed, 340 insertions(+), 338 deletions(-) diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml index 4cf62947f528..52512b8f1270 100644 --- a/nixos/doc/manual/administration/cleaning-store.xml +++ b/nixos/doc/manual/administration/cleaning-store.xml @@ -29,8 +29,8 @@ this unit automatically at certain points in time, for instance, every night at 03:15: -nix.gc.automatic = true; -nix.gc.dates = "03:15"; + = true; + = "03:15"; diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index d89d262eff4e..2fc353059dfc 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -39,9 +39,9 @@ IP address. This can be accomplished using the following configuration on the host: -networking.nat.enable = true; -networking.nat.internalInterfaces = ["ve-+"]; -networking.nat.externalInterface = "eth0"; + = true; + = ["ve-+"]; + = "eth0"; where eth0 should be replaced with the desired external interface. Note that ve-+ is a wildcard diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml index 0d7b8ae910a7..03db40a3bc52 100644 --- a/nixos/doc/manual/administration/control-groups.xml +++ b/nixos/doc/manual/administration/control-groups.xml @@ -47,7 +47,7 @@ would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s CPU share in configuration.nix: -systemd.services.httpd.serviceConfig.CPUShares = 512; +systemd.services.httpd.serviceConfig.CPUShares = 512; By default, every cgroup has 1024 CPU shares, so this will halve the @@ -61,7 +61,7 @@ available memory. Per-cgroup memory limits can be specified in httpd.service to 512 MiB of RAM (excluding swap): -systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 94f03a2ee116..79b230e5fc7f 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -15,8 +15,8 @@ following specifies that there shall be a container named containers.database = { config = { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql96; + { = true; + = pkgs.postgresql96; }; }; @@ -33,11 +33,11 @@ ports. However, they cannot change the network configuration. You can give a container its own network as follows: -containers.database = - { privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; - }; +containers.database = { + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; +}; This gives the container a private virtual Ethernet interface with IP diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index d5d8140e0764..d39ac7f8bef4 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -30,8 +30,8 @@ line. For instance, to create a container that has # nixos-container create foo --config ' - services.openssh.enable = true; - users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; + = true; + users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' @@ -100,9 +100,9 @@ specify a new configuration on the command line: # nixos-container update foo --config ' - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; + = true; + = "foo@example.org"; + = [ 80 ]; ' # curl http://$(nixos-container show-ip foo)/ diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml index cbd54bca62f9..f794085295cf 100644 --- a/nixos/doc/manual/configuration/abstractions.xml +++ b/nixos/doc/manual/configuration/abstractions.xml @@ -11,7 +11,7 @@ to abstract. Take, for instance, this Apache HTTP Server configuration: { - services.httpd.virtualHosts = + = [ { hostName = "example.org"; documentRoot = "/webroot"; adminAddr = "alice@example.org"; @@ -43,7 +43,7 @@ let }; in { - services.httpd.virtualHosts = + = [ exampleOrgCommon (exampleOrgCommon // { enableSSL = true; @@ -66,7 +66,7 @@ allowed. Thus, you also could have written: { - services.httpd.virtualHosts = + = let exampleOrgCommon = ...; in [ exampleOrgCommon (exampleOrgCommon // { ... }) @@ -86,7 +86,7 @@ the host name. This can be done as follows: { - services.httpd.virtualHosts = + = let makeVirtualHost = name: { hostName = name; @@ -113,7 +113,7 @@ element in a list: { - services.httpd.virtualHosts = + = let makeVirtualHost = ...; in map makeVirtualHost @@ -132,7 +132,7 @@ function that takes a set as its argument, like this: { - services.httpd.virtualHosts = + = let makeVirtualHost = { name, root }: { hostName = name; diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml index 26a572ba1fb5..c53b9598109c 100644 --- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml @@ -6,14 +6,14 @@ Ad-Hoc Configuration -You can use to specify +You can use to specify shell commands to be run at the end of network-setup.service. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address: -networking.localCommands = + = '' ip -6 addr add 2001:610:685:1::1/64 dev eth0 ''; diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index ab3665bae504..ae58f61d73ed 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -24,7 +24,7 @@ manual. Finally, you add it to environment.systemPackages, e.g. -environment.systemPackages = [ pkgs.my-package ]; + = [ pkgs.my-package ]; and you run nixos-rebuild, specifying your own @@ -41,7 +41,7 @@ Nixpkgs tree. For instance, here is how you specify a build of the package directly in configuration.nix: -environment.systemPackages = + = let my-hello = with pkgs; stdenv.mkDerivation rec { name = "hello-2.8"; @@ -57,7 +57,7 @@ environment.systemPackages = Of course, you can also move the definition of my-hello into a separate Nix expression, e.g. -environment.systemPackages = [ (import ./my-hello.nix) ]; + = [ (import ./my-hello.nix) ]; where my-hello.nix contains: diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 3d1cdaf4c4ab..60a4dac97d5d 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -28,9 +28,9 @@ form name = { config, pkgs, ... }: -{ services.httpd.enable = true; - services.httpd.adminAddr = "alice@example.org"; - services.httpd.documentRoot = "/webroot"; +{ = true; + = "alice@example.org"; + = "/webroot"; } @@ -40,7 +40,7 @@ the document root. Sets can be nested, and in fact dots in option names are shorthand for defining a set containing another set. For instance, - defines a set named + defines a set named services that contains a set named httpd, which in turn contains an option definition named enable with value true. @@ -89,7 +89,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no Strings are enclosed in double quotes, e.g. -networking.hostName = "dexter"; + = "dexter"; Special characters can be escaped by prefixing them with a @@ -99,7 +99,7 @@ networking.hostName = "dexter"; single quotes, e.g. -networking.extraHosts = + = '' 127.0.0.2 other-localhost 10.0.0.1 server @@ -125,8 +125,8 @@ networking.extraHosts = false, e.g. -networking.firewall.enable = true; -networking.firewall.allowPing = false; + = true; + = false; @@ -138,7 +138,7 @@ networking.firewall.allowPing = false; For example, -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; +."net.ipv4.tcp_keepalive_time" = 60; (Note that here the attribute name @@ -158,7 +158,7 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; enclosed in braces, as in the option definition -fileSystems."/boot" = +."/boot" = { device = "/dev/sda1"; fsType = "ext4"; options = [ "rw" "data=ordered" "relatime" ]; @@ -175,7 +175,7 @@ fileSystems."/boot" = elements are separated by whitespace, like this: -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + = [ "fuse" "kvm-intel" "coretemp" ]; List elements can be any other type, e.g. sets: @@ -195,12 +195,12 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; the function argument pkgs. Typical uses: -environment.systemPackages = + = [ pkgs.thunderbird pkgs.emacs ]; -postgresql.package = pkgs.postgresql90; + = pkgs.postgresql90; The latter option definition changes the default PostgreSQL diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index 8aa01fb57a09..8b7654e9b42e 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -28,7 +28,7 @@ has a dependency on GTK+ 2. If you want to build it against GTK+ 3, you can specify that as follows: -environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; + = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; The function override performs the call to the Nix @@ -38,7 +38,7 @@ the set of arguments specified by you. So here the function argument causing Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, -environment.systemPackages would be a list with two + would be a list with two elements.) Even greater customisation is possible using the function @@ -51,7 +51,7 @@ For instance, if you want to override the source code of Emacs, you can say: -environment.systemPackages = [ + = [ (pkgs.emacs.overrideAttrs (oldAttrs: { name = "emacs-25.0-pre"; src = /path/to/my/emacs/tree; diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index dc2fa715097c..4c875e6f037f 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -8,12 +8,12 @@ With declarative package management, you specify which packages you want on your system by setting the option -. For instance, adding the +. For instance, adding the following line to configuration.nix enables the Mozilla Thunderbird email application: -environment.systemPackages = [ pkgs.thunderbird ]; + = [ pkgs.thunderbird ]; The effect of this specification is that the Thunderbird package from @@ -34,7 +34,7 @@ name, such as different channels that you might have.) To “uninstall” a package, simply remove it from - and run + and run nixos-rebuild switch. diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index ae3d124cd6bb..0ff37c38d8b0 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -13,21 +13,21 @@ device /dev/disk/by-label/data onto the mount point /data: -fileSystems."/data" = +."/data" = { device = "/dev/disk/by-label/data"; fsType = "ext4"; }; Mount points are created automatically if they don’t already exist. -For , it’s best to use the topology-independent +For , it’s best to use the topology-independent device aliases in /dev/disk/by-label and /dev/disk/by-uuid, as these don’t change if the topology changes (e.g. if a disk is moved to another IDE controller). You can usually omit the file system type -(), since mount can usually +(), since mount can usually detect the type and load the necessary kernel module automatically. However, if the file system is needed at early boot (in the initial ramdisk) and is not ext2, ext3 @@ -38,7 +38,7 @@ available. System startup will fail if any of the filesystems fails to mount, dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding -options = [ "nofail" ];. +options = [ "nofail" ];. diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml index 75cccef95b38..ecc21a3bdf51 100644 --- a/nixos/doc/manual/configuration/firewall.xml +++ b/nixos/doc/manual/configuration/firewall.xml @@ -12,37 +12,37 @@ both IPv4 and IPv6 traffic. It is enabled by default. It can be disabled as follows: -networking.firewall.enable = false; + = false; If the firewall is enabled, you can open specific TCP ports to the outside world: -networking.firewall.allowedTCPPorts = [ 80 443 ]; + = [ 80 443 ]; Note that TCP port 22 (ssh) is opened automatically if the SSH daemon -is enabled (). UDP +is enabled (). UDP ports can be opened through -. +. To open ranges of TCP ports: -networking.firewall.allowedTCPPortRanges = [ + = [ { from = 4000; to = 4007; } { from = 8000; to = 8010; } ]; Similarly, UDP port ranges can be opened through -. +. Also of interest is -networking.firewall.allowPing = true; + = true; to allow the machine to respond to ping requests. (ICMPv6 pings are diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index 68238b547d60..f3ce4af39b9f 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,15 +12,15 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; Typically you’ll also want to set a default gateway and set of name servers: -networking.defaultGateway = "192.168.1.1"; -networking.nameservers = [ "8.8.8.8" ]; + = "192.168.1.1"; + = [ "8.8.8.8" ]; @@ -31,10 +31,10 @@ service The default gateway and name server configuration is performed by network-setup.service. -The host name is set using : +The host name is set using : -networking.hostName = "cartman"; + = "cartman"; The default host name is nixos. Set it to the diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 74a21e18ec3f..6b0ba0d48f01 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -11,14 +11,14 @@ is used to automatically assign IPv6 addresses to all interfaces. You can disable IPv6 support globally by setting: -networking.enableIPv6 = false; + = false; You can disable IPv6 on a single interface using a normal sysctl (in this example, we use interface eth0): -boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +."net.ipv6.conf.eth0.disable_ipv6" = true; @@ -26,14 +26,14 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; For configuring a gateway, optionally with explicitly specified interface: -networking.defaultGateway6 = { + = { address = "fe00::1"; interface = "enp0s3"; } diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 52be26d6024a..b9325629256a 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -10,7 +10,7 @@ the option . For instance, this selects the Linux 3.10 kernel: -boot.kernelPackages = pkgs.linuxPackages_3_10; + = pkgs.linuxPackages_3_10; Note that this not only replaces the kernel, but also packages that are specific to the kernel version, such as the NVIDIA video drivers. @@ -45,23 +45,23 @@ is typically y, n or Kernel modules for hardware devices are generally loaded automatically by udev. You can force a module to -be loaded via , e.g. +be loaded via , e.g. -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + = [ "fuse" "kvm-intel" "coretemp" ]; If the module is required early during the boot (e.g. to mount the root file system), you can use -: +: -boot.initrd.extraKernelModules = [ "cifs" ]; + = [ "cifs" ]; This causes the specified modules and their dependencies to be added to the initial ramdisk. Kernel runtime parameters can be set through -, e.g. +, e.g. -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; +."net.ipv4.tcp_keepalive_time" = 120; sets the kernel’s TCP keepalive time to 120 seconds. To see the available parameters, run sysctl -a. diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 00c795cd0898..6c2b4cc60b5b 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -33,13 +33,13 @@ as /, add the following to configuration.nix: -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -fileSystems."/".device = "/dev/mapper/crypted"; +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +."/".device = "/dev/mapper/crypted"; Should grub be used as bootloader, and /boot is located on an encrypted partition, it is necessary to add the following grub option: -boot.loader.grub.enableCryptodisk = true; + = true; diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 5420c7f88385..2f76459a24e9 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -22,8 +22,8 @@ use other modules by including them from { config, pkgs, ... }: { imports = [ ./vpn.nix ./kde.nix ]; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.emacs ]; + = true; + = [ pkgs.emacs ]; ... } @@ -35,25 +35,25 @@ latter might look like this: { config, pkgs, ... }: -{ services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; +{ = true; + = true; + = true; } Note that both configuration.nix and kde.nix define the option -. When multiple modules +. When multiple modules define an option, NixOS will try to merge the definitions. In the case of -, that’s easy: the lists of +, that’s easy: the lists of packages can simply be concatenated. The value in configuration.nix is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use mkBefore: -boot.kernelModules = mkBefore [ "kvm-intel" ]; + = mkBefore [ "kvm-intel" ]; This causes the kvm-intel kernel module to be @@ -61,7 +61,7 @@ loaded before any other kernel modules. For other types of options, a merge may not be possible. For instance, if two modules define -, +, nixos-rebuild will give an error: @@ -72,7 +72,7 @@ When that happens, it’s possible to force one definition take precedence over the others: -services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; + = pkgs.lib.mkForce "bob@example.org"; @@ -89,15 +89,15 @@ wondering how it’s possible that the (indirect) is a “lazy” language — it only computes values when they are needed. This works as long as no individual configuration value depends on itself.. For example, here is a module that adds -some packages to only if - is set to +some packages to only if + is set to true somewhere else: { config, pkgs, ... }: -{ environment.systemPackages = - if config.services.xserver.enable then +{ = + if config. then [ pkgs.firefox pkgs.thunderbird ] @@ -113,10 +113,10 @@ value of a configuration option is. The command allows you to find out: -$ nixos-option services.xserver.enable +$ nixos-option true -$ nixos-option boot.kernelModules +$ nixos-option [ "tun" "ipv6" "loop" ... ] @@ -130,10 +130,10 @@ typical use: $ nix-repl '<nixpkgs/nixos>' -nix-repl> config.networking.hostName +nix-repl> config. "mandark" -nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +nix-repl> map (x: x.hostName) config. [ "example.org" "example.gov" ] diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index b4808e74ff9d..bbbee3a52ed5 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -10,7 +10,7 @@ use NetworkManager. You can enable NetworkManager by setting: -networking.networkmanager.enable = true; + = true; some desktop managers (e.g., GNOME) enable NetworkManager @@ -20,7 +20,7 @@ automatically for you. belong to the networkmanager group: -users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; +users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml index 7c928baaf896..7dbe598cffe2 100644 --- a/nixos/doc/manual/configuration/ssh.xml +++ b/nixos/doc/manual/configuration/ssh.xml @@ -10,12 +10,12 @@ setting: -services.openssh.enable = true; + = true; By default, root logins using a password are disallowed. They can be disabled entirely by setting -services.openssh.permitRootLogin to + to "no". You can declaratively specify authorised RSA/DSA public keys for @@ -23,7 +23,7 @@ a user as follows: -users.extraUsers.alice.openssh.authorizedKeys.keys = +users.extraUsers.alice.openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index c6656edff6c8..848b221baa7f 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -12,12 +12,12 @@ management. In the declarative style, users are specified in states that a user account named alice shall exist: -users.users.alice = - { isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +.alice = + { isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; @@ -32,13 +32,13 @@ a password. However, you can use the passwd program to set a password, which is retained across invocations of nixos-rebuild. -If you set users.mutableUsers to false, then the contents of /etc/passwd -and /etc/group will be congruent to your NixOS configuration. For instance, -if you remove a user from users.users and run nixos-rebuild, the user -account will cease to exist. Also, imperative commands for managing users +If you set to false, then the contents of +/etc/passwd and /etc/group will be congruent to +your NixOS configuration. For instance, if you remove a user from +and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be -assigned by setting the user's hashedPassword option. A -hashed password can be generated using mkpasswd -m sha-512 +assigned by setting the user's hashedPassword +option. A hashed password can be generated using mkpasswd -m sha-512 after installing the mkpasswd package. A user ID (uid) is assigned automatically. You can also specify @@ -54,7 +54,7 @@ to the user specification. group named students shall exist: -users.groups.students.gid = 1000; +.students.gid = 1000; As with users, the group ID (gid) is optional and will be assigned diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 1868380dcbfa..6ce43a437009 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -15,12 +15,12 @@ section on wireless networks. NixOS will start wpa_supplicant for you if you enable this setting: -networking.wireless.enable = true; + = true; NixOS lets you specify networks for wpa_supplicant declaratively: -networking.wireless.networks = { + = { echelon = { psk = "abcdefgh"; }; diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 9c2c59006f15..fd0daf6c6e57 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -9,14 +9,14 @@ The X Window System (X11) provides the basis of NixOS’ graphical user interface. It can be enabled as follows: -services.xserver.enable = true; + = true; The X server will automatically detect and use the appropriate video driver from a set of X.org drivers (such as vesa and intel). You can also specify a driver manually, e.g. -services.xserver.videoDrivers = [ "r128" ]; + = [ "r128" ]; to enable X.org’s xf86-video-r128 driver. @@ -25,13 +25,13 @@ Otherwise, you can only log into a plain undecorated xterm window. Thus you should pick one or more of the following lines: -services.xserver.desktopManager.plasma5.enable = true; -services.xserver.desktopManager.xfce.enable = true; -services.xserver.desktopManager.gnome3.enable = true; -services.xserver.windowManager.xmonad.enable = true; -services.xserver.windowManager.twm.enable = true; -services.xserver.windowManager.icewm.enable = true; -services.xserver.windowManager.i3.enable = true; + = true; + = true; + = true; + = true; + = true; + = true; + = true; @@ -40,22 +40,22 @@ program that provides a graphical login prompt and manages the X server) is SLiM. You can select an alternative one by picking one of the following lines: -services.xserver.displayManager.sddm.enable = true; -services.xserver.displayManager.lightdm.enable = true; + = true; + = true; You can set the keyboard layout (and optionally the layout variant): -services.xserver.layout = "de"; -services.xserver.xkbVariant = "neo"; + = "de"; + = "neo"; The X server is started automatically at boot time. If you don’t want this to happen, you can set: -services.xserver.autorun = false; + = false; The X server can then be started manually: @@ -70,13 +70,13 @@ The X server can then be started manually: has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "nvidia" ]; + = [ "nvidia" ]; Or if you have an older card, you may have to use one of the legacy drivers: -services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy173" ]; + = [ "nvidiaLegacy340" ]; + = [ "nvidiaLegacy304" ]; + = [ "nvidiaLegacy173" ]; You may need to reboot after enabling this driver to prevent a clash with other kernel modules. @@ -84,7 +84,7 @@ with other kernel modules. On 64-bit systems, if you want full acceleration for 32-bit programs such as Wine, you should also set the following: -hardware.opengl.driSupport32Bit = true; + = true; @@ -96,7 +96,7 @@ hardware.opengl.driSupport32Bit = true; has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "ati_unfree" ]; + = [ "ati_unfree" ]; You will need to reboot after enabling this driver to prevent a clash with other kernel modules. @@ -104,7 +104,7 @@ with other kernel modules. On 64-bit systems, if you want full acceleration for 32-bit programs such as Wine, you should also set the following: -hardware.opengl.driSupport32Bit = true; + = true; @@ -115,12 +115,12 @@ hardware.opengl.driSupport32Bit = true; Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: -services.xserver.libinput.enable = true; + = true; The driver has many options (see ). For instance, the following disables tap-to-click behavior: -services.xserver.libinput.tapping = false; + = false; Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09. diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 18804d2c08be..8cb592faed53 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -9,9 +9,9 @@ To enable the Xfce Desktop Environment, set -services.xserver.desktopManager = { - xfce.enable = true; - default = "xfce"; +services.xserver.desktopManager = { + xfce.enable = true; + default = "xfce"; }; @@ -20,12 +20,12 @@ services.xserver.desktopManager = { Optionally, compton can be enabled for nice graphical effects, some example settings: -services.compton = { - enable = true; - fade = true; - inactiveOpacity = "0.9"; - shadow = true; - fadeDelta = 4; +services.compton = { + enable = true; + fade = true; + inactiveOpacity = "0.9"; + shadow = true; + fadeDelta = 4; }; @@ -33,9 +33,9 @@ services.compton = { Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your - environment.systemPackages. + . - + Thunar Volume Support @@ -44,7 +44,7 @@ services.compton = { Thunar volume support, put -services.xserver.desktopManager.xfce.enable = true; + = true; into your configuration.nix. diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 4db9020b9606..52d8a292f8be 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -75,7 +75,7 @@ have set mutableUsers = false. Another way is to temporarily add the following to your configuration: -users.extraUsers.your-user.initialPassword = "test" +users.extraUsers.your-user.initialHashedPassword = "test"; Important: delete the $hostname.qcow2 file if you diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index ecd020a067a9..11fcb43732a9 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -111,7 +111,7 @@ $ nix-channel --add https://nixos.org/channels/nixos-versionconfiguration.nix: -boot.loader.grub.extraEntries = '' + = '' menuentry "Ubuntu" { search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e configfile "($ubuntu)/boot/grub/grub.cfg" @@ -183,7 +183,7 @@ $ sudo groupdel nixbld account with sudo passwd -l root if you use sudo) - users.extraUsers.root.initialHashedPassword = ""; + users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 7fcd22a112cf..2b31b7ed3152 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -42,7 +42,7 @@ -boot.loader.grub.device = "/dev/sda"; + = "/dev/sda"; @@ -51,7 +51,7 @@ boot.loader.grub.device = "/dev/sda"; -boot.initrd.checkJournalingFS = false; + = false; diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e20b6574b725..f967a7fe2682 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -208,26 +208,29 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif BIOS systems - You must set the option - to specify on which disk - the GRUB boot loader is to be installed. Without it, NixOS cannot - boot. + You must set the option + to specify on which disk + the GRUB boot loader is to be installed. Without it, NixOS cannot + boot. UEFI systems - You must set the option - to true. - nixos-generate-config should do this automatically for new - configurations when booted in - UEFI mode. - You may want to look at the options starting with - and - as well. + You must set the option + to true. + nixos-generate-config should do this automatically for new + configurations when booted in + UEFI mode. + You may want to look at the options starting with + and + as well. + + + If there are other operating systems running on the machine before installing NixOS, the - option can be set to + option can be set to true to automatically add them to the grub menu. Another critical option is , @@ -269,15 +272,15 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif As the last step, nixos-install will ask you to set the password for the root user, e.g. - -setting root password... -Enter new UNIX password: *** -Retype new UNIX password: *** - + + setting root password... + Enter new UNIX password: *** + Retype new UNIX password: *** + - To prevent the password prompt, set users.mutableUsers = false; in + To prevent the password prompt, set = false; in configuration.nix, which allows unattended installation necessary in automation. @@ -290,20 +293,20 @@ Retype new UNIX password: *** If everything went well: - -# reboot + + # reboot You should now be able to boot into the installed NixOS. The - GRUB boot menu shows a list of available - configurations (initially just one). Every time you - change the NixOS configuration (see Changing Configuration ), a - new item is added to the menu. This allows you to easily roll back - to a previous configuration if something goes wrong. + GRUB boot menu shows a list of available + configurations (initially just one). Every time you + change the NixOS configuration (see Changing Configuration ), a + new item is added to the menu. This allows you to easily roll back + to a previous configuration if something goes wrong. You should log in and change the root password with passwd. @@ -376,26 +379,26 @@ drive (here /dev/sda). NixOS Configuration - -{ config, pkgs, ... }: + + { config, pkgs, ... }: -{ - imports = + { + imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./hardware-configuration.nix ]; - boot.loader.grub.device = "/dev/sda"; # (for BIOS systems only) - boot.loader.systemd-boot.enable = true; # (for UEFI systems only) + = "/dev/sda"; # (for BIOS systems only) + = true; # (for UEFI systems only) - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; - # Enable the OpenSSH server. - services.sshd.enable = true; -} + # Enable the OpenSSH server. + services.sshd.enable = true; + } diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index aee6523345c4..24881c8fec0f 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -119,7 +119,7 @@ able to go back to your original channel. the following to configuration.nix: -system.autoUpgrade.enable = true; + = true; This enables a periodically executed systemd service named @@ -130,7 +130,7 @@ runs, see systemctl list-timers.) You can also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03; + = https://nixos.org/channels/nixos-17.03; diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index 45d6daf068b3..76ffa8cb7e37 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -6,56 +6,56 @@ Input Methods -Input methods are an operating system component that allows any data, such - as keyboard strokes or mouse movements, to be received as input. In this way - users can enter characters and symbols not found on their input devices. Using - an input method is obligatory for any language that has more graphemes than +Input methods are an operating system component that allows any data, such + as keyboard strokes or mouse movements, to be received as input. In this way + users can enter characters and symbols not found on their input devices. Using + an input method is obligatory for any language that has more graphemes than there are keys on the keyboard. The following input methods are available in NixOS: IBus: The intelligent input bus. - Fcitx: A customizable lightweight input + Fcitx: A customizable lightweight input method. Nabi: A Korean input method based on XIM. - Uim: The universal input method, is a library with a XIM + Uim: The universal input method, is a library with a XIM bridge.
IBus -IBus is an Intelligent Input Bus. It provides full featured and user +IBus is an Intelligent Input Bus. It provides full featured and user friendly input method user interface. The following snippet can be used to configure IBus: i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; }; -i18n.inputMethod.ibus.engines is optional and can be +i18n.inputMethod.ibus.engines is optional and can be used to add extra IBus engines. Available extra IBus engines are: - Anthy (ibus-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji + Anthy (ibus-engines.anthy): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Hangul (ibus-engines.hangul): Korean input + Hangul (ibus-engines.hangul): Korean input method. - m17n (ibus-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n + m17n (ibus-engines.m17n): m17n is an input + method that uses input methods and corresponding icons in the m17n database. - mozc (ibus-engines.mozc): A Japanese input + mozc (ibus-engines.mozc): A Japanese input method from Google. - Table (ibus-engines.table): An input method + Table (ibus-engines.table): An input method that load tables of input methods. - table-others (ibus-engines.table-others): + table-others (ibus-engines.table-others): Various table-based input methods. To use this, and any other table-based input methods, it must appear in the list of engines along with table. For example: @@ -72,71 +72,71 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
Fcitx -Fcitx is an input method framework with extension support. It has three - built-in Input Method Engine, Pinyin, QuWei and Table-based input +Fcitx is an input method framework with extension support. It has three + built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. The following snippet can be used to configure Fcitx: i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; + enabled = "fcitx"; + fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; }; -i18n.inputMethod.fcitx.engines is optional and can be +i18n.inputMethod.fcitx.engines is optional and can be used to add extra Fcitx engines. Available extra Fcitx engines are: - Anthy (fcitx-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji + Anthy (fcitx-engines.anthy): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Chewing (fcitx-engines.chewing): Chewing is - an intelligent Zhuyin input method. It is one of the most popular input + Chewing (fcitx-engines.chewing): Chewing is + an intelligent Zhuyin input method. It is one of the most popular input methods among Traditional Chinese Unix users. - Hangul (fcitx-engines.hangul): Korean input + Hangul (fcitx-engines.hangul): Korean input method. - Unikey (fcitx-engines.unikey): Vietnamese input + Unikey (fcitx-engines.unikey): Vietnamese input method. - m17n (fcitx-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n + m17n (fcitx-engines.m17n): m17n is an input + method that uses input methods and corresponding icons in the m17n database. - mozc (fcitx-engines.mozc): A Japanese input + mozc (fcitx-engines.mozc): A Japanese input method from Google. - table-others (fcitx-engines.table-others): + table-others (fcitx-engines.table-others): Various table-based input methods.
Nabi -Nabi is an easy to use Korean X input method. It allows you to enter - phonetic Korean characters (hangul) and pictographic Korean characters +Nabi is an easy to use Korean X input method. It allows you to enter + phonetic Korean characters (hangul) and pictographic Korean characters (hanja). The following snippet can be used to configure Nabi: i18n.inputMethod = { - enabled = "nabi"; + enabled = "nabi"; };
Uim -Uim (short for "universal input method") is a multilingual input method +Uim (short for "universal input method") is a multilingual input method framework. Applications can use it through so-called bridges. The following snippet can be used to configure uim: i18n.inputMethod = { - enabled = "uim"; + enabled = "uim"; }; -Note: The i18n.inputMethod.uim.toolbar option can be +Note: The option can be used to choose uim toolbar.
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml index 7acbc2fc4dde..a26653dda535 100644 --- a/nixos/modules/programs/digitalbitbox/doc.xml +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -15,9 +15,9 @@ installed by setting programs.digitalbitbox to true in a manner similar to - - programs.digitalbitbox.enable = true; - + + = true; + and bundles the digitalbitbox package (see ), which contains the @@ -46,11 +46,11 @@ digitalbitbox package which could be installed as follows: - - environment.systemPackages = [ - pkgs.digitalbitbox - ]; - + + = [ + pkgs.digitalbitbox +]; +
@@ -62,9 +62,9 @@ The digitalbitbox hardware package enables the udev rules for Digital Bitbox devices and may be installed as follows: - - hardware.digitalbitbox.enable = true; - + + = true; + @@ -72,14 +72,14 @@ the udevRule51 and udevRule52 attributes by means of overriding as follows: - - programs.digitalbitbox = { - enable = true; - package = pkgs.digitalbitbox.override { - udevRule51 = "something else"; - }; - }; - + +programs.digitalbitbox = { + enable = true; + package = pkgs.digitalbitbox.override { + udevRule51 = "something else"; + }; +}; + diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml index 85b0e023e6c1..91740ee16ec2 100644 --- a/nixos/modules/programs/plotinus.xml +++ b/nixos/modules/programs/plotinus.xml @@ -17,7 +17,7 @@ To enable Plotinus, add the following to your configuration.nix: -programs.plotinus.enable = true; + = true; diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 6130ed82ed38..7cdc554989ea 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -48,9 +48,9 @@ http { configuration.nix: -security.acme.certs."foo.example.com" = { - webroot = "/var/www/challenges"; - email = "foo@example.com"; +."foo.example.com" = { + webroot = "/var/www/challenges"; + email = "foo@example.com"; }; @@ -58,17 +58,17 @@ security.acme.certs."foo.example.com" = { The private key key.pem and certificate fullchain.pem will be put into /var/lib/acme/foo.example.com. The target directory can -be configured with the option security.acme.directory. +be configured with the option . Refer to for all available configuration -options for the security.acme module. +options for the security.acme module.
Using ACME certificates in Nginx NixOS supports fetching ACME certificates for you by setting -enableACME = true; in a virtualHost config. We + enableACME = true; in a virtualHost config. We first create self-signed placeholder certificates in place of the real ACME certs. The placeholder certs are overwritten when the ACME certs arrive. For foo.example.com the config would @@ -77,13 +77,13 @@ look like. services.nginx = { - enable = true; - virtualHosts = { + enable = true; + virtualHosts = { "foo.example.com" = { - forceSSL = true; - enableACME = true; + forceSSL = true; + enableACME = true; locations."/" = { - root = "/var/www"; + root = "/var/www"; }; }; }; diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml index 5715ee7ac165..d69341eb3cde 100644 --- a/nixos/modules/security/hidepid.xml +++ b/nixos/modules/security/hidepid.xml @@ -8,9 +8,9 @@ Setting - - security.hideProcessInformation = true; - + + = true; + ensures that access to process information is restricted to the owning user. This implies, among other things, that command-line arguments remain private. Unless your deployment relies on unprivileged @@ -25,9 +25,9 @@ To allow a service foo to run without process information hiding, set - - systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; - + +systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; + diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index a98026942959..98a631c0cd32 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -23,15 +23,15 @@ configuration.nix: -services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql94; + = true; + = pkgs.postgresql94; Note that you are required to specify the desired version of PostgreSQL (e.g. pkgs.postgresql94). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for - such as the most recent + such as the most recent release of PostgreSQL. - If services.emacs.defaultEditor is + If is true, the EDITOR variable will be set to a wrapper script which launches emacsclient. @@ -497,10 +497,10 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal Emacs daemon is not wanted for all users, it is possible to install the service but not globally enable it: - + + = false; + = true; + @@ -582,7 +582,7 @@ services.emacs.install = true; To install the DocBook 5.0 schemas, either add pkgs.docbook5 to - environment.systemPackages ( (NixOS), or run nix-env -i pkgs.docbook5 (Nix). diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index 4b00f50abd63..3306ba8e9b11 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -18,19 +18,18 @@ webserver to proxy HTTP requests to the socket. frontend proxy: - services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts."git.example.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; - }; - }; -''; +services.nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts."git.example.com" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + }; +}; @@ -49,24 +48,24 @@ all data like the repositories and uploads will be stored. services.gitlab = { - enable = true; - databasePassword = "eXaMpl3"; - initialRootPassword = "UseNixOS!"; - https = true; - host = "git.example.com"; - port = 443; - user = "git"; - group = "git"; + enable = true; + databasePassword = "eXaMpl3"; + initialRootPassword = "UseNixOS!"; + https = true; + host = "git.example.com"; + port = 443; + user = "git"; + group = "git"; smtp = { - enable = true; - address = "localhost"; - port = 25; + enable = true; + address = "localhost"; + port = 25; }; secrets = { - db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; - secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; - otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; - jws = '' + db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; + secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; + otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; + jws = '' -----BEGIN RSA PRIVATE KEY----- MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm @@ -96,7 +95,7 @@ services.gitlab = { -----END RSA PRIVATE KEY----- ''; }; - extraConfig = { + extraConfig = { gitlab = { email_from = "gitlab-no-reply@example.com"; email_display_name = "Example GitLab"; @@ -116,7 +115,7 @@ secret from config/secrets.yml located in your Gitlab state folder. Refer to for all available configuration -options for the services.gitlab module. +options for the services.gitlab module.
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml index 6d4d2a9b488c..75493ac1394f 100644 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -55,7 +55,7 @@ Because Taskserver by default only provides scripts to setup users imperatively, the nixos-taskserver tool is used for addition and deletion of organisations along with users and groups defined - by and as well for + by and as well for imperative set up. @@ -99,10 +99,10 @@ For example, let's say you have the following configuration: { - services.taskserver.enable = true; - services.taskserver.fqdn = "server"; - services.taskserver.listenHost = "::"; - services.taskserver.organisations.my-company.users = [ "alice" ]; + = true; + = "server"; + = "::"; + services.taskserver.organisations.my-company.users = [ "alice" ]; } This creates an organisation called my-company with the @@ -136,7 +136,7 @@ $ ssh server nixos-taskserver user export my-company alice | sh If you set any options within - , + service.taskserver.pki.manual.*, nixos-taskserver won't issue certificates, but you can still use it for adding or removing user accounts. diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml index 555c6df4d551..ff1088698589 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.xml +++ b/nixos/modules/services/networking/dnscrypt-proxy.xml @@ -19,7 +19,7 @@ To enable the client proxy, set - services.dnscrypt-proxy.enable = true; + = true; @@ -38,17 +38,17 @@ DNS client, change the default proxy listening port to a non-standard value and point the other client to it: - services.dnscrypt-proxy.localPort = 43; + = 43; dnsmasq - { - services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#43" ]; - } +{ + = true; + = [ "127.0.0.1#43" ]; +} @@ -56,10 +56,10 @@ unbound - { - services.unbound.enable = true; - services.unbound.forwardAddresses = [ "127.0.0.1@43" ]; - } +{ + = true; + = [ "127.0.0.1@43" ]; +} From 8fccc7e1df9a984d41e6feb6bf677365eaaeabf0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 10 Jan 2018 01:50:28 +0100 Subject: [PATCH 018/491] deluge: use mkEnableOption --- nixos/modules/services/torrent/deluge.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index ec1e97f4125e..bff22cd13594 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -11,10 +11,7 @@ in { options = { services = { deluge = { - enable = mkOption { - default = false; - description = "Start the Deluge daemon"; - }; + enable = mkEnableOption "Deluge daemon"; openFilesLimit = mkOption { default = openFilesLimit; @@ -25,14 +22,7 @@ in { }; }; - deluge.web = { - enable = mkOption { - default = false; - description = '' - Start Deluge Web daemon. - ''; - }; - }; + deluge.web.enable = mkEnableOption "Deluge Web daemon"; }; }; From fe840cd3339eba56855840630d22889ee1424bfb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 10 Jan 2018 01:52:15 +0100 Subject: [PATCH 019/491] deluge: add test --- nixos/release.nix | 1 + nixos/tests/deluge.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 nixos/tests/deluge.nix diff --git a/nixos/release.nix b/nixos/release.nix index 4fd77e6471cf..39a6f34aa985 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -264,6 +264,7 @@ in rec { tests.containers-hosts = callTest tests/containers-hosts.nix {}; tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; + tests.deluge = callTest tests/deluge.nix {}; tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {}; diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix new file mode 100644 index 000000000000..6119fd58447c --- /dev/null +++ b/nixos/tests/deluge.nix @@ -0,0 +1,29 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "deluge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ flokli ]; + }; + + nodes = { + server = + { pkgs, config, ... }: + + { services.deluge = { + enable = true; + web.enable = true; + }; + networking.firewall.allowedTCPPorts = [ 8112 ]; + }; + + client = { }; + }; + + testScript = '' + startAll; + + $server->waitForUnit("deluged"); + $server->waitForUnit("delugeweb"); + $client->waitForUnit("network.target"); + $client->waitUntilSucceeds("curl --fail http://server:8112"); + ''; +}) From b901c40a8e2aeabafedbaeec6e07f3ce4567d42a Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 12 Apr 2018 18:45:14 +0200 Subject: [PATCH 020/491] oauth2_proxy: update module for extraConfig support --- .../services/security/oauth2_proxy.nix | 125 ++++++++++-------- 1 file changed, 71 insertions(+), 54 deletions(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index ef48d52e7a94..d4557a7dfe21 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -6,70 +6,80 @@ with lib; let cfg = config.services.oauth2_proxy; - # Use like: - # repeatedArgs (arg: "--arg=${arg}") args - repeatedArgs = concatMapStringsSep " "; - # oauth2_proxy provides many options that are only relevant if you are using # a certain provider. This set maps from provider name to a function that # takes the configuration and returns a string that can be inserted into the # command-line to launch oauth2_proxy. providerSpecificOptions = { - azure = cfg: '' - --azure-tenant=${cfg.azure.tenant} \ - --resource=${cfg.azure.resource} \ - ''; + azure = cfg: { + azure.tenant = cfg.azure.tenant; + resource = cfg.azure.resource; + }; - github = cfg: '' - ${optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}"} \ - ${optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}"} \ - ''; + github = cfg: { github = { + inherit (cfg.github) org team; + }; }; - google = cfg: '' - --google-admin-email=${cfg.google.adminEmail} \ - --google-service-account=${cfg.google.serviceAccountJSON} \ - ${repeatedArgs (group: "--google-group=${group}") cfg.google.groups} \ - ''; + google = cfg: { google = with cfg.google; { + admin-email = adminEmail; + service-account = serviceAccountJSON; + group = groups; + }; }; }; authenticatedEmailsFile = pkgs.writeText "authenticated-emails" cfg.email.addresses; - getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: "") cfg; + getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: {}) cfg; - mkCommandLine = cfg: '' - --provider='${cfg.provider}' \ - ${optionalString (!isNull cfg.email.addresses) "--authenticated-emails-file='${authenticatedEmailsFile}'"} \ - --approval-prompt='${cfg.approvalPrompt}' \ - ${optionalString (cfg.passBasicAuth && !isNull cfg.basicAuthPassword) "--basic-auth-password='${cfg.basicAuthPassword}'"} \ - --client-id='${cfg.clientID}' \ - --client-secret='${cfg.clientSecret}' \ - ${optionalString (!isNull cfg.cookie.domain) "--cookie-domain='${cfg.cookie.domain}'"} \ - --cookie-expire='${cfg.cookie.expire}' \ - --cookie-httponly=${boolToString cfg.cookie.httpOnly} \ - --cookie-name='${cfg.cookie.name}' \ - --cookie-secret='${cfg.cookie.secret}' \ - --cookie-secure=${boolToString cfg.cookie.secure} \ - ${optionalString (!isNull cfg.cookie.refresh) "--cookie-refresh='${cfg.cookie.refresh}'"} \ - ${optionalString (!isNull cfg.customTemplatesDir) "--custom-templates-dir='${cfg.customTemplatesDir}'"} \ - ${repeatedArgs (x: "--email-domain='${x}'") cfg.email.domains} \ - --http-address='${cfg.httpAddress}' \ - ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${boolToString cfg.htpasswd.displayForm}"} \ - ${optionalString (!isNull cfg.loginURL) "--login-url='${cfg.loginURL}'"} \ - --pass-access-token=${boolToString cfg.passAccessToken} \ - --pass-basic-auth=${boolToString cfg.passBasicAuth} \ - --pass-host-header=${boolToString cfg.passHostHeader} \ - --proxy-prefix='${cfg.proxyPrefix}' \ - ${optionalString (!isNull cfg.profileURL) "--profile-url='${cfg.profileURL}'"} \ - ${optionalString (!isNull cfg.redeemURL) "--redeem-url='${cfg.redeemURL}'"} \ - ${optionalString (!isNull cfg.redirectURL) "--redirect-url='${cfg.redirectURL}'"} \ - --request-logging=${boolToString cfg.requestLogging} \ - ${optionalString (!isNull cfg.scope) "--scope='${cfg.scope}'"} \ - ${repeatedArgs (x: "--skip-auth-regex='${x}'") cfg.skipAuthRegexes} \ - ${optionalString (!isNull cfg.signatureKey) "--signature-key='${cfg.signatureKey}'"} \ - --upstream='${cfg.upstream}' \ - ${optionalString (!isNull cfg.validateURL) "--validate-url='${cfg.validateURL}'"} \ - ${optionalString cfg.tls.enable "--tls-cert='${cfg.tls.certificate}' --tls-key='${cfg.tls.key}' --https-address='${cfg.tls.httpsAddress}'"} \ - '' + getProviderOptions cfg cfg.provider; + allConfig = with cfg; { + inherit (cfg) provider scope upstream; + approval-prompt = approvalPrompt; + basic-auth-password = basicAuthPassword; + client-id = clientID; + client-secret = clientSecret; + custom-templates-dir = customTemplatesDir; + email-domain = email.domains; + http-address = httpAddress; + login-url = loginURL; + pass-access-token = passAccessToken; + pass-basic-auth = passBasicAuth; + pass-host-header = passHostHeader; + proxy-prefix = proxyPrefix; + profile-url = profileURL; + redeem-url = redeemURL; + redirect-url = redirectURL; + request-logging = requestLogging; + skip-auth-regex = skipAuthRegexes; + signature-key = signatureKey; + validate-url = validateURL; + htpasswd-file = htpasswd.file; + cookie = { + inherit (cookie) domain secure expire name secret refresh; + httponly = cookie.httpOnly; + }; + } // lib.optionalAttrs (!isNull cfg.email.addresses) { + authenticated-emails-file = authenticatedEmailsFile; + } // lib.optionalAttrs (cfg.passBasicAuth) { + basic-auth-password = cfg.basicAuthPassword; + } // lib.optionalAttrs (!isNull cfg.htpasswd.file) { + display-htpasswd-file = cfg.htpasswd.displayForm; + } // lib.optionalAttrs tls.enable { + tls-cert = tls.certificate; + tls-key = tls.key; + https-address = tls.httpsAddress; + } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; + + mapConfig = key: attr: + if (!isNull attr && attr != []) then ( + if (builtins.typeOf attr) == "set" then concatStringsSep " " + (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else + if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else + if (builtins.typeOf attr) == "bool" then "--${key}=${boolToString attr}" else + if (builtins.typeOf attr) == "string" then "--${key}='${attr}'" else + "--${key}=${toString attr}") + else ""; + + configString = concatStringsSep " " (mapAttrsToList mapConfig allConfig); in { options.services.oauth2_proxy = { @@ -365,7 +375,7 @@ in }; secret = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The seed string for secure cookies. ''; @@ -494,6 +504,13 @@ in ''; }; + extraConfig = mkOption { + default = {}; + description = '' + Extra config to pass to oauth2_proxy. + ''; + }; + }; config = mkIf cfg.enable { @@ -511,7 +528,7 @@ in serviceConfig = { User = "oauth2_proxy"; Restart = "always"; - ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${mkCommandLine cfg}"; + ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}"; }; }; From a037cbd46bab2553921c5d5de51641bfdcf902a9 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 16 Apr 2018 14:06:22 +0200 Subject: [PATCH 021/491] oauth2_proxy: add keyFile, make some options optional --- .../services/security/oauth2_proxy.nix | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index d4557a7dfe21..cf41625d16c8 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -20,7 +20,7 @@ let inherit (cfg.github) org team; }; }; - google = cfg: { google = with cfg.google; { + google = cfg: { google = with cfg.google; optionalAttrs (groups != []) { admin-email = adminEmail; service-account = serviceAccountJSON; group = groups; @@ -57,6 +57,7 @@ let inherit (cookie) domain secure expire name secret refresh; httponly = cookie.httpOnly; }; + set-xauthrequest = setXauthrequest; } // lib.optionalAttrs (!isNull cfg.email.addresses) { authenticated-emails-file = authenticatedEmailsFile; } // lib.optionalAttrs (cfg.passBasicAuth) { @@ -120,7 +121,7 @@ in }; clientID = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The OAuth Client ID. ''; @@ -128,7 +129,7 @@ in }; clientSecret = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The OAuth Client Secret. ''; @@ -282,7 +283,8 @@ in #################################################### # UPSTREAM Configuration upstream = mkOption { - type = types.commas; + type = with types; coercedTo string (x: [x]) (listOf string); + default = []; description = '' The http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path. @@ -504,6 +506,14 @@ in ''; }; + setXauthrequest = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). + ''; + }; + extraConfig = mkOption { default = {}; description = '' @@ -511,10 +521,28 @@ in ''; }; + keyFile = mkOption { + type = types.nullOr types.string; + default = null; + description = '' + oauth2_proxy allows passing sensitive configuration via environment variables. + Make a file that contains lines like + OAUTH2_PROXY_CLIENT_SECRET=asdfasdfasdf.apps.googleuserscontent.com + and specify the path here. + ''; + example = "/run/keys/oauth2_proxy"; + }; + }; config = mkIf cfg.enable { + services.oauth2_proxy = mkIf (!isNull cfg.keyFile) { + clientID = mkDefault null; + clientSecret = mkDefault null; + cookie.secret = mkDefault null; + }; + users.extraUsers.oauth2_proxy = { description = "OAuth2 Proxy"; }; @@ -529,6 +557,7 @@ in User = "oauth2_proxy"; Restart = "always"; ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}"; + EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile; }; }; From 7292c5a5701bacc4188a00e0399a92aa748ec6a5 Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Tue, 17 Apr 2018 09:19:55 +1000 Subject: [PATCH 022/491] Fixed indentation --- .../doc/manual/configuration/config-file.xml | 4 +-- .../doc/manual/configuration/ipv4-config.xml | 5 ++- .../doc/manual/configuration/ipv6-config.xml | 5 ++- nixos/doc/manual/configuration/user-mgmt.xml | 14 ++++---- .../installing-from-other-distro.xml | 10 ++++-- nixos/doc/manual/installation/installing.xml | 35 +++++++++---------- 6 files changed, 41 insertions(+), 32 deletions(-) diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 60a4dac97d5d..d4ca15bb3e72 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -29,8 +29,8 @@ form name = { config, pkgs, ... }: { = true; - = "alice@example.org"; - = "/webroot"; + = "alice@example.org"; + = "/webroot"; } diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index f3ce4af39b9f..fbc9695c6014 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,7 +12,10 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0.ipv4.addresses = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; Typically you’ll also want to set a default gateway and set of name diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 6b0ba0d48f01..e8960dc8930c 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -26,7 +26,10 @@ example, we use interface eth0): DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +networking.interfaces.eth0.ipv6.addresses = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 848b221baa7f..1456a5894119 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -12,13 +12,13 @@ management. In the declarative style, users are specified in states that a user account named alice shall exist: -.alice = - { isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; - }; +.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; Note that alice is a member of the diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 11fcb43732a9..7e6ddb05cd66 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -183,7 +183,9 @@ $ sudo groupdel nixbld account with sudo passwd -l root if you use sudo) - users.extraUsers.root.initialHashedPassword = ""; + +users.extraUsers.root.initialHashedPassword = ""; + @@ -243,13 +245,15 @@ $ sudo groupdel nixbld $ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE +$ sudo touch /etc/NIXOS_LUSTRATE + Let's also make sure the NixOS configuration files are kept once we reboot on NixOS: -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f967a7fe2682..ba6098d917d0 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -273,9 +273,9 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif you to set the password for the root user, e.g. - setting root password... - Enter new UNIX password: *** - Retype new UNIX password: *** +setting root password... +Enter new UNIX password: *** +Retype new UNIX password: *** @@ -380,25 +380,24 @@ drive (here /dev/sda). NixOS Configuration - { config, pkgs, ... }: - - { - imports = - [ # Include the results of the hardware scan. +{ config, pkgs, ... }: { + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix - ]; + ]; - = "/dev/sda"; # (for BIOS systems only) - = true; # (for UEFI systems only) + = "/dev/sda"; # (for BIOS systems only) + = true; # (for UEFI systems only) - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; - # Enable the OpenSSH server. - services.sshd.enable = true; - } + # Enable the OpenSSH server. + services.sshd.enable = true; +} + From 6bf47e0d77fad929d37c007883dd3a493bc2947c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 14:53:42 +0200 Subject: [PATCH 023/491] mypaint-brushes: init at 1.3.0 --- .../libraries/mypaint-brushes/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/mypaint-brushes/default.nix diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix new file mode 100644 index 000000000000..140dbcc937b5 --- /dev/null +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchpatch, autoconf, automake, fetchFromGitHub, pkgconfig}: + +let + pname = "mypaint-brushes"; + version = "1.3.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "Jehan"; + repo = pname; + rev = "v${version}"; + sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + patches = [ + # build with automake 1.16 + (fetchpatch { + url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; + sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; + }) + ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + homepage = http://mypaint.org/; + description = "Brushes used by MyPaint and other software using libmypaint."; + license = licenses.cc0; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca44af435501..c1c63060734e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17032,6 +17032,8 @@ with pkgs; mypaint = callPackage ../applications/graphics/mypaint { }; + mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; From efe25f416c7a594c33b8239935a843a6941077b1 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 18 Apr 2018 17:09:48 +0300 Subject: [PATCH 024/491] 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 991799321094..71485551ef6a 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 025/491] 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 ed78133a759c..b1bf38427a83 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 3b69e6ef1a3d752fa8572784b0fadfffefaeee7f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 18 Apr 2018 15:34:23 -0400 Subject: [PATCH 026/491] sherpa: 2.2.4 -> 2.2.5 --- .../science/physics/sherpa/default.nix | 7 +- .../physics/sherpa/explicit_overloads.patch | 119 ------------------ 2 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 pkgs/applications/science/physics/sherpa/explicit_overloads.patch diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index cdbe19c53b33..340428e8e777 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,20 +2,17 @@ stdenv.mkDerivation rec { name = "sherpa-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1rw0ivx78zkbkl7nwil9i4fn8rvkifc3i20zrq3asbi4kb6brj2x"; + sha256 = "0rv14j8gvjjr3darb0wcradlmsnyq915jz7v2yybrjzqfbsr3zb5"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; enableParallelBuilding = true; - # LLVM 4 doesn't allow ambigous type in std::abs argument - patches = stdenv.lib.optional stdenv.cc.isClang [ ./explicit_overloads.patch ]; - configureFlags = [ "--with-sqlite3=${sqlite.dev}" "--enable-hepmc2=${hepmc}" diff --git a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch b/pkgs/applications/science/physics/sherpa/explicit_overloads.patch deleted file mode 100644 index 33e5a7632178..000000000000 --- a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/ATOOLS/Phys/Flavour.C b/ATOOLS/Phys/Flavour.C -index 1986348..740eea3 100644 ---- a/ATOOLS/Phys/Flavour.C -+++ b/ATOOLS/Phys/Flavour.C -@@ -298,8 +298,8 @@ std::string Flavour::IDName() const - - bool Flavour::IsDiQuark() const - { -- if(abs(Kfcode())>=1103&&abs(Kfcode())<=5505) { -- double help=abs(Kfcode())/100.0-int(abs(Kfcode())/100.0); -+ if(abs((long)Kfcode())>=1103&&abs((long)Kfcode())<=5505) { -+ double help=abs((long)Kfcode())/100.0-int(abs((long)Kfcode())/100.0); - if(help<0.031) return true; - } - return false; -@@ -307,27 +307,27 @@ bool Flavour::IsDiQuark() const - - bool Flavour::IsBaryon() const - { -- if (abs(Kfcode())%10000<1000) return false; -+ if (abs((long)Kfcode())%10000<1000) return false; - return !IsDiQuark(); - } - - bool Flavour::IsB_Hadron() const - { -- if (abs(Kfcode())<100) return 0; -+ if (abs((long)Kfcode())<100) return 0; - if (Kfcode()-100*int(Kfcode()/100)<10) return 0; -- if (abs((Kfcode()-100*int(Kfcode()/100))/10)==5) return 1; -- if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==5) return 1; -- if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1; -+ if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==5) return 1; -+ if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==5) return 1; -+ if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1; - return 0; - } - - bool Flavour::IsC_Hadron() const - { -- if (abs(Kfcode())<100) return 0; -+ if (abs((long)Kfcode())<100) return 0; - if (Kfcode()-100*int(Kfcode()/100)<10) return 0; -- if (abs((Kfcode()-100*int(Kfcode()/100))/10)==4) return 1; -- if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==4) return 1; -- if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1; -+ if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==4) return 1; -+ if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==4) return 1; -+ if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1; - return 0; - } - -diff --git a/AddOns/Pythia/Pythia_Jet_Criterion.C b/AddOns/Pythia/Pythia_Jet_Criterion.C -index bbe9597..c1201e1 100644 ---- a/AddOns/Pythia/Pythia_Jet_Criterion.C -+++ b/AddOns/Pythia/Pythia_Jet_Criterion.C -@@ -117,8 +117,8 @@ namespace PYTHIA { - double Qsq = sign * Q.Abs2(); - // Mass term of radiator - DEBUG_VAR(ampl->MS()); -- double m2Rad = ( abs(RadAfterBranch.Flav().Kfcode()) >= 4 -- && abs(RadAfterBranch.Flav().Kfcode()) < 7) -+ double m2Rad = ( abs((long)RadAfterBranch.Flav().Kfcode()) >= 4 -+ && abs((long)RadAfterBranch.Flav().Kfcode()) < 7) - ? ampl->MS()->Mass2(RadAfterBranch.Flav()) - : 0.; - // Construct 2->3 variables for FSR -diff --git a/BEAM/Main/EPA.C b/BEAM/Main/EPA.C -index 861a1b2..340ac33 100644 ---- a/BEAM/Main/EPA.C -+++ b/BEAM/Main/EPA.C -@@ -54,7 +54,7 @@ double EPA::CosInt::GetCosInt(double X) - - double EPA::phi(double x, double qq) - { -- if (abs(m_beam.Kfcode()) == kf_p_plus) { -+ if (abs((long)m_beam.Kfcode()) == kf_p_plus) { - const double a = 7.16; - const double b = -3.96; - const double c = .028; -@@ -179,7 +179,7 @@ bool EPA::CalculateWeight(double x,double q2) - m_weight=0.0; - return 1; - } -- if (abs(m_beam.Kfcode()) == kf_e) { -+ if (abs((long)m_beam.Kfcode()) == kf_e) { - double f = alpha/M_PI*(1+sqr(1-m_x))/m_x*log(2.*m_energy/m_mass); - if (f < 0) f = 0.; - m_weight = f; -@@ -187,7 +187,7 @@ bool EPA::CalculateWeight(double x,double q2) - <<"energy = "<Get()<0.25) -- anti=Flavour((kf_code)(abs(rem[0])*1000+abs(rem[1])*100+1)); -+ anti=Flavour((kf_code)(abs((long)rem[0])*1000+abs((long)rem[1])*100+1)); - } - else { -- anti=Flavour((kf_code)(abs(rem[0])*1100+3)); -+ anti=Flavour((kf_code)(abs((long)rem[0])*1100+3)); - } - if (flav.IsAnti()) anti=anti.Bar(); - return anti; From e8c936556dcbb08e23f374015191d96c621a10c2 Mon Sep 17 00:00:00 2001 From: vodkabot <38538876+vodkabot@users.noreply.github.com> Date: Thu, 19 Apr 2018 21:54:09 +0300 Subject: [PATCH 027/491] twilight: init at 2018-04-19 --- pkgs/tools/graphics/twilight/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/graphics/twilight/default.nix diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix new file mode 100644 index 000000000000..8d1ee7b7bfbe --- /dev/null +++ b/pkgs/tools/graphics/twilight/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub +, libGL, libGLU, freeglut, libX11 }: + +let + version = "2018-04-19"; +in stdenv.mkDerivation rec { + name = "twilight-${version}"; + + src = fetchFromGitHub { + owner = "tweakoz"; + repo = "twilight"; + rev = "43f21d15c2a8923c9d707bdf3789f480bfd4b36d"; + sha256 = "0mmmi4jj8yd8wnah6kx5na782sjycszgzim33dfalr0ph361m4pz"; + }; + + buildInputs = [ libGL libGLU freeglut libX11 ]; + + installPhase = '' + install -Dm755 twilight $out/bin/twilight + ''; + + meta = with stdenv.lib; { + description = "Redo of IRIX twilight backdrop in old school OpenGL"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05bb159a5f77..bf47b1ebf6f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5251,6 +5251,10 @@ with pkgs; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; + twilight = callPackage ../tools/graphics/twilight/default.nix { + libX11 = xorg.libX11; + }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; From bf6660c3ed27a323999fe70cce5731551693d1ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 21:47:14 -0700 Subject: [PATCH 028/491] xpra: 2.2.5 -> 2.2.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xpra/versions. These checks were done: - built on NixOS - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra_launcher-wrapped -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra_launcher-wrapped --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra_launcher -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra_launcher --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/..xpra-wrapped-wrapped -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/..xpra-wrapped-wrapped --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra-wrapped -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra-wrapped --help’ got 0 exit code - found 2.2.6 with grep in /nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6 - directory tree listing: https://gist.github.com/01ffc3c415200e59fd7469357044a87a --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b931f270dee2..9bc13b3260da 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; + sha256 = "1zyynghhzjbgnmzcibm17wpj9f7jy31d7dr373li8cwg2yl2swyz"; }; nativeBuildInputs = [ pkgconfig ]; From 53bea54a651c9a7c3f3a21af08779f806cd8735a Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 16:42:27 +0200 Subject: [PATCH 029/491] matrix-synapse: 0.27.2 -> 0.27.4 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3cf460539699..4c82f5cfdde8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.27.2"; + version = "0.27.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3"; + sha256 = "051bwr4vz8mwglh1m9rqlljbn8g3alvd52f09ff887nsi6z3jc17"; }; patches = [ From cf351f6389eaf83f7122285389e9958110fe9da2 Mon Sep 17 00:00:00 2001 From: James Kay Date: Fri, 20 Apr 2018 16:20:45 +0100 Subject: [PATCH 030/491] atlassian-cli: init at 7.8.0 --- .../office/atlassian-cli/default.nix | 31 +++++++++++++++++++ .../office/atlassian-cli/wrapper.sh | 20 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/office/atlassian-cli/default.nix create mode 100755 pkgs/applications/office/atlassian-cli/wrapper.sh diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix new file mode 100644 index 000000000000..a56c15bffb2a --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchzip, jre }: +stdenv.mkDerivation { + name = "atlassian-cli"; + version = "7.8.0"; + src = fetchzip { + url = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip; + sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; + extraPostFetch = "chmod go-w $out"; + }; + tools = [ "agile" "bamboo" "bitbucket" "confluence" "csv" + "hipchat" "jira" "servicedesk" "structure" "tempo" "trello" "upm" ]; + installPhase = '' + mkdir -p $out/{bin,share/doc/atlassian-cli} + cp -r lib $out/share/java + cp -r README.txt license $out/share/doc/atlassian-cli + for tool in $tools + do + substitute ${./wrapper.sh} $out/bin/$tool \ + --subst-var out \ + --subst-var-by jre ${jre} \ + --subst-var-by tool $tool + chmod +x $out/bin/$tool + done + ''; + meta = with stdenv.lib; { + description = "An integrated family of CLI’s for various Atlassian applications"; + homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; + maintainers = [ maintainers.twey ]; + license = [ licenses.unfreeRedistributable ]; + }; +} diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/applications/office/atlassian-cli/wrapper.sh new file mode 100755 index 000000000000..80b60dbc468c --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/wrapper.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +tool=@tool@ +user=ATLASSIAN_${tool^^}_USER +host=ATLASSIAN_${tool^^}_HOST +pass=ATLASSIAN_${tool^^}_PASS + +[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli +if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ] +then + >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli' + exit 1 +fi + +@jre@/bin/java \ + -jar @out@/share/java/@tool@-cli-* \ + --server "${!host}" \ + --user "${!user}" \ + --password "${!pass}" \ + "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b80db9d4d0ca..3b34769e148d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14766,6 +14766,8 @@ with pkgs; artha = callPackage ../applications/misc/artha { }; + atlassian-cli = callPackage ../applications/office/atlassian-cli { }; + atomEnv = callPackage ../applications/editors/atom/env.nix { gconf = gnome2.GConf; }; From 3d974552f35c450d6f6f74e18932e1d55d06e541 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 17:24:19 +0200 Subject: [PATCH 031/491] canonicaljson: 1.0.0 -> 1.1.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93e821fb719d..c2465a8e2f22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16640,16 +16640,16 @@ EOF canonicaljson = buildPythonPackage rec { name = "canonicaljson-${version}"; - version = "1.0.0"; + version = "1.1.3"; src = pkgs.fetchgit { url = "https://github.com/matrix-org/python-canonicaljson.git"; rev = "refs/tags/v${version}"; - sha256 = "0r82zlip93y169ijkn8xpbp0yr22mf92pni6dw420vb53l27sprq"; + sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy"; }; propagatedBuildInputs = with self; [ - frozendict simplejson + frozendict simplejson six ]; }; From 3e3b5895ca2088126219559768e412902b137ee0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Apr 2018 22:30:59 +0800 Subject: [PATCH 032/491] remarshal: use python3 instead of python2 Officially both python2 and 3 are supported. --- pkgs/development/tools/remarshal/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index baba4fd75ea9..23c9768f7e05 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,7 +1,7 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { - name = "remarshal-${version}"; +python3Packages.buildPythonApplication rec { + pname = "remarshal"; version = "0.7.0"; src = fetchFromGitHub { @@ -11,10 +11,8 @@ pythonPackages.buildPythonApplication rec { sha256 = "1wsgvzfp40lvly7nyyhv9prip4vi32rfc8kdji587jpw28zc1dfb"; }; - propagatedBuildInputs = with pythonPackages; [ - dateutil - pytoml - pyyaml + propagatedBuildInputs = with python3Packages; [ + dateutil pytoml pyyaml ]; meta = with stdenv.lib; { From d71a8533ff24c510be9692c24df64d8675d7d8b5 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Sun, 22 Apr 2018 12:23:19 +0900 Subject: [PATCH 033/491] ffmpeg library clash fix --- pkgs/tools/misc/sweep-visualizer/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index c1f3fbea8e5c..cbf849494b75 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -24,10 +24,9 @@ buildPhase = ":"; installPhase = '' - mkdir -p $out/lib $out/bin $out/share/sweep-visualizer + mkdir -p $out/bin $out/share/sweep-visualizer mv usr/share/* $out/share mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/ - mv $out/share/sweep-visualizer/*.so $out/lib/ ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer ''; @@ -40,12 +39,12 @@ ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; in '' - for lib in $out/lib/*.so; do - patchelf --set-rpath "$out/lib:${libPath}" $lib + for lib in $out/share/sweep-visualizer/*.so; do + patchelf --set-rpath "$out/share/sweep-visualizer:${libPath}" $lib done patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${libPath}" \ + --set-rpath "$out/share/sweep-visualizer:${libPath}" \ $out/share/sweep-visualizer/sweep_visualizer wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} ''; From e9baa47a3b441631e2c124f919416eb827ad662a Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Fri, 13 Apr 2018 17:09:47 +0200 Subject: [PATCH 034/491] tribler: 7.0.1 -> 7.0.2 --- pkgs/applications/networking/p2p/tribler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index f6828fe6f317..aa42af5ccbdd 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -2,13 +2,12 @@ , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { - pname = "tribler"; - name = "${pname}-${version}"; - version = "7.0.1"; + name = "tribler-${version}"; + version = "7.0.2"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4"; + sha256 = "1p0d0l0sa0nrnbyx2gg50nklkljwvl581i9w3z5qbkfzc7jsdy42"; }; buildInputs = [ @@ -41,6 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.service-identity pythonPackages.psutil pythonPackages.meliae + pythonPackages.sip ]; postPatch = '' From 63901546df7b0b473459ad076c9dd190b5a0aba7 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sat, 21 Apr 2018 18:46:44 +0200 Subject: [PATCH 035/491] canonicaljson: separating from pythonPackages --- .../python-modules/canonicaljson/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +----------- 2 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/canonicaljson/default.nix diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix new file mode 100644 index 000000000000..b7fd01472aab --- /dev/null +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, frozendict, simplejson, six +}: + +buildPythonPackage rec { + pname = "canonicaljson"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q50zk9a0r7kd56rdf9cgyxxj7vy54j96sgh8vc8jhmsvdv8dzh6"; + }; + + propagatedBuildInputs = [ + frozendict simplejson six + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/matrix-org/python-canonicaljson; + description = "Encodes objects and arrays as RFC 7159 JSON."; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2465a8e2f22..878292cb2025 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16638,20 +16638,7 @@ EOF }; }; - canonicaljson = buildPythonPackage rec { - name = "canonicaljson-${version}"; - version = "1.1.3"; - - src = pkgs.fetchgit { - url = "https://github.com/matrix-org/python-canonicaljson.git"; - rev = "refs/tags/v${version}"; - sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy"; - }; - - propagatedBuildInputs = with self; [ - frozendict simplejson six - ]; - }; + canonicaljson = callPackage ../development/python-modules/canonicaljson { }; daemonize = buildPythonPackage rec { name = "daemonize-${version}"; From ce3961cc70d506838084834c22e29983899c5011 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 22:37:06 +0200 Subject: [PATCH 036/491] python-frozendict: 0.5 -> 1.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 878292cb2025..1de6d8bafa3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2558,11 +2558,11 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; frozendict = buildPythonPackage rec { - name = "frozendict-0.5"; + name = "frozendict-1.2"; src = pkgs.fetchurl { url = "mirror://pypi/f/frozendict/${name}.tar.gz"; - sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n"; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; }; meta = { From 2749531e0f1a76c7e611ce8a7f553de337c1f8e9 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sat, 21 Apr 2018 18:48:10 +0200 Subject: [PATCH 037/491] frozendict: move to separate module --- .../python-modules/frozendict/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/frozendict/default.nix diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix new file mode 100644 index 000000000000..4ec8eff70c6d --- /dev/null +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "frozendict"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/slezica/python-frozendict; + description = "An immutable dictionary"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1de6d8bafa3f..b4028e01a4e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2557,20 +2557,7 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - frozendict = buildPythonPackage rec { - name = "frozendict-1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/frozendict/${name}.tar.gz"; - sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; - }; - - meta = { - homepage = https://github.com/slezica/python-frozendict; - description = "An immutable dictionary"; - license = stdenv.lib.licenses.mit; - }; - }; + frozendict = callPackage ../development/python-modules/frozendict { }; ftputil = callPackage ../development/python-modules/ftputil { }; From 236703f9f3ac1d0904d63940d00f885dfeeb854b Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 22 Apr 2018 20:10:15 +0200 Subject: [PATCH 038/491] nixos/systemd-networkd: wait for udev to settle ... to avoid race condition between udevd renaming and networkd configuring interfaces (39069) --- nixos/modules/system/boot/networkd.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index eea10613ea58..74d17cf9787e 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -712,6 +712,9 @@ in systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; restartTriggers = map (f: f.source) (unitFiles); + # prevent race condition with interface renaming (#39069) + requires = [ "systemd-udev-settle.service" ]; + after = [ "systemd-udev-settle.service" ]; }; systemd.services.systemd-networkd-wait-online = { From 9b5793790eb1b12fe4aa6b2ec259b3b5f9e8ba01 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 23 Apr 2018 10:49:47 +0200 Subject: [PATCH 039/491] motuclient: 1.4.00 -> 1.5.00 --- pkgs/applications/science/misc/motu-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix index 0d5c79fde900..0994bb1ca38d 100644 --- a/pkgs/applications/science/misc/motu-client/default.nix +++ b/pkgs/applications/science/misc/motu-client/default.nix @@ -1,11 +1,11 @@ { python27Packages, fetchurl, lib } : python27Packages.buildPythonApplication rec { - name = "motu-client-${version}"; - version = "1.4.00"; + pname = "motu-client"; + version = "1.5.00"; src = fetchurl { url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz"; - sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb"; + sha256 = "1iqsws3wa2gpb36ms21xmaxfi83i8p8cdya4cxpn4r47c8mz74x8"; }; meta = with lib; { From 4cd88807d8434efdc3fb666767098e2b3ee0b812 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Apr 2018 22:32:09 +0800 Subject: [PATCH 040/491] home-assistant: make port configurable so we can use it elsewhere Additionally, some settings based on NixOS configuation is set via defaultConfig which is then merged with the user provided configration. For now that just means http port and time zone but others can easily be added. --- .../modules/services/misc/home-assistant.nix | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index ac37c11106ef..07b14bb67643 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -5,7 +5,9 @@ with lib; let cfg = config.services.home-assistant; - configFile = pkgs.writeText "configuration.yaml" (builtins.toJSON cfg.config); + configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig + then (lib.recursiveUpdate defaultConfig (if (isNull cfg.config) then {} else cfg.config)) + else cfg.config)); availableComponents = pkgs.home-assistant.availableComponents; @@ -38,6 +40,12 @@ let then (cfg.package.override { inherit extraComponents; }) else cfg.package; + # If you are changing this, please update the description in applyDefaultConfig + defaultConfig = { + homeassistant.time_zone = config.time.timeZone; + http.server_port = (toString cfg.port); + }; + in { meta.maintainers = with maintainers; [ dotlambda ]; @@ -50,6 +58,26 @@ in { description = "The config directory, where your configuration.yaml is located."; }; + port = mkOption { + default = 8123; + type = types.int; + description = "The port on which to listen."; + }; + + applyDefaultConfig = mkOption { + default = true; + type = types.bool; + description = '' + Setting this option enables a few configuration options for HA based on NixOS configuration (such as time zone) to avoid having to manually specify configuration we already have. + + + Currently one side effect of enabling this is that the http component will be enabled. + + + This only takes effect if config != null in order to ensure that a manually managed configuration.yaml is not overwritten. + ''; + }; + config = mkOption { default = null; type = with types; nullOr attrs; @@ -110,15 +138,14 @@ in { ln -s ${configFile} ${cfg.configDir}/configuration.yaml ''; serviceConfig = { - ExecStart = '' - ${package}/bin/hass --config "${cfg.configDir}" - ''; + ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; User = "hass"; Group = "hass"; Restart = "on-failure"; ProtectSystem = "strict"; ReadWritePaths = "${cfg.configDir}"; PrivateTmp = true; + RemoveIPC = true; }; path = [ "/run/wrappers" # needed for ping From b886faa6b60eb67bc9c09484673998924083c12b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Apr 2018 22:33:32 +0800 Subject: [PATCH 041/491] home-assistant: use remarshal to convert configuration to YAML HA doesn't mind the configuration being JSON instead of YAML but since YAML is the official language, use that as it allows users to easily exchange config data with other parties in the community. --- nixos/modules/services/misc/home-assistant.nix | 6 ++++-- nixos/tests/home-assistant.nix | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 07b14bb67643..b9a972967792 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -134,8 +134,10 @@ in { description = "Home Assistant"; after = [ "network.target" ]; preStart = lib.optionalString (cfg.config != null) '' - rm -f ${cfg.configDir}/configuration.yaml - ln -s ${configFile} ${cfg.configDir}/configuration.yaml + config=${cfg.configDir}/configuration.yaml + rm -f $config + ${pkgs.remarshal}/bin/json2yaml -i ${configFile} -o $config + chmod 444 $config ''; serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 2e45dc78471f..4ebccb7ab868 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -51,9 +51,9 @@ in { startAll; $hass->waitForUnit("home-assistant.service"); - # Since config is specified using a Nix attribute set, - # configuration.yaml is a link to the Nix store - $hass->succeed("test -L ${configDir}/configuration.yaml"); + # The config is specified using a Nix attribute set, + # but then converted from JSON to YAML + $hass->succeed("test -f ${configDir}/configuration.yaml"); # Check that Home Assistant's web interface and API can be reached $hass->waitForOpenPort(8123); From 1b4027c6fcaf73b7e1ed83bbe728827a83f1be47 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 12:08:24 +0200 Subject: [PATCH 042/491] abootimg: init at 0.6 --- pkgs/development/mobile/abootimg/default.nix | 43 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/mobile/abootimg/default.nix diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix new file mode 100644 index 000000000000..a2ddda34347a --- /dev/null +++ b/pkgs/development/mobile/abootimg/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, utillinux }: + +let + version = "0.6"; +in +stdenv.mkDerivation { + name = "abootimg-${version}"; + + src = fetchFromGitHub { + owner = "ggrandou"; + repo = "abootimg"; + rev = "7e127fee6a3981f6b0a50ce9910267cd501e09d4"; + sha256 = "1qgx9fxwhylgnixzkz2mzv2707f65qq7rar2rsqak536vhig1z9a"; + }; + + nativeBuildInputs = [ makeWrapper utillinux ]; + + postPatch = '' + cat < version.h + #define VERSION_STR "${version}" + EOF + ''; + + installPhase = '' + mkdir -p $out/bin + install -D -m 755 abootimg $out/bin + install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1; + + install -D -m 755 abootimg-pack-initrd $out/bin + wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]} + + install -D -m 755 abootimg-unpack-initrd $out/bin + wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ggrandou/abootimg; + description = "Manipulate Android Boot Images"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e320dc31fc..940a3672f198 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -688,6 +688,8 @@ with pkgs; pkgs_i686 = pkgsi686Linux; }; + abootimg = callPackage ../development/mobile/abootimg {}; + adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { adb = androidenv.platformTools; }; From 9c194b1b63ffc92f289a783398f71ce6dfb70d18 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Mon, 23 Apr 2018 15:29:50 +0200 Subject: [PATCH 043/491] frozendict: disable checks as there are none --- pkgs/development/python-modules/frozendict/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 4ec8eff70c6d..94d42206d63d 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -9,6 +9,9 @@ buildPythonPackage rec { sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; }; + # frozendict does not come with tests + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/slezica/python-frozendict; description = "An immutable dictionary"; From 8647df2fb6be8d586376c2cb76ca5f2518dcbb81 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 20:37:03 +0200 Subject: [PATCH 044/491] goocanvas_2: support gobjectIntrospection --- pkgs/development/libraries/goocanvas/2.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 026f58079f6d..ef36a9c076fb 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -13,11 +13,13 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; - buildInputs = [ gtk3 cairo glib ]; + buildInputs = [ gtk3 cairo glib gobjectIntrospection ]; configureFlags = [ "--disable-python" ]; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; meta = with stdenv.lib; { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; From 0e5f82b847632cfd01122915ad9c57b2c65a2026 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 20:37:27 +0200 Subject: [PATCH 045/491] pdf-quench: init at 1.0.5 --- pkgs/applications/misc/pdf-quench/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/pdf-quench/default.nix diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix new file mode 100644 index 000000000000..5b80fb161224 --- /dev/null +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: + +pythonPackages.buildPythonApplication rec { + name = "pdf-quench-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "linuxerwang"; + repo = "pdf-quench"; + rev = "b72b3970b371026f9a7ebe6003581e8a63af98f6"; + sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ]; + propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; + + dontBuild = true; + doCheck = false; + + postPatch = '' + substituteInPlace src/pdf_quench.py \ + --replace /usr/bin/python "${pythonPackages.python}/bin/python" + ''; + + installPhase = '' + install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/linuxerwang/pdf-quench; + description = "A visual tool for cropping pdf files"; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e320dc31fc..a45a6f2d04a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4276,6 +4276,8 @@ with pkgs; pdfmod = callPackage ../applications/misc/pdfmod { }; + pdf-quench = callPackage ../applications/misc/pdf-quench { }; + jbig2enc = callPackage ../tools/graphics/jbig2enc { }; pdfread = callPackage ../tools/graphics/pdfread { From 94a420b92159ad979b97859a3db4779f91826a9f Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Mon, 23 Apr 2018 21:27:42 +0200 Subject: [PATCH 046/491] 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 67a5390aa6aa..7928f08f4581 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 e304b6b216ef77c7c19fae799e282c94a4b32506 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Mon, 23 Apr 2018 22:02:24 +0200 Subject: [PATCH 047/491] typora: 0.9.44 -> 0.9.47 --- pkgs/applications/editors/typora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 7c6d186b8830..d687712fc08a 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.44"; + version = "0.9.47"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5"; + sha256 = "431741948f5a2faba04984c495bea56b4a800c6dbb7e21e24ad3124fb8ffcbc9"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3"; + sha256 = "a95c8c1e296d8587a4dc6182af3b24253c3c2abc991badb7c758cd6d1bf5b1b6"; } ; From cdfa85c599a2d0fbc3288e6245564c91d8ac1a92 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Apr 2018 15:40:12 +0200 Subject: [PATCH 048/491] cddlib: 0.94h -> 0.94i, add cdd_both_reps binary --- pkgs/development/libraries/cddlib/default.nix | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 818eb6db8c69..ee56b50e1da5 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -1,17 +1,49 @@ -{stdenv, fetchurl, gmp}: +{ stdenv +, fetchurl +, fetchpatch +, gmp +, autoreconfHook +}: + stdenv.mkDerivation rec { name = "cddlib-${version}"; - fileVersion = "094h"; - version = "0.94h"; - src = fetchurl { + version = "0.94i"; + src = let + fileVersion = stdenv.lib.replaceStrings ["."] [""] version; + in fetchurl { + # Might switch to github in the future, see + # https://trac.sagemath.org/ticket/21952#comment:20 urls = [ "http://archive.ubuntu.com/ubuntu/pool/universe/c/cddlib/cddlib_${fileVersion}.orig.tar.gz" "ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-${fileVersion}.tar.gz" ]; - name = ""; - sha256 = "1dasasscwfg793q8fwzgwf64xwj7w62yfvszpr8x8g38jka08vgy"; + sha256 = "00zdgiqb91vx6gd2103h3ijij0llspsxc6zz3iw2bll39fvkl4xq"; }; buildInputs = [gmp]; + nativeBuildInputs = [ + autoreconfHook + ]; + # compute reduced H and V representation of polytope + # this patch is included by most distributions (Debian, Conda, ArchLinux, SageMath) + # proposed upstream (no answer yet): https://github.com/cddlib/cddlib/pull/3 + both_reps_c = (fetchurl { + name = "cdd_both_reps.c"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cdd_both_reps.c?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; + sha256 = "0r9yc5bgiz8i72c6vsn2y2mjk5581iw94gji9v7lg16kzzgrk9x0"; + }); + preAutoreconf = '' + # Required by sage.geometry.polyhedron + cp ${both_reps_c} src/cdd_both_reps.c + cp ${both_reps_c} src-gmp/cdd_both_reps.c + ''; + patches = [ + # add the cdd_both_reps binary + (fetchpatch { + name = "add-cdd_both_reps-binary.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch?id=78e3a61a68c916450aa4e5ceecd20041583af901"; + sha256 = "162ni2fr7dpbdkz0b5nizxq7qr5k1i1d75g0smiylpzfb0hb761a"; + }) + ]; meta = { inherit version; description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; From 6d9eb6c8a9aedfc6d5fe5f8a5ad6d791588dacf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 09:59:29 -0700 Subject: [PATCH 049/491] openfortivpn: 1.6.0 -> 1.7.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/openfortivpn/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn -h’ got 0 exit code - ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn --help’ got 0 exit code - ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn help’ got 0 exit code - ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn --version’ and found version 1.7.0 - found 1.7.0 with grep in /nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0 - directory tree listing: https://gist.github.com/34708b90f0d4fc975a7b9dbd4670bfee --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 6eafdde10824..b265cdb4c326 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.6.0"; + version = "1.7.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "0ca80i8m88f4vhwiq548wjyqwwszpbap92l83bl0wdppvp4nk192"; + sha256 = "1qfz5igry7fhrkz5iyzqpffldhpdvcw98k06yb6acwc1jyv87nh0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 378630f477cc6e141bcc447982116da4d3a085f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 10:18:10 -0700 Subject: [PATCH 050/491] osrm-backend: 5.16.4 -> 5.17.2 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/osrm-backend/versions. These checks were done: - built on NixOS - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed --version’ and found version 5.17.2 - found 5.17.2 with grep in /nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2 - directory tree listing: https://gist.github.com/82e852d822486a83285e755488f6d056 --- pkgs/servers/osrm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index b7c85a8f9a4b..3b11f26d6ce2 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.16.4"; + version = "5.17.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "01wghly0rqv4f9lfabmbfddjp2pclcfip45rmn0fvnj5c6x23v6v"; + sha256 = "0ar94wpsc2vr6pn4x5wy7mkpjlilgnyw545wm0l78174q43460y9"; }; nativeBuildInputs = [ cmake pkgconfig ]; From bec9726946daada8e14d2c329c53dbb69ce79fae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 12:55:16 -0500 Subject: [PATCH 051/491] ngx_brotli: -> 0.1.1 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 95e156f96275..0e53b35e06d0 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -5,8 +5,8 @@ src = let gitsrc = pkgs.fetchFromGitHub { owner = "eustas"; repo = "ngx_brotli"; - rev = "6a1174446f5a866d3d13615dd2824177570f0a69"; - sha256 = "148xfh6w1wgql2jj922ryiddrs93dyacs903j2hnil67cpia45p6"; + rev = "37ab9b2933a0b756ba3447000b7f31d432ed8228"; # v0.1.1 + sha256 = "114ai8v9ns23qm12wp9dgdjvldqjnrmb3cmarkn0d3k6n3bm01bf"; }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/config \ From 2dbde855ebd39bfe2ea6d9431c11b0344e48ff4e Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Thu, 19 Apr 2018 14:47:40 +0000 Subject: [PATCH 052/491] pythonPackages.dataclasses: init at 0.5 --- .../python-modules/dataclasses/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/dataclasses/default.nix diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix new file mode 100644 index 000000000000..083ea6d6347b --- /dev/null +++ b/pkgs/development/python-modules/dataclasses/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: + +buildPythonPackage rec { + pname = "dataclasses"; + version = "0.5"; + + # backport only works on Python 3.6, and is in the standard library in Python 3.7 + disabled = !isPy36; + + src = fetchPypi { + inherit pname version; + sha256 = "07lgn1k56sqpw7yfzv5a6mwshsgaipjawflgyr6lrkryjl64481z"; + }; + + meta = with stdenv.lib; { + description = "An implementation of PEP 557: Data Classes"; + homepage = "https://github.com/ericvsmith/dataclasses"; + license = licenses.asl20; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93e821fb719d..2043277f2361 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1200,6 +1200,8 @@ in { datadog = callPackage ../development/python-modules/datadog {}; + dataclasses = callPackage ../development/python-modules/dataclasses { }; + debian = callPackage ../development/python-modules/debian {}; defusedxml = callPackage ../development/python-modules/defusedxml {}; From e4a6e320bb8f2adb79a3c9b83478da753de4eedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Apr 2018 00:12:19 +0200 Subject: [PATCH 053/491] home-assistant: simplify definition of configFile --- nixos/modules/services/misc/home-assistant.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index b9a972967792..1dc7b44ee37b 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -5,9 +5,10 @@ with lib; let cfg = config.services.home-assistant; - configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig - then (lib.recursiveUpdate defaultConfig (if (isNull cfg.config) then {} else cfg.config)) - else cfg.config)); + # cfg.config != null can be assumed here + configFile = pkgs.writeText "configuration.json" + (builtins.toJSON (if cfg.applyDefaultConfig then + (lib.recursiveUpdate defaultConfig cfg.config) else cfg.config)); availableComponents = pkgs.home-assistant.availableComponents; From e05099fdde718fef86bb7991fa89c69815b7362f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 12:14:08 -0700 Subject: [PATCH 054/491] 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 851ee7f326b6..01bfe1653fe6 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 82a9df76cce9f46ccf76aeab2a5f98fc38ea81ae Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Tue, 24 Apr 2018 21:25:13 +0200 Subject: [PATCH 055/491] tuxpaint: init at 0.9.22 --- pkgs/games/tuxpaint/default.nix | 46 ++++++++++++++++++++ pkgs/games/tuxpaint/tuxpaint-completion.diff | 16 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 64 insertions(+) create mode 100644 pkgs/games/tuxpaint/default.nix create mode 100644 pkgs/games/tuxpaint/tuxpaint-completion.diff diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix new file mode 100644 index 000000000000..ddf0782b210d --- /dev/null +++ b/pkgs/games/tuxpaint/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, + cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf }: + +stdenv.mkDerivation rec { + version = "0.9.22"; + name = "tuxpaint-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz"; + sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca"; + }; + + nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo + librsvg gettext libpaper fribidi pkgconfig gperf ]; + hardeningDisable = [ "format" ]; + makeFlags = [ "GPERF=${gperf}/bin/gperf" + "PREFIX=$$out" + "COMPLETIONDIR=$$out/share/bash-completion/completions" + ]; + + patches = [ ./tuxpaint-completion.diff ]; + postPatch = '' + grep -Zlr include.*SDL . | xargs -0 sed -i -e 's,"SDL,"SDL/SDL,' + ''; + + # stamps + stamps = fetchurl { + url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2014-08-23/tuxpaint-stamps-2014.08.23.tar.gz"; + sha256 = "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q"; + }; + + postInstall = '' + tar xzf $stamps + cd tuxpaint-stamps-2014.08.23 + make install-all PREFIX=$out + rm -rf $out/share/tuxpaint/stamps/military + ''; + + meta = { + description = "Open Source Drawing Software for Children"; + homepage = http://www.tuxpaint.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ woffs ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/pkgs/games/tuxpaint/tuxpaint-completion.diff new file mode 100644 index 000000000000..0824b2becf49 --- /dev/null +++ b/pkgs/games/tuxpaint/tuxpaint-completion.diff @@ -0,0 +1,16 @@ +--- tuxpaint-0.9.22/src/tuxpaint-completion.bash~ 1970-01-01 01:00:01.000000000 +0100 ++++ tuxpaint-0.9.22/src/tuxpaint-completion.bash 2018-03-06 10:54:03.437560921 +0100 +@@ -8,7 +8,6 @@ + # FIXME: See http://www.debian-administration.org/articles/316 for an intro + # to how we should be doing this... -bjk 2009.09.09 + +-have tuxpaint && + _tuxpaint() + { + local cur +@@ -96,4 +95,4 @@ + fi + + } +-[ "${have:-}" ] && complete -F _tuxpaint $filenames tuxpaint ++complete -F _tuxpaint $filenames tuxpaint diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a4ebec0480a..6611baa9fe10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19442,6 +19442,8 @@ with pkgs; tremulous = callPackage ../games/tremulous { }; + tuxpaint = callPackage ../games/tuxpaint { }; + speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC From 2ac306c91cefc585d23239b54e5539abb64c0c04 Mon Sep 17 00:00:00 2001 From: Felix Dietze Date: Tue, 24 Apr 2018 21:57:51 +0200 Subject: [PATCH 056/491] nixos manual: Fix typo in Syntax Summary --- nixos/doc/manual/configuration/summary.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index be1f2263149e..38032c5d9dc3 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -53,7 +53,7 @@ manual for the rest. { x = 1; y = 2; } - An set with attributes names x and y + A set with attributes named x and y { foo.bar = 1; } From dad3714ec16c96b4512d5ebdff84f88867dfb291 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 15:06:15 -0500 Subject: [PATCH 057/491] live555: supports darwin --- .../development/libraries/live555/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 1479f7b6153b..69c16878fdf5 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib, darwin }: # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD let @@ -12,19 +12,22 @@ stdenv.mkDerivation { sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d"; }; - postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles" - + stdenv.lib.optionalString (stdenv ? glibc) '' - + postPatch = '' + sed 's,/bin/rm,rm,g' -i genMakefiles + sed \ + -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ + -i config.linux + '' + stdenv.lib.optionalString (stdenv ? glibc) '' substituteInPlace liveMedia/include/Locale.hh \ --replace '' '' ''; configurePhase = '' - sed \ - -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ - -i config.linux - - ./genMakefiles linux + ./genMakefiles ${{ + x86_64-darwin = "macosx"; + i686-linux = "linux"; + x86_64-linux = "linux-64bit"; + }.${stdenv.system}} ''; installPhase = '' @@ -35,10 +38,12 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; + + meta = with lib; { description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; homepage = http://www.live555.com/liveMedia/; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From db6cc5623945c6594475303a838accce41a9729a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 15:08:12 -0500 Subject: [PATCH 058/491] libmtp: supports darwin --- pkgs/development/libraries/libmtp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 88ef55715a7c..c3061626a6ae 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }: stdenv.mkDerivation rec { name = "libmtp-1.1.15"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; + buildInputs = [ libiconv ]; propagatedBuildInputs = [ libusb1 ]; nativeBuildInputs = [ pkgconfig ]; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { in the form of a library suitable primarily for POSIX compliant operating systems. We implement MTP Basic, the stuff proposed for standardization. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; } From 9c406d2ac8574ea03ba68db9b843c36ac43e3289 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 15:09:07 -0500 Subject: [PATCH 059/491] libdvdnav: supports Darwin --- pkgs/development/libraries/libdvdnav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 42321b2f866a..b0dfd1e8fc12 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A library that implements DVD navigation features such as DVD menus"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; passthru = { inherit libdvdread; }; From 00bf1150473dedb02f22696450b250e04875faab Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 15:16:12 -0500 Subject: [PATCH 060/491] schroedinger: add Darwin patch --- .../libraries/schroedinger/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 2309719c2bdc..167fe4190764 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, orc, pkgconfig }: +{ stdenv, fetchurl, orc, pkgconfig, fetchpatch, autoreconfHook }: stdenv.mkDerivation { name = "schroedinger-1.0.11"; @@ -13,15 +13,23 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ orc ]; - doCheck = true; + doCheck = (!stdenv.isDarwin); + + patchFlags = "-p0"; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/schroedinger/files/patch-testsuite-Makefile.am.diff"; + sha256 = "0cc8ymvgjgwy7ghca2dd8m8pxpinf27s2i8krf2m3fzv2ckq09v3"; + }) + ]; meta = with stdenv.lib; { homepage = http://diracvideo.org/; maintainers = [ maintainers.spwhitt ]; license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From f827bd40072c7f275a09ccc57d36a468941c618e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 13:23:53 -0700 Subject: [PATCH 061/491] 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 61409279ded7..9113b6716649 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 1c3d38c69b0b795a6a445a3fa3af3780cb4c8f06 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Apr 2018 22:56:25 +0200 Subject: [PATCH 062/491] vim_configurable: replace default ftNix patch with sources from vim-nix --- .../applications/editors/vim/configurable.nix | 6 ++ .../editors/vim/ft-nix-support.patch | 78 +------------------ 2 files changed, 7 insertions(+), 77 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 0f81b0bdd640..9ffa31f2f2e0 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -4,6 +4,7 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE +, vimPlugins # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -80,6 +81,11 @@ composableDerivation { flags = { ftNix = { patches = [ ./ft-nix-support.patch ]; + preConfigure = '' + cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim + cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim + cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim + ''; }; } // edf { diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 5feb9c879517..274d855731fd 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -6,7 +6,7 @@ index a8e6261..2b008fc 100644 " Z80 assembler asz80 au BufNewFile,BufRead *.z8a setf z8a -+" NIX ++" Nix +au BufNewFile,BufRead *.nix setf nix + augroup END @@ -18,79 +18,3 @@ index a8e6261..2b008fc 100644 unlet s:cpo_save + + -diff --git a/runtime/syntax/nix.vim b/runtime/syntax/nix.vim -new file mode 100644 -index 0000000..a2f9918 ---- /dev/null -+++ b/runtime/syntax/nix.vim -@@ -0,0 +1,56 @@ -+" Vim syntax file -+" Language: nix -+" Maintainer: Marc Weber -+" Modify and commit if you feel that way -+" Last Change: 2011 Jun -+" -+" this syntax file can be still be enhanced very much.. -+" Don't ask, do it :-) -+" This file (github.com/MarcWeber/vim-addon-nix) is periodically synced with -+" the patch found in vim_configurable (nixpkgs) -+ -+" Quit when a (custom) syntax file was already loaded -+if exists("b:current_syntax") -+ finish -+endif -+ -+ -+sy cluster nixStrings contains=nixStringParam,nixStringIndented -+ -+syn keyword nixKeyword let throw inherit import true false null with -+syn keyword nixConditional if else then -+syn keyword nixBrace ( ) { } = -+syn keyword nixBuiltin __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists -+ \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList -+ \ __head __tail __add __sub __lessThan __substring __stringLength -+ -+syn region nixStringIndented start=+''+ skip=+'''\|''${\|"+ end=+''+ contains=nixStringParam -+" syn region nixString start=+"+ skip=+\\"+ end=+"+ -+syn match nixAttr "\w\+\ze\s*=" -+syn match nixFuncArg "\zs\w\+\ze\s*:" -+syn region nixStringParam start=+\${+ end=+}+ contains=@nixStrings -+syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+ -+syn match nixEndOfLineComment "#.*$" -+ -+hi def link nixKeyword Keyword -+hi def link nixConditional Conditional -+hi def link nixBrace Special -+hi def link nixString String -+hi def link nixStringIndented String -+hi def link nixBuiltin Special -+hi def link nixStringParam Macro -+hi def link nixMultiLineComment Comment -+hi def link nixEndOfLineComment Comment -+hi def link nixAttr Identifier -+hi def link nixFuncArg Identifier -+ -+syn sync maxlines=20000 -+syn sync minlines=50000 -+ -+let b:current_syntax = "nix" -+ -+" thanks to domenkozar -+" scan backwards to find begining of multiline statements -+syn sync ccomment nixMultiLineComment minlines=10 maxlines=500 -+syn sync ccomment nixStringIndented minlines=10 maxlines=500 -+syn sync ccomment nixString maxlines=10 -diff --git a/runtime/ftplugin/nix.vim b/runtime/ftplugin/nix.vim -new file mode 100644 ---- /dev/null -+++ b/runtime/ftplugin/nix.vim -@@ -0,0 +1,2 @@ -+" Only do this when not done yet for this buffer -+if exists("b:did_ftplugin") -+ finish -+endif -+let b:did_ftplugin = 1 -+ -+" coding conventions -+setlocal shiftwidth=2 expandtab softtabstop=2 -+let b:undo_ftplugin = "setlocal sw< et< sts<" From 40bb3374e91cbdbace29594a0f620d4402bc703c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 24 Apr 2018 23:12:40 +0200 Subject: [PATCH 063/491] 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 981c01e2b4a7..7c082cbbbb0f 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 a4ba8c654403c1f1e6ba006533e3306dd32a638e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 23:27:45 +0200 Subject: [PATCH 064/491] clementine: each output should hav a wrapped `GST_PLUGIN_SYSTEM_PATH_1_0` see https://github.com/NixOS/nixpkgs/commit/ef5e212d20959d4d883df2ff2a54e5ef4b2512a5#r28723596 /cc @jtojnar --- pkgs/applications/audio/clementine/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index b8ff3daec606..6379975e951c 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -70,7 +70,9 @@ let free = stdenv.mkDerivation { name = "clementine-free-${version}"; - inherit src patches nativeBuildInputs buildInputs postPatch; + inherit src patches nativeBuildInputs postPatch; + + buildInputs = buildInputs ++ [ makeWrapper ]; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; @@ -78,6 +80,11 @@ let passthru.unfree = unfree; + postInstall = '' + wrapProgram $out/bin/clementine \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + meta = with stdenv.lib; { homepage = http://www.clementine-player.org; description = "A multiplatform music player"; @@ -108,8 +115,7 @@ let rmdir $out/bin makeWrapper ${free}/bin/clementine $out/bin/clementine \ - --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine mkdir -p $out/share for dir in applications icons kde4; do From 3e53f00a1f5ca65b5740e6974bed118e993ac18c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 15:12:21 -0700 Subject: [PATCH 065/491] eccodes: 2.7.0 -> 2.7.3 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/eccodes/versions. These checks were done: - built on NixOS - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/codes_info -v’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_histogram -h’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_histogram --help’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_filter -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_ls -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_dump -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_merge -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib2ppm -h’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib2ppm --help’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_set -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_get -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_get_data -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_copy -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_compare -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_index_build help’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_index_build -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_ls -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_dump -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_set -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_get -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_copy -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_compare -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_index_build help’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_index_build -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_get -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_compare -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_copy -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_dump -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_filter -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_ls -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_dump -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_ls -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_compare -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_get -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_filter -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_copy -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_to_netcdf -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/codes_bufr_filter -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_filter -V’ and found version 2.7.3 - found 2.7.3 with grep in /nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3 - directory tree listing: https://gist.github.com/f485bc3b3d6105246360c970ac7462e1 --- pkgs/development/libraries/eccodes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 49dcb31c0478..a453a70dcad7 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.7.0"; + version = "2.7.3"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "0slfim64wdyd97nwv7ry0xwhiarphl93ij2v19c8a1c0dz7ld3qi"; + sha256 = "1nvip0cmbhzmgzyi65qw8406p460alw1842dw2r4nq1lpcyi9avg"; }; nativeBuildInputs = [ cmake ]; From 1e0d2306fc9f4d59bb5fab8781f1b17f76347820 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 16:02:42 -0700 Subject: [PATCH 066/491] armadillo: 8.400.0 -> 8.500.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/armadillo/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 8.500.0 with grep in /nix/store/4b5v6xvxsbdqgwlqnj421wa0cwhdpw4p-armadillo-8.500.0 - directory tree listing: https://gist.github.com/5849376cdd72ab243c8f004589cb24ec --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index a5ca79c0d82e..4c98bbc182c8 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "8.400.0"; + version = "8.500.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "16yxhn904ll48879vmycv84rja28im0mrcfgb03nm7bs8lpvrdjw"; + sha256 = "1wdvii5sncq3d8dh272s1n79mpcwzz437lyyfwy7gm7vbks6j77m"; }; nativeBuildInputs = [ cmake ]; From 734b13a817376f0b96f2e1e7a71034bdbcacbd7c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 18:35:54 -0500 Subject: [PATCH 067/491] gst-plugins: fix on Darwin --- pkgs/development/libraries/gstreamer/bad/default.nix | 1 + pkgs/development/libraries/gstreamer/good/default.nix | 5 +++++ pkgs/development/libraries/gstreamer/ugly/default.nix | 9 ++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 73cbaa0f8070..8ebd70921135 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; }; preConfigure = '' diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 5c10221b27d7..21376ce79c1c 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -6,6 +6,7 @@ , libsoup, libpulseaudio, libintl , darwin, lame, mpg123, twolame , gtkSupport ? false, gtk3 ? null +, ncurses }: assert gtkSupport -> gtk3 != null; @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; }; src = fetchurl { @@ -39,11 +41,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python meson ninja gettext ]; + NIX_LDFLAGS = "-lncurses"; + buildInputs = [ gst-plugins-base orc bzip2 libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca libsoup libshout lame mpg123 twolame libintl + ncurses ] ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index a5449abb9f7d..004bb0715f26 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, python , gst-plugins-base, orc, gettext , a52dec, libcdio, libdvdread -, libmad, libmpeg2, x264, libintl +, libmad, libmpeg2, x264, libintl, lib +, darwin }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-1.14.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "Gstreamer Ugly Plugins"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' @@ -18,6 +19,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; }; src = fetchurl { @@ -34,5 +36,6 @@ stdenv.mkDerivation rec { a52dec libcdio libdvdread libmad libmpeg2 x264 libintl - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; + [ IOKit CoreFoundation DiskArbitration ]); } From 24600635755cea965bf21b1b1073076d7bfd498a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 00:17:31 +0000 Subject: [PATCH 068/491] nixos: installer: cleanup a bit --- nixos/modules/installer/cd-dvd/iso-image.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 83f8a2586bd3..08923970cd38 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -73,7 +73,8 @@ let APPEND ${toString config.boot.loader.grub.memtest86.params} ''; - isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + isolinuxCfg = concatStringsSep "\n" + ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); # The EFI boot image. efiDir = pkgs.runCommand "efi-directory" {} '' From 3e0a443203acb5c70c4d4686360da4c5820ff8b4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 19:09:21 -0500 Subject: [PATCH 069/491] musl: provide 'iconv' utility occasionally expected as part of libiconv --- pkgs/os-specific/linux/musl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 4d1c2cad2e33..a3d09127c085 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -17,6 +17,13 @@ let sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71"; }; + # iconv tool, implemented by musl author: + iconv_c = fetchurl { + name = "iconv.c"; + url = "http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f"; + sha256 = "1yafz6y509zxpa1i830p5463p91g0y70q60z8q054078qrpln8hp"; + }; + in stdenv.mkDerivation rec { name = "musl-${version}"; @@ -77,6 +84,9 @@ stdenv.mkDerivation rec { moveToOutput lib/musl-gcc.specs $dev substituteInPlace $dev/bin/musl-gcc \ --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs + + # provide 'iconv' utility + $CC ${iconv_c} -o $out/bin/iconv '' + lib.optionalString useBSDCompatHeaders '' install -D ${queue_h} $dev/include/sys/queue.h install -D ${cdefs_h} $dev/include/sys/cdefs.h From de00c0d7fbdbc27fd4a7a5addf5d42d3a90e3181 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 19:31:56 -0500 Subject: [PATCH 070/491] musl/iconv: use copy from Alpine for minor touchups to error messages --- pkgs/os-specific/linux/musl/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index a3d09127c085..0912f427430b 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -17,11 +17,14 @@ let sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71"; }; - # iconv tool, implemented by musl author: + # iconv tool, implemented by musl author. + # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f + # We use copy from Alpine which fixes error messages, see: + # https://git.alpinelinux.org/cgit/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f iconv_c = fetchurl { name = "iconv.c"; - url = "http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f"; - sha256 = "1yafz6y509zxpa1i830p5463p91g0y70q60z8q054078qrpln8hp"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; + sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; }; in From b933157f44b5b432d248fec56151ba0646a00e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 20 Apr 2018 13:57:36 +0200 Subject: [PATCH 071/491] kholidays: Move from kde_applications to kde_frameworks --- pkgs/applications/kde/default.nix | 1 - pkgs/development/libraries/kde-frameworks/default.nix | 1 + .../libraries/kde-frameworks}/kholidays.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/{applications/kde => development/libraries/kde-frameworks}/kholidays.nix (81%) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 36dd1773b39e..451fdbe151f4 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -107,7 +107,6 @@ let kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; - kholidays = callPackage ./kholidays.nix {}; kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 08eebfd83aee..f54139836b1d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -129,6 +129,7 @@ let syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; kirigami2 = callPackage ./kirigami2.nix {}; + kholidays = callPackage ./kholidays.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix similarity index 81% rename from pkgs/applications/kde/kholidays.nix rename to pkgs/development/libraries/kde-frameworks/kholidays.nix index 352bec094922..2ede69e74953 100644 --- a/pkgs/applications/kde/kholidays.nix +++ b/pkgs/development/libraries/kde-frameworks/kholidays.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, extra-cmake-modules, kdoctools, qtbase, qtdeclarative, qttools, }: @@ -8,7 +8,7 @@ mkDerivation { name = "kholidays"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; + maintainers = with lib.maintainers; [ bkchr ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtbase qtdeclarative qttools ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc008b7beb6..78b8cff8215c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11153,7 +11153,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver kirigami2; + threadweaver kirigami2 kholidays; ### KDE PLASMA 5 @@ -11163,7 +11163,7 @@ with pkgs; ### KDE APPLICATIONS inherit (kdeApplications.override { libsForQt5 = self; }) - kholidays libkdcraw libkexiv2 libkipi libkomparediff2 libksane; + libkdcraw libkexiv2 libkipi libkomparediff2 libksane; ### LIBRARIES From faed18320652bd9d08d609ec663cbdb3aaec0be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 20 Apr 2018 16:24:00 +0200 Subject: [PATCH 072/491] kde_applications: 17.12.3 -> 18.04.0 --- .../kde/akonadi/akonadi-paths.patch | 121 +- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/kalarmcal.nix | 4 +- pkgs/applications/kde/konsole.nix | 4 +- pkgs/applications/kde/okular.nix | 4 +- pkgs/applications/kde/spectacle.nix | 3 +- pkgs/applications/kde/srcs.nix | 1712 +++++++++-------- 7 files changed, 929 insertions(+), 921 deletions(-) diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index 91fd934b1ecc..4743c36c44d0 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -1,8 +1,40 @@ -Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett +diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp +index 2e9f1acf4..ecc80afdc 100644 +--- a/src/akonadicontrol/agentmanager.cpp ++++ b/src/akonadicontrol/agentmanager.cpp +@@ -84,12 +84,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent) + mStorageController = new Akonadi::ProcessControl; + mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld + connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); +- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + + if (mAgentServerEnabled) { + mAgentServer = new Akonadi::ProcessControl; + connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); +- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + } + + #ifndef QT_NO_DEBUG +diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp +index be1cc4afb..6d0c1d7e5 100644 +--- a/src/akonadicontrol/agentprocessinstance.cpp ++++ b/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) + } else { + Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); + const QStringList arguments = QStringList() << executable << identifier(); +- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); ++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); + mController->start(agentLauncherExec, arguments); + } + return true; +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index a32e86602..48ea4e52e 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -10,7 +42,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett +@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings) #endif const bool defaultInternalServer = true; @@ -29,28 +61,28 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp - << QStringLiteral("/opt/local/lib/mysql5/bin") - << QStringLiteral("/opt/mysql/sbin"); - if (defaultServerPath.isEmpty()) { -- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath); - } - -- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath); +- +- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath); + const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") -@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett +@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings) #endif } -- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath); +- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath); + mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; -- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath); +- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath); + mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett +@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -59,7 +91,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -69,7 +101,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings) settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -79,20 +111,20 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer( +@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file -- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf")); +- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); + const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); - const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf")); + const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { -Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp -@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings +diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp +index 60e6272f2..ad7cefbfe 100644 +--- a/src/server/storage/dbconfigpostgresql.cpp ++++ b/src/server/storage/dbconfigpostgresql.cpp +@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -100,7 +132,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp QString defaultInitDbPath; QString defaultPgData; -@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings +@@ -70,34 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings) mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); if (mInternalServer) { @@ -130,14 +162,13 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp - } - } - postgresSearchPath.append(postgresVersionedSearchPaths); -- -- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath); -- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath); +- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath); + defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } -@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings +@@ -117,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -149,7 +180,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); if (mInternalServer && mInitDbPath.isEmpty()) { -@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings +@@ -141,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings) settings.setValue(QStringLiteral("Port"), mHostPort); } settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -157,35 +188,3 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); -Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp -+++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A - } else { - Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); - const QStringList arguments = QStringList() << executable << identifier(); -- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher")); -+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); - mController->start(agentLauncherExec, arguments); - } - return true; -Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp -+++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp -@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose, - mStorageController = new Akonadi::ProcessControl; - mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld - connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); -- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - - if (mAgentServerEnabled) { - mAgentServer = new Akonadi::ProcessControl; - connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); -- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - } - - #ifndef QT_NO_DEBUG diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 9ad488f63ab4..a2feeac7cd9f 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.04.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix index f2fb6f4d8bbd..46832477cc60 100644 --- a/pkgs/applications/kde/kalarmcal.nix +++ b/pkgs/applications/kde/kalarmcal.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement, - kpimtextedit, + kpimtextedit, kcalutils }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit + akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 5269941fa113..2847e312d00a 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -4,7 +4,7 @@ kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, - kwindowsystem, kxmlgui, qtscript + kwindowsystem, kxmlgui, qtscript, knewstuff }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty - kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript + kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 5f6f28c95b08..39fb232b3421 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -5,7 +5,7 @@ kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5, - qtdeclarative, qtsvg, threadweaver + qtdeclarative, qtsvg, threadweaver, kcrash }: mkDerivation { @@ -16,7 +16,7 @@ mkDerivation { kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 - qtdeclarative qtsvg threadweaver + qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; meta = with lib; { homepage = http://www.kde.org; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 6deec6aaabb4..f036e8cf632c 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,7 +4,7 @@ ki18n, xcb-util-cursor, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras + qtx11extras, knewstuff }: mkDerivation { @@ -14,6 +14,7 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor + knewstuff ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index d61784805e45..36c18a3f9979 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1691 +3,1699 @@ { akonadi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz"; - sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi"; - name = "akonadi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-18.04.0.tar.xz"; + sha256 = "1scbc6k2w23qmw4qa147ji7r6p88b97yi9wr46xlshgcn2kj684d"; + name = "akonadi-18.04.0.tar.xz"; }; }; akonadi-calendar = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz"; - sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a"; - name = "akonadi-calendar-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-18.04.0.tar.xz"; + sha256 = "09fk8n69f83ygwfsdjx4mv9hwqpifpv9nbdnl19pjgw2ffp99rna"; + name = "akonadi-calendar-18.04.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz"; - sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9"; - name = "akonadi-calendar-tools-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz"; + sha256 = "1b10kybjj803qwsz74dhism6q7q0lmslqvsb8b9ma8wqk9ajs33f"; + name = "akonadi-calendar-tools-18.04.0.tar.xz"; }; }; akonadiconsole = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz"; - sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b"; - name = "akonadiconsole-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadiconsole-18.04.0.tar.xz"; + sha256 = "053w5ywm8wlv7ssbvyq0z36jsir9mk0ywlqb0ybnlbvr5dawxnnz"; + name = "akonadiconsole-18.04.0.tar.xz"; }; }; akonadi-contacts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz"; - sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v"; - name = "akonadi-contacts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-contacts-18.04.0.tar.xz"; + sha256 = "01cfxia8vnwizzavk1vbrxbszsyg1sa3qbz79fab7iw8380zqdm2"; + name = "akonadi-contacts-18.04.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz"; - sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4"; - name = "akonadi-import-wizard-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-import-wizard-18.04.0.tar.xz"; + sha256 = "123gaxs5zi5b8x1ripr8ldjipx6rpmr3f51mgv40ibx1h967in19"; + name = "akonadi-import-wizard-18.04.0.tar.xz"; }; }; akonadi-mime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz"; - sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2"; - name = "akonadi-mime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-mime-18.04.0.tar.xz"; + sha256 = "14xgi5saylbp19gg0lnqpasz5x335wz6dnmpfsicz0j5452yfznw"; + name = "akonadi-mime-18.04.0.tar.xz"; }; }; akonadi-notes = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz"; - sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g"; - name = "akonadi-notes-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-notes-18.04.0.tar.xz"; + sha256 = "0ahr185jjyh68qf57vaja6c867rm0iy8jp78g4nmzf3dc6y7r01v"; + name = "akonadi-notes-18.04.0.tar.xz"; }; }; akonadi-search = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz"; - sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x"; - name = "akonadi-search-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-search-18.04.0.tar.xz"; + sha256 = "1jn23rr9yah2c4cccbkcvxn4rr6p0q4327b0kwjqzag4lkwd2fy0"; + name = "akonadi-search-18.04.0.tar.xz"; }; }; akregator = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz"; - sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp"; - name = "akregator-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akregator-18.04.0.tar.xz"; + sha256 = "10hid155gszwh7gxp4pqbcfch6hrf0bsikj8ah2fvdgii96dn9gc"; + name = "akregator-18.04.0.tar.xz"; }; }; analitza = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz"; - sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw"; - name = "analitza-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/analitza-18.04.0.tar.xz"; + sha256 = "1yx18mbxvkswpn120rhi092l5wz6s60194q076wdgimx71ngn2v2"; + name = "analitza-18.04.0.tar.xz"; }; }; ark = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz"; - sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi"; - name = "ark-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ark-18.04.0.tar.xz"; + sha256 = "19bh71j5dvz80mz9xff4ygd0qdvjwsihyx5cb5ay6a2gdf1fhm12"; + name = "ark-18.04.0.tar.xz"; }; }; artikulate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz"; - sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx"; - name = "artikulate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/artikulate-18.04.0.tar.xz"; + sha256 = "1fqv71przn3yfv4dk511bh5bd0cdmwkixwcg17r037nmj3z0xdhg"; + name = "artikulate-18.04.0.tar.xz"; }; }; audiocd-kio = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz"; - sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26"; - name = "audiocd-kio-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/audiocd-kio-18.04.0.tar.xz"; + sha256 = "0rf8gk8wymk6lff5g4ivx5lfl31rml1ag40fq78nrvnw0sxkm2b1"; + name = "audiocd-kio-18.04.0.tar.xz"; }; }; baloo-widgets = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz"; - sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h"; - name = "baloo-widgets-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/baloo-widgets-18.04.0.tar.xz"; + sha256 = "1y1wxgwyjdarw6sj7mrsqgljh2fib0vcwwd0nzbnn8ys1v8gqyxj"; + name = "baloo-widgets-18.04.0.tar.xz"; }; }; blinken = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz"; - sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0"; - name = "blinken-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/blinken-18.04.0.tar.xz"; + sha256 = "19chf9d9d537a5daqca1i4a58gmxz98x4i5palqs3635w1655ln9"; + name = "blinken-18.04.0.tar.xz"; }; }; bomber = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz"; - sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s"; - name = "bomber-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/bomber-18.04.0.tar.xz"; + sha256 = "1vzqmjkxlw2v63f49ix63p6ypjgg31j8r0rzmq8m41262m3pp0sn"; + name = "bomber-18.04.0.tar.xz"; }; }; bovo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz"; - sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9"; - name = "bovo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/bovo-18.04.0.tar.xz"; + sha256 = "1p4s7kjrjndcqkrkk3y7dqvyfdrn1yy5id3z3wj06ciwpygvv500"; + name = "bovo-18.04.0.tar.xz"; }; }; calendarsupport = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz"; - sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84"; - name = "calendarsupport-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/calendarsupport-18.04.0.tar.xz"; + sha256 = "0hd1pbqjd75d8fm86b358xd8dni019b2190ly2r3armanjcmdc4r"; + name = "calendarsupport-18.04.0.tar.xz"; }; }; cantor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz"; - sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w"; - name = "cantor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/cantor-18.04.0.tar.xz"; + sha256 = "1zkpa0ihkylzdf5wlywdvnf34dk21nj5cyczjyh9x5psbr6q0151"; + name = "cantor-18.04.0.tar.xz"; }; }; cervisia = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz"; - sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr"; - name = "cervisia-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/cervisia-18.04.0.tar.xz"; + sha256 = "1ji8i0k6rzmgshpgpk613vkn6kvdwb0ns32cp19j0bd5ljr701wq"; + name = "cervisia-18.04.0.tar.xz"; }; }; dolphin = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz"; - sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20"; - name = "dolphin-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz"; + sha256 = "0lvdpa3mq6mhfl97a4q1wwg22zccwjf7ja1mbz1dlbjfnck8l1mm"; + name = "dolphin-18.04.0.tar.xz"; }; }; dolphin-plugins = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz"; - sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf"; - name = "dolphin-plugins-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dolphin-plugins-18.04.0.tar.xz"; + sha256 = "10kdf2h8i1jnbsnx9j4c8zs6ryakinhxrggrid038xqgxm4fyxcq"; + name = "dolphin-plugins-18.04.0.tar.xz"; }; }; dragon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz"; - sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4"; - name = "dragon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dragon-18.04.0.tar.xz"; + sha256 = "0maxlhac9znqsm7qf3c9g7vlramivy63wd8c9aj64c78jqj6l54w"; + name = "dragon-18.04.0.tar.xz"; }; }; eventviews = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz"; - sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc"; - name = "eventviews-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/eventviews-18.04.0.tar.xz"; + sha256 = "0ai0259ygriza057dn3l6kfapqc2zdp7prv7qrz0x2akssnvn5f3"; + name = "eventviews-18.04.0.tar.xz"; }; }; ffmpegthumbs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz"; - sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5"; - name = "ffmpegthumbs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ffmpegthumbs-18.04.0.tar.xz"; + sha256 = "08hirsm7gbk51i76kkavv50z3289zvphmkfh26lh6rg123f003i6"; + name = "ffmpegthumbs-18.04.0.tar.xz"; }; }; filelight = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz"; - sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf"; - name = "filelight-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/filelight-18.04.0.tar.xz"; + sha256 = "1mk46a9x40yj7vfjgprhdhmx151lhkv8zb1i4rks01zjpq8bpa43"; + name = "filelight-18.04.0.tar.xz"; }; }; granatier = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz"; - sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x"; - name = "granatier-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/granatier-18.04.0.tar.xz"; + sha256 = "1vfp4wqv13qxj5vaiqd6hn07hvmdkyrcdicxn693yprn32gqrn33"; + name = "granatier-18.04.0.tar.xz"; }; }; grantlee-editor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz"; - sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4"; - name = "grantlee-editor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/grantlee-editor-18.04.0.tar.xz"; + sha256 = "04mw1mskfaqp7klwc0bdwfm3j365pwkwi0yhp86dggxzyisqbx9h"; + name = "grantlee-editor-18.04.0.tar.xz"; }; }; grantleetheme = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz"; - sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx"; - name = "grantleetheme-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/grantleetheme-18.04.0.tar.xz"; + sha256 = "1i3axg318skx2ifg8fln5blpyj6qnzb0r7frqb9prm0rawk6cr03"; + name = "grantleetheme-18.04.0.tar.xz"; }; }; gwenview = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz"; - sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr"; - name = "gwenview-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/gwenview-18.04.0.tar.xz"; + sha256 = "0i87k3f1g9w36rzr60c2xw6r41k7zgnbda51mpd3i8q5mvi8r4z5"; + name = "gwenview-18.04.0.tar.xz"; }; }; incidenceeditor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz"; - sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka"; - name = "incidenceeditor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/incidenceeditor-18.04.0.tar.xz"; + sha256 = "1z76lz8h0f6h81xvk690h1pz6i1ca4k2kcdvxxj99xm3fxdw5gi4"; + name = "incidenceeditor-18.04.0.tar.xz"; }; }; juk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz"; - sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6"; - name = "juk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/juk-18.04.0.tar.xz"; + sha256 = "0k0kiksqmnp14y3ymfiwg0amv4wyk2ls4cbdimbwg0mvpyvfnnqa"; + name = "juk-18.04.0.tar.xz"; }; }; k3b = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz"; - sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l"; - name = "k3b-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz"; + sha256 = "167x2mcxj4zq05brxzvhm157sis13xahkv79i9pzbgjb1zx17s3l"; + name = "k3b-18.04.0.tar.xz"; }; }; kaccounts-integration = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz"; - sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9"; - name = "kaccounts-integration-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaccounts-integration-18.04.0.tar.xz"; + sha256 = "09l1ycy4000mxx86hkqigbg803190r159d2yjsfrs7q5i2jrsl09"; + name = "kaccounts-integration-18.04.0.tar.xz"; }; }; kaccounts-providers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz"; - sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5"; - name = "kaccounts-providers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaccounts-providers-18.04.0.tar.xz"; + sha256 = "07ra8pjd89qklvb771wcczbxwll86caz07v43a7fhs3f70nwizia"; + name = "kaccounts-providers-18.04.0.tar.xz"; }; }; kaddressbook = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz"; - sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq"; - name = "kaddressbook-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaddressbook-18.04.0.tar.xz"; + sha256 = "0fi5nxhp93i1j4dym2yjsnvbxkqvqlanka3cnzbya4abdzrjd9ir"; + name = "kaddressbook-18.04.0.tar.xz"; }; }; kajongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz"; - sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa"; - name = "kajongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kajongg-18.04.0.tar.xz"; + sha256 = "0cbgy6zkjd5yd6ybm9v7gvp2hs99m7m8w2my36fqp1sczghjs7x5"; + name = "kajongg-18.04.0.tar.xz"; }; }; kalarm = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz"; - sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7"; - name = "kalarm-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalarm-18.04.0.tar.xz"; + sha256 = "0v4zfv48n116j68cfd34vlgk9jyr1zfc8i36i7gjkaq2x9m80g02"; + name = "kalarm-18.04.0.tar.xz"; }; }; kalarmcal = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz"; - sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km"; - name = "kalarmcal-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalarmcal-18.04.0.tar.xz"; + sha256 = "0npvwjzrxyf447xyq4kbx5wh94fv7clfjvikwnla9l0s8xwv9gf7"; + name = "kalarmcal-18.04.0.tar.xz"; }; }; kalgebra = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz"; - sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7"; - name = "kalgebra-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalgebra-18.04.0.tar.xz"; + sha256 = "0qk9dchqlklbxssmhfz38s792nidlfh1bkhrmxh5kvpkjziqg7k6"; + name = "kalgebra-18.04.0.tar.xz"; }; }; kalzium = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz"; - sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h"; - name = "kalzium-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalzium-18.04.0.tar.xz"; + sha256 = "02c51r4pqj9iyy2wzrilpzd5z8b1lvbv2mian2qr1psi56l3magv"; + name = "kalzium-18.04.0.tar.xz"; }; }; kamera = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz"; - sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9"; - name = "kamera-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kamera-18.04.0.tar.xz"; + sha256 = "07p51jjp0lj04gfs1mfbg6k6cdh6ms55yjcag7qhcz32ism0y1vc"; + name = "kamera-18.04.0.tar.xz"; + }; + }; + kamoso = { + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/kamoso-18.04.0.tar.xz"; + sha256 = "1d7989jr3g02yh10hmnf8mlqypp35xll52v5q6jjqrzbfcmna7dk"; + name = "kamoso-18.04.0.tar.xz"; }; }; kanagram = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz"; - sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k"; - name = "kanagram-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kanagram-18.04.0.tar.xz"; + sha256 = "1drz8641ns1c1070a98w2wasyvf5nc6jrpn1pzfqmv9bljxrmyrc"; + name = "kanagram-18.04.0.tar.xz"; }; }; kapman = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz"; - sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z"; - name = "kapman-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kapman-18.04.0.tar.xz"; + sha256 = "0cpsm35sah99rxy42v5isd90w0j839537jmjck4lg40dx38sdz7m"; + name = "kapman-18.04.0.tar.xz"; }; }; kapptemplate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz"; - sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3"; - name = "kapptemplate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kapptemplate-18.04.0.tar.xz"; + sha256 = "1w61s7bj34vq3s9ca3d6kyv9k43qirnyj4mw73wfpxf6ldx19yzp"; + name = "kapptemplate-18.04.0.tar.xz"; }; }; kate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz"; - sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5"; - name = "kate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kate-18.04.0.tar.xz"; + sha256 = "04kb8ynkq6xwmjbrgfg4zv652p3zgr2127f6sb8sq0j9qy55pvq5"; + name = "kate-18.04.0.tar.xz"; }; }; katomic = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz"; - sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl"; - name = "katomic-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/katomic-18.04.0.tar.xz"; + sha256 = "119v88k2l1bpmf1gm9njkfv90pv595wwjlzkap06c6rx95scpi0q"; + name = "katomic-18.04.0.tar.xz"; + }; + }; + kbackup = { + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/kbackup-18.04.0.tar.xz"; + sha256 = "0vayj48zgblsphwffs6b0xphzair6sywy0ksp6ab9x64n8f1mw5q"; + name = "kbackup-18.04.0.tar.xz"; }; }; kblackbox = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz"; - sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm"; - name = "kblackbox-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblackbox-18.04.0.tar.xz"; + sha256 = "1gpjnic6n4kyh7b6x0mb9162qv223fs6lm7iqh6qxwkixcp06qlx"; + name = "kblackbox-18.04.0.tar.xz"; }; }; kblocks = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz"; - sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2"; - name = "kblocks-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblocks-18.04.0.tar.xz"; + sha256 = "1y2h1nwgr67b05ggl2v34jh097mzbljhz9ji332xv4vf2rffwqar"; + name = "kblocks-18.04.0.tar.xz"; }; }; kblog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz"; - sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb"; - name = "kblog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblog-18.04.0.tar.xz"; + sha256 = "1jnsd6fw3pyip71a2cw65y9yrm4zwczh0770n15jcg5yn5whswgs"; + name = "kblog-18.04.0.tar.xz"; }; }; kbounce = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz"; - sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw"; - name = "kbounce-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbounce-18.04.0.tar.xz"; + sha256 = "15926m75gysd6gl2vg7d08y4m0cnfazc9jlyx0cnb8a5nfzh5z21"; + name = "kbounce-18.04.0.tar.xz"; }; }; kbreakout = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz"; - sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c"; - name = "kbreakout-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbreakout-18.04.0.tar.xz"; + sha256 = "0i5pbiimrn2bkq94ggwlx7jhfw4wna5srgffa5531jpn28gq456n"; + name = "kbreakout-18.04.0.tar.xz"; }; }; kbruch = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz"; - sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r"; - name = "kbruch-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbruch-18.04.0.tar.xz"; + sha256 = "0s7r0hqy4nyrg0ndrb93pd8akldc5k8xx31m4jc8gi23aqvz5wwk"; + name = "kbruch-18.04.0.tar.xz"; }; }; kcachegrind = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz"; - sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd"; - name = "kcachegrind-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcachegrind-18.04.0.tar.xz"; + sha256 = "0f6f8wx0kffhhzjjcdn47m3428jbh95nzajm8vhbs789h69ax2a0"; + name = "kcachegrind-18.04.0.tar.xz"; }; }; kcalc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz"; - sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j"; - name = "kcalc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalc-18.04.0.tar.xz"; + sha256 = "03q09q5whg1wfgm30p426hlljignjs0lvwfak2n4ka9ggyk3vc9d"; + name = "kcalc-18.04.0.tar.xz"; }; }; kcalcore = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz"; - sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z"; - name = "kcalcore-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalcore-18.04.0.tar.xz"; + sha256 = "0g4gm47yniy4f11v6rhs3gp2lk8dcrnw8ajchz88s7spii0riv2m"; + name = "kcalcore-18.04.0.tar.xz"; }; }; kcalutils = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz"; - sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb"; - name = "kcalutils-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalutils-18.04.0.tar.xz"; + sha256 = "1hh3gd81bfkbyr7qvppk8iaywac77y55rwkpvbvin62snipw6ap1"; + name = "kcalutils-18.04.0.tar.xz"; }; }; kcharselect = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz"; - sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4"; - name = "kcharselect-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcharselect-18.04.0.tar.xz"; + sha256 = "08qgwfz23634wv0fw0rx162rcav5fivsp63srdf4c6my5151nxa9"; + name = "kcharselect-18.04.0.tar.xz"; }; }; kcolorchooser = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz"; - sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl"; - name = "kcolorchooser-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcolorchooser-18.04.0.tar.xz"; + sha256 = "02lqg4ra2nrkfnlhirs148bsd3b5a1j81s9z84wg11z8havrabfn"; + name = "kcolorchooser-18.04.0.tar.xz"; }; }; kcontacts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz"; - sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl"; - name = "kcontacts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcontacts-18.04.0.tar.xz"; + sha256 = "0ja9xbpvv6klwwg0rzppxhfj2nfb7dydadxw5f9471rzniywn1xb"; + name = "kcontacts-18.04.0.tar.xz"; }; }; kcron = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz"; - sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf"; - name = "kcron-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcron-18.04.0.tar.xz"; + sha256 = "0pm532pajm7kbzg7w7azi5qx5xnkc9k5crxbahpw8n32lq34lm18"; + name = "kcron-18.04.0.tar.xz"; }; }; kdav = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz"; - sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4"; - name = "kdav-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdav-18.04.0.tar.xz"; + sha256 = "159bll2b3anxj5i7i92cqsz7hqm66n5ihlzk1g7waqdc9b429hr2"; + name = "kdav-18.04.0.tar.xz"; }; }; kdebugsettings = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz"; - sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr"; - name = "kdebugsettings-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdebugsettings-18.04.0.tar.xz"; + sha256 = "0fr5a0k9jv8zkzv7fl7r71c2gbd1jj3c0vwpyf5riskymznnrx9g"; + name = "kdebugsettings-18.04.0.tar.xz"; }; }; kde-dev-scripts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz"; - sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554"; - name = "kde-dev-scripts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kde-dev-scripts-18.04.0.tar.xz"; + sha256 = "0nnrzpqgzmfg3msx6vqc8js7yzdpscm9599pr4xs4jl4cx5m8vp8"; + name = "kde-dev-scripts-18.04.0.tar.xz"; }; }; kde-dev-utils = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz"; - sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6"; - name = "kde-dev-utils-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kde-dev-utils-18.04.0.tar.xz"; + sha256 = "020dyzf078l91rs7sl1dkdbd08viizinsmbvf1f0kfbkfysccfci"; + name = "kde-dev-utils-18.04.0.tar.xz"; }; }; kdeedu-data = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz"; - sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr"; - name = "kdeedu-data-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdeedu-data-18.04.0.tar.xz"; + sha256 = "0rx9ymyv6x29fwl6hvznvylq6gvw992rg3l8mk4qmmzjs4rbjb5q"; + name = "kdeedu-data-18.04.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz"; - sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j"; - name = "kdegraphics-mobipocket-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-mobipocket-18.04.0.tar.xz"; + sha256 = "01g00k3yqsrahslshybd1azd9w0vgmacfs0yrz5ia93amw4azfhn"; + name = "kdegraphics-mobipocket-18.04.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz"; - sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4"; - name = "kdegraphics-thumbnailers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-thumbnailers-18.04.0.tar.xz"; + sha256 = "1j04bwp9hc9jc7si6jgg4y61jqic27zj094nv2xpwrxnnaz4y4nh"; + name = "kdegraphics-thumbnailers-18.04.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz"; - sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh"; - name = "kdenetwork-filesharing-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdenetwork-filesharing-18.04.0.tar.xz"; + sha256 = "1qfd7jr171bc4alm139hhdiv9q0x8y7mhrkyb7qspr7a8ki8j5cg"; + name = "kdenetwork-filesharing-18.04.0.tar.xz"; }; }; kdenlive = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz"; - sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp"; - name = "kdenlive-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdenlive-18.04.0.tar.xz"; + sha256 = "0v54cisilijdq0hyl38fhz0m7lpvphqjvx046ighcqxbrcg6pgah"; + name = "kdenlive-18.04.0.tar.xz"; }; }; kdepim-addons = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz"; - sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h"; - name = "kdepim-addons-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-addons-18.04.0.tar.xz"; + sha256 = "0rcfx07cvpm22kskwry78wzhglpc0vzxavmjydi24lll9ac12mvc"; + name = "kdepim-addons-18.04.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz"; - sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24"; - name = "kdepim-apps-libs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-apps-libs-18.04.0.tar.xz"; + sha256 = "1ax5y6cdw7klgxky121mk8ilpm257bc8h90pc89ziha888l39wgz"; + name = "kdepim-apps-libs-18.04.0.tar.xz"; }; }; kdepim-runtime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz"; - sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn"; - name = "kdepim-runtime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-runtime-18.04.0.tar.xz"; + sha256 = "1pxbrr3rcm3yr7il5abz9r06xvd0j1hsphbskjyphylb3r0xv7mz"; + name = "kdepim-runtime-18.04.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz"; - sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa"; - name = "kdesdk-kioslaves-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdesdk-kioslaves-18.04.0.tar.xz"; + sha256 = "18w55iism0b26m6v1j6qlpa4y8zdc12bbc8hi8rwz6nyra2a4r6h"; + name = "kdesdk-kioslaves-18.04.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz"; - sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci"; - name = "kdesdk-thumbnailers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdesdk-thumbnailers-18.04.0.tar.xz"; + sha256 = "1gsfn3km6dggnwav17vrbv077dj6xsxixjqrypqf8v5n29vzl72g"; + name = "kdesdk-thumbnailers-18.04.0.tar.xz"; }; }; kdf = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz"; - sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp"; - name = "kdf-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdf-18.04.0.tar.xz"; + sha256 = "1dxm9q25a9vjja3cx7zd9afx08i84l498sykbnvflf56qq6p9jdv"; + name = "kdf-18.04.0.tar.xz"; }; }; kdialog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz"; - sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4"; - name = "kdialog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdialog-18.04.0.tar.xz"; + sha256 = "0ni5imk1a153j4n923im3rs3g691cwlw3g180wcarrg7iads6icn"; + name = "kdialog-18.04.0.tar.xz"; }; }; kdiamond = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz"; - sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc"; - name = "kdiamond-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdiamond-18.04.0.tar.xz"; + sha256 = "0gzxpk3llgh45w3iwbqsshv4mc4whshv7zwaz8ik4wpp9kc72xj9"; + name = "kdiamond-18.04.0.tar.xz"; }; }; keditbookmarks = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz"; - sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya"; - name = "keditbookmarks-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/keditbookmarks-18.04.0.tar.xz"; + sha256 = "18x6cgligwqqj20q69ins33fvkz3is8a11nkp4zx3kb9q50xsdv7"; + name = "keditbookmarks-18.04.0.tar.xz"; }; }; kfind = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz"; - sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s"; - name = "kfind-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfind-18.04.0.tar.xz"; + sha256 = "11wgdyparz26gqxlbnawwmhjr2lkqa1j0qqwmiihs0pxfq6q9arw"; + name = "kfind-18.04.0.tar.xz"; }; }; kfloppy = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz"; - sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p"; - name = "kfloppy-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfloppy-18.04.0.tar.xz"; + sha256 = "039lryi6nk69d054svm0yq5x4yd8pja6f8fx0q2wqpnffrsis5yj"; + name = "kfloppy-18.04.0.tar.xz"; }; }; kfourinline = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz"; - sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw"; - name = "kfourinline-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfourinline-18.04.0.tar.xz"; + sha256 = "101h7y2vmg966h92k6360qc3rrgcwvnhg2lz09yffgwf8mqyp19q"; + name = "kfourinline-18.04.0.tar.xz"; }; }; kgeography = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz"; - sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih"; - name = "kgeography-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgeography-18.04.0.tar.xz"; + sha256 = "1syky2a8crh5vrn3419a1rzv37ld0kh9llkmcszm9h8jaqdsiw5v"; + name = "kgeography-18.04.0.tar.xz"; }; }; kget = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz"; - sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww"; - name = "kget-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kget-18.04.0.tar.xz"; + sha256 = "16dj0w8rkiybhdcgp9cf4r50nh790psx4b9xxqgfnab3b8lq35mx"; + name = "kget-18.04.0.tar.xz"; }; }; kgoldrunner = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz"; - sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx"; - name = "kgoldrunner-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgoldrunner-18.04.0.tar.xz"; + sha256 = "0ydhz0pm0adwjrbsiqkq6d1cs6l8nw2cj4mxf36144gs333nly1z"; + name = "kgoldrunner-18.04.0.tar.xz"; }; }; kgpg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz"; - sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp"; - name = "kgpg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgpg-18.04.0.tar.xz"; + sha256 = "1ayyzc7vwdrhp2pc41yh01lkc9n0q4icy05z6yg14si0c7a62s78"; + name = "kgpg-18.04.0.tar.xz"; }; }; khangman = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz"; - sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk"; - name = "khangman-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/khangman-18.04.0.tar.xz"; + sha256 = "01xmvljp3z4x4aihbz4b22avh10hhnvv8y8jy0nd3pggln4mj15c"; + name = "khangman-18.04.0.tar.xz"; }; }; khelpcenter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz"; - sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n"; - name = "khelpcenter-17.12.3.tar.xz"; - }; - }; - kholidays = { - version = "17.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz"; - sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di"; - name = "kholidays-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/khelpcenter-18.04.0.tar.xz"; + sha256 = "1pc6dd4rn4c636sn8lbkdq2svijrpp4fcgf76infk7dsqrxrgnsr"; + name = "khelpcenter-18.04.0.tar.xz"; }; }; kidentitymanagement = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz"; - sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y"; - name = "kidentitymanagement-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kidentitymanagement-18.04.0.tar.xz"; + sha256 = "129a38ajkpzgm2z921riyawlnx70c41ln3z7hvx159x3ghcsacyw"; + name = "kidentitymanagement-18.04.0.tar.xz"; }; }; kig = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz"; - sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid"; - name = "kig-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kig-18.04.0.tar.xz"; + sha256 = "1djy20lcs50ykb99akhfw873br9q0x72r3pma6mv69dpv5jpk3v3"; + name = "kig-18.04.0.tar.xz"; }; }; kigo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz"; - sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh"; - name = "kigo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kigo-18.04.0.tar.xz"; + sha256 = "0jqkab57z0xhbxf2hcagg5b0pgn2z4dnzirp6ccfybl835nwr4rp"; + name = "kigo-18.04.0.tar.xz"; }; }; killbots = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz"; - sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an"; - name = "killbots-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/killbots-18.04.0.tar.xz"; + sha256 = "10j82a9yv5v21pp9249nzm42ys104ickwavqys5j43230h0qlyl2"; + name = "killbots-18.04.0.tar.xz"; }; }; kimagemapeditor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz"; - sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn"; - name = "kimagemapeditor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kimagemapeditor-18.04.0.tar.xz"; + sha256 = "01cy4nfi9gzgyfqb16vsy3b15bgag0g3dz2l9v0d4fijxpf157br"; + name = "kimagemapeditor-18.04.0.tar.xz"; }; }; kimap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz"; - sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw"; - name = "kimap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kimap-18.04.0.tar.xz"; + sha256 = "1l22fzslf0zrr230hq17rfg88ifngfwcc1n0v3fzpxnia4cm68by"; + name = "kimap-18.04.0.tar.xz"; }; }; kio-extras = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz"; - sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks"; - name = "kio-extras-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kio-extras-18.04.0.tar.xz"; + sha256 = "15icgvanjhvxi2k9hihadvxnx2jpjp2r3gy89brvdsh8lhj9kzil"; + name = "kio-extras-18.04.0.tar.xz"; }; }; kiriki = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz"; - sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q"; - name = "kiriki-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kiriki-18.04.0.tar.xz"; + sha256 = "0m98fqnrk1vinkammf5fjkbvj5wwk45v8m4m951nvn0wpzrb0clf"; + name = "kiriki-18.04.0.tar.xz"; }; }; kiten = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz"; - sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5"; - name = "kiten-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kiten-18.04.0.tar.xz"; + sha256 = "1xk58q89hdpy4fhk8ic2ybf60d0xgwfm6ay1gny4qb6klr5xx7ah"; + name = "kiten-18.04.0.tar.xz"; }; }; kjumpingcube = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz"; - sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l"; - name = "kjumpingcube-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kjumpingcube-18.04.0.tar.xz"; + sha256 = "1j9v6j3yams0azdc27g76x3baz6wcw173lam5r8z0q5f6xayv9zl"; + name = "kjumpingcube-18.04.0.tar.xz"; }; }; kldap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz"; - sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy"; - name = "kldap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kldap-18.04.0.tar.xz"; + sha256 = "1fjh6insnmnl4yk5n11bsp9xrhyzkb7cf3vsbx6yjn13gwg06xm9"; + name = "kldap-18.04.0.tar.xz"; }; }; kleopatra = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz"; - sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd"; - name = "kleopatra-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kleopatra-18.04.0.tar.xz"; + sha256 = "1lqqhy0pyv8v9x20if6sjklbmfnjmip4nfm0adp5wh7r3n9c0908"; + name = "kleopatra-18.04.0.tar.xz"; }; }; klettres = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz"; - sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0"; - name = "klettres-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klettres-18.04.0.tar.xz"; + sha256 = "0x2vj449dgzlyhyagdcs5f12rd3w025iq5q8qcsml7mnr5vy06n3"; + name = "klettres-18.04.0.tar.xz"; }; }; klickety = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz"; - sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8"; - name = "klickety-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klickety-18.04.0.tar.xz"; + sha256 = "1l81xk00bkbxm9fmqjyphf8wijgxp979kfsflvy7zyzga43k64fc"; + name = "klickety-18.04.0.tar.xz"; }; }; klines = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz"; - sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0"; - name = "klines-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klines-18.04.0.tar.xz"; + sha256 = "1axp8mv1hxdddw86wsd6dkv7cbzk5b3lswqvwxdbbrpsq8j8vjz1"; + name = "klines-18.04.0.tar.xz"; }; }; kmag = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz"; - sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w"; - name = "kmag-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmag-18.04.0.tar.xz"; + sha256 = "1yaryycwy5h3pafzsvn4xr96p96j3a3302x6y73i9xm94nz7a60f"; + name = "kmag-18.04.0.tar.xz"; }; }; kmahjongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz"; - sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a"; - name = "kmahjongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmahjongg-18.04.0.tar.xz"; + sha256 = "191cl5cnq6q8b3fr22frfwrg0a2bqf9c2x454ab0ysc2qapblfkx"; + name = "kmahjongg-18.04.0.tar.xz"; }; }; kmail = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz"; - sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs"; - name = "kmail-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmail-18.04.0.tar.xz"; + sha256 = "1faw94imrr30bg155zs4hszfbv9fszywyk1v24d0l03vyh4w0x8r"; + name = "kmail-18.04.0.tar.xz"; }; }; kmail-account-wizard = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz"; - sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx"; - name = "kmail-account-wizard-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmail-account-wizard-18.04.0.tar.xz"; + sha256 = "0sgasycw0ixh6c04kibyii6f5aygkhwanidnmidhgdnqhgcg31gp"; + name = "kmail-account-wizard-18.04.0.tar.xz"; }; }; kmailtransport = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz"; - sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0"; - name = "kmailtransport-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmailtransport-18.04.0.tar.xz"; + sha256 = "122zcgz9vlqzmr2xy4msrzg9ajvyjlwcf7g4br7bja42f5nk704f"; + name = "kmailtransport-18.04.0.tar.xz"; }; }; kmbox = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz"; - sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm"; - name = "kmbox-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmbox-18.04.0.tar.xz"; + sha256 = "0qljbixj2jka8sngavi41jjcssy293acy1d6syjyagad7z5f0d0k"; + name = "kmbox-18.04.0.tar.xz"; }; }; kmime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz"; - sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm"; - name = "kmime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmime-18.04.0.tar.xz"; + sha256 = "03hwvwdkb1176d837hbwm8wqj0bl29fdfzirgrp1yri4vadmhrqx"; + name = "kmime-18.04.0.tar.xz"; }; }; kmines = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz"; - sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9"; - name = "kmines-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmines-18.04.0.tar.xz"; + sha256 = "0jyrynqqzk5dwwfd05kdzx5lc6cjkbhhp5l8ijyfwdqs63wzj705"; + name = "kmines-18.04.0.tar.xz"; }; }; kmix = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz"; - sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp"; - name = "kmix-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmix-18.04.0.tar.xz"; + sha256 = "0xq5jd5nrjb95lhc38n0b6kmmdbr2hrnpq8kvdywv6xazhb0h9mg"; + name = "kmix-18.04.0.tar.xz"; }; }; kmousetool = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz"; - sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z"; - name = "kmousetool-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmousetool-18.04.0.tar.xz"; + sha256 = "1n36myw2j43mnlawkymyv73l4xkpc5ynqalqka2jigdzqin87gr7"; + name = "kmousetool-18.04.0.tar.xz"; }; }; kmouth = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz"; - sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n"; - name = "kmouth-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmouth-18.04.0.tar.xz"; + sha256 = "03m4ia8s2qg6pnih6i8df3y2dxc8qcxwcnn7kyjd1ygw8i3gjkyk"; + name = "kmouth-18.04.0.tar.xz"; }; }; kmplot = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz"; - sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9"; - name = "kmplot-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmplot-18.04.0.tar.xz"; + sha256 = "1bl0sw58p4qnbka1kss2w3p0w7r91c29hg3h3ljxlarj8yg7z95v"; + name = "kmplot-18.04.0.tar.xz"; }; }; knavalbattle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz"; - sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f"; - name = "knavalbattle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knavalbattle-18.04.0.tar.xz"; + sha256 = "0hw5syv8csnx1myjdfsd96bxvqcg2c21fpcgmb9dc8gj4nzqqabv"; + name = "knavalbattle-18.04.0.tar.xz"; }; }; knetwalk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz"; - sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k"; - name = "knetwalk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knetwalk-18.04.0.tar.xz"; + sha256 = "0r3a9pa9nwhfg5xbp062dsaq8n20mrykfbcp52m9wlln8rwjiz1x"; + name = "knetwalk-18.04.0.tar.xz"; }; }; knotes = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz"; - sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3"; - name = "knotes-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knotes-18.04.0.tar.xz"; + sha256 = "1gkz3vrsj9irzyhc1djvmkbikiqxn7bgv913ynax8akbbmlh9xlh"; + name = "knotes-18.04.0.tar.xz"; }; }; kolf = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz"; - sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj"; - name = "kolf-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kolf-18.04.0.tar.xz"; + sha256 = "0cjvm5xg09wnx5n5hz9w3ckxfyhnwxn423f4hm5c8qwij4gnsfsn"; + name = "kolf-18.04.0.tar.xz"; }; }; kollision = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz"; - sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz"; - name = "kollision-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kollision-18.04.0.tar.xz"; + sha256 = "03lkrdh11q4vmbc8a5hflsbk2w39ffr96r6rwazkas7svc2hky6i"; + name = "kollision-18.04.0.tar.xz"; }; }; kolourpaint = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz"; - sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w"; - name = "kolourpaint-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kolourpaint-18.04.0.tar.xz"; + sha256 = "18b01w44bp7hyhxyj5cbfhlmhvcr1bbi1j6i0j62h67sm9fy65vr"; + name = "kolourpaint-18.04.0.tar.xz"; }; }; kompare = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz"; - sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl"; - name = "kompare-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kompare-18.04.0.tar.xz"; + sha256 = "019z54h9dlcxy7hfzxrh0nh3l2jzc993jhdw4s70h7mf2yddl6zi"; + name = "kompare-18.04.0.tar.xz"; }; }; konqueror = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz"; - sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw"; - name = "konqueror-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konqueror-18.04.0.tar.xz"; + sha256 = "0z7b8w47xs2wm13c82fkcf07qd7ikyi67dg8abfnxhvmri4bsxn2"; + name = "konqueror-18.04.0.tar.xz"; }; }; konquest = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz"; - sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli"; - name = "konquest-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konquest-18.04.0.tar.xz"; + sha256 = "0344hjkhq5czxi3wl9vfavli79lh7mqhk8qby0hj53xp6mqh7xfx"; + name = "konquest-18.04.0.tar.xz"; }; }; konsole = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz"; - sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs"; - name = "konsole-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konsole-18.04.0.tar.xz"; + sha256 = "0r2al3ja1fpkyyq7hrzis9pmkp54idivfmrj71rqk74jfjjjky2k"; + name = "konsole-18.04.0.tar.xz"; }; }; kontact = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz"; - sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas"; - name = "kontact-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kontact-18.04.0.tar.xz"; + sha256 = "14kpnfa2bl92frz6vssfs1q3065vsgl5bfgrgyvbbpxfviy5ciaz"; + name = "kontact-18.04.0.tar.xz"; }; }; kontactinterface = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz"; - sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks"; - name = "kontactinterface-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kontactinterface-18.04.0.tar.xz"; + sha256 = "12hmh1wxsxb1n1727qpmarhs83nziy93kb7a8xyahpkky82jn62x"; + name = "kontactinterface-18.04.0.tar.xz"; + }; + }; + kopete = { + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/kopete-18.04.0.tar.xz"; + sha256 = "0p22yjpzrgqmdr74pw9pxasb25w9ikdgsrlbcq5yy95il1zppwfl"; + name = "kopete-18.04.0.tar.xz"; }; }; korganizer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz"; - sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40"; - name = "korganizer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/korganizer-18.04.0.tar.xz"; + sha256 = "02vyycpiqdfik2902pk97jz28s4nh2wax129y6n1mdxjjvw15gp2"; + name = "korganizer-18.04.0.tar.xz"; }; }; kpat = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz"; - sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh"; - name = "kpat-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kpat-18.04.0.tar.xz"; + sha256 = "02s74cwyp3mpdc8xk6hky3p8s3svdwwkrdfbaxbkh6ysywbm7728"; + name = "kpat-18.04.0.tar.xz"; }; }; kpimtextedit = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz"; - sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c"; - name = "kpimtextedit-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kpimtextedit-18.04.0.tar.xz"; + sha256 = "101jj454b4p52yxzcp837075fp3lh3wnkjw8spcfb6k1rjf0ss68"; + name = "kpimtextedit-18.04.0.tar.xz"; }; }; kqtquickcharts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz"; - sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0"; - name = "kqtquickcharts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kqtquickcharts-18.04.0.tar.xz"; + sha256 = "1ccfgbm1dbrf0nkkpg7qzrpa0sjdv46cvdn7qc86qqqmbb96zij8"; + name = "kqtquickcharts-18.04.0.tar.xz"; }; }; krdc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz"; - sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps"; - name = "krdc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/krdc-18.04.0.tar.xz"; + sha256 = "11nk01vhpqlhgn7b928svvpdn5r9hbrc01248xzqkj16iwrdrqr9"; + name = "krdc-18.04.0.tar.xz"; }; }; kreversi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz"; - sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg"; - name = "kreversi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kreversi-18.04.0.tar.xz"; + sha256 = "1jbvsldl1g1ljl4mzn1l93gi5kb8jrzwqjzfga4dbribif8shmq8"; + name = "kreversi-18.04.0.tar.xz"; }; }; krfb = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz"; - sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv"; - name = "krfb-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/krfb-18.04.0.tar.xz"; + sha256 = "1aq285jn4k0s9vwy99w2a1wm4nzwzjafz8a0gy47ydi0m29b1rkc"; + name = "krfb-18.04.0.tar.xz"; }; }; kross-interpreters = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz"; - sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s"; - name = "kross-interpreters-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kross-interpreters-18.04.0.tar.xz"; + sha256 = "15cbpq7cs0hnm42c03kyvyshfa10xdsajlbmsixzbmvks34c8b1y"; + name = "kross-interpreters-18.04.0.tar.xz"; }; }; kruler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz"; - sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa"; - name = "kruler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kruler-18.04.0.tar.xz"; + sha256 = "0bm1d8n0v4qg8jaciws247bda7q5nab0i80qlg2xb20lygi2fwwr"; + name = "kruler-18.04.0.tar.xz"; }; }; kshisen = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz"; - sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0"; - name = "kshisen-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kshisen-18.04.0.tar.xz"; + sha256 = "1m9wa59iz3p2x7zxngp2wqf99ab6p1gai3h0fb4zbqbib98jpmyf"; + name = "kshisen-18.04.0.tar.xz"; }; }; ksirk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz"; - sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz"; - name = "ksirk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksirk-18.04.0.tar.xz"; + sha256 = "0msw4lkrjj5ihbdg9ibjrk7ddcw933kqhbf6aap5jc4lz0r6y1d8"; + name = "ksirk-18.04.0.tar.xz"; }; }; ksmtp = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz"; - sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b"; - name = "ksmtp-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksmtp-18.04.0.tar.xz"; + sha256 = "1r89wm8q4vxaqdd1j8qb84qr7zg1dfb731r7qypilvkcc8z1samn"; + name = "ksmtp-18.04.0.tar.xz"; }; }; ksnakeduel = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz"; - sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy"; - name = "ksnakeduel-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksnakeduel-18.04.0.tar.xz"; + sha256 = "04lpcp7l4xwnwk073yji84kaw16gi0ybkzlvcg1plpqj6w1y1y8w"; + name = "ksnakeduel-18.04.0.tar.xz"; }; }; kspaceduel = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz"; - sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6"; - name = "kspaceduel-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kspaceduel-18.04.0.tar.xz"; + sha256 = "04shgk89xfp3z26683mc9g612fmnqg01fp8qah7y8mbac3cv4f5i"; + name = "kspaceduel-18.04.0.tar.xz"; }; }; ksquares = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz"; - sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667"; - name = "ksquares-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksquares-18.04.0.tar.xz"; + sha256 = "17siqdj6l2g2rnaswdzipxlxxx8x4q5wb4z2rc12gf08fggxfmgn"; + name = "ksquares-18.04.0.tar.xz"; }; }; ksudoku = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz"; - sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n"; - name = "ksudoku-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksudoku-18.04.0.tar.xz"; + sha256 = "1slmfps0861n8p4rqc1ng4981v1jdyppzr990abadqzf344d3ab3"; + name = "ksudoku-18.04.0.tar.xz"; }; }; ksystemlog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz"; - sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr"; - name = "ksystemlog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksystemlog-18.04.0.tar.xz"; + sha256 = "164cfzfjya7yg5pzzpxzfr0r1yf6napvibpjs9y784fl4r2qb780"; + name = "ksystemlog-18.04.0.tar.xz"; }; }; kteatime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz"; - sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz"; - name = "kteatime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kteatime-18.04.0.tar.xz"; + sha256 = "0sm4kcq618qp5ihnvcw2zp0frnj21mmjapksy7q63skh9ncjgmj3"; + name = "kteatime-18.04.0.tar.xz"; }; }; ktimer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz"; - sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x"; - name = "ktimer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktimer-18.04.0.tar.xz"; + sha256 = "1mgjgs8j4wfkjq766w9lyc21h3l3cfv5qb5a3x1anc74y1vanksj"; + name = "ktimer-18.04.0.tar.xz"; }; }; ktnef = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz"; - sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n"; - name = "ktnef-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktnef-18.04.0.tar.xz"; + sha256 = "1rys8l7rmwzv79mwmm97yxfq8gsfz4sh6hf7bjq6zhc9q42n3r36"; + name = "ktnef-18.04.0.tar.xz"; }; }; ktouch = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz"; - sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795"; - name = "ktouch-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktouch-18.04.0.tar.xz"; + sha256 = "10lwc2gz1gwghz95f1dgdv33n4rwly0f8maslv3hb47cr14c259v"; + name = "ktouch-18.04.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz"; - sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm"; - name = "ktp-accounts-kcm-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-accounts-kcm-18.04.0.tar.xz"; + sha256 = "1arcg0wabjqla5mc773vrbwd2abl5zwhhchf88f1i4krcv2crn3s"; + name = "ktp-accounts-kcm-18.04.0.tar.xz"; }; }; ktp-approver = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz"; - sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp"; - name = "ktp-approver-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-approver-18.04.0.tar.xz"; + sha256 = "0afgd08x857mi7s5br3m5q41k8rm77p6dnvb3idjsmv0m8324md4"; + name = "ktp-approver-18.04.0.tar.xz"; }; }; ktp-auth-handler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz"; - sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21"; - name = "ktp-auth-handler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-auth-handler-18.04.0.tar.xz"; + sha256 = "1d7s1rqh231k57bygbyzxiz3cs9diqx4x2f7v66awm20la2p804y"; + name = "ktp-auth-handler-18.04.0.tar.xz"; }; }; ktp-call-ui = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz"; - sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m"; - name = "ktp-call-ui-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-call-ui-18.04.0.tar.xz"; + sha256 = "1qffsq9nnhzlgmm42vg98g172361zra06wgpa7n8y3pvl9mwlrbm"; + name = "ktp-call-ui-18.04.0.tar.xz"; }; }; ktp-common-internals = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz"; - sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80"; - name = "ktp-common-internals-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-common-internals-18.04.0.tar.xz"; + sha256 = "0cvyw7rs8afi7c1dl58jmibzqy1jdnbkjqsxilnlkj5rmplg10av"; + name = "ktp-common-internals-18.04.0.tar.xz"; }; }; ktp-contact-list = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz"; - sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb"; - name = "ktp-contact-list-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-list-18.04.0.tar.xz"; + sha256 = "1384rps2wp1qgqq0jj1p9rjkg3gdrsjid87jhdjv95kjxc1a7a1y"; + name = "ktp-contact-list-18.04.0.tar.xz"; }; }; ktp-contact-runner = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz"; - sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq"; - name = "ktp-contact-runner-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-runner-18.04.0.tar.xz"; + sha256 = "02hr0g619h30hr49rxs5yvwna6skzkvca03p9yy70ib22gzpfxli"; + name = "ktp-contact-runner-18.04.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz"; - sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj"; - name = "ktp-desktop-applets-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-desktop-applets-18.04.0.tar.xz"; + sha256 = "09jfw3sn6yn4znir0rcgwwc5h1zp2vc39y4i7fi1rznhdagwy1ji"; + name = "ktp-desktop-applets-18.04.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz"; - sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8"; - name = "ktp-filetransfer-handler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-filetransfer-handler-18.04.0.tar.xz"; + sha256 = "1wc72ghl2v6bjrw1pb8h8ajigqhyb53nlhya2cqhdf1banpjv0n5"; + name = "ktp-filetransfer-handler-18.04.0.tar.xz"; }; }; ktp-kded-module = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz"; - sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp"; - name = "ktp-kded-module-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-kded-module-18.04.0.tar.xz"; + sha256 = "1845csv2ci5589iws49ma5qrkgs5q6hqb2hzrk6znr6w3d1smbbj"; + name = "ktp-kded-module-18.04.0.tar.xz"; }; }; ktp-send-file = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz"; - sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch"; - name = "ktp-send-file-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-send-file-18.04.0.tar.xz"; + sha256 = "137l6b4dpd78x8z99cpz0sp8f5lbdlvzkd2w742jsiylxchrjr5l"; + name = "ktp-send-file-18.04.0.tar.xz"; }; }; ktp-text-ui = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz"; - sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v"; - name = "ktp-text-ui-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-text-ui-18.04.0.tar.xz"; + sha256 = "12hhfkjglqbd4qxhl10xczk9ha0j494vjldkg05lhm0l233zr9km"; + name = "ktp-text-ui-18.04.0.tar.xz"; }; }; ktuberling = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz"; - sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4"; - name = "ktuberling-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktuberling-18.04.0.tar.xz"; + sha256 = "12mrb0a5k5z02mjwdn8vlcwr8jxwp7x2f04wzac749csyn0sj86d"; + name = "ktuberling-18.04.0.tar.xz"; }; }; kturtle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz"; - sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8"; - name = "kturtle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kturtle-18.04.0.tar.xz"; + sha256 = "0vm28xngj52l6fs7sd54wg4fhss131kh6ihs1ibnzi9in0hvga62"; + name = "kturtle-18.04.0.tar.xz"; }; }; kubrick = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz"; - sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp"; - name = "kubrick-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kubrick-18.04.0.tar.xz"; + sha256 = "0as99qx9vi6zcx61kai7y3ym4vzm8r7ma4p0a2z8rxymps1nk3dy"; + name = "kubrick-18.04.0.tar.xz"; }; }; kwalletmanager = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz"; - sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1"; - name = "kwalletmanager-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwalletmanager-18.04.0.tar.xz"; + sha256 = "1f4124bm86aqbv36v961jca647vvxrlssq5ydnvi1yfx0saza94q"; + name = "kwalletmanager-18.04.0.tar.xz"; }; }; kwave = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz"; - sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng"; - name = "kwave-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwave-18.04.0.tar.xz"; + sha256 = "1bw6lcl95aqcvzp2z31krdaiq0hfhndicynarai58rcg2ngbsm53"; + name = "kwave-18.04.0.tar.xz"; }; }; kwordquiz = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz"; - sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx"; - name = "kwordquiz-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwordquiz-18.04.0.tar.xz"; + sha256 = "1rfr1hc6xkciyx5wknzikf4ml1sgcqj8lflxpksdsg9m5nk7w73y"; + name = "kwordquiz-18.04.0.tar.xz"; }; }; libgravatar = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz"; - sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm"; - name = "libgravatar-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libgravatar-18.04.0.tar.xz"; + sha256 = "1wzfvp5acdkpj37bg1hphy0fszvbakzx0azg56zk0h9526h6qrq1"; + name = "libgravatar-18.04.0.tar.xz"; }; }; libkcddb = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz"; - sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi"; - name = "libkcddb-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkcddb-18.04.0.tar.xz"; + sha256 = "1967in5041lyjapi3avlns1g7ps8sqvq547gw13snhkjn0dbs1aa"; + name = "libkcddb-18.04.0.tar.xz"; }; }; libkcompactdisc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz"; - sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v"; - name = "libkcompactdisc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkcompactdisc-18.04.0.tar.xz"; + sha256 = "01c1pmb2v7bd03jdkwdw4l37736ad8igrrwa9cf5jwg6q5ps9xgb"; + name = "libkcompactdisc-18.04.0.tar.xz"; }; }; libkdcraw = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz"; - sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc"; - name = "libkdcraw-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdcraw-18.04.0.tar.xz"; + sha256 = "04gc0m4ndkx02yavqmc5xh488rmxw5ppicv902iby0m9ywrjinik"; + name = "libkdcraw-18.04.0.tar.xz"; }; }; libkdegames = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz"; - sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd"; - name = "libkdegames-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdegames-18.04.0.tar.xz"; + sha256 = "09wxdvd2ahhh11ncylh5il5fbx1jx6jpwzp1r18cx5k71fw2idp6"; + name = "libkdegames-18.04.0.tar.xz"; }; }; libkdepim = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz"; - sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q"; - name = "libkdepim-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdepim-18.04.0.tar.xz"; + sha256 = "0m3rlwdy010v4s3157w8jlb6ahcmn4frqxp1ibachpmz6y77gkkq"; + name = "libkdepim-18.04.0.tar.xz"; }; }; libkeduvocdocument = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz"; - sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v"; - name = "libkeduvocdocument-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkeduvocdocument-18.04.0.tar.xz"; + sha256 = "1g10c955gy0530xypr62x9dp4736s6qwr5afb90nlj8rhnq2zmbw"; + name = "libkeduvocdocument-18.04.0.tar.xz"; }; }; libkexiv2 = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz"; - sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg"; - name = "libkexiv2-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkexiv2-18.04.0.tar.xz"; + sha256 = "11ydba6jdvyvp3j3zzy7gjcmz20zv6nwg07r00xgs34y9n50rhzy"; + name = "libkexiv2-18.04.0.tar.xz"; }; }; libkgapi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz"; - sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y"; - name = "libkgapi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkgapi-18.04.0.tar.xz"; + sha256 = "0bp7y1wjajzzq6q3sygl2vxk685k5hmcvy1i42q5fph28q2b0dli"; + name = "libkgapi-18.04.0.tar.xz"; }; }; libkgeomap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz"; - sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi"; - name = "libkgeomap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkgeomap-18.04.0.tar.xz"; + sha256 = "0814ql6xpj02sirmz9crn649rabqclhzjnrlk47isgjwsgk5kqmh"; + name = "libkgeomap-18.04.0.tar.xz"; }; }; libkipi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz"; - sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq"; - name = "libkipi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkipi-18.04.0.tar.xz"; + sha256 = "10d7yb6psrj1xl34pkhw6fpmja7mk8bkq80id0snc5nxlr0v1jdb"; + name = "libkipi-18.04.0.tar.xz"; }; }; libkleo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz"; - sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k"; - name = "libkleo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkleo-18.04.0.tar.xz"; + sha256 = "179abszgi7nm763cvyqi2274x7107vb4irblsdfkqmlp924xssdd"; + name = "libkleo-18.04.0.tar.xz"; }; }; libkmahjongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz"; - sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd"; - name = "libkmahjongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkmahjongg-18.04.0.tar.xz"; + sha256 = "1grsyjsghjk3ikj7lpib3k94qcsz6r1l3czcawwamf2m83jydk2k"; + name = "libkmahjongg-18.04.0.tar.xz"; }; }; libkomparediff2 = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz"; - sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l"; - name = "libkomparediff2-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkomparediff2-18.04.0.tar.xz"; + sha256 = "0vzq25q9hihv8np0l0jdyfipf3w86wm6y7n46dhhqkqw380wrxwy"; + name = "libkomparediff2-18.04.0.tar.xz"; }; }; libksane = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz"; - sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2"; - name = "libksane-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libksane-18.04.0.tar.xz"; + sha256 = "1vc7z3dzr0nk3rrfq96p6phbb3rfnkn6wpjnzmc66f4mvq96hn7i"; + name = "libksane-18.04.0.tar.xz"; }; }; libksieve = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz"; - sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433"; - name = "libksieve-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libksieve-18.04.0.tar.xz"; + sha256 = "16x419wzpyl9jj4q49rwmfm75x6minwrg0jvkad5kh541r52a5bn"; + name = "libksieve-18.04.0.tar.xz"; }; }; lokalize = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz"; - sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9"; - name = "lokalize-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/lokalize-18.04.0.tar.xz"; + sha256 = "19j0jqn3xzawsyy4fzsy3c2hrjp9920bihzpbq8yalws6w0v8li4"; + name = "lokalize-18.04.0.tar.xz"; }; }; lskat = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz"; - sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0"; - name = "lskat-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/lskat-18.04.0.tar.xz"; + sha256 = "1dk73c6v5h5abx5244rnjjfxi2cn2sya1jav3020nif111c2c9f7"; + name = "lskat-18.04.0.tar.xz"; }; }; mailcommon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz"; - sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f"; - name = "mailcommon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mailcommon-18.04.0.tar.xz"; + sha256 = "10psdddw3wzyalh5662rvq68l8i9sxmcl5pavgn03np3g3fws8fd"; + name = "mailcommon-18.04.0.tar.xz"; }; }; mailimporter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz"; - sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc"; - name = "mailimporter-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mailimporter-18.04.0.tar.xz"; + sha256 = "0wwclx24bfczqxvcf5jdfpqa9cx0dv9ygsj5blaqk9g5pgych5hi"; + name = "mailimporter-18.04.0.tar.xz"; }; }; marble = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz"; - sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i"; - name = "marble-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/marble-18.04.0.tar.xz"; + sha256 = "0q1dr2p4qwcik86fcr0jqvplkwfnj14fysqcqk2pwwdkfnqlsppv"; + name = "marble-18.04.0.tar.xz"; }; }; mbox-importer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz"; - sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp"; - name = "mbox-importer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mbox-importer-18.04.0.tar.xz"; + sha256 = "1kai38svb4bsj1kfhyv94sgxqavj4fgb4laxl2sxvwah3rk6avd5"; + name = "mbox-importer-18.04.0.tar.xz"; }; }; messagelib = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz"; - sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald"; - name = "messagelib-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/messagelib-18.04.0.tar.xz"; + sha256 = "14nn6aw1831j0iwwb7d4swxh6i4855izglmifq2ijsbpbdqsq5p2"; + name = "messagelib-18.04.0.tar.xz"; }; }; minuet = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz"; - sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b"; - name = "minuet-17.12.3.tar.xz"; - }; - }; - okteta = { - version = "17.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz"; - sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; - name = "okteta-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/minuet-18.04.0.tar.xz"; + sha256 = "0fdyv0qbj04pxsbyvrmbqs7bff7cld28iyw7n8lgv2gdm3n45vbh"; + name = "minuet-18.04.0.tar.xz"; }; }; okular = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz"; - sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha"; - name = "okular-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/okular-18.04.0.tar.xz"; + sha256 = "1ywzpdahnfc0ydvpidphdyh61ql7zwk4m6cpfj2zg9njh276w1d8"; + name = "okular-18.04.0.tar.xz"; }; }; palapeli = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz"; - sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln"; - name = "palapeli-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/palapeli-18.04.0.tar.xz"; + sha256 = "0m4h5h15qcqdhlrsi73c8jxkb3zhz07m2jw3r37603w4g6jk9g8b"; + name = "palapeli-18.04.0.tar.xz"; }; }; parley = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz"; - sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6"; - name = "parley-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/parley-18.04.0.tar.xz"; + sha256 = "0h87zfqssbbvwyvar9yf8hv53bdpv7arncs63l6hfr6ajspla9if"; + name = "parley-18.04.0.tar.xz"; }; }; picmi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz"; - sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn"; - name = "picmi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/picmi-18.04.0.tar.xz"; + sha256 = "1pxa4xql2c78n0jqswgll2hpfn33fgw6yz7g8ydgn5nnbcsfhs6r"; + name = "picmi-18.04.0.tar.xz"; }; }; pimcommon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz"; - sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq"; - name = "pimcommon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pimcommon-18.04.0.tar.xz"; + sha256 = "0xnh0xys4sfqashimc1zsdxbssd3821bp9cx6hb0d8l3bq5x2vrp"; + name = "pimcommon-18.04.0.tar.xz"; }; }; pim-data-exporter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz"; - sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b"; - name = "pim-data-exporter-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pim-data-exporter-18.04.0.tar.xz"; + sha256 = "0isr1hv74n9mbihirk4qr109d4shh42k8jgcy9v2hmkplq72vwc7"; + name = "pim-data-exporter-18.04.0.tar.xz"; }; }; pim-sieve-editor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz"; - sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp"; - name = "pim-sieve-editor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pim-sieve-editor-18.04.0.tar.xz"; + sha256 = "0q1f72mb925qzikqfpv74dcc5f9ipxszvm0z05lsp1dhrmz1pf9a"; + name = "pim-sieve-editor-18.04.0.tar.xz"; }; }; poxml = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz"; - sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp"; - name = "poxml-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/poxml-18.04.0.tar.xz"; + sha256 = "1rwr1ldrkwyfxm56i16mpq0vmqiq2397gcbzg4skqpc727s55nlv"; + name = "poxml-18.04.0.tar.xz"; }; }; print-manager = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz"; - sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7"; - name = "print-manager-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/print-manager-18.04.0.tar.xz"; + sha256 = "1x70xia2rph40flx4r3cpxcvxfzny83v87l4kgc1n0khavhp9lpx"; + name = "print-manager-18.04.0.tar.xz"; }; }; rocs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz"; - sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46"; - name = "rocs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/rocs-18.04.0.tar.xz"; + sha256 = "0q0q9bnmsw23jdbrxrkmmjvyr5jv4s1z8v9h7nsaxqs1k2prflp4"; + name = "rocs-18.04.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz"; - sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m"; - name = "signon-kwallet-extension-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/signon-kwallet-extension-18.04.0.tar.xz"; + sha256 = "04r92pc8l2vw1dc916n658484v14smqrgg4ngx6rccffm58jfvk0"; + name = "signon-kwallet-extension-18.04.0.tar.xz"; }; }; spectacle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz"; - sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr"; - name = "spectacle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/spectacle-18.04.0.tar.xz"; + sha256 = "1slqgp1rgzcw4nikh6zmxpp3yc04dfbjcqqx2j4wpa1p2xwfv0c2"; + name = "spectacle-18.04.0.tar.xz"; }; }; step = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz"; - sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v"; - name = "step-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/step-18.04.0.tar.xz"; + sha256 = "048f4n24819vj41a0hdabmqvw6k7wkwwicz0q0slvfqws5c3h1l4"; + name = "step-18.04.0.tar.xz"; }; }; svgpart = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz"; - sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5"; - name = "svgpart-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/svgpart-18.04.0.tar.xz"; + sha256 = "1yf535ry8xc7lqhcavn2kjmjs0ngkwinm369q0qp7hfddcpsyfbp"; + name = "svgpart-18.04.0.tar.xz"; }; }; sweeper = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz"; - sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x"; - name = "sweeper-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/sweeper-18.04.0.tar.xz"; + sha256 = "1yf1xfbv516ia3aqj3l8qcdsbjac9pnm8qb23l26g6n3jnq4b331"; + name = "sweeper-18.04.0.tar.xz"; }; }; syndication = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz"; - sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808"; - name = "syndication-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/syndication-18.04.0.tar.xz"; + sha256 = "11fx8f9sfc51w5dg6mylbvk0yaaxvc9y2dsg9xxasiw8v6rjjq3n"; + name = "syndication-18.04.0.tar.xz"; }; }; umbrello = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz"; - sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0"; - name = "umbrello-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/umbrello-18.04.0.tar.xz"; + sha256 = "1lbf82j04j8qax7qnsqwsjrz1m4yq0ca6xc9fdhmvkpnzn5z9ydp"; + name = "umbrello-18.04.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz"; - sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i"; - name = "zeroconf-ioslave-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/zeroconf-ioslave-18.04.0.tar.xz"; + sha256 = "0lqh70bmlrj22d82vhm5a9ylm2yj9rz4zgncfwrh9952q1xkzl22"; + name = "zeroconf-ioslave-18.04.0.tar.xz"; }; }; } From 58f53dc4d4b8b87172956e3658d24f158f9abaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sat, 21 Apr 2018 14:40:10 +0200 Subject: [PATCH 073/491] okteta: Move into own package Okteta was removed from kde applications and will now be released independently. So, we currently use the released version from 17.12.3. --- .../{kde/okteta.nix => editors/okteta/default.nix} | 12 +++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) rename pkgs/applications/{kde/okteta.nix => editors/okteta/default.nix} (58%) diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/editors/okteta/default.nix similarity index 58% rename from pkgs/applications/kde/okteta.nix rename to pkgs/applications/editors/okteta/default.nix index 0ac8ddebc75d..770eb63dc69e 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,16 +1,22 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, shared-mime-info }: -mkDerivation { +let + version = "17.12.3"; +in mkDerivation rec { name = "okteta"; + src = fetchurl { + url = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz"; + sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; + }; meta = { license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg ]; + maintainers = with lib.maintainers; [ peterhoeg bkchr ]; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; buildInputs = [ shared-mime-info ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78b8cff8215c..a82de21279b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16419,7 +16419,9 @@ with pkgs; akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole - kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okteta okular spectacle; + kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; + + okteta = libsForQt5.callPackage ../applications/editors/okteta { }; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; From 337e9723ce402c74996453b27088f2aa53e9e013 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 24 Apr 2018 15:16:45 +0800 Subject: [PATCH 074/491] kde-applications: Create alias to okteta --- pkgs/applications/kde/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 451fdbe151f4..5870179b6c0b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -28,6 +28,7 @@ still shows most of the available features is in `./gwenview.nix`. { stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs, plasma5, attica, phonon, + okteta }: let @@ -151,7 +152,6 @@ let mbox-importer = callPackage ./mbox-importer.nix {}; messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; - okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; pimcommon = callPackage ./pimcommon.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; @@ -159,6 +159,9 @@ let print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; syndication = callPackage ./syndication.nix {}; + # Okteta was removed from kde applications and will now be released independently + # Lets keep an alias for compatibility reasons + inherit okteta; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a82de21279b6..d5e8b16e017c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16411,6 +16411,7 @@ with pkgs; inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs; inherit plasma5; inherit attica phonon; + inherit okteta; }; in recurseIntoAttrs (makeOverridable mkApplications attrs); From a2f617f49f7c256b6baba65d621ef660658733fe Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 24 Apr 2018 20:40:52 +0800 Subject: [PATCH 075/491] qcachegrind: Remove qt 5.10 build fix patch, now applied upstream --- pkgs/development/tools/analysis/qcachegrind/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 15be7554c198..30d82aca83ae 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -12,14 +12,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; - patches = [ - (fetchpatch { - name = "fix-qt5_10-build.patch"; - url = https://github.com/KDE/kcachegrind/commit/c41607a.patch; - sha256 = "00kh5im3hpcarch8rc2dsgxsajfmd8vd7rry9x6mxrbkgr4ifq8y"; - }) - ]; - postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree From 8945e6b105d6a9481b4dd1c2506dbdcca4327e36 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 09:37:19 +0800 Subject: [PATCH 076/491] kproperty: 3.0.2 -> 3.1.0 --- pkgs/development/libraries/kproperty/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix index 52b5d944b413..455fb5a711c0 100644 --- a/pkgs/development/libraries/kproperty/default.nix +++ b/pkgs/development/libraries/kproperty/default.nix @@ -1,22 +1,23 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons + qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, + qttools }: mkDerivation rec { pname = "kproperty"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1hzkvdap7dzpnxlp4rfg5f24fhqjpqm2hlvv88gj4c0scbp73ynm"; + sha256 = "18qlwp7ajpx16bd0lfzqfx8y9cbrs8k4nax3cr30wj5sd3l8xpky"; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons ]; + buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons qttools ]; propagatedBuildInputs = [ qtbase ]; From d5121536b80911264b3f55870d5253ede8a2b395 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 09:37:46 +0800 Subject: [PATCH 077/491] kreport: 3.0.2 -> 3.1.0 --- pkgs/development/libraries/kreport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index 561e964c9610..3f44dbb9c138 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "kreport"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1zd3vhf26cyp8xrq11awm9pmhnk88ppyc0riyr0gxj8y703ahkp0"; + sha256 = "0v7krpfx0isij9wzwam28fqn039i4wcznbplvnvl6hsykdi8ar1v"; }; nativeBuildInputs = [ extra-cmake-modules ]; From 1bde5c59307f1e2d8f786f366f5171f04d60c1e9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 09:38:04 +0800 Subject: [PATCH 078/491] kexi: 3.0.2 -> 3.1.0 --- pkgs/applications/office/kexi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 8463703c0179..2aa19dea1c24 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -9,12 +9,12 @@ mkDerivation rec { pname = "kexi"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf"; + sha256 = "1ysj44qq75wglw4d080l3gfw47695gapf29scxhb1g3py55csmbd"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From b20a82cd7592ad8ebcfb1e94ce5b44f067355b83 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 09:38:17 +0800 Subject: [PATCH 079/491] calligra: 3.0.1 -> 3.1.0 --- pkgs/applications/office/calligra/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 8449cdf05def..01014e6687cb 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -15,24 +15,16 @@ mkDerivation rec { pname = "calligra"; - version = "3.0.1"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; + sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; enableParallelBuilding = true; - patches = [ - (fetchpatch { - name = "calligra-build-with-newer-kcalcore.patch"; - url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff"; - sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ From 04e13de94f1909afc4711a92cf83d5969afa0981 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 20:54:36 -0500 Subject: [PATCH 080/491] gn: fix Darwin build --- .../tools/build-managers/gn/default.nix | 139 ++++++++++++------ 1 file changed, 93 insertions(+), 46 deletions(-) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 5e7dd5214a04..bfbb2b4e3308 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,77 +1,124 @@ -{ stdenv, lib, fetchgit, fetchurl, libevent, ninja, python }: +{ stdenv, lib, fetchgit, fetchurl, fetchpatch +, libevent, ninja, python, darwin }: let depsGit = { "tools/gn" = fetchgit { url = "https://chromium.googlesource.com/chromium/src/tools/gn"; - rev = "d0c518db129975ce88ff1de26c857873b0619c4b"; - sha256 = "0l15vzmjyx6bwlz1qhn3fy7yx3qzzxr3drnkj3l0p0fmyxza52vx"; + rev = "0fa417a0d2d8484e9a5a636e3301da322f586601"; + sha256 = "0pigcl14yc4aak6q1ghfjxdz2ah4fg4m2r5y3asw2rz6mpr5y9z0"; }; "base" = fetchgit { url = "https://chromium.googlesource.com/chromium/src/base"; - rev = "bc6e3ce8ca01b894751e1f7b22b561e3ae2e7f17"; - sha256 = "1yl49v6nxbrfms52xf7fiwh7d4301m2aj744pa3hzzh989c5j6g5"; + rev = "ab1d7c3b92ce9c9bc756bdefb8338360d1a33a1e"; + sha256 = "15wis6qg9ka62k6v1vamg0bp3v5vkpapg485jsn4bbfcaqp6di0f"; }; "build" = fetchgit { url = "https://chromium.googlesource.com/chromium/src/build"; - rev = "e934a19ae908081fba13769924e4ea45a7a451ce"; - sha256 = "0jhy418vaiin7djg9zvk83f8zhasigki4442x5j7gkmgmgmyc4am"; + rev = "8d44c08a4c9997695db8098198bdd5026bc7a6f9"; + sha256 = "19sajgf55xfmvnwvy2ss7g6pyljp751cfsws30w415m6m00lmpxl"; }; "config" = fetchgit { url = "https://chromium.googlesource.com/chromium/src/build/config"; - rev = "df16c6a2c070704b0a25efe46ee9af16de1e65b3"; - sha256 = "1x18syzz1scwhd8lf448hy5lnfpq118l403x9qmwm0np318w09wg"; + rev = "14116c0cdcb9e28995ca8bb384a12e5c9dbd1dbb"; + sha256 = "04nif0lm4wcy05b7xhal023874s4r0iq067q57cgwdm72i2gml40"; }; "testing/gtest" = fetchgit { url = "https://chromium.googlesource.com/chromium/testing/gtest"; rev = "585ec31ea716f08233a815e680fc0d4699843938"; sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; }; + "third_party/apple_apsl" = fetchurl { + url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz"; + sha256 = "0sc7b7zdw7f9piyyijl7xq3v1fzflqlck1apwm8kvgdhkyz3l63k"; + }; }; -in - stdenv.mkDerivation rec { - name = "gn"; - version = "0.0.0.20170629"; - sourceRoot = "."; +in stdenv.mkDerivation { + name = "gn"; + version = "20180423"; + sourceRoot = "."; - unpackPhase = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} + unpackPhase = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + if [ -d ${v} ]; then cp -r ${v}/* $sourceRoot/${n} - '') depsGit)} - ''; + else + mkdir -p $sourceRoot/${n} + pushd $sourceRoot/${n} + unpackFile ${v} + popd + fi + '') depsGit)} - postPatch = '' - # Patch shebands (for sandbox build) - chmod u+w -R build - patchShebangs build + chmod u+w -R $sourceRoot + ''; - # Patch out Chromium-bundled libevent - chmod u+w tools/gn/bootstrap tools/gn/bootstrap/bootstrap.py - sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ - tools/gn/bootstrap/bootstrap.py - ''; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch"; + sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a"; + }) + ]; - NIX_LDFLAGS = "-levent"; + postPatch = '' + # Disable libevent bootstrapping (we will provide it). + sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ + tools/gn/bootstrap/bootstrap.py - nativeBuildInputs = [ ninja python ]; - buildInputs = [ libevent ]; + # FIXME Needed with old Apple SDKs + substituteInPlace base/mac/foundation_util.mm \ + --replace "NSArray*" "NSArray*" + substituteInPlace base/mac/sdk_forward_declarations.h \ + --replace "NSDictionary*" "NSDictionary*" \ + --replace "NSArray*" "NSArray*" \ + --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" - buildPhase = '' - python tools/gn/bootstrap/bootstrap.py -s - ''; + # Patch shebangs (for sandbox build) + patchShebangs build + ''; - installPhase = '' - install -vD out/Release/gn "$out/bin/gn" - ''; + # FIXME again this shouldn't be necessary but I can't figure out a better way + NIX_CFLAGS_COMPILE = "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; - meta = with stdenv.lib; { - description = "A meta-build system that generates NinjaBuild files"; - homepage = https://chromium.googlesource.com/chromium/src/tools/gn; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.stesie ]; - }; - } + NIX_LDFLAGS = "-levent"; + + nativeBuildInputs = [ ninja python ]; + buildInputs = [ libevent ] + + # FIXME These dependencies shouldn't be needed but can't find a way + # around it. Chromium pulls this in while bootstrapping GN. + ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + libobjc + cctools + + # frameworks + ApplicationServices + Foundation + AppKit + ImageCaptureCore + CoreBluetooth + IOBluetooth + CoreWLAN + Quartz + Cocoa + ]); + + buildPhase = '' + python tools/gn/bootstrap/bootstrap.py -s + ''; + + installPhase = '' + install -vD out/Release/gn "$out/bin/gn" + ''; + + meta = with lib; { + description = "A meta-build system that generates NinjaBuild files"; + homepage = https://chromium.googlesource.com/chromium/src/tools/gn; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ stesie matthewbauer ]; + }; +} From 791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 21:22:52 -0500 Subject: [PATCH 081/491] musl bootstrap: remove libiconv --- .../bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh index 8b5070dc6d6f..b160a748d8dc 100644 --- a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh @@ -26,7 +26,7 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" done -for i in $out/lib/libiconv*.so $out/lib/libpcre* $out/lib/libc.so; do +for i in $out/lib/libpcre* $out/lib/libc.so; do if [ -L "$i" ]; then continue; fi echo patching "$i" $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 5522bc5dea25..4fc9999b538c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -136,8 +136,6 @@ in with pkgs; rec { cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib - '' + lib.optionalString (hostPlatform.libc == "musl") '' - cp -d ${libiconv.out}/lib/libiconv*.so* $out/lib '' + lib.optionalString (hostPlatform != buildPlatform) '' # These needed for cross but not native tools because the stdenv From a276d5160cc4b307d97261b419e183fb3a2214aa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 22:38:38 -0500 Subject: [PATCH 082/491] inkscape: fix on Darwin Fixes #39175 --- .../graphics/inkscape/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 47452eb43e88..b5d11d912a5e 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,9 +2,15 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake +, libvisio, libcdr, libexif, potrace, autoreconfHook +, intltool +, lib }: +# Note that originally this Nix expression used CMake to build but +# this led to errors on MacOS of "Too many arguments". Inkscape +# supports autoconf and we will use this for now on. + let python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]); in @@ -17,12 +23,6 @@ stdenv.mkDerivation rec { sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; }; - unpackPhase = '' - cp $src ${name}.tar.bz2 - tar xvjf ${name}.tar.bz2 > /dev/null - cd ${name} - ''; - postPatch = '' patchShebangs share/extensions patchShebangs fix-roff-punct @@ -33,25 +33,26 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook intltool ]; buildInputs = [ perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace cmake python2Env + libvisio libcdr libexif potrace python2Env ]; enableParallelBuilding = true; + preConfigure = '' + intltoolize -f + ''; + postInstall = '' # Make sure PyXML modules can be found at run-time. rm "$out/share/icons/hicolor/icon-theme.cache" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; - meta = with stdenv.lib; { + meta = with lib; { license = "GPL"; homepage = https://www.inkscape.org; description = "Vector graphics editor"; @@ -62,5 +63,6 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; + maintainers = with maintainters; [ matthewbauer ]; }; } From 7587f9804f23f6ab9973f8735b10cd0bb87e0c7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 22:58:45 -0500 Subject: [PATCH 083/491] glibmm: fix High Sierra segfault --- pkgs/development/libraries/glibmm/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index a3af96d51edc..86ed94d7bf34 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }: let ver_maj = "2.54"; @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patchFlags = "-p0"; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e864b2340be9ef003d8ff4aef92e7151d06287dd/devel/glibmm/files/0001-ustring-Fix-wchar-conversion-on-macOS-with-libc.patch"; + sha256 = "02qvnailw1i59cjbj3cy7y02kfcivsvkdjrf4njkp4plarayyqp9"; + }) + ]; + nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; From b87cb29d1be6a7729199aa33a5f0e5fd5f9801ef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 23:00:27 -0500 Subject: [PATCH 084/491] =?UTF-8?q?glibmm:=202.54.1=20=E2=86=92=202.56.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Noticed this was out of date. --- pkgs/development/libraries/glibmm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 86ed94d7bf34..3c3b49e66161 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.54"; - ver_min = "1"; + ver_maj = "2.56"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw"; + sha256 = "1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f"; }; outputs = [ "out" "dev" ]; From 656f69bea5b5cdbb1a25192b89448e43952aeba4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 12:11:43 +0800 Subject: [PATCH 085/491] buildbot-plugins.wsgi-dashboards: Remove maintainer akazakov Missing from maintainers file --- pkgs/development/tools/build-managers/buildbot/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 1d1b963df993..35c8ed8c71cd 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -97,7 +97,7 @@ meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot WSGI dashboards Plugin"; - maintainers = with maintainers; [ akazakov ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; }; }; From bd1d0e02922d0d18a3e4d99a82bdf8c6db23055d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 02:45:58 +0000 Subject: [PATCH 086/491] flashrom: fix build with gcc7 --- pkgs/tools/misc/flashrom/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index b1e093126584..1bdab1e841f8 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"; }; + # Newer versions of libusb deprecate some API flashrom uses. + postPatch = '' + substituteInPlace Makefile \ + --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable=" + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libftdi pciutils ]; From ec632b745fb72e5070983dd3dff78ed81466243d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 23:18:35 -0500 Subject: [PATCH 087/491] qtwebengine: rewrite Fixes #39334 and Fixes #36729 Also, Fixes #36932 (hopefully it's still building) (This might be able to be able to be cherry-picked to 18.03 but be careful - chromium is extremely touchy. Probably best to wait for it to be built successfully on Hydra a few times.) --- .../libraries/qt-5/mkDerivation.nix | 5 +- .../libraries/qt-5/modules/qtwebengine.nix | 95 ++++++++++++++++--- 2 files changed, 82 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 739c9b4a1608..96014cfbc779 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -9,9 +9,8 @@ args: let args_ = { - qmakeFlags = - (args.qmakeFlags or []) - ++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ]; + qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] + ++ (args.qmakeFlags or []); NIX_CFLAGS_COMPILE = optional (!debug) "-DQT_NO_DEBUG" diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 08345510d787..e798d529ce1b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -11,9 +11,8 @@ , libcap , pciutils , systemd - , enableProprietaryCodecs ? true - +, gn, darwin, openbsm , lib, stdenv # lib.optional, needsPax }: @@ -25,7 +24,7 @@ qtModule { name = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison coreutils flex git gperf ninja pkgconfig python2 which + bison coreutils flex git gperf ninja pkgconfig python2 which gn ]; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -61,8 +60,50 @@ qtModule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + '' + + optionalString stdenv.isDarwin '' + # Remove annoying xcode check + substituteInPlace mkspecs/features/platform.prf \ + --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false + substituteInPlace src/core/config/mac_osx.pri \ + --replace /usr ${stdenv.cc} \ + --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false + + # FIXME Needed with old Apple SDKs + # Abandon all hope ye who try to make sense of this. + substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \ + --replace "NSArray*" "NSArray*" + substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \ + --replace "NSDictionary*" "NSDictionary*" \ + --replace "NSArray*" "NSArray*" \ + --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" + + cat < src/3rdparty/chromium/build/mac/find_sdk.py +#!/usr/bin/env python +print("10.10.0") +print("") +EOF + + cat < src/3rdparty/chromium/build/config/mac/sdk_info.py +#!/usr/bin/env python +print('xcode_version="9.1"') +print('xcode_version_int=9') +print('xcode_build="9B55"') +print('machine_os_build="17E199"') +print('sdk_path=""') +print('sdk_version="10.10"') +print('sdk_platform_path=""') +print('sdk_build="17B41"') +EOF + + # Apple has some secret stuff they don't share with OpenBSM + substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ + --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" + substituteInPlace src/3rdparty/chromium/sandbox/mac/bootstrap_sandbox.cc \ + --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" ''; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; preConfigure = '' export NINJAFLAGS=-j$NIX_BUILD_CORES @@ -70,13 +111,9 @@ qtModule { if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fi - ''; + ''; - qmakeFlags = - [ - # Use system Ninja because bootstrapping it is fragile - "WEBENGINE_CONFIG+=use_system_ninja" - ] ++ optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; + qmakeFlags = optional enableProprietaryCodecs "-- -proprietary-codecs"; propagatedBuildInputs = [ # Image formats @@ -90,9 +127,10 @@ qtModule { # Text rendering harfbuzz icu - ] - ++ optionals (!stdenv.isDarwin) [ - dbus zlib minizip snappy nss protobuf jsoncpp libevent + + libevent + ] ++ optionals (!stdenv.isDarwin) [ + dbus zlib minizip snappy nss protobuf jsoncpp # Audio formats alsaLib @@ -106,17 +144,44 @@ qtModule { # X11 libs xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm - ]; + ] + + # FIXME These dependencies shouldn't be needed but can't find a way + # around it. Chromium pulls this in while bootstrapping GN. + ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + libobjc + cctools + + # frameworks + ApplicationServices + Foundation + AppKit + ImageCaptureCore + CoreBluetooth + IOBluetooth + CoreWLAN + Quartz + Cocoa + + openbsm + libunwind + ]); dontUseNinjaBuild = true; dontUseNinjaInstall = true; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' cat > $out/libexec/qt.conf < Date: Wed, 25 Apr 2018 00:05:18 -0500 Subject: [PATCH 088/491] nixos: typofixes/tab deletion in some foundationdb docs/module Signed-off-by: Austin Seipp --- nixos/modules/services/databases/foundationdb.nix | 8 ++++---- nixos/modules/services/databases/foundationdb.xml | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index ba921a9c1521..22acddc8ca91 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -206,7 +206,7 @@ in default = null; type = types.nullOr types.str; description = '' - Machine identifier key. All processes on a machine should share a + Machine identifier key. All processes on a machine should share a unique id. By default, processes on a machine determine a unique id to share. This does not generally need to be set. ''; @@ -216,7 +216,7 @@ in default = null; type = types.nullOr types.str; description = '' - Zone identifier key. Processes that share a zone id are + Zone identifier key. Processes that share a zone id are considered non-unique for the purposes of data replication. If unset, defaults to machine id. ''; @@ -226,7 +226,7 @@ in default = null; type = types.nullOr types.str; description = '' - Data center identifier key. All processes physically located in a + Data center identifier key. All processes physically located in a data center should share the id. If you are depending on data center based replication this must be set on all processes. ''; @@ -236,7 +236,7 @@ in default = null; type = types.nullOr types.str; description = '' - Data hall identifier key. All processes physically located in a + Data hall identifier key. All processes physically located in a data hall should share the id. If you are depending on data hall based replication this must be set on all processes. ''; diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index d10a5cfe836e..2a0e3c76c9d8 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -16,8 +16,8 @@ FoundationDB (or "FDB") is a distributed, open source, high performance, transactional key-value store. It can store petabytes of data and deliver -exceptional performance while maintaining consistency and ACID semantics over a -large cluster. +exceptional performance while maintaining consistency and ACID semantics +(serializable transactions) over a large cluster.
Configuring and basic setup @@ -101,7 +101,7 @@ FoundationDB worker processes that should be started on the machine. FoundationDB worker processes typically require 4GB of RAM per-process at minimum for good performance, so this option is set to 1 by default since the -maximum aount of RAM is unknown. You're advised to abide by this restriction, +maximum amount of RAM is unknown. You're advised to abide by this restriction, so pick a number of processes so that each has 4GB or more. A similar option exists in order to scale backup agent processes, @@ -129,7 +129,8 @@ client applications will use to find and join coordinators. Note that this file can not be managed by NixOS so easily: FoundationDB is designed so that it will rewrite the file at runtime for all clients and nodes when cluster coordinators change, with clients transparently handling this -without intervention. +without intervention. It is fundamentally a mutable file, and you should not +try to manage it in any way in NixOS. When dealing with a cluster, there are two main things you want to do: From 22fb762e1a939299ecad27179ca6c5d4013c367e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 25 Apr 2018 00:10:08 -0500 Subject: [PATCH 089/491] live555: add aarch64-linux entry Fixes eval --- pkgs/development/libraries/live555/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 69c16878fdf5..e0cf3328bac2 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { x86_64-darwin = "macosx"; i686-linux = "linux"; x86_64-linux = "linux-64bit"; + aarch64-linux = "linux-64bit"; }.${stdenv.system}} ''; From 0a8c91a931ea270e8b1d66f592f6acba9b4b5fcf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 25 Apr 2018 00:17:21 -0500 Subject: [PATCH 090/491] inkscape: typo --- pkgs/applications/graphics/inkscape/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index b5d11d912a5e..9a8ef6bd7744 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; - maintainers = with maintainters; [ matthewbauer ]; + maintainers = with maintainers; [ matthewbauer ]; }; } From 72ec248eda744ccdf1233cebbeeb176355f4b0d8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Apr 2018 06:27:21 +0000 Subject: [PATCH 091/491] 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 82d1f7a4746b..7b274812737e 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 31e9e752ae0b998598ee1650b8c0db9cb04a0349 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 25 Apr 2018 03:16:13 -0400 Subject: [PATCH 092/491] fio: 3.5 -> 3.6, enable on darwin (#39452) --- pkgs/tools/system/fio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index ee7c70240b0a..6e63f467f600 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -15,11 +15,15 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ libaio python zlib ]; + buildInputs = [ python zlib ] + ++ stdenv.lib.optional (!stdenv.isDarwin) libaio; enableParallelBuilding = true; postPatch = '' + substituteInPlace Makefile \ + --replace "mandir = /usr/share/man" "mandir = \$(prefix)/man" \ + --replace "sharedir = /usr/share/fio" "sharedir = \$(prefix)/share/fio" substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; From 6891bda37071bbecdb343ff941ba893511f5fd70 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 25 Apr 2018 00:06:11 +0200 Subject: [PATCH 093/491] nixos/tests/keymap: wait for xdotool to succeed xdotool failed in rare cases when a window was already created but not yet decorated by the window manager. also prevent a (never observed but possible) race condition --- nixos/tests/keymap.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index abff90d5047d..be880388314c 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -8,17 +8,19 @@ let testReader = pkgs.writeScript "test-input-reader" '' #!${pkgs.stdenv.shell} - rm -f ${resultFile} + rm -f ${resultFile} ${resultFile}.tmp logger "testReader: START: Waiting for $1 characters, expecting '$2'." touch ${readyFile} read -r -N $1 chars rm -f ${readyFile} if [ "$chars" == "$2" ]; then - logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile} + logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp else - logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile} + logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp fi + # rename after the file is written to prevent a race condition + mv ${resultFile}.tmp ${resultFile} ''; @@ -52,7 +54,7 @@ let if ($desc eq "Xorg keymap") { # make sure the xterm window is open and has focus $machine->waitForWindow(qr/testterm/); - $machine->succeed("${pkgs.xdotool}/bin/xdotool search --name testterm windowactivate --sync"); + $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync"); } # wait for reader to be ready @@ -71,7 +73,7 @@ let $machine->waitForX; mkTest "VT keymap", "openvt -sw --"; - mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -fullscreen -e"; + mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e"; ''; }; From 8ffaeecfca73704c67831e83d59890c52197b9c0 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:28:52 +0300 Subject: [PATCH 094/491] clion: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 84ba32c41256..de98c4b049f3 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -239,12 +239,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */ + sha256 = "170xgm3dzakvlwxx5kpy4zilq140kzcaxx9g3dm1w0i83g4l5j48"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml From a52b5be4a26ea74f3f6062330d5a6e63239ac5d7 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:07 +0300 Subject: [PATCH 095/491] goland: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index de98c4b049f3..f6db50a106b7 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -265,12 +265,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */ + sha256 = "11bkbh661fpypr1v89xba4nmf02l4map9jdlj2ky6d77l9295ip3"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; From e74d28ef96827252dc9abd53423439fbd7fac5d4 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:23 +0300 Subject: [PATCH 096/491] idea-community: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f6db50a106b7..5f08271c5cd1 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -278,12 +278,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */ + sha256 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; From 21feb8a2eda7a309a2498cdcebd18cf1e698a12f Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:36 +0300 Subject: [PATCH 097/491] idea-ultimate: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5f08271c5cd1..f5b87eb26e77 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -291,12 +291,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */ + sha256 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; From 12f07ac1bc9f5ca718305a7199456f802c4cd058 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:54 +0300 Subject: [PATCH 098/491] pycharm-community: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f5b87eb26e77..0dd4bc2a9b67 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -317,12 +317,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */ + sha256 = "1s26jczag12p3v3r6fdk02mmg55npzn0mzkmgcvh40fr7q7mq2pr"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; From 609766bf80598d58445a2099741e07686ddac96b Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:12 +0300 Subject: [PATCH 099/491] pycharm-professional: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 0dd4bc2a9b67..cd792cb31b81 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -330,12 +330,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */ + sha256 = "0k7529xhhnvjz7ycs5ab4qc4cr35g1v2qxlswy1aqcgzh2zg4c85"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; From ef038375f8701125b35832147cfbf7706a52c809 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:37 +0300 Subject: [PATCH 100/491] ruby-mine: 2017.3.3 -> 2017.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index cd792cb31b81..e6c84a308e95 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -356,12 +356,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */ + sha256 = "094m45jhrh4n64q5lrgfyvrimqjll6kcl2cx3cbsa3pp7x16abqn"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2017.3"; From 2479b449b6db3409abf7752e0455dc08a19805c3 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:53 +0300 Subject: [PATCH 101/491] webstorm: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e6c84a308e95..aedfb1fec3de 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -369,12 +369,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */ + sha256 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; From 2848b5db7d303fcb276958dbc4a78c185f5e1264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 25 Apr 2018 11:16:06 +0200 Subject: [PATCH 102/491] nix-zsh-completions: 0.3.8 -> 0.3.9 --- pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 2bcff6b809dc..8e15476451a8 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.8"; + version = "0.3.9"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "05ynd38br2kn657g7l01jg1q8ja9xwrdyb95w02gh7j9cww2k06w"; + sha256 = "1ysc9g72yj63ygm915a316f1hcklmgswyrwsq5abwwj48001y01n"; }; installPhase = '' From 954e02f835ca42d20f6fd01a940f06edd3fbb0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 25 Apr 2018 11:19:51 +0200 Subject: [PATCH 103/491] nix-bash-completions: 0.6.5 -> 0.6.6 --- pkgs/shells/bash/nix-bash-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 739dbd538a6e..b76e65ca8719 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.5"; + version = "0.6.6"; name = "nix-bash-completions-${version}"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "10f70jw81vky52s3fidf7vzl725fihiypsw39825wnkpynayhmrg"; + sha256 = "1lz9cgacyd4cphr7l90x4hn0ifhxwzz2d5829w1jcglasfacfpsw"; }; # To enable lazy loading via. bash-completion we need a symlink to the script From c60a874ef5a325fd881a2fa11b7dfe405c41022f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:01:58 +0200 Subject: [PATCH 104/491] LTS Haskell 11.6 --- .../configuration-hackage2nix.yaml | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e15482a6708c..5e12e90a3c3d 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.5 + # LTS Haskell 11.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -69,7 +69,7 @@ default-package-overrides: - aeson-compat ==0.3.7.1 - aeson-diff ==1.1.0.4 - aeson-extra ==0.4.1.0 - - aeson-generic-compat ==0.0.1.1 + - aeson-generic-compat ==0.0.1.2 - aeson-injector ==1.1.0.0 - aeson-picker ==0.1.0.4 - aeson-pretty ==0.8.7 @@ -83,10 +83,10 @@ default-package-overrides: - alerts ==0.1.0.0 - alex ==3.2.4 - algebra ==4.3.1 - - algebraic-graphs ==0.0.5 + - algebraic-graphs ==0.1.1.1 - alsa-core ==0.5.0.1 - alsa-mixer ==0.2.0.3 - - alsa-pcm ==0.6.0.4 + - alsa-pcm ==0.6.1 - alsa-seq ==0.6.0.7 - alternative-vector ==0.0.0 - alternators ==0.1.2.0 @@ -132,7 +132,7 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - attoparsec-time ==1 - attoparsec-uri ==0.0.4 - - audacity ==0.0.1.2 + - audacity ==0.0.2 - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 @@ -140,7 +140,7 @@ default-package-overrides: - auto-update ==0.1.4 - avwx ==0.3.0.2 - axiom ==0.4.6 - - b9 ==0.5.44 + - b9 ==0.5.47 - backprop ==0.1.5.1 - bank-holidays-england ==0.1.0.6 - barrier ==0.1.1 @@ -263,7 +263,7 @@ default-package-overrides: - cabal-rpm ==0.12.2 - cabal-toolkit ==0.0.5 - cache ==0.1.1.0 - - cairo ==0.13.4.2 + - cairo ==0.13.5.0 - calendar-recycling ==0.0 - call-stack ==0.1.0 - capataz ==0.1.0.1 @@ -291,12 +291,12 @@ default-package-overrides: - Chart-cairo ==1.8.3 - chaselev-deque ==0.5.0.5 - ChasingBottoms ==1.3.1.4 - - chatwork ==0.1.3.1 + - chatwork ==0.1.3.2 - cheapskate ==0.1.1 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.4.9.5 + - checkers ==0.4.10 - choice ==0.2.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 @@ -471,7 +471,7 @@ default-package-overrides: - dawg-ord ==0.5.1.0 - dbcleaner ==0.1.3 - dbus ==0.10.15 - - debian-build ==0.10.1.0 + - debian-build ==0.10.1.1 - debug ==0.1.1 - Decimal ==0.5.1 - declarative ==0.5.2 @@ -610,7 +610,7 @@ default-package-overrides: - extensible ==0.4.8 - extensible-effects ==2.4.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.5 + - extra ==1.6.6 - extractable-singleton ==0.0.1 - extrapolate ==0.3.1 - fail ==4.9.0.0 @@ -666,7 +666,7 @@ default-package-overrides: - ForestStructures ==0.0.0.2 - forma ==0.2.0 - format-numbers ==0.1.0.0 - - formatting ==6.3.2 + - formatting ==6.3.4 - foundation ==0.0.20 - FPretty ==1.1 - Frames ==0.3.0.2 @@ -734,10 +734,10 @@ default-package-overrides: - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.1.1 - ghc-syb-utils ==0.2.3.3 - - ghc-tcplugins-extra ==0.2.4 + - ghc-tcplugins-extra ==0.2.5 - ghc-typelits-extra ==0.2.4 - - ghc-typelits-knownnat ==0.4.1 - - ghc-typelits-natnormalise ==0.5.9 + - ghc-typelits-knownnat ==0.4.2 + - ghc-typelits-natnormalise ==0.5.10 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.15 - gi-cairo ==1.0.15 @@ -759,7 +759,7 @@ default-package-overrides: - glazier ==0.11.0.1 - glazier-pipes ==0.1.5.1 - GLFW-b ==1.4.8.3 - - glib ==0.13.5.0 + - glib ==0.13.6.0 - Glob ==0.9.2 - glob-posix ==0.1.0.1 - gloss ==1.11.1.1 @@ -792,7 +792,7 @@ default-package-overrides: - group-by-date ==0.1.0.2 - grouped-list ==0.2.2.0 - groups ==0.4.1.0 - - gtk2hs-buildtools ==0.13.3.1 + - gtk2hs-buildtools ==0.13.4.0 - H ==0.9.0.1 - h2c ==1.0.0 - hackage-db ==2.0 @@ -817,8 +817,8 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.3.0 - haskeline ==0.7.4.2 - - haskell-gi ==0.21.0 - - haskell-gi-base ==0.21.0 + - haskell-gi ==0.21.2 + - haskell-gi-base ==0.21.1 - haskell-gi-overloading ==0.0 - haskell-lexer ==1.0.1 - haskell-lsp ==0.2.0.1 @@ -931,8 +931,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -982,12 +982,12 @@ default-package-overrides: - HTTP ==4000.3.11 - http2 ==1.6.3 - http-api-data ==0.3.7.2 - - http-client ==0.5.12 + - http-client ==0.5.12.1 - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - http-conduit ==2.3.1 - - http-date ==0.0.6.1 + - http-date ==0.0.7 - http-link-header ==1.0.3 - http-media ==0.7.1.2 - http-reverse-proxy ==0.5.0.1 @@ -1007,13 +1007,13 @@ default-package-overrides: - hw-fingertree ==0.1.0.1 - hw-fingertree-strict ==0.1.0.3 - hw-hedgehog ==0.1.0.1 - - hw-hspec-hedgehog ==0.1.0.3 + - hw-hspec-hedgehog ==0.1.0.4 - hw-int ==0.0.0.3 - hw-json ==0.6.0.0 - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.5.0.0 + - hw-prim ==0.5.0.2 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 @@ -1071,7 +1071,7 @@ default-package-overrides: - intervals ==0.8.1 - intro ==0.3.1.0 - invariant ==0.5 - - invertible ==0.2.0.4 + - invertible ==0.2.0.5 - io-choice ==0.0.6 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1082,7 +1082,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.2 - ip ==1.1.2 - ip6addr ==0.5.3 - - iproute ==1.7.3 + - iproute ==1.7.4 - IPv6Addr ==1.0.2 - IPv6DB ==0.2.6 - ipython-kernel ==0.9.0.2 @@ -1245,7 +1245,7 @@ default-package-overrides: - markup ==4.0.4 - marvin-interpolate ==1.1.2 - massiv ==0.1.6.1 - - massiv-io ==0.1.2.0 + - massiv-io ==0.1.3.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 - matplotlib ==0.6.0 @@ -1282,7 +1282,7 @@ default-package-overrides: - mighty-metropolis ==1.2.0 - milena ==0.5.2.1 - mime-mail ==0.4.14 - - mime-mail-ses ==0.4.0.0 + - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.7 - minimorph ==0.1.6.1 - miniutter ==0.4.7.0 @@ -1312,7 +1312,7 @@ default-package-overrides: - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadloc ==0.7.1 - - monad-logger ==0.3.28.4 + - monad-logger ==0.3.28.5 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.9 - monad-logger-syslog ==0.1.4.0 @@ -1436,7 +1436,7 @@ default-package-overrides: - old-time ==1.1.0.3 - once ==0.2 - one-liner ==0.9.2 - - one-liner-instances ==0.1.1.0 + - one-liner-instances ==0.1.2.1 - OneTuple ==0.2.1 - online ==0.2.1.0 - Only ==0.1 @@ -1470,7 +1470,7 @@ default-package-overrides: - pandoc ==2.1.2 - pandoc-citeproc ==0.14.3 - pandoc-types ==1.17.3.1 - - pango ==0.13.4.0 + - pango ==0.13.5.0 - papillon ==0.1.0.5 - parallel ==3.2.1.1 - parallel-io ==0.3.3 @@ -1533,7 +1533,7 @@ default-package-overrides: - pipes-category ==0.3.0.0 - pipes-concurrency ==2.0.10 - pipes-csv ==1.4.3 - - pipes-extras ==1.0.13 + - pipes-extras ==1.0.14 - pipes-fastx ==0.3.0.0 - pipes-fluid ==0.6.0.0 - pipes-group ==1.0.9 @@ -1652,7 +1652,7 @@ default-package-overrides: - raaz ==0.2.0 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 - - rakuten ==0.1.1.0 + - rakuten ==0.1.1.1 - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 @@ -1748,13 +1748,13 @@ default-package-overrides: - SafeSemaphore ==0.10.1 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - - sampling ==0.3.2 + - sampling ==0.3.3 - sandman ==0.2.0.1 - say ==0.1.0.0 - - sbp ==2.3.13 + - sbp ==2.3.16 - sbv ==7.5 - - scalendar ==1.2.0 - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1889,7 +1889,7 @@ default-package-overrides: - Spock-worker ==0.3.1.0 - spreadsheet ==0.1.3.7 - sqlite-simple ==0.4.15.0 - - sql-words ==0.1.5.1 + - sql-words ==0.1.6.0 - squeal-postgresql ==0.1.1.4 - srcloc ==0.5.1.2 - stache ==1.2.1 @@ -1898,7 +1898,7 @@ default-package-overrides: - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - - StateVar ==1.1.0.4 + - StateVar ==1.1.1.0 - stateWriter ==0.2.10 - static-text ==0.2.0.1 - statistics ==0.14.0.2 @@ -2020,7 +2020,7 @@ default-package-overrides: - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - - text-ldap ==0.1.1.11 + - text-ldap ==0.1.1.12 - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 @@ -2034,7 +2034,7 @@ default-package-overrides: - tfp ==1.0.0.2 - tf-random ==0.5 - th-abstraction ==0.2.6.0 - - th-data-compat ==0.0.2.5 + - th-data-compat ==0.0.2.6 - th-desugar ==1.7 - these ==0.7.4 - th-expand-syns ==0.4.4.0 @@ -2049,7 +2049,7 @@ default-package-overrides: - threepenny-editors ==0.5.6 - threepenny-gui ==0.8.2.3 - threepenny-gui-flexbox ==0.4.2 - - th-reify-compat ==0.0.1.3 + - th-reify-compat ==0.0.1.4 - th-reify-many ==0.1.8 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 @@ -2058,7 +2058,7 @@ default-package-overrides: - th-to-exp ==0.0.1.1 - th-utilities ==0.2.0.1 - tibetan-utils ==0.1.1.5 - - tidal ==0.9.8 + - tidal ==0.9.9 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2104,7 +2104,7 @@ default-package-overrides: - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.7 + - turtle ==1.5.8 - turtle-options ==0.1.0.4 - type-assertions ==0.1.0.0 - type-combinators ==0.2.4.3 @@ -2150,7 +2150,7 @@ default-package-overrides: - universe-instances-extended ==1.0.0.1 - universe-instances-trans ==1.0.0.1 - universe-reverse-instances ==1.0 - - universum ==1.1.0 + - universum ==1.1.1 - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.0.1 - unix-time ==0.3.8 @@ -2241,8 +2241,8 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.2 - - warp ==3.2.18.2 - - warp-tls ==3.2.4.2 + - warp ==3.2.19 + - warp-tls ==3.2.4.3 - wave ==0.1.5 - wavefront ==0.7.1.2 - webdriver ==0.8.5 @@ -2273,7 +2273,7 @@ default-package-overrides: - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.2 - - wl-pprint ==1.2 + - wl-pprint ==1.2.1 - wl-pprint-annotated ==0.1.0.0 - wl-pprint-console ==0.1.0.1 - wl-pprint-extras ==3.5.0.5 @@ -2327,7 +2327,7 @@ default-package-overrides: - xml-types ==0.3.6 - xmonad ==0.13 - xmonad-contrib ==0.13 - - xmonad-extras ==0.13.2 + - xmonad-extras ==0.13.3 - xss-sanitize ==0.3.5.7 - xturtle ==0.2.0.0 - xxhash ==0.0.2 From 46cce6ef9924e1961171b2207f5e707974141620 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Apr 2018 10:56:04 +0200 Subject: [PATCH 105/491] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-6-g7882850 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5dcdcbfee8248cc4b7fbe7ce08857000b39d77d6. --- .../haskell-modules/hackage-packages.nix | 2001 ++++++++++------- 1 file changed, 1161 insertions(+), 840 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bf7838b2b21b..8d25c173d75a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17550,8 +17550,8 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.1.0.4"; - sha256 = "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks"; + version = "1.1.1.0"; + sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s"; libraryHaskellDepends = [ base stm transformers ]; homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; @@ -19613,6 +19613,26 @@ self: { inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11_1_9" = callPackage + ({ mkDerivation, base, data-default, libX11, libXext, libXinerama + , libXrandr, libXrender, libXScrnSaver + }: + mkDerivation { + pname = "X11"; + version = "1.9"; + sha256 = "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh"; + libraryHaskellDepends = [ base data-default ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver + ]; + homepage = "https://github.com/xmonad/X11"; + description = "A binding to the X11 graphics library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: mkDerivation { @@ -22499,17 +22519,6 @@ self: { }) {}; "aeson-generic-compat" = callPackage - ({ mkDerivation, aeson, base }: - mkDerivation { - pname = "aeson-generic-compat"; - version = "0.0.1.1"; - sha256 = "1davhg48x4k9nsizpafjlicwryi05ijfh902bn35x76pay7alims"; - libraryHaskellDepends = [ aeson base ]; - description = "Compatible generic class names of Aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-generic-compat_0_0_1_2" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { pname = "aeson-generic-compat"; @@ -22518,7 +22527,6 @@ self: { libraryHaskellDepends = [ aeson base ]; description = "Compatible generic class names of Aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-injector" = callPackage @@ -23717,8 +23725,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "alg"; - version = "0.2.0.0"; - sha256 = "1lh5pz3zmzyq9dkgzabgi8xhlssxccxw24ng97lynmsvc7jjras8"; + version = "0.2.1.0"; + sha256 = "13glk774rdd6fwi427djkc1q4xqmdf44smhp5lgv24vfwd5fffcq"; libraryHaskellDepends = [ base ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; @@ -23841,22 +23849,6 @@ self: { }) {}; "algebraic-graphs" = callPackage - ({ mkDerivation, array, base, containers, criterion, extra - , QuickCheck - }: - mkDerivation { - pname = "algebraic-graphs"; - version = "0.0.5"; - sha256 = "046507r77wn4f6grxzrh2n90rnllp1inhdvn4fg9ki36k5qgqyzx"; - libraryHaskellDepends = [ array base containers ]; - testHaskellDepends = [ base containers extra QuickCheck ]; - benchmarkHaskellDepends = [ base containers criterion ]; - homepage = "https://github.com/snowleopard/alga"; - description = "A library for algebraic graph construction and transformation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "algebraic-graphs_0_1_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, containers , criterion, deepseq, extra, QuickCheck }: @@ -23876,7 +23868,6 @@ self: { homepage = "https://github.com/snowleopard/alga"; description = "A library for algebraic graph construction and transformation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algebraic-prelude" = callPackage @@ -24181,27 +24172,6 @@ self: { }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage - ({ mkDerivation, alsa-core, alsaLib, array, base - , extensible-exceptions, sample-frame, storable-record - }: - mkDerivation { - pname = "alsa-pcm"; - version = "0.6.0.4"; - sha256 = "0anafqzml5haacb7ax27a82b815rhv7nqawa7w3lb11vj1wi7bls"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - alsa-core array base extensible-exceptions sample-frame - storable-record - ]; - libraryPkgconfigDepends = [ alsaLib ]; - homepage = "http://www.haskell.org/haskellwiki/ALSA"; - description = "Binding to the ALSA Library API (PCM audio)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; - - "alsa-pcm_0_6_1" = callPackage ({ mkDerivation, alsa-core, alsaLib, array, base , extensible-exceptions, sample-frame, semigroups, storable-record }: @@ -24219,7 +24189,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -28446,6 +28416,8 @@ self: { pname = "arbtt"; version = "0.10.0.1"; sha256 = "0pav5q0xh90vjrj77l7vk38l38xyhqas4750il5wkpqf4f5li877"; + revision = "1"; + editedCabalFile = "1mmrv81c9gwa2gqlp0agipg5sdxm88fhiza84y2sv8vg7zf88x82"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29885,6 +29857,8 @@ self: { pname = "async-pool"; version = "0.9.0.2"; sha256 = "1wg78y80zd7qyizyis073dmmvq4s67ni1pkaq31jl5klr49rs5g0"; + revision = "1"; + editedCabalFile = "0w3l3lbnfdm9ihp7pfda4sf1y1cqpc6g6q6wjzafdi088l3lklkn"; libraryHaskellDepends = [ async base containers fgl monad-control stm transformers transformers-base @@ -30447,8 +30421,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.10.0.8"; - sha256 = "159nf1dfb4zh7kbk534xxhvap3gi6943j9vrp7k6lkyvp3p2s1q9"; + version = "2.10.0.11"; + sha256 = "09c2nldzaqm8a203gqk6lc81gfhmvz30pxicxi9g1971y1q0nklj"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -30897,27 +30871,6 @@ self: { }) {}; "audacity" = callPackage - ({ mkDerivation, base, bytestring, deepseq, directory - , explicit-exception, filepath, non-empty, storable-record - , storablevector, tagchup, transformers, utility-ht, xml-basic - }: - mkDerivation { - pname = "audacity"; - version = "0.0.1.2"; - sha256 = "1df9vk6f1gj0jpj3rmq63s3xjqc5p02hprfvq1nqgws0vfnp5lab"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring deepseq directory explicit-exception filepath - non-empty storable-record storablevector tagchup transformers - utility-ht xml-basic - ]; - homepage = "http://hub.darcs.net/thielema/audacity"; - description = "Interchange with the Audacity sound signal editor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "audacity_0_0_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory , explicit-exception, filepath, non-empty, semigroups , storable-record, storablevector, tagchup, transformers @@ -30937,7 +30890,6 @@ self: { homepage = "http://hub.darcs.net/thielema/audacity"; description = "Interchange with the Audacity sound signal editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "audiovisual" = callPackage @@ -32423,39 +32375,6 @@ self: { }) {}; "b9" = callPackage - ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes - , bytestring, conduit, conduit-extra, ConfigFile, directory - , filepath, free, hashable, hspec, hspec-expectations, lens, mtl - , optparse-applicative, parallel, parsec, pretty, pretty-show - , process, QuickCheck, random, shake, syb, template, text, time - , transformers, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "b9"; - version = "0.5.44"; - sha256 = "0fr9s2s4gwh6l80s9j4jj5s10mp92dkxs5fwjlk8vbyg6xi6sgza"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bifunctors binary boxes bytestring conduit - conduit-extra ConfigFile directory filepath free hashable lens mtl - parallel parsec pretty pretty-show process QuickCheck random shake - syb template text time transformers unordered-containers vector - yaml - ]; - executableHaskellDepends = [ - base bytestring directory lens optparse-applicative - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations QuickCheck text - unordered-containers vector yaml - ]; - homepage = "https://github.com/sheyll/b9-vm-image-builder"; - description = "A tool and library for building virtual machine images"; - license = stdenv.lib.licenses.mit; - }) {}; - - "b9_0_5_47" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes , bytestring, conduit, conduit-extra, ConfigFile, directory , filepath, free, hashable, hspec, hspec-expectations, lens, mtl @@ -32486,7 +32405,6 @@ self: { homepage = "https://github.com/sheyll/b9-vm-image-builder"; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babl" = callPackage @@ -32998,12 +32916,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_11_0_0" = callPackage + "base_4_11_1_0" = callPackage ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.11.0.0"; - sha256 = "1p18cm61ql911nqfld1kc7h6qpmhfxrf1xyahik180a7rbygbkq3"; + version = "4.11.1.0"; + sha256 = "0q2ygfqy4qim8h9fmlb5iwfnf2lrly27bqqvnckdlmh775fmq07g"; libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; @@ -33127,8 +33045,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-noprelude"; - version = "4.11.0.0"; - sha256 = "11q2cqy865q13hy2kc9k41cprdmlzh172prh5dhy3xp6zsbppjnh"; + version = "4.11.1.0"; + sha256 = "19d1x487kwhc60qjix7xx53dlszbx08rdhxd2zab1pwjw62ws3c8"; libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "https://github.com/hvr/base-noprelude"; @@ -33898,18 +33816,18 @@ self: { ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring , case-insensitive, conduit, free, hashable, haskell-src-exts , lifted-base, monad-control, mtl, network-uri, postgresql-libpq - , postgresql-simple, scientific, text, time, unordered-containers - , uuid, vector + , postgresql-simple, scientific, tagged, text, time + , unordered-containers, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.3.1.0"; - sha256 = "1nv7r50b4khx1ski5c64dywphzbn1x9xx9hp8b8zfh88i05b5jf6"; + version = "0.3.2.0"; + sha256 = "09iv1ji1kpavi42z0p4nng057h0q5f16cdsx0yiq53c3ji3yvbnf"; libraryHaskellDepends = [ aeson base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base monad-control - mtl network-uri postgresql-libpq postgresql-simple scientific text - time unordered-containers uuid vector + mtl network-uri postgresql-libpq postgresql-simple scientific + tagged text time unordered-containers uuid-types vector ]; homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres"; description = "Connection layer between beam and postgres"; @@ -35419,15 +35337,15 @@ self: { inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; - "bindings-GLFW_3_2_1_0" = callPackage + "bindings-GLFW_3_2_1_1" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr , libXxf86vm, test-framework, test-framework-hunit }: mkDerivation { pname = "bindings-GLFW"; - version = "3.2.1.0"; - sha256 = "1sbbms17yyrv5cmf584bc5k4bh8l2vrrhkz2693nyhkadvjxiavb"; + version = "3.2.1.1"; + sha256 = "03hn12bdqypwd6x9hxa7685bm6w86nsf6cmcwkr8zzgb41mwc93b"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ libGL libX11 libXcursor libXext libXfixes libXi libXinerama @@ -39194,7 +39112,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_36" = callPackage + "brick_0_36_2" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, QuickCheck, stm, template-haskell, text @@ -39202,8 +39120,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.36"; - sha256 = "1i1np31hncgz5cvygraxcv9x6l7yn9y3f8f92jih1im38drhp65z"; + version = "0.36.2"; + sha256 = "0zzd3lwlb60n3zdcyyqf89b066337f6qny5m4clf1fbvqiw7g771"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41150,6 +41068,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ca" = callPackage + ({ mkDerivation, alg, base }: + mkDerivation { + pname = "ca"; + version = "0.0.0.1"; + sha256 = "0fkqbpgbbp1g6q5vjmgnfddrilyqwqsvd6w7w3vmgg6q7zdh6fy2"; + libraryHaskellDepends = [ alg base ]; + description = "Cellular Automata"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cab" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, conduit , conduit-extra, containers, directory, filepath, process @@ -42385,8 +42314,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.4.2"; - sha256 = "0sm3367ikrjfzwhz1f9bkamk6i33p5cginzc9kpgw3x0lk6pbrhg"; + version = "0.13.5.0"; + sha256 = "1wxylv4d8120ri0vgar168ikqa9m6533ipdwi38qlmxmw20ws2j2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -44215,6 +44144,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {dttools = null;}; + "cdeps" = callPackage + ({ mkDerivation, alex, array, base, bytestring, directory, filepath + , hspec, optparse-applicative, text + }: + mkDerivation { + pname = "cdeps"; + version = "0.1.0.0"; + sha256 = "1klj3cx7cx39iyskv7fs6s28jplyn13dwv4khz79kxgg1sxd9gv5"; + revision = "2"; + editedCabalFile = "1r2ihgk5yj6xv4qc276b29gfzblksf82qdp0qg06cz590kxb8v2x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring directory filepath text + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ base hspec ]; + description = "Extract dependencies from C code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cedict" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, parsec , utf8-string @@ -45123,35 +45074,6 @@ self: { }) {}; "chatwork" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection - , data-default-class, hspec, http-api-data, http-client - , http-client-tls, http-types, req, servant-server, text, warp - }: - mkDerivation { - pname = "chatwork"; - version = "0.1.3.1"; - sha256 = "0wsr84yk8l9s8fpb6fg4vbjyzlvy0608qply1h12zi09b5zr149i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req text - ]; - executableHaskellDepends = [ - aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req text - ]; - testHaskellDepends = [ - aeson aeson-casing base bytestring connection data-default-class - hspec http-api-data http-client http-client-tls http-types req - servant-server text warp - ]; - homepage = "https://github.com/matsubara0507/chatwork#readme"; - description = "The ChatWork API in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "chatwork_0_1_3_2" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection , data-default-class, hspec, http-api-data, http-client , http-client-tls, http-types, req, servant-server, text, warp @@ -45178,7 +45100,6 @@ self: { homepage = "https://github.com/matsubara0507/chatwork#readme"; description = "The ChatWork API in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate" = callPackage @@ -45311,20 +45232,6 @@ self: { }) {}; "checkers" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; - version = "0.4.9.5"; - sha256 = "1xaffx0vmq4swciyq3qzjfklfj19nnhd5yama9di5sas4f8v517i"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - homepage = "https://github.com/conal/checkers"; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_4_10" = callPackage ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; @@ -45336,7 +45243,6 @@ self: { homepage = "https://github.com/conal/checkers"; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -48595,6 +48501,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "coerce-util" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "coerce-util"; + version = "0.1.0.0"; + sha256 = "0v4ymcrqij8q9s8pcgbfrnl8y379fki3zp80lg4xqvbx0i89vsxf"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/chessai/coerce-util.git"; + description = "utils for Data.Coerce"; + license = stdenv.lib.licenses.mit; + }) {}; + "cofunctor" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50202,6 +50120,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-prelude_1_4_0_1" = callPackage + ({ mkDerivation, base, cpphs }: + mkDerivation { + pname = "composition-prelude"; + version = "1.4.0.1"; + sha256 = "172fnixh4jgmwfsaxg0fyji0i745pbjwk00l3yh5pwng9swzi6ik"; + libraryHaskellDepends = [ base ]; + libraryToolDepends = [ cpphs ]; + homepage = "https://github.com/vmchale/composition-prelude#readme"; + description = "Higher-order function combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "composition-tree" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { @@ -52475,6 +52407,8 @@ self: { pname = "contravariant"; version = "1.4.1"; sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9"; + revision = "1"; + editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx"; libraryHaskellDepends = [ base StateVar transformers transformers-compat ]; @@ -53674,8 +53608,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.4.1"; - sha256 = "1sd6h0xw76iwvgl7i4c9wy6q5fmq75inq5vh79rzf3bhmahb1529"; + version = "3.5.0"; + sha256 = "0x8l31zbgcx4idcvpjsipsc3k610hj6g6rjpxbbpaz7zcb2ykvn1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -54210,8 +54144,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "9.3"; - sha256 = "1w1mb43hb6zn8n8r261j623jrgxx54h8jifhcby8nnfyl3h97c69"; + version = "10.0"; + sha256 = "10wg1s47r70gxgl9bfg3cxhj8w74k7wn0c3lh418mxypb2p3ffww"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -57780,16 +57714,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_3_0_0_2" = callPackage - ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens - , profunctors, tagged + "data-diverse-lens_3_1_0_0" = callPackage + ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec + , lens, profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "3.0.0.2"; - sha256 = "0hahvbyb6yr3bq36dlrvdsgzg3nifckyp10h83d2ryqgla7p7rbp"; + version = "3.1.0.0"; + sha256 = "0g1cnn1kw36ac68wm8qmd8pdzjpl4xcil7shailxwawldi52v549"; libraryHaskellDepends = [ - base data-diverse generic-lens lens profunctors tagged + base data-diverse data-has generic-lens lens profunctors tagged ]; testHaskellDepends = [ base data-diverse generic-lens hspec lens tagged @@ -60052,25 +59986,6 @@ self: { }) {}; "debian-build" = callPackage - ({ mkDerivation, base, directory, filepath, process, split - , transformers - }: - mkDerivation { - pname = "debian-build"; - version = "0.10.1.0"; - sha256 = "1d4h3r0v82fwiwazvcgrbv9f7nslbgw94hbsyyibsiikwpg36454"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory filepath process split transformers - ]; - executableHaskellDepends = [ base filepath transformers ]; - homepage = "http://twitter.com/khibino/"; - description = "Debian package build sequence tools"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "debian-build_0_10_1_1" = callPackage ({ mkDerivation, base, directory, filepath, process, split , transformers }: @@ -60087,7 +60002,6 @@ self: { homepage = "http://twitter.com/khibino/"; description = "Debian package build sequence tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debug" = callPackage @@ -72239,15 +72153,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_5_3_0" = callPackage + "extensible-effects_2_6_0_1" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, mtl , QuickCheck, silently, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.5.3.0"; - sha256 = "0dp6wsrlqivghmhwkj5js807i5m71lp9g3v3v8qb7xd3c08awy86"; + version = "2.6.0.1"; + sha256 = "1c39hn8iskn71s3hd3af3q1xym9mzdvrjswcnyqrkibws47k2lmx"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control QuickCheck silently test-framework @@ -72300,23 +72214,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.6.5"; - sha256 = "05x89gclm8vw1rx4945p3asmsa28055y81nwzvgq91yr5qc4lbgi"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - homepage = "https://github.com/ndmitchell/extra#readme"; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_6" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: @@ -72331,7 +72228,6 @@ self: { homepage = "https://github.com/ndmitchell/extra#readme"; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -72760,8 +72656,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.5.0.0"; - sha256 = "17jv9ysnd0bvlzc0sircj0mnbxpwzzby98wf6p6hj76m284acdx6"; + version = "0.6.0.1"; + sha256 = "1am161zrjaann9pnazsv9ic43cnw1bimqcy6vvh5qinigc33p08f"; libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat-compat hspec QuickCheck @@ -77161,24 +77057,6 @@ self: { }) {}; "formatting" = callPackage - ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec - , integer-gmp, old-locale, scientific, semigroups, text, time - , transformers - }: - mkDerivation { - pname = "formatting"; - version = "6.3.2"; - sha256 = "1h5jy7y2cd1qaymypw8hfr52924szas0jd2hvjpbr5mrwssvhkqf"; - libraryHaskellDepends = [ - array base bytestring clock ghc-prim integer-gmp old-locale - scientific semigroups text time transformers - ]; - testHaskellDepends = [ base hspec semigroups ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "formatting_6_3_4" = callPackage ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec , integer-gmp, old-locale, scientific, semigroups, text, time , transformers @@ -77194,7 +77072,6 @@ self: { testHaskellDepends = [ base hspec semigroups ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forml" = callPackage @@ -78593,6 +78470,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fsnotify_0_2_1_2" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , filepath, hinotify, tasty, tasty-hunit, temporary, text, time + , unix-compat + }: + mkDerivation { + pname = "fsnotify"; + version = "0.2.1.2"; + sha256 = "1384yksg5v1rsbbhncairxh8ahwqmg661mgc2yrcs6hbnv5jzjyp"; + libraryHaskellDepends = [ + async base bytestring containers directory filepath hinotify text + time unix-compat + ]; + testHaskellDepends = [ + async base directory filepath tasty tasty-hunit temporary + unix-compat + ]; + homepage = "https://github.com/haskell-fswatch/hfsnotify"; + description = "Cross platform library for file change notification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fsnotify-conduit" = callPackage ({ mkDerivation, async, base, conduit, directory, filepath , fsnotify, hspec, resourcet, temporary, transformers @@ -81042,6 +80942,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_5_0_0" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.5.0.0"; + sha256 = "0s640ql6i9lr8s8m39fvjv7iz1pbcnjnvb8xsdbygb49cwk3khcz"; + libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -81066,6 +80980,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-aeson_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, genvalidity-vector, hspec + , QuickCheck, validity, validity-aeson + }: + mkDerivation { + pname = "genvalidity-aeson"; + version = "0.2.0.0"; + sha256 = "0lwy2r7gb5s26hilgxs2hf8zcn4dhdwqhr8r05zrvjcry4inn5mm"; + libraryHaskellDepends = [ + aeson base genvalidity genvalidity-scientific genvalidity-text + genvalidity-unordered-containers genvalidity-vector QuickCheck + validity validity-aeson + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-hspec hspec + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-bytestring" = callPackage ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-bytestring @@ -81086,6 +81024,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-bytestring_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.2.0.0"; + sha256 = "0ai3pmybs2xky8b596s0xs6511ab1h28ywbaishn5s0217q225zf"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck validity validity-bytestring + ]; + testHaskellDepends = [ + base bytestring genvalidity genvalidity-hspec hspec QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers @@ -81127,6 +81085,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec_0_6_0_0" = callPackage + ({ mkDerivation, base, doctest, genvalidity, genvalidity-property + , hspec, hspec-core, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-hspec"; + version = "0.6.0.0"; + sha256 = "0pa4wx08yipr59nsdf5prh6j5pcixnxxfd9i4vm1rb4v89nws6al"; + libraryHaskellDepends = [ + base genvalidity genvalidity-property hspec hspec-core QuickCheck + validity + ]; + testHaskellDepends = [ + base doctest genvalidity hspec hspec-core QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for GenValidity instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , genvalidity, genvalidity-aeson, genvalidity-hspec @@ -81150,6 +81129,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-aeson_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , genvalidity, genvalidity-aeson, genvalidity-hspec + , genvalidity-text, hspec, QuickCheck, text + }: + mkDerivation { + pname = "genvalidity-hspec-aeson"; + version = "0.2.0.0"; + sha256 = "0xkignwkq1hdyvachslwf5clzvnw0bmyi00mv3nkigxn8q1vbf7h"; + libraryHaskellDepends = [ + aeson base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck + ]; + testHaskellDepends = [ + aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec + genvalidity-text hspec text + ]; + homepage = "http://cs-syd.eu"; + description = "Standard spec's for aeson-related instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-binary" = callPackage ({ mkDerivation, base, binary, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck @@ -81168,6 +81170,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-binary_0_2_0_0" = callPackage + ({ mkDerivation, base, binary, deepseq, doctest, genvalidity + , genvalidity-hspec, hspec, QuickCheck + }: + mkDerivation { + pname = "genvalidity-hspec-binary"; + version = "0.2.0.0"; + sha256 = "0qmmhbka2ba9x9ypafij5q9gmmm7x4v1frf9mrfi4ffw91fnfnpv"; + libraryHaskellDepends = [ + base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for binary-related Instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-cereal" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck @@ -81186,6 +81206,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-cereal_0_2_0_0" = callPackage + ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity + , genvalidity-hspec, hspec, QuickCheck + }: + mkDerivation { + pname = "genvalidity-hspec-cereal"; + version = "0.2.0.0"; + sha256 = "18fz57lwn6ljrm9fszb1n2jzn93kqvqi7x9fyp6a0kh733lyzrnn"; + libraryHaskellDepends = [ + base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "http://cs-syd.eu"; + description = "Standard spec's for cereal-related instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-hashable" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck @@ -81209,6 +81247,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-hashable_0_2_0_0" = callPackage + ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec + , genvalidity-property, hashable, hspec, hspec-core, QuickCheck + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-hashable"; + version = "0.2.0.0"; + sha256 = "1mw3lg792hssbfasb0av9x9n7ksqcjwxpgab0n9ia1jspxacrxr4"; + libraryHaskellDepends = [ + base genvalidity genvalidity-hspec genvalidity-property hashable + hspec QuickCheck validity + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-hspec hashable hspec + hspec-core QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for Hashable instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-path" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path , validity-path @@ -81225,6 +81286,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-path_0_3_0_0" = callPackage + ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec + , hspec, path, QuickCheck, validity-path + }: + mkDerivation { + pname = "genvalidity-path"; + version = "0.3.0.0"; + sha256 = "00rbizzxy9ccd85gr0bf4kw6b5bz15pzhg05qzsifpjj6vfy4izf"; + libraryHaskellDepends = [ + base genvalidity path QuickCheck validity-path + ]; + testHaskellDepends = [ base genvalidity-hspec hspec path ]; + benchmarkHaskellDepends = [ + base criterion genvalidity path QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Path"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-property" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, QuickCheck, validity @@ -81242,6 +81324,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-property_0_2_0_0" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, genvalidity + , hspec, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-property"; + version = "0.2.0.0"; + sha256 = "10przvvqrmjyr9cmbna79kj15wjhi0r4j64qn5824gslyy7g39pa"; + libraryHaskellDepends = [ + base genvalidity hspec QuickCheck validity + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard properties for functions on `Validity` types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-scientific" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, scientific, validity, validity-scientific @@ -81262,6 +81362,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-scientific_0_2_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, scientific, validity, validity-scientific + }: + mkDerivation { + pname = "genvalidity-scientific"; + version = "0.2.0.0"; + sha256 = "0zf0akzbggyy79h48m78cfsp82nmdgk0py8crfp81sh0pd3cydpi"; + libraryHaskellDepends = [ + base genvalidity QuickCheck scientific validity validity-scientific + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck scientific + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Scientific"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text @@ -81282,6 +81402,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-text_0_5_0_0" = callPackage + ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, text, validity, validity-text + }: + mkDerivation { + pname = "genvalidity-text"; + version = "0.5.0.0"; + sha256 = "0vyw27l0b9snndl1nixidg8ghk6i95qv2xk59fbj1r1ybg27b837"; + libraryHaskellDepends = [ + array base genvalidity QuickCheck text validity validity-text + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck text + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-time" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time @@ -81300,6 +81440,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-time_0_2_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, time, validity-time + }: + mkDerivation { + pname = "genvalidity-time"; + version = "0.2.0.0"; + sha256 = "04kfqs4mc9p5flr3vvb6qj3nb4agpl3hww62g7np6sl5s36cbycb"; + libraryHaskellDepends = [ + base genvalidity QuickCheck time validity-time + ]; + testHaskellDepends = [ base genvalidity-hspec hspec time ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-unordered-containers" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity @@ -81322,6 +81480,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-unordered-containers_0_2_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable + , hspec, QuickCheck, unordered-containers, validity + , validity-unordered-containers + }: + mkDerivation { + pname = "genvalidity-unordered-containers"; + version = "0.2.0.0"; + sha256 = "1kfn6g3h33g215qy0iffhr35vd2np9nsf6634fjk40mbz1san0m8"; + libraryHaskellDepends = [ + base genvalidity hashable QuickCheck unordered-containers validity + validity-unordered-containers + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec unordered-containers + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for unordered-containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-uuid" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, uuid, validity, validity-uuid @@ -81342,6 +81522,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-uuid_0_1_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, uuid, validity, validity-uuid + }: + mkDerivation { + pname = "genvalidity-uuid"; + version = "0.1.0.0"; + sha256 = "1j4q3smhz812cfgsv6vmjgng068knd9v7xg0hkvx868wbndgk37h"; + libraryHaskellDepends = [ + base genvalidity QuickCheck uuid validity validity-uuid + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck uuid + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for UUID"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-vector" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector @@ -81362,6 +81562,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-vector_0_2_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, validity, validity-vector, vector + }: + mkDerivation { + pname = "genvalidity-vector"; + version = "0.2.0.0"; + sha256 = "0ww3hzkzhblx8qp062vz74vwaqvv38l0sl0dwyxrqra68qglxr4f"; + libraryHaskellDepends = [ + base genvalidity QuickCheck validity validity-vector vector + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for vector"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "geo-resolver" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, http-conduit, http-types, HUnit, QuickCheck @@ -81758,14 +81978,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_4_1" = callPackage + "ghc-boot_8_4_2" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.4.1"; - sha256 = "0abgzvqra66hi61bn901dlk0r0n4s2fg6y7d8w2k2a6w437vgzdd"; + version = "8.4.2"; + sha256 = "120vdlb6gyv6mndv8n3sssnif1m4zz6wrjlq9xmr2sha27pgsx9r"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -81774,12 +81994,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_4_1" = callPackage + "ghc-boot-th_8_4_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.4.1"; - sha256 = "0l9fv1sp4dbq1ssw0l55riw9zpcii8fz75i0yj0vlihccf10lbj9"; + version = "8.4.2"; + sha256 = "1c7crailwqgwn7a8mqpggmkzzz7067z3hz710vx7wp71wynzj8ff"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; @@ -82546,18 +82766,6 @@ self: { }) {}; "ghc-tcplugins-extra" = callPackage - ({ mkDerivation, base, ghc }: - mkDerivation { - pname = "ghc-tcplugins-extra"; - version = "0.2.4"; - sha256 = "03lxph20m33ipa117i917khgk8rv3fljly3fh31j92d0l02bh9sb"; - libraryHaskellDepends = [ base ghc ]; - homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; - description = "Utilities for writing GHC type-checker plugins"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-tcplugins-extra_0_2_5" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; @@ -82567,7 +82775,6 @@ self: { homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; description = "Utilities for writing GHC type-checker plugins"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-time-alloc-prof" = callPackage @@ -82626,27 +82833,6 @@ self: { }) {}; "ghc-typelits-knownnat" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; - version = "0.4.1"; - sha256 = "0m3flri3y82wvqania3yj7mhnnxvx8z5hxwl6mr5ppavxak169q9"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - homepage = "http://clash-lang.org/"; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_4_2" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck , template-haskell, transformers @@ -82665,27 +82851,9 @@ self: { homepage = "http://clash-lang.org/"; description = "Derive KnownNat constraints from other KnownNat constraints"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit, template-haskell - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.5.9"; - sha256 = "1aw0pgcplljll86gk9jvqc22zpnb17amamna11n9b4xzrw2lrnkg"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - homepage = "http://www.clash-lang.org/"; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_5_10" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: @@ -82700,6 +82868,23 @@ self: { homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; + }) {}; + + "ghc-typelits-natnormalise_0_6" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty + , tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.6"; + sha256 = "0xs5d7bsyp53nzg509gs2qyfrj5fjp7bpyw3pjnnqk8d4xcgmf2w"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra integer-gmp transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -82756,15 +82941,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghci_8_4_1" = callPackage + "ghci_8_4_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell , transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.4.1"; - sha256 = "0jlnzkwj4xxs57c0zi3rcy96rksqakx65a7m8xq04055ip388sws"; + version = "8.4.2"; + sha256 = "0pdhy6p3axq6jwl84mcq6404r1mnld7fbyspkmzninvdd46wr74l"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th template-haskell transformers unix @@ -84123,8 +84308,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.4.1"; - sha256 = "11w567c4zafcdm5i6wpi1dr4m6mpfvyqyda4llq7wgvjbshy5fqk"; + version = "0.13.5.0"; + sha256 = "0p1mwzbrzb74wxlykasza4qvvlck2b0wgnhvfa0j3h27x4ii8xjw"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -85574,8 +85759,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.5.0"; - sha256 = "1bd6lfl8l08s28g9wky2bpyl2kh8vhycdni2wh3m7iq91madxgbj"; + version = "0.13.6.0"; + sha256 = "1sz8mvac39sxj7skw8zasbp6srm4k92223l29lll1125d8n0cwaf"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -90416,8 +90601,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.14.7"; - sha256 = "0fqbr1h2zxa4g6jyias163bnlsnsdhfzfansc63qzh9y10vc2hn4"; + version = "0.14.9"; + sha256 = "1khz6ymwga07h7s1k9gadf212m242l9qq09qn2fvx8v67p4wvxxz"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -90522,6 +90707,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "gtk-sni-tray" = callPackage + ({ mkDerivation, base, bytestring, containers, dbus, directory + , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut + , gtk3, hslogger, optparse-applicative, status-notifier-item, text + , transformers, unix + }: + mkDerivation { + pname = "gtk-sni-tray"; + version = "0.1.0.0"; + sha256 = "0a9yxhir33zg1bkv9nyazkrjawv2w9qr43n4prrifib7r976b7pj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk + gi-gdkpixbuf gi-glib gi-gtk hslogger status-notifier-item text + transformers unix + ]; + libraryPkgconfigDepends = [ gtk3 ]; + executableHaskellDepends = [ + base dbus gi-gdk gi-gtk gtk-strut hslogger optparse-applicative + status-notifier-item text unix + ]; + homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme"; + description = "A standalone StatusNotifierItem/AppIndicator tray"; + license = stdenv.lib.licenses.bsd3; + }) {gtk3 = pkgs.gnome3.gtk;}; + "gtk-strut" = callPackage ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: mkDerivation { @@ -90578,8 +90790,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.3.1"; - sha256 = "0m3irv9cs8f602wc5lq84c7k1pd9yg4vydfzzn2qa6z0l552y3r2"; + version = "0.13.4.0"; + sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90731,8 +90943,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.14.8"; - sha256 = "0sxk3dhzhqkmlwqkpvmi1b0ycyqdz19z7zfr5nxhskzn5b522ikw"; + version = "0.14.9"; + sha256 = "1rcn0x6q0r0a3waxdsyvbyzfswsi6j7yr9fsixqr1c0g334lmqa8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -92834,8 +93046,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.6.2"; - sha256 = "0nkq1qlhpd6gmrj75vik51a4fndn6sy3vwx2nk91vmdd7ml2f0v8"; + version = "1.6.5"; + sha256 = "10pn82hichabqxxk931zwqkis8p0z235ydv7dlcrl8nisj6lzda1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93661,6 +93873,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "half_0_3" = callPackage + ({ mkDerivation, base, deepseq, hspec, QuickCheck, template-haskell + }: + mkDerivation { + pname = "half"; + version = "0.3"; + sha256 = "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6"; + libraryHaskellDepends = [ base deepseq template-haskell ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/ekmett/half"; + description = "Half-precision floating-point"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "halfs" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, filepath, fingertree, HFuse, mtl, QuickCheck, random @@ -94278,6 +94505,34 @@ self: { 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 + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.5"; + sha256 = "1imgfnn58cmfi383zfi0flx8w2430f5kplsy2m27djy5fv6brmpv"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -95366,8 +95621,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.4"; - sha256 = "0dclanbd07knph3bxn5a3kyl9qkqcwhy00y5jnah9sxk4qqhjkk5"; + version = "0.0.0.7"; + sha256 = "0bbyrbs1rm83sd5nsd65yxxfyz4day20hs3vz7rlkh2hjxhpvxjv"; libraryHaskellDepends = [ base containers hasbolt lens neat-interpolation template-haskell text th-lift-instances @@ -96527,37 +96782,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.21.0"; - sha256 = "109jgixxrb9xjlkqnwkch9zgb2rj79knd8ivgfi1cc4v30299vwi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath - haskell-gi-base mtl pretty-show process regex-tdfa safe text - transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - testHaskellDepends = [ base doctest ]; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; - inherit (pkgs.gnome3) gobjectIntrospection;}; - - "haskell-gi_0_21_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers - , directory, doctest, filepath, glib, gobjectIntrospection - , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe - , text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.21.1"; - sha256 = "0nhsjw0cv29r6rbajz4lf1ca63lm1m0i57wcs8p6aw10kx246q1n"; + version = "0.21.2"; + sha256 = "0g32zgj89n1nihldvn756bz0z25h1ip8as2xvp3d10prx92i4qgi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96581,8 +96807,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.21.0"; - sha256 = "1vrz2vrmvsbahzsp1c06x4qmny5qhbrnz5ybzh5p8z1g3ji9z166"; + version = "0.21.1"; + sha256 = "0p992mpyy9z699zpvp8i8b5v8a3jhiq6c4n29zlf7qbcxc8z4z36"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; @@ -96663,25 +96889,27 @@ self: { }) {}; "haskell-igraph" = callPackage - ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs - , colour, data-default-class, data-ordlist, hashable, hxt, igraph - , matrices, primitive, random, split, tasty, tasty-golden - , tasty-hunit, unordered-containers + ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, cereal + , cereal-conduit, colour, conduit, data-default-class, data-ordlist + , hashable, hxt, igraph, matrices, primitive, random, split, tasty + , tasty-golden, tasty-hunit, unordered-containers }: mkDerivation { pname = "haskell-igraph"; - version = "0.3.0"; - sha256 = "1d0phlb2c7dibvs6ayvwgqslkzxmvcij7iw9mqxqk67zp12ga0pv"; + version = "0.4.0"; + sha256 = "19bhfcrfj4jxd6znqzslax6sd4w1icwp4rn3h0w31qpjv54x171f"; libraryHaskellDepends = [ - base binary bytestring bytestring-lexing colour data-default-class - hashable hxt primitive split unordered-containers + base bytestring bytestring-lexing cereal cereal-conduit colour + conduit data-default-class hashable hxt primitive split + unordered-containers ]; librarySystemDepends = [ igraph ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base data-ordlist matrices random tasty tasty-golden tasty-hunit + base cereal conduit data-ordlist matrices random tasty tasty-golden + tasty-hunit ]; - description = "Imcomplete igraph bindings"; + description = "Haskell interface of the igraph library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {igraph = null;}; @@ -101292,8 +101520,8 @@ self: { }: mkDerivation { pname = "hedis-config"; - version = "0.0.3"; - sha256 = "0n78gh1qz8d7xjc74bb20mvxjk4lf8acc1a3glhyr8ycw05sap2b"; + version = "1.0.0"; + sha256 = "19p0g83ybn9iajy5r8ymc8mapml34zw1a7s5hmpxdayv6slabg7r"; libraryHaskellDepends = [ aeson base bytestring hedis scientific text time ]; @@ -103120,23 +103348,19 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart , Chart-cairo, Chart-diagrams, colour, composition-prelude , data-binary-ieee754, data-default, directory, filepath, hspec - , lens, monad-loops, optparse-applicative + , lens, monad-loops }: mkDerivation { pname = "hgis"; - version = "0.1.3.8"; - sha256 = "10lqv0v4lnah22qwlyh1ixhcvl0abs9brlpddw0a24xdym4j0xhf"; - isLibrary = true; - isExecutable = true; + version = "1.0.0.0"; + sha256 = "1j70p3bgy8v1nzpqiv20lpxq7vxi54f9j3mwl8046hanra99wdr5"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo Chart-diagrams colour composition-prelude data-binary-ieee754 data-default directory filepath lens monad-loops - optparse-applicative ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - description = "Package and command-line for GIS with Haskell"; + description = "Library and for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -105468,6 +105692,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; + "hmatrix_0_19_0_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq + , openblasCompat, random, semigroups, split, storable-complex + , vector + }: + mkDerivation { + pname = "hmatrix"; + version = "0.19.0.0"; + sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj"; + configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; + libraryHaskellDepends = [ + array base binary bytestring deepseq random semigroups split + storable-complex vector + ]; + librarySystemDepends = [ openblasCompat ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numeric Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openblasCompat;}; + "hmatrix-backprop" = callPackage ({ mkDerivation, ANum, backprop, base, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog @@ -105523,13 +105768,13 @@ self: { ({ mkDerivation, base, containers, glpk, hmatrix }: mkDerivation { pname = "hmatrix-glpk"; - version = "0.6.0.0"; - sha256 = "0x5ghi0rqv6zir304cjg2plpvzgihg31b5irkpf5alig6v7jdjn1"; + version = "0.19.0.0"; + sha256 = "1rbbzz1jc9r7blbqd37jb8f054xfk521q54b3srz3k34nkp05yb1"; libraryHaskellDepends = [ base containers hmatrix ]; librarySystemDepends = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -105548,6 +105793,23 @@ self: { license = "GPL"; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl_0_19_0_1" = callPackage + ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector + }: + mkDerivation { + pname = "hmatrix-gsl"; + version = "0.19.0.1"; + sha256 = "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm"; + libraryHaskellDepends = [ + array base hmatrix process random vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numerical computation"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector @@ -105654,6 +105916,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hmatrix-sparse" = callPackage + ({ mkDerivation, base, hmatrix, mkl_core, mkl_intel, mkl_sequential + }: + mkDerivation { + pname = "hmatrix-sparse"; + version = "0.19.0.0"; + sha256 = "04h9vf4aayhmjnlk8wnf9mg3rfjx9n6dhnv49vpwv7j8c4qhbd4s"; + libraryHaskellDepends = [ base hmatrix ]; + librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Sparse linear solver"; + license = stdenv.lib.licenses.bsd3; + }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;}; + "hmatrix-special" = callPackage ({ mkDerivation, base, hmatrix, hmatrix-gsl }: mkDerivation { @@ -105666,6 +105942,19 @@ self: { license = "GPL"; }) {}; + "hmatrix-special_0_19_0_0" = callPackage + ({ mkDerivation, base, hmatrix, hmatrix-gsl }: + mkDerivation { + pname = "hmatrix-special"; + version = "0.19.0.0"; + sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz"; + libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Interface to GSL special functions"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-static" = callPackage ({ mkDerivation, array, base, haskell-src-meta, hmatrix, parsec , template-haskell, tfp @@ -105683,6 +105972,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-sundials" = callPackage + ({ mkDerivation, base, containers, diagrams-lib + , diagrams-rasterific, hmatrix, hspec, inline-c, lens, plots + , sundials_arkode, template-haskell, vector + }: + mkDerivation { + pname = "hmatrix-sundials"; + version = "0.19.0.0"; + sha256 = "03pil8zkkixlgv2m07zyiyribpkphhl75ixvazb36c6rznvkg6nd"; + libraryHaskellDepends = [ + base containers hmatrix inline-c template-haskell vector + ]; + librarySystemDepends = [ sundials_arkode ]; + testHaskellDepends = [ + base containers diagrams-lib diagrams-rasterific hmatrix hspec + inline-c lens plots template-haskell vector + ]; + testSystemDepends = [ sundials_arkode ]; + homepage = "https://github.com/idontgetoutmuch/hmatrix/tree/sundials"; + description = "hmatrix interface to sundials"; + license = stdenv.lib.licenses.bsd3; + }) {sundials_arkode = null;}; + "hmatrix-svdlibc" = callPackage ({ mkDerivation, base, criterion, hmatrix, hspec, QuickCheck , vector @@ -105722,8 +106034,8 @@ self: { }: mkDerivation { pname = "hmatrix-tests"; - version = "0.6.0.0"; - sha256 = "1my4w6nxlwizlysk4ika9xaqjjgjxi2lal83zqgjkc05jxs1p9ih"; + version = "0.19.0.0"; + sha256 = "18adrcwd8zgw8x9dn5fvpjq4l88iqvlm5z0yxzr96zppi8z5w6fw"; libraryHaskellDepends = [ base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random ]; @@ -108112,6 +108424,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpc-threshold" = callPackage + ({ mkDerivation, base, bytestring, interpolate, pcre-heavy }: + mkDerivation { + pname = "hpc-threshold"; + version = "0.1.0.0"; + sha256 = "113m7fpm4zffvzwnqjzd45mbc18acgj5c1b9z5hqwklygjjjpx4a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring interpolate pcre-heavy ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/eckyputrady/hpc-threshold#readme"; + description = "Small utility for validating whether HPC result is above defined thresholds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hpc-tracer" = callPackage ({ mkDerivation, array, base, containers, haskell98, hpc, network , parsec, pretty, process, unix @@ -113542,34 +113870,6 @@ self: { }) {}; "http-client" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, deepseq, directory - , exceptions, filepath, ghc-prim, hspec, http-types, memory - , mime-types, monad-control, network, network-uri, random, stm - , streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.5.12"; - sha256 = "1m4c4zyl8y3i8bzyrgqv9kcjqzj17rwnf49dvn6745bn8kiyq6v0"; - libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive containers - cookie deepseq exceptions filepath ghc-prim http-types memory - mime-types network network-uri random stm streaming-commons text - time transformers - ]; - testHaskellDepends = [ - async base blaze-builder bytestring case-insensitive containers - deepseq directory hspec http-types monad-control network - network-uri streaming-commons text time transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_5_12_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -113595,7 +113895,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -113901,22 +114200,6 @@ self: { }) {}; "http-date" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, doctest - , hspec, old-locale, time - }: - mkDerivation { - pname = "http-date"; - version = "0.0.6.1"; - sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj"; - libraryHaskellDepends = [ array attoparsec base bytestring ]; - testHaskellDepends = [ - base bytestring doctest hspec old-locale time - ]; - description = "HTTP Date parser/formatter"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-date_0_0_7" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, doctest , hspec, old-locale, time }: @@ -113930,7 +114213,6 @@ self: { ]; description = "HTTP Date parser/formatter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-dispatch" = callPackage @@ -115388,8 +115670,8 @@ self: { ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: mkDerivation { pname = "hw-hspec-hedgehog"; - version = "0.1.0.3"; - sha256 = "0bnqvbh8jkpnannfgx1ghv5b4qvj37w1p29ap730s2bbfpsaldq2"; + version = "0.1.0.4"; + sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; testHaskellDepends = [ base hedgehog hspec ]; homepage = "https://github.com/haskell-works/hw-hspec-hedgehog#readme"; @@ -115409,6 +115691,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-ip" = callPackage + ({ mkDerivation, base, hedgehog, hspec, hw-hspec-hedgehog }: + mkDerivation { + pname = "hw-ip"; + version = "0.1.0.0"; + sha256 = "1gw0g6xd6q2rbnpb8j2yi8ddq39r2l8rplx8nfwk9mqzpgxx0r1n"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + homepage = "https://github.com/haskell-works/hw-ip#readme"; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, conduit, containers, criterion, dlist, hspec @@ -115615,18 +115910,48 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector + }: mkDerivation { pname = "hw-prim"; - version = "0.5.0.0"; - sha256 = "00sivy11g7haafpqy12sxgslffw841bx0i25phaz5vcfwp5xrp9j"; - libraryHaskellDepends = [ base bytestring vector ]; - testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; + 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 + }: + mkDerivation { + pname = "hw-prim"; + version = "0.5.0.3"; + sha256 = "1cnh8qm4kz4fxh34wn9039dxbb54mwhkls21m5s73q773q9fx4rz"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -119389,7 +119714,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0" = callPackage + "influxdb_1_6_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -119399,8 +119724,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0"; - sha256 = "1fmz5n3mp3w1v2axp9g1nw9h5sj6cw3xbs44xczn59sgpmz5hv34"; + version = "1.6.0.1"; + sha256 = "14xk27qg5w7pdrmbz7fys96x4yywv0hk82z46802dlnxlfpikyc3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -119990,14 +120315,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "integer-gmp_1_0_1_0" = callPackage + "integer-gmp_1_0_2_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "1.0.1.0"; - sha256 = "1xrdqksharn0jg8m1d7zm8nhbsq3abw2k25kzw0z7m0zm14n1nlw"; - revision = "1"; - editedCabalFile = "02xp5ldq3xxx1qdxg7gbs2zcqpf1dxbdrvrzizxnjwhpiqxcigy3"; + version = "1.0.2.0"; + sha256 = "1aaz2mdmwbrfxahhycpiz92hdvfn9mm7964wfypf8m0m8libhs6k"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -120559,25 +120882,6 @@ self: { }) {}; "invertible" = callPackage - ({ mkDerivation, base, haskell-src-meta, invariant, lens - , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell - , transformers, TypeCompose - }: - mkDerivation { - pname = "invertible"; - version = "0.2.0.4"; - sha256 = "0hrg58p5yz97n2xi9mbad69skldr163mr1wdvykdsvwyyxhfl4q4"; - libraryHaskellDepends = [ - base haskell-src-meta invariant lens partial-isomorphisms - semigroupoids template-haskell transformers TypeCompose - ]; - testHaskellDepends = [ base QuickCheck transformers ]; - description = "bidirectional arrows, bijective functions, and invariant functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "invertible_0_2_0_5" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell , transformers @@ -121113,8 +121417,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.3"; - sha256 = "0zhfn0rxwakspx1b9pxcqb9vbi8lr786hhb5s9j15xiszkl8hf4s"; + version = "1.7.4"; + sha256 = "17gcmw9m8c30cm3j5hdcqhpkvbir9js1k6s3ad141yszxymmnq8q"; libraryHaskellDepends = [ appar base byteorder containers network ]; @@ -128102,15 +128406,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "language-docker_4_0_1" = callPackage + "language-docker_5_0_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, free, Glob , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split , template-haskell, text, th-lift, time }: mkDerivation { pname = "language-docker"; - version = "4.0.1"; - sha256 = "0z1jifvinq90qh4106azd6ss80ds5p8acvl8x73j4zmqpn2d95xa"; + version = "5.0.0"; + sha256 = "16shdy1dh0bsalj0ciwg7h9dkjfjgkrfmq7g81z3k8fgy1w2y81n"; libraryHaskellDepends = [ base bytestring free mtl parsec pretty split template-haskell text th-lift time @@ -128748,7 +129052,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -128828,8 +129132,8 @@ self: { }: mkDerivation { pname = "language-rust"; - version = "0.1.1.26"; - sha256 = "1f363j2kpvww0v7l13lg8a2a0v0h2zw7q3x8fyssvrw3yn5afwyn"; + version = "0.2.0.27"; + sha256 = "04xyw05i5fbk766igpa5kx9wa4801s84wr6nyl4y9dwy8fcnq9va"; libraryHaskellDepends = [ array base bytestring deepseq prettyprinter template-haskell transformers utf8-string @@ -130432,8 +130736,8 @@ self: { }: mkDerivation { pname = "lens-toml-parser"; - version = "0.1.0.1"; - sha256 = "1mcbba5ff2jfr91jlzi5s5jf09p92jbpg37gf525bhv23hhid7xy"; + version = "0.1.0.2"; + sha256 = "1akp8mm62pnz8ncg235rdxzcrxv36paw723m7dcyr3139qflzxkn"; libraryHaskellDepends = [ base profunctors text time toml-parser ]; testHaskellDepends = [ base containers dwergaz hlint lens-family text toml-parser @@ -130459,14 +130763,15 @@ self: { "lens-utils" = callPackage ({ mkDerivation, aeson, base, containers, data-default, lens - , monoid, template-haskell + , monoid, split, template-haskell }: mkDerivation { pname = "lens-utils"; - version = "1.4.2"; - sha256 = "1sgsahb2cgfhbv3vw0h1cqls5g5kgbq9crx4w0rfjxcwk9d5jzds"; + version = "1.4.4"; + sha256 = "0ry04ghvbyxa236s150hfs5fa0fsip312ivflg70j49n02ypxr91"; libraryHaskellDepends = [ - aeson base containers data-default lens monoid template-haskell + aeson base containers data-default lens monoid split + template-haskell ]; homepage = "https://github.com/luna/lens-utils"; description = "Collection of missing lens utilities"; @@ -137622,17 +137927,18 @@ self: { }) {}; "marihana" = callPackage - ({ mkDerivation, base, directory }: + ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "marihana"; - version = "0.1.1.0"; - sha256 = "1wcrmjxw39pcarvwn4cfzd4wimvsf57qg8vl5lykcd9s4p2dnyvw"; + version = "0.2.1.0"; + sha256 = "03aw0chicgmyj3ix7nz0dc5mpck0409bv1d7lfs5wn9z4mmynqiv"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base directory ]; - executableHaskellDepends = [ base directory ]; - testHaskellDepends = [ base directory ]; + libraryHaskellDepends = [ base directory filepath process ]; + executableHaskellDepends = [ base directory filepath process ]; + testHaskellDepends = [ base directory filepath process ]; homepage = "https://github.com/suzukeno/marihana#readme"; + description = "Minimal tool to make your blog in Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -138072,8 +138378,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.1.2.0"; - sha256 = "02va411j1alsja009xms30x0zhwansjiy81djz2za06ghyg4f6a1"; + version = "0.1.3.0"; + sha256 = "08jngww0ki28d2mhfj9vw4rlxigzzvgb295k5fnj0cr7xmhr48zx"; libraryHaskellDepends = [ base bytestring data-default deepseq directory filepath JuicyPixels massiv netpbm process vector @@ -140915,26 +141221,6 @@ self: { }) {}; "mime-mail-ses" = callPackage - ({ mkDerivation, base, base64-bytestring, byteable, bytestring - , conduit, cryptohash, http-client, http-conduit, http-types - , mime-mail, old-locale, text, time, transformers, xml-conduit - , xml-types - }: - mkDerivation { - pname = "mime-mail-ses"; - version = "0.4.0.0"; - sha256 = "0w87ba8a5kli7xv7d8x5viz1c2rmm3ahaxp5d797n8bb13yn09mw"; - libraryHaskellDepends = [ - base base64-bytestring byteable bytestring conduit cryptohash - http-client http-conduit http-types mime-mail old-locale text time - transformers xml-conduit xml-types - ]; - homepage = "http://github.com/snoyberg/mime-mail"; - description = "Send mime-mail messages via Amazon SES"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mime-mail-ses_0_4_1" = callPackage ({ mkDerivation, base, base64-bytestring, byteable, bytestring , conduit, cryptohash, http-client, http-client-tls, http-conduit , http-types, mime-mail, old-locale, text, time, transformers @@ -140952,7 +141238,6 @@ self: { homepage = "http://github.com/snoyberg/mime-mail"; description = "Send mime-mail messages via Amazon SES"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-string" = callPackage @@ -141134,35 +141419,32 @@ self: { }) {}; "minio-hs" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , case-insensitive, conduit, conduit-combinators, conduit-extra - , containers, cryptonite, cryptonite-conduit, data-default - , directory, exceptions, filepath, http-client, http-conduit - , http-types, lifted-async, lifted-base, memory, monad-control - , protolude, QuickCheck, resourcet, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, temporary, text, text-format - , time, transformers, transformers-base, vector, xml-conduit + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, data-default, directory, exceptions, filepath + , http-client, http-conduit, http-types, memory, protolude + , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, temporary, text, text-format, time + , transformers, unliftio, unliftio-core, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "0.3.2"; - sha256 = "0yfhnvngw27h05hxywxp76fcy4566djsm0l3x2kx8n4ppwi5p6r4"; + version = "1.0.0"; + sha256 = "0q6qzzkkbm9b0a7c630yj2rlg54imir1yjbpsy4x9fh3kc7vx0i2"; libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring case-insensitive - conduit conduit-combinators conduit-extra containers cryptonite - cryptonite-conduit data-default exceptions filepath http-client - http-conduit http-types lifted-async lifted-base memory - monad-control protolude resourcet text text-format time - transformers transformers-base vector xml-conduit + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit data-default + exceptions filepath http-client http-conduit http-types memory + protolude resourcet text text-format time transformers unliftio + unliftio-core xml-conduit ]; testHaskellDepends = [ - aeson async base base64-bytestring bytestring case-insensitive - conduit conduit-combinators conduit-extra containers cryptonite - cryptonite-conduit data-default directory exceptions filepath - http-client http-conduit http-types lifted-async lifted-base memory - monad-control protolude QuickCheck resourcet tasty tasty-hunit + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit data-default + directory exceptions filepath http-client http-conduit http-types + memory protolude QuickCheck resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck temporary text text-format time - transformers transformers-base vector xml-conduit + transformers unliftio unliftio-core xml-conduit ]; homepage = "https://github.com/minio/minio-hs#readme"; description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; @@ -141429,15 +141711,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_19_0_0" = callPackage + "miso_0_20_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.19.0.0"; - sha256 = "0xnnhs36rnbaq8q4s6r2lhm9g4qdvm0qm0pj3hgrkgn22cs2fq21"; + version = "0.20.0.0"; + sha256 = "0nr7j9065mrwmmqwjsgl9krh21mhxjddbwmkwja0b207aglc072j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141660,6 +141942,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; + revision = "1"; + editedCabalFile = "02b0ycywjhzx1ll36l38mwp2gy677hgsqpq2mwyi277ykbrwnsdk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -141708,8 +141992,8 @@ self: { pname = "mmark-ext"; version = "0.2.0.0"; sha256 = "1ccfdjsn8z80x2m5p9q17r2hf14zj63nkxkrg9s7knwr1j08gj1k"; - revision = "1"; - editedCabalFile = "0sql0z4123v5kzqcganfaag6ijl3j7lw52d3c50r9qwwg8q2dydz"; + revision = "2"; + editedCabalFile = "0h47hy97mdan3cnxppf0yarmis81irc0c92nm1xv9f6w35li7rkq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl lucid microlens mmark modern-uri skylighting text @@ -142614,28 +142898,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , exceptions, fast-logger, lifted-base, monad-control, monad-loops - , mtl, resourcet, stm, stm-chans, template-haskell, text - , transformers, transformers-base, transformers-compat - , unliftio-core - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.28.4"; - sha256 = "1pqay81lk6divcfslg4dqcpyq2wv7vpdzb73kb2g4203mmpjcpv4"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra exceptions fast-logger - lifted-base monad-control monad-loops mtl resourcet stm stm-chans - template-haskell text transformers transformers-base - transformers-compat unliftio-core - ]; - homepage = "https://github.com/snoyberg/monad-logger#readme"; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_28_5" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , exceptions, fast-logger, lifted-base, monad-control, monad-loops , mtl, resourcet, stm, stm-chans, template-haskell, text @@ -142655,7 +142917,6 @@ self: { homepage = "https://github.com/snoyberg/monad-logger#readme"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -146247,6 +146508,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability-transition" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, logging-effect, mtl + , mwc-probability, primitive, QuickCheck, transformers + }: + mkDerivation { + pname = "mwc-probability-transition"; + version = "0.3.0.3"; + sha256 = "04jnszan9723ycrf1xgh2k87vcx0xyq5ga8q3fjskr3937j0ydxj"; + libraryHaskellDepends = [ + base ghc-prim logging-effect mtl mwc-probability primitive + transformers + ]; + testHaskellDepends = [ + base hspec logging-effect mwc-probability QuickCheck + ]; + homepage = "https://github.com/ocramz/mwc-probability-transition"; + description = "A Markov stochastic transition operator with logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mwc-random" = callPackage ({ mkDerivation, base, math-functions, primitive, time, vector }: mkDerivation { @@ -152582,12 +152863,12 @@ self: { }) {}; "one-liner-instances" = callPackage - ({ mkDerivation, base, one-liner }: + ({ mkDerivation, base, one-liner, random }: mkDerivation { pname = "one-liner-instances"; - version = "0.1.1.0"; - sha256 = "0yb5rdy735lalwrxvmvvjnpyikdqs2y2fjldjcbjj0r3d912azxn"; - libraryHaskellDepends = [ base one-liner ]; + version = "0.1.2.1"; + sha256 = "1gy900nd5n6cffqw63hlkqg4ly86wjlfqgdcm1zy2nyx7dxg914k"; + libraryHaskellDepends = [ base one-liner random ]; homepage = "https://github.com/mstksg/one-liner-instances#readme"; description = "Generics-based implementations for common typeclasses"; license = stdenv.lib.licenses.bsd3; @@ -152930,8 +153211,8 @@ self: { ({ mkDerivation, base, type-fun }: mkDerivation { pname = "open-union"; - version = "0.3.0.0"; - sha256 = "01wxkla0034d5i331vzbjm5ilkdn2570qhl0pa6lf3m58aghmccn"; + version = "0.4.0.0"; + sha256 = "0mf37xya4bb8za8jrhnzr9pddsd93dw0vycmjlks5w50x10d4a55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base type-fun ]; @@ -155682,8 +155963,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.4.0"; - sha256 = "1m7as420nh55n0hywnl6rbm7zj4s1ry38xvb1gk3np7k87lwf20z"; + version = "0.13.5.0"; + sha256 = "1s29dmds28ffbcbic8pw3bsixkb6lzjm78j8qv4x3r9l64kvjndz"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -160924,8 +161205,8 @@ self: { }: mkDerivation { pname = "pipes-extras"; - version = "1.0.13"; - sha256 = "04adszpz02a72zz8kjj9lcw62n296p74rq4xds3b8g345m6c51g1"; + version = "1.0.14"; + sha256 = "17f8aj6p074yryk0a26vg1iiy7dva5cjb1gzsrvsq41dhy28j7gx"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -166813,8 +167094,8 @@ self: { }: mkDerivation { pname = "prologue"; - version = "3.1.7"; - sha256 = "024ygn8q24sxdxdr1mip9pcjjmzm254am7fyzbqpmj5cjg1kykq6"; + version = "3.2.0"; + sha256 = "19q61qjmygjah49qjy4a89hpn8ra8z9pq0f72p1c7wzgk38zp55r"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils @@ -166992,8 +167273,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.4"; - sha256 = "0wzaca3hcvbdfb326srj6sivzkbyshxv6j0lvng6k8dqwiipnvwb"; + version = "5.3.5"; + sha256 = "0x6whnn53grfkjqybn91kfsr69w3r9mk9r39yzwx35skwkqj3vb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167001,11 +167282,7 @@ self: { filepath hashable hslogger IfElse mtl network process split stm text time transformers unix unix-compat ]; - executableHaskellDepends = [ - ansi-terminal async base bytestring containers directory exceptions - filepath hashable hslogger IfElse mtl network process split stm - text time transformers unix unix-compat - ]; + executableHaskellDepends = [ base ]; homepage = "https://propellor.branchable.com/"; description = "property-based host configuration management in haskell"; license = stdenv.lib.licenses.bsd2; @@ -170744,31 +171021,6 @@ self: { }) {}; "rakuten" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, constraints - , data-default-class, extensible, hspec, http-api-data, http-client - , http-client-tls, http-types, lens, req, servant-server, text - , warp - }: - mkDerivation { - pname = "rakuten"; - version = "0.1.1.0"; - sha256 = "13m8rg805aw5rj2a5j16yj06k5ws99ssl89r5s62xlq6lbzhc84c"; - libraryHaskellDepends = [ - aeson base bytestring connection constraints data-default-class - extensible http-api-data http-client http-client-tls http-types - lens req text - ]; - testHaskellDepends = [ - aeson base bytestring connection constraints data-default-class - extensible hspec http-api-data http-client http-client-tls - http-types lens req servant-server text warp - ]; - homepage = "https://github.com/matsubara0507/rakuten#readme"; - description = "The Rakuten API in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rakuten_0_1_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, constraints , data-default-class, extensible, hspec, http-api-data, http-client , http-client-tls, http-types, lens, req, servant-server, text @@ -170791,7 +171043,6 @@ self: { homepage = "https://github.com/matsubara0507/rakuten#readme"; description = "The Rakuten API in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ralist" = callPackage @@ -172293,6 +172544,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reactive-banana-automation" = callPackage + ({ mkDerivation, base, doctest, reactive-banana, stm, time }: + mkDerivation { + pname = "reactive-banana-automation"; + version = "0.1.1"; + sha256 = "0fn3frv0idgdg9faysri7x5nzrxrzhpy41s5nm6v8ckqcnzq7vvv"; + libraryHaskellDepends = [ base reactive-banana stm time ]; + testHaskellDepends = [ base doctest ]; + description = "home (etc) automation using reactive-banana"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "reactive-banana-bunch" = callPackage ({ mkDerivation, base, non-empty, reactive-banana, transformers , utility-ht @@ -173198,8 +173461,8 @@ self: { ({ mkDerivation, base, deepseq, raptor2, redland }: mkDerivation { pname = "redland"; - version = "0.2.0.1"; - sha256 = "080bp01x6vlfw116zcl75vr7pb753mn8892rkh7aqgaf8ajkhb2c"; + version = "0.2.0.2"; + sha256 = "0wfmv87d9vxah1s519457zs4436lri7ypn2069r8wdpvaariiim5"; libraryHaskellDepends = [ base deepseq ]; libraryPkgconfigDepends = [ raptor2 redland ]; description = "Redland RDF library bindings"; @@ -179217,8 +179480,8 @@ self: { }: mkDerivation { pname = "safe-money"; - version = "0.5"; - sha256 = "09ia4sf98ggl2y8xl0gn1vjapvwbbqq3ibfrci2p2akkyykg2vk8"; + version = "0.6"; + sha256 = "1l8gn9vscng92s1dkfj2fa55k63jnzcnw590r5a8n7dqwaycpz7r"; libraryHaskellDepends = [ aeson base binary cereal constraints deepseq hashable serialise store text vector-space xmlbf @@ -179694,24 +179957,6 @@ self: { }) {}; "sampling" = callPackage - ({ mkDerivation, base, containers, criterion, foldl, mwc-random - , primitive, vector - }: - mkDerivation { - pname = "sampling"; - version = "0.3.2"; - sha256 = "0kl2d53rp0wi3fb0apm8czzx1wj93ljl3a17w6yibyqgc3j5cqd6"; - libraryHaskellDepends = [ - base containers foldl mwc-random primitive vector - ]; - testHaskellDepends = [ base ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/jtobin/sampling"; - description = "Sample values from collections"; - license = stdenv.lib.licenses.mit; - }) {}; - - "sampling_0_3_3" = callPackage ({ mkDerivation, base, containers, criterion, foldl, mwc-random , primitive, vector }: @@ -179727,7 +179972,6 @@ self: { homepage = "https://github.com/jtobin/sampling"; description = "Sample values from collections"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "samtools" = callPackage @@ -180106,33 +180350,6 @@ self: { }) {}; "sbp" = callPackage - ({ mkDerivation, aeson, array, base, base64-bytestring - , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , resourcet, tasty, tasty-hunit, template-haskell, text, yaml - }: - mkDerivation { - pname = "sbp"; - version = "2.3.13"; - sha256 = "0gvjqddnvbr3vn7qaajqqbh23p17vavj0p97zwh6fbizkxpj25k9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - homepage = "https://github.com/swift-nav/libsbp"; - description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "sbp_2_3_16" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops @@ -180157,7 +180374,6 @@ self: { homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -181345,8 +181561,8 @@ self: { }: mkDerivation { pname = "scroll"; - version = "1.20170122"; - sha256 = "0f4blgfaz69y2i6cj91zq63v5dqv7invjvqv5a4l1rgjixpn7dc9"; + version = "1.20180421"; + sha256 = "0apzrvf99rskj4dbmn57jjxrsf19j436s8a09m950df5aws3a0wj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -181633,6 +181849,25 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; + "sdl2-ttf_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf + , template-haskell, text, transformers + }: + mkDerivation { + pname = "sdl2-ttf"; + version = "2.1.0"; + sha256 = "1xw05jgv6x9xplahwf3jjdq6v3mha4s7bb27kn8x66764glnyrf7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring sdl2 template-haskell text transformers + ]; + libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; + description = "Bindings to SDL2_ttf"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; + "sdnv" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -182384,13 +182619,19 @@ self: { }) {}; "semirings" = callPackage - ({ mkDerivation }: + ({ mkDerivation, base, constrictor, containers, hashable + , integer-gmp, unordered-containers, vector + }: mkDerivation { pname = "semirings"; - version = "0.0.0"; - sha256 = "0dc4vi7zlpvz12b9hvq5b6v621aw84hp331rcbn617gpw7dvflcq"; - doHaddock = false; - description = "TBA"; + version = "0.1.1"; + sha256 = "1vrvid3ix80vwmf7qmp5f1f97nyzkq4a01bxf62kpqlbri2m9mz3"; + libraryHaskellDepends = [ + base constrictor containers hashable integer-gmp + unordered-containers vector + ]; + homepage = "http://github.com/chessai/semirings"; + description = "two monoids as one, in holy haskimony"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -183365,8 +183606,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.5.3.0"; - sha256 = "1fwzsx13lvqaaxh8cfs7zi8l2a0c7kgz8gnnwgssrasnk27jsc20"; + version = "0.5.3.1"; + sha256 = "0mndi1b0sgfik7yij3l65bcsqp820igbf09nnrk8dmznnama56y4"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -185875,8 +186116,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.1"; - sha256 = "0rl0a2d55r55w705jx4si17n403l06jk3d6mrf3gd2ghn93hb13a"; + version = "1.8.0.2"; + sha256 = "16gmyn1rbfx33dxxkyxrswa8cvjpiq3i2vm59hy4y9lag10nq9xn"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats lens shake shake-ext text @@ -185920,8 +186161,7 @@ self: { description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {cdeps = null;}; + }) {}; "shake-extras" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath @@ -193335,19 +193575,6 @@ self: { }) {}; "sql-words" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-simple }: - mkDerivation { - pname = "sql-words"; - version = "0.1.5.1"; - sha256 = "0nr4ld96s3n48ydd15jsxb823kk2682wkjd2h7vqc306891qwwzd"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck quickcheck-simple ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "SQL keywords data constructors into OverloadedString"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sql-words_0_1_6_0" = callPackage ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; @@ -193358,7 +193585,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "SQL keywords data constructors into OverloadedString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlcipher" = callPackage @@ -194602,8 +194828,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.6.1"; - sha256 = "0wqa6lrn2l38grg4h24ihacchavsyglbvlmlsfh4s9h1300dngab"; + version = "0.7.0"; + sha256 = "0g3abhr63jnqw231k6kai9c5gqh15dyxrr78fqw5ga98l3p2b8jl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194615,7 +194841,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Cabal hspec pretty shakespeare text yaml + base bytestring Cabal hspec network-uri pretty shakespeare text + yaml ]; homepage = "https://github.com/typeable/stackage2nix#readme"; description = "Convert Stack files into Nix build instructions"; @@ -195247,8 +195474,8 @@ self: { }: mkDerivation { pname = "status-notifier-item"; - version = "0.1.0.0"; - sha256 = "1g1gf3anqrg8mfdyjvymk5wlg0h4pfc0pv4wlw5phk6r93dxah1n"; + version = "0.2.1.0"; + sha256 = "1w81n87x70bqpskcp0nai9l8ry6hk518myn1cymi695x94vv9m6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200564,31 +200791,30 @@ self: { "taffybar" = callPackage ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers , dbus, directory, dyre, either, enclosed-exceptions, filepath - , glib, gtk-traymanager, gtk3, HStringTemplate, HTTP, mtl, multimap + , gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-gtk, glib, gtk-traymanager + , gtk3, haskell-gi-base, HStringTemplate, HTTP, mtl, multimap , network, network-uri, old-locale, parsec, process, rate-limit , safe, split, stm, text, time, time-locale-compat, time-units - , transformers, tuple, unix, utf8-string, X11, xdg-basedir, xml - , xml-helpers, xmonad, xmonad-contrib + , transformers, transformers-base, tuple, unix, utf8-string, X11 + , xdg-basedir, xml, xml-helpers, xmonad, xmonad-contrib }: mkDerivation { pname = "taffybar"; - version = "1.0.1"; - sha256 = "1agx7q73h8x53cl8i408yifrr80fbm47pwn46mi6abcp61s92chn"; + version = "1.0.2"; + sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ alsa-mixer base cairo ConfigFile containers dbus directory dyre - either enclosed-exceptions filepath glib gtk-traymanager gtk3 - HStringTemplate HTTP mtl multimap network network-uri old-locale - parsec process rate-limit safe split stm text time - time-locale-compat time-units transformers tuple unix utf8-string - X11 xdg-basedir xml xml-helpers xmonad xmonad-contrib - ]; - executableHaskellDepends = [ - base containers directory dyre filepath glib gtk3 mtl safe split - utf8-string X11 xdg-basedir + either enclosed-exceptions filepath gi-gdk gi-gdkpixbuf gi-gdkx11 + gi-gtk glib gtk-traymanager gtk3 haskell-gi-base HStringTemplate + HTTP mtl multimap network network-uri old-locale parsec process + rate-limit safe split stm text time time-locale-compat time-units + transformers transformers-base tuple unix utf8-string X11 + xdg-basedir xml xml-helpers xmonad xmonad-contrib ]; + executableHaskellDepends = [ base ]; homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; @@ -201278,6 +201504,8 @@ self: { pname = "tar"; version = "0.4.1.0"; sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm"; + revision = "1"; + editedCabalFile = "14ljxvasrda7qafz95gz3m0lpdsh4vvd6j8b3qkr2a2sp7cc0sis"; libraryHaskellDepends = [ base bytestring directory filepath old-time ]; @@ -202806,8 +203034,8 @@ self: { ({ mkDerivation, base, Boolean }: mkDerivation { pname = "temporal-media"; - version = "0.6.2"; - sha256 = "0dsvpag8j2lfn6nz9wbzcbdfrzmq35ww9n8p5db638b11749sc97"; + version = "0.6.3"; + sha256 = "04qbbx32rs6mz5w3j7wj2hx744x858rv60hmpla3zpx2491r0qi9"; libraryHaskellDepends = [ base Boolean ]; homepage = "https://github.com/anton-k/temporal-media"; description = "data types for temporal media"; @@ -204178,6 +204406,8 @@ self: { pname = "text-format"; version = "0.3.1.1"; sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd"; + revision = "1"; + editedCabalFile = "1ap2paddh2q1ifs3nwdj0f1r7fypnsa669l7gdvgyfidz3w5vzic"; libraryHaskellDepends = [ array base double-conversion ghc-prim integer-gmp old-locale text time transformers @@ -204336,27 +204566,6 @@ self: { }) {}; "text-ldap" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, dlist - , memory, QuickCheck, quickcheck-simple, random, transformers - }: - mkDerivation { - pname = "text-ldap"; - version = "0.1.1.11"; - sha256 = "1921cdq9akvcn0hsgs07g2bvbpdvhb1h389yv9703472d0sz7pfs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers dlist memory transformers - ]; - executableHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-simple random - ]; - description = "Parser and Printer for LDAP text data stream"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-ldap_0_1_1_12" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dlist , memory, QuickCheck, quickcheck-simple, random, transformers }: @@ -204375,7 +204584,6 @@ self: { ]; description = "Parser and Printer for LDAP text data stream"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-lens" = callPackage @@ -205224,17 +205432,6 @@ self: { }) {}; "th-data-compat" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-data-compat"; - version = "0.0.2.5"; - sha256 = "1q2gggciz9s9ksn3h0mc5zffawz6j7pg6k1k96pqsx39f1bbrbqs"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Compatibility for data definition template of TH"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-data-compat_0_0_2_6" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; @@ -205243,7 +205440,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-desugar" = callPackage @@ -205350,8 +205546,8 @@ self: { }: mkDerivation { pname = "th-format"; - version = "0.1.1.0"; - sha256 = "1axan3icxz9yxkra2kb9r66h9h51v4zbjncd1xsvgiplqmwf6fjl"; + version = "0.1.2.0"; + sha256 = "1wc9ndqv2qxk75b47s44j0lrx5h9hc1r4h1nvl01pbdks6yyi43j"; libraryHaskellDepends = [ base Earley haskell-src-meta template-haskell text ]; @@ -205549,18 +205745,6 @@ self: { }) {}; "th-reify-compat" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-reify-compat"; - version = "0.0.1.3"; - sha256 = "0byl2n0lj55vx2kyka172bwvw8zcyag78cnqs7y9yp4kl8ivwh8z"; - libraryHaskellDepends = [ base template-haskell ]; - homepage = "http://github.com/khibino/haskell-th-reify-compat/"; - description = "Compatibility for the result type of TH reify"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-reify-compat_0_0_1_4" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-reify-compat"; @@ -205570,7 +205754,6 @@ self: { homepage = "http://github.com/khibino/haskell-th-reify-compat/"; description = "Compatibility for the result type of TH reify"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-reify-many" = callPackage @@ -206479,25 +206662,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty - , tasty-hunit, text, time, websockets - }: - mkDerivation { - pname = "tidal"; - version = "0.9.8"; - sha256 = "08a8k4kdq6wmhggf3bm4c5a6xck2waf6n6815csms919rhlbkbpb"; - libraryHaskellDepends = [ - base colour containers hashable hosc mersenne-random-pure64 mtl - parsec safe semigroups text time websockets - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://tidalcycles.org/"; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_0_9_9" = callPackage ({ mkDerivation, base, colour, containers, hashable, hosc , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty , tasty-hunit, text, time, websockets @@ -206514,7 +206678,6 @@ self: { homepage = "http://tidalcycles.org/"; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -209121,6 +209284,8 @@ self: { pname = "transformers-either"; version = "0.0.2"; sha256 = "1122rgspazl3n9vghlzzg14hv6p0a66lf6r7hkim14p0rcagvx5a"; + revision = "1"; + editedCabalFile = "134big9w9307vjmj6p6m3wgmh4lrvv8dyg0iw2nm54p9kg0c6ga8"; libraryHaskellDepends = [ base text transformers ]; description = "An Either monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -209132,6 +209297,8 @@ self: { pname = "transformers-either"; version = "0.1.0"; sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm"; + revision = "1"; + editedCabalFile = "1bhkkh73irjql1jhxdcrv1igmf0hqpnw2p0w1s6fwhiidx64kvy9"; libraryHaskellDepends = [ base exceptions text transformers ]; homepage = "http://github.com/tmcgilchrist/transformers-either/"; description = "An Either monad transformer"; @@ -210635,8 +210802,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.7"; - sha256 = "1qh33akv57wv11qg5bk8wa0gbjjq89gxakcg40b93qc8d0dd86wk"; + version = "1.5.8"; + sha256 = "0vp442byylqki6pabhg8bs27msqsdcwcnql40z003jx1hidccnq4"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -210730,20 +210897,20 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion , data-default, directory, extra, hspec, htoml-megaparsec - , http-client, http-client-tls, http-types, megaparsec, microlens + , http-client, http-client-tls, http-types, lens, megaparsec , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.37"; - sha256 = "14csa7p3z4ywxwybs0y4ylymsqg1m8scp5fhcm3mayy9cdz2g49n"; + version = "1.0.1.38"; + sha256 = "19k1z6wrizym21a29hx31yhv4y5m1w0474iqm8idyxih4fya3k7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring composition-prelude containers data-default extra htoml-megaparsec - http-client http-client-tls http-types megaparsec microlens split - text unordered-containers + http-client http-client-tls http-types lens megaparsec split text + unordered-containers ]; executableHaskellDepends = [ base bytestring directory optparse-applicative @@ -211603,8 +211770,8 @@ self: { ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "type-interpreter"; - version = "0.1.3"; - sha256 = "0gv1782vj48v9cybsyc8wqsgndg966gkpnzxaw7s9f2g1c18jj1s"; + version = "0.1.4"; + sha256 = "0743byvz8jry9b5li4wg5qc4nwl5ri0vjvsfdy3l4gkg1v1zh0ng"; libraryHaskellDepends = [ base containers mtl template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Interpreter for Template Haskell types"; @@ -211988,18 +212155,17 @@ self: { }) {}; "type-unary" = callPackage - ({ mkDerivation, applicative-numbers, base, constraints, newtype - , ty, vector-space + ({ mkDerivation, applicative-numbers, base, constraints + , newtype-generics, ty, vector-space }: mkDerivation { pname = "type-unary"; - version = "0.3.0"; - sha256 = "1s84bw7fxxsqixy03892zb1s261fc0c8h5srsifs5mzgvhxkn20l"; - revision = "1"; - editedCabalFile = "03lz4iprlfl2bnh4isa2k7ddv1wxz8mqb7x1nmhjqbx34apbqi11"; + version = "0.3.2"; + sha256 = "12h20xjqr1abb5mb4fmij9j0vkfn7rwbidm2dr7ssbkk7cb5fv37"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - applicative-numbers base constraints newtype ty vector-space + applicative-numbers base constraints newtype-generics ty + vector-space ]; homepage = "https://github.com/conal/type-unary"; description = "Type-level and typed unary natural numbers, inequality proofs, vectors"; @@ -213883,16 +214049,16 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , doctest, ghc-prim, Glob, hashable, hedgehog, microlens - , microlens-mtl, mtl, safe-exceptions, semigroups, stm, tasty - , tasty-hedgehog, text, text-format, transformers, type-operators + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog + , text, text-format, transformers, type-operators , unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.1.0"; - sha256 = "0k1gk9dba9f7w852m6y46gq1md3z0w29bgv4qy7xp3pk16h3axhp"; + version = "1.1.1"; + sha256 = "0l49k17f73hkywccvnir79iwlj7j7bb3p89j5kf5hdnk25biw2hq"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text text-format transformers @@ -213903,8 +214069,7 @@ self: { utf8-string ]; benchmarkHaskellDepends = [ - base containers criterion deepseq hashable mtl semigroups text - unordered-containers + base containers gauge unordered-containers ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; @@ -214116,6 +214281,28 @@ self: { 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 + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.7.0"; + sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -214136,8 +214323,8 @@ self: { }: mkDerivation { pname = "unliftio-pool"; - version = "0.1.0.1"; - sha256 = "1z4h20jn3i3582i63vmih2ccr0pljp6whb3h4pbpj36s1q75bmgp"; + version = "0.2.0.0"; + sha256 = "0alwn39ri4npgxfxvnv43bl8vfjhjl4ffcvv8l9nmrmzsh770p59"; libraryHaskellDepends = [ base resource-pool time transformers unliftio-core ]; @@ -215287,6 +215474,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "utf8-validator" = callPackage + ({ mkDerivation, base, bytestring, criterion, tasty, tasty-hunit + , text, utf8-string + }: + mkDerivation { + pname = "utf8-validator"; + version = "0.1.0.0"; + sha256 = "1r4y6gvd4jqfqv4qz01bhq1r17lsi548p6sr1byvkj00nia0cyjk"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text utf8-string + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/edwardgeorge/utf8-validator#readme"; + description = "Constant-space UTF8 validator for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "util" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -215975,6 +216180,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_5_0_0" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.5.0.0"; + sha256 = "0hpdj3ckp2r8dklpjdrrbfd02maskxw2vrjnqnxsgi8s3j8avqsv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -215992,6 +216211,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-aeson_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, validity, validity-scientific + , validity-text, validity-unordered-containers, validity-vector + }: + mkDerivation { + pname = "validity-aeson"; + version = "0.2.0.0"; + sha256 = "01ck9kbclrjxbjb7rvr1y95cizbdq5lzdd0xfpbpaf4rfgjd3w56"; + libraryHaskellDepends = [ + aeson base validity validity-scientific validity-text + validity-unordered-containers validity-vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-bytestring" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { @@ -216004,6 +216241,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-bytestring_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, validity }: + mkDerivation { + pname = "validity-bytestring"; + version = "0.3.0.0"; + sha256 = "1yxrpwxqn0262262j27sf1nb6iw6fnirypivnmpw0ghml28w7aym"; + libraryHaskellDepends = [ base bytestring validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for bytestring"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-containers" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { @@ -216016,6 +216266,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-containers_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, validity }: + mkDerivation { + pname = "validity-containers"; + version = "0.3.0.0"; + sha256 = "1jh2f46x5gwhb5i5bmqn1vdn27way0nk7q2gphyjb62zrg3d3zq5"; + libraryHaskellDepends = [ base containers validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-path" = callPackage ({ mkDerivation, base, filepath, path, validity }: mkDerivation { @@ -216028,6 +216291,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-path_0_3_0_0" = callPackage + ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path + , validity + }: + mkDerivation { + pname = "validity-path"; + version = "0.3.0.0"; + sha256 = "1ijrzfk9jhlxxcdjqdq4cqz7ir7k7z9zrbamb18zai99hb6gg066"; + libraryHaskellDepends = [ base filepath path validity ]; + testHaskellDepends = [ + base filepath genvalidity-hspec hspec path validity + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for Path"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-scientific" = callPackage ({ mkDerivation, base, scientific, validity }: mkDerivation { @@ -216040,6 +216321,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-scientific_0_2_0_0" = callPackage + ({ mkDerivation, base, scientific, validity }: + mkDerivation { + pname = "validity-scientific"; + version = "0.2.0.0"; + sha256 = "0l4mzrhn6yhqd6kz7rwfvrqxk0dhwvfkh40pfjyzbkg5mvd1drhh"; + libraryHaskellDepends = [ base scientific validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for scientific"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-text" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { @@ -216052,6 +216346,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-text_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.3.0.0"; + sha256 = "190gkwa3b4rnhmah9idivvrv0val4crv8y3qy9s0aa44kpcj2b8m"; + libraryHaskellDepends = [ base bytestring text validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-time" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { @@ -216064,6 +216371,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-time_0_2_0_0" = callPackage + ({ mkDerivation, base, time, validity }: + mkDerivation { + pname = "validity-time"; + version = "0.2.0.0"; + sha256 = "0rp1y2xq3h18ji3vaiv3w76kkdyql5y8xxxz730za6mrf1ffbnk4"; + libraryHaskellDepends = [ base time validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-unordered-containers" = callPackage ({ mkDerivation, base, hashable, unordered-containers, validity }: mkDerivation { @@ -216906,16 +217226,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-sized_1_0_0_0" = callPackage - ({ mkDerivation, base, deepseq, finite-typelits - , indexed-list-literals, primitive, vector + "vector-sized_1_0_1_0" = callPackage + ({ mkDerivation, adjunctions, base, deepseq, distributive + , finite-typelits, indexed-list-literals, primitive, vector }: mkDerivation { pname = "vector-sized"; - version = "1.0.0.0"; - sha256 = "1jn00l5nw2ws4j6z8fd2h312003vpi8a4ygakmrdg4580cwnjmls"; + version = "1.0.1.0"; + sha256 = "0p3bwqdz3k1a3ya7bj80d6crpbsk62wcvl6rkpkr0snqh4zq87zl"; libraryHaskellDepends = [ - base deepseq finite-typelits indexed-list-literals primitive vector + adjunctions base deepseq distributive finite-typelits + indexed-list-literals primitive vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -218086,12 +218407,12 @@ self: { }) {}; "vulkan" = callPackage - ({ mkDerivation, base, vector-sized, vulkan }: + ({ mkDerivation, base, cpphs, vector-sized, vulkan }: mkDerivation { pname = "vulkan"; - version = "2.0.0.0"; - sha256 = "1lm92sgv1nbc4h4znyilyp3hqlj5xl6i9zcrax0fxx69a9q2jg2l"; - libraryHaskellDepends = [ base vector-sized ]; + version = "2.1.0.0"; + sha256 = "1w19ip6qc5qbscp06a2b58x9yhjc98naaq1gxymk7gs3iagylrzq"; + libraryHaskellDepends = [ base cpphs vector-sized ]; librarySystemDepends = [ vulkan ]; homepage = "http://github.com/expipiplus1/vulkan#readme"; description = "Bindings to the Vulkan graphics API"; @@ -219988,8 +220309,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.18.2"; - sha256 = "01jmwq9a5xxig14qh30w2fspjv4rhprv6q6i6bsv1qy9m9n2mczb"; + 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 @@ -220054,23 +220375,6 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, wai, warp - }: - mkDerivation { - pname = "warp-tls"; - version = "3.2.4.2"; - sha256 = "08g74490mpaghrvkb5z6pa6b6bby1a83js52pg5jlm9b5zfwcj2w"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager wai warp - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "HTTP over TLS support for Warp via the TLS package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp-tls_3_2_4_3" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, wai, warp }: @@ -220085,7 +220389,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -221761,6 +222064,27 @@ self: { 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 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.3"; + sha256 = "0naqmgkqqq83mnrp4ic97i6f6ak3h862jk6pa77c83qmz4ahh4ld"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wilton-ffi" = callPackage ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { @@ -222057,10 +222381,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "wl-pprint"; - version = "1.2"; - sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r"; - revision = "1"; - editedCabalFile = "04w1mm6c0k39x3aglrz5rgqjxszxb6jld0s7qrl4zhndl92nzi5c"; + version = "1.2.1"; + sha256 = "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c"; libraryHaskellDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer"; license = stdenv.lib.licenses.bsd3; @@ -225266,8 +225588,8 @@ self: { }: mkDerivation { pname = "xmonad-extras"; - version = "0.13.2"; - sha256 = "1ixnr76gmym9gab6m6r2rvrrvakxa5kda6cll9nbq954sjvj54jx"; + version = "0.13.3"; + sha256 = "15gxkkni3d6mr7zlzyp6nvzv0jy3vfhjkd8zrdin2nxb5pwwbsp0"; configureFlags = [ "-f-with_hlist" "-fwith_parsec" "-fwith_split" ]; @@ -226977,19 +227299,18 @@ self: { "yesod-auth-oauth2" = callPackage ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec , http-client, http-conduit, http-types, microlens, random - , safe-exceptions, text, transformers, uri-bytestring, yesod-auth - , yesod-core + , safe-exceptions, text, uri-bytestring, yesod-auth, yesod-core }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.4.1.0"; - sha256 = "1p0sxgi7cl6lqzkx478zva2byzanna6jicdrgdns2p91cnw5hlh9"; + version = "0.5.0.0"; + sha256 = "03qqaxwpdz15krnl8rnm6m3rlmpgfn1i41x1w7c4rhl701hy0vda"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring errors hoauth2 http-client http-conduit - http-types microlens random safe-exceptions text transformers - uri-bytestring yesod-auth yesod-core + http-types microlens random safe-exceptions text uri-bytestring + yesod-auth yesod-core ]; testHaskellDepends = [ base hspec uri-bytestring ]; homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; @@ -227780,8 +228101,8 @@ self: { }: mkDerivation { pname = "yesod-media-simple"; - version = "0.2.0.0"; - sha256 = "1sfz1iczsqhg8vasc4zyfwpw48hjlslfwf8r60a1c7kgrpa9yj6k"; + version = "0.2.0.1"; + sha256 = "1687c46qqdpzvalfi4dajsxaml1ljipysbvz9j1jargl3jrsdfqi"; libraryHaskellDepends = [ base bytestring diagrams-cairo diagrams-core diagrams-lib directory JuicyPixels vector yesod @@ -229857,8 +230178,8 @@ self: { }: mkDerivation { pname = "zifter"; - version = "0.0.1.6"; - sha256 = "0bswk4z26v020qkcm09cjkjkvwxsx1mrzrf3kajhwwzpb8vzxbdh"; + version = "0.0.1.7"; + sha256 = "1gdrnxa23lk885ldbn72n136acjfv8l0bnpf5v0lnypzl1hwp4rk"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions filepath optparse-applicative path path-io process safe stm validity From 93b324093025c5c9235d7514a544323b8f1c088b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Apr 2018 11:42:58 +0200 Subject: [PATCH 106/491] all-cabal-hashes: update to latest version --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index e7dbf947815b..38f8030cc272 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz"; - sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9cd032898a8fd11b69827ff02d2f295cac0907d9.tar.gz"; + sha256 = "1xxg3dcp5jgin978sa9510ji10p2j47x7b2n0xz00wrs9yjn5zvg"; } From a49dca6821855e3572e7a1d236fb96c3223ff02f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:39:43 +0200 Subject: [PATCH 107/491] haskell-monad-logger: drop obsolete override --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1e993524b5ce..600670c9140b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -866,9 +866,6 @@ self: super: { # https://github.com/fpco/stackage/issues/3126 stack = doJailbreak super.stack; - # https://github.com/snoyberg/monad-logger/issues/1 - monad-logger = self.monad-logger_0_3_28_5; - # These packages depend on each other, forming an infinite loop. scalendar = markBroken (super.scalendar.override { SCalendar = null; }); SCalendar = markBroken (super.SCalendar.override { scalendar = null; }); From 7724ead286392d37b3f11813a5c79b6720236b25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:41:18 +0200 Subject: [PATCH 108/491] haskell-{hlint,hoogle}: drop obsolete overrides --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 600670c9140b..eb419957561e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1027,9 +1027,6 @@ self: super: { indexed-list-literals = self.indexed-list-literals_0_2_0_0; }; - # Both need a more up-to-date version - hlint = super.hlint.override { extra = self.extra_1_6_6; }; - hoogle = super.hoogle.override { extra = self.extra_1_6_6; }; } // From 33e046271af4c3a532a86fb7a8114dad6f94275e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:52:25 +0200 Subject: [PATCH 109/491] haskell-vector-sized: update override --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eb419957561e..785f38be3d0f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1023,7 +1023,8 @@ self: super: { # This package refers to the wrong library (itself in fact!) vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; - vector-sized_1_0_0_0 = super.vector-sized_1_0_0_0.override { + # Builds only with the latest version of indexed-list-literals. + vector-sized_1_0_1_0 = super.vector-sized_1_0_1_0.override { indexed-list-literals = self.indexed-list-literals_0_2_0_0; }; From 1d0a71879dac0226272212df7a2463d8eeb8f75b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:03:33 +0200 Subject: [PATCH 110/491] 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 43c869feff12..fe6bc699fb98 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -578,7 +578,7 @@ self: super: { }); # Older versions don't compile. - brick = doJailbreak super.brick_0_36; # https://github.com/jtdaugherty/brick/issues/171 + brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_1_3; From ca7d98399976be0dd562d1f8ecd62ed3e5cd5656 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 25 Apr 2018 13:47:26 +0100 Subject: [PATCH 111/491] buildkite-agent3: init at 3.0.1 (#39471) New stable release. Version 2.6 is kept for backwards compatibility. https://github.com/buildkite/agent/releases/tag/v3.0.0 https://github.com/buildkite/agent/releases/tag/v3.0.1 --- .../buildkite-agent/2.x.nix | 12 ++++++++++ .../buildkite-agent/3.x.nix | 12 ++++++++++ .../{default.nix => generic.nix} | 22 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix create mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix rename pkgs/development/tools/continuous-integration/buildkite-agent/{default.nix => generic.nix} (73%) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix new file mode 100644 index 000000000000..6a73e2581822 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + src = fetchFromGitHub { + owner = "buildkite"; + repo = "agent"; + rev = "v${version}"; + sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg"; + }; + version = "2.6.10"; + hasBootstrapScript = true; +}) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix new file mode 100644 index 000000000000..2ceaee5650b2 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + src = fetchFromGitHub { + owner = "buildkite"; + repo = "agent"; + rev = "v${version}"; + sha256 = "09smyrzp1xkczlmh8vqb7bmjb2b5d6yf9birjgaw36c6m44bpfvs"; + }; + version = "3.0.1"; + hasBootstrapScript = false; +}) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix similarity index 73% rename from pkgs/development/tools/continuous-integration/buildkite-agent/default.nix rename to pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 7a5f2f44823b..8aa02ac307dd 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,19 +1,13 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: +{ stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep +, src, version, hasBootstrapScript +, ... }: let - version = "2.6.10"; goPackagePath = "github.com/buildkite/agent"; in buildGoPackage { name = "buildkite-agent-${version}"; - inherit goPackagePath; - - src = fetchFromGitHub { - owner = "buildkite"; - repo = "agent"; - rev = "v${version}"; - sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg"; - }; + inherit goPackagePath src; nativeBuildInputs = [ makeWrapper ]; @@ -22,18 +16,20 @@ buildGoPackage { noAuditTmpdir = stdenv.isLinux; postInstall = '' + ${stdenv.lib.optionalString hasBootstrapScript '' # Install bootstrap.sh mkdir -p $bin/libexec/buildkite-agent cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh + ''} # Fix binary name mv $bin/bin/{agent,buildkite-agent} # These are runtime dependencies wrapProgram $bin/bin/buildkite-agent \ - --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' \ - --set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh + ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh"} \ + --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; meta = with stdenv.lib; { @@ -47,7 +43,7 @@ buildGoPackage { ''; homepage = https://buildkite.com/docs/agent; license = licenses.mit; - maintainers = with maintainers; [ pawelpacana zimbatm ]; + maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5e8b16e017c..6e66f1ead518 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7592,7 +7592,9 @@ with pkgs; buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-agent = buildkite-agent2; + buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; + buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; byacc = callPackage ../development/tools/parsing/byacc { }; From ac61ae50b7b47dfae92ff921dab0774554e7df9e Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 25 Apr 2018 14:54:59 +0200 Subject: [PATCH 112/491] gn: Switch to fetchzip for apple_apsl directory The tarball from upstream seems to be generated on the fly, so the output is not deterministic and using fetchzip makes this more reliable as we have a recursively hashed output path without any of the non-determinisms in tarballs. Unfortunately, the build still fails on NixOS systems, because we need a few more stuff in the build tree. Signed-off-by: aszlig Cc: @matthewbauer, @stesie --- pkgs/development/tools/build-managers/gn/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index bfbb2b4e3308..a9930d258c2c 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchurl, fetchpatch +{ stdenv, lib, fetchgit, fetchzip, fetchpatch , libevent, ninja, python, darwin }: let @@ -28,9 +28,10 @@ let rev = "585ec31ea716f08233a815e680fc0d4699843938"; sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; }; - "third_party/apple_apsl" = fetchurl { + "third_party/apple_apsl" = fetchzip { url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz"; - sha256 = "0sc7b7zdw7f9piyyijl7xq3v1fzflqlck1apwm8kvgdhkyz3l63k"; + sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8"; + stripRoot = false; }; }; From a3502ba765ed5634b62d2440d342f81f68a67a8b Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 25 Apr 2018 14:58:54 +0200 Subject: [PATCH 113/491] gn: Add libc++ and libc++abi from third_party On GNU/Linux the build references these files, so let's fetch them from the Chromium repository. I haven't checked whether they are heavily patched or whether we can use the version from LLVM, but when looking at the changes, they do seem to divert a bit from upstream LLVM. Signed-off-by: aszlig Cc: @matthewbauer, @stesie --- pkgs/development/tools/build-managers/gn/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index a9930d258c2c..35f54369abd9 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -33,6 +33,16 @@ let sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8"; stripRoot = false; }; + "buildtools/third_party/libc++/trunk" = fetchgit { + url = "https://chromium.googlesource.com/chromium/llvm-project/libcxx"; + rev = "ece1de8658d749e19c12cacd4458cc330eca94e3"; + sha256 = "1nlyvfkzhchwv9b18bh82jcamqv3acj26ah9ajs31f2dql05amhg"; + }; + "buildtools/third_party/libc++abi/trunk" = fetchgit { + url = "https://chromium.googlesource.com/chromium/llvm-project/libcxxabi"; + rev = "52c7a3760aef1df328a9bc957f686410872f0dc0"; + sha256 = "1aam539j01381q27b7xhij18pz3h0lhw08hglvqq4hgvlqx5cn2s"; + }; }; in stdenv.mkDerivation { From 97698b0d6d644cc6d59495e339f6fbf44ff8ac64 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 08:08:47 -0500 Subject: [PATCH 114/491] musl-stdenv: don't add special allowance for libiconv --- pkgs/stdenv/linux/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2eb55ae439b5..92da0d7873d0 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -362,7 +362,6 @@ in ++ [ /*propagated from .dev*/ linuxHeaders binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] - ++ lib.optional (localSystem.libc == "musl") libiconv ++ lib.optionals localSystem.isAarch64 [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; From 4340a1582ffbd90f19e42f1480d36e17c0b515c7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 1 Mar 2018 05:32:36 +0100 Subject: [PATCH 115/491] =?UTF-8?q?pitivi:=200.96=20=E2=86=92=200.99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/pitivi/default.nix | 61 ++++++++++++------- .../prevent-closure-contamination.patch | 23 +++++++ 2 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/video/pitivi/prevent-closure-contamination.patch diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 48074a86b552..6c92b9aeed6b 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,61 +1,80 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook , python3Packages, gst, gtk3, hicolor-icon-theme , gobjectIntrospection, librsvg, gnome3, libnotify -# for gst-transcoder: -, which, meson, ninja +, meson, ninja }: let - version = "0.96"; + version = "0.99"; # gst-transcoder will eventually be merged with gstreamer (according to # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we # don't bother exposing the package to all of nixpkgs. gst-transcoder = stdenv.mkDerivation rec { - name = "gst-transcoder-1.8.0"; + version = "1.12.2"; + name = "gst-transcoder-${version}"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://github.com/pitivi/gst-transcoder/archive/1.8.0.tar.gz"; - sha256 = "0iggr6idmp7cmfsf6pkhfl3jq1bkga37jl5prbcl1zapkzi26fg6"; + url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz"; + sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which meson ninja gobjectIntrospection ] - ++ (with gst; [ gstreamer gst-plugins-base ]); + nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ]; + buildInputs = with gst; [ gstreamer gst-plugins-base ]; }; -in stdenv.mkDerivation rec { +in python3Packages.buildPythonApplication rec { name = "pitivi-${version}"; src = fetchurl { - url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz"; - sha256 = "115d37mvi32yds8gqj2yidkk6pap7szavhjf2hw0388ynydlc2zs"; + url = "mirror://gnome/sources/pitivi/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + format = "other"; + + patches = [ + # By default, the build picks up environment variables like PYTHONPATH + # and saves them to the generated binary. This would make the build-time + # dependencies part of the closure so we remove it. + ./prevent-closure-contamination.patch + ]; + + postPatch = '' + patchShebangs ./getenvvar.py + ''; + + nativeBuildInputs = [ meson ninja pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst; [ gstreamer gst-editing-services - gst-plugins-base gst-plugins-good + gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad gst-plugins-ugly gst-libav gst-validate - ]) ++ (with python3Packages; [ - python pygobject3 gst-python pyxdg numpy pycairo matplotlib - dbus-python ]); + pythonPath = with python3Packages; [ pygobject3 gst-python pyxdg numpy pycairo matplotlib dbus-python ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "pitivi"; + versionPolicy = "none"; # we are using dev version, since the stable one is too old + }; + }; + meta = with stdenv.lib; { description = "Non-Linear video editor utilizing the power of GStreamer"; - homepage = "http://pitivi.org/"; + homepage = http://pitivi.org/; longDescription = '' Pitivi is a video editor built upon the GStreamer Editing Services. It aims to be an intuitive and flexible application that can appeal to newbies and professionals alike. ''; - license = licenses.lgpl21Plus; - platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = with maintainers; []; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/pkgs/applications/video/pitivi/prevent-closure-contamination.patch new file mode 100644 index 000000000000..0025ecd0a4cf --- /dev/null +++ b/pkgs/applications/video/pitivi/prevent-closure-contamination.patch @@ -0,0 +1,23 @@ +--- a/meson.build ++++ b/meson.build +@@ -26,15 +26,15 @@ + geteenvvar = find_program('getenvvar.py') + cdata = configuration_data() + cdata.set('CONFIGURED_PYTHONPATH', +- run_command(geteenvvar, 'PYTHONPATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GI_TYPELIB_PATH', +- run_command(geteenvvar, 'GI_TYPELIB_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_LD_LIBRARY_PATH', +- run_command(geteenvvar, 'LD_LIBRARY_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GST_PLUGIN_PATH', +- run_command(geteenvvar, 'GST_PLUGIN_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GST_PLUGIN_SYSTEM_PATH', +- run_command(geteenvvar, 'GST_PLUGIN_SYSTEM_PATH').stdout().strip()) ++ '') + cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) + cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))) + cdata.set('PACKAGE_NAME', 'Pitivi') From 2d54f8f915166dbdc93ed9497f622799e930bf9b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 08:09:56 -0500 Subject: [PATCH 116/491] musl: build iconv using just-built pieces This is a bit unusual for a package, but not libc's as they should stand alone. --- pkgs/os-specific/linux/musl/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 0912f427430b..cd102cca00f1 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -68,6 +68,8 @@ stdenv.mkDerivation rec { dontDisableStatic = true; separateDebugInfo = true; + NIX_DONT_SET_RPATH = true; + postInstall = '' # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do. # Apparently glibc provides scsi itself? @@ -88,8 +90,13 @@ stdenv.mkDerivation rec { substituteInPlace $dev/bin/musl-gcc \ --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs - # provide 'iconv' utility - $CC ${iconv_c} -o $out/bin/iconv + # provide 'iconv' utility, using just-built headers, libc/ldso + $CC ${iconv_c} -o $out/bin/iconv \ + -I$dev/include \ + -L$out/lib -Wl,-rpath=$out/lib \ + -lc \ + -B $out/lib \ + -Wl,-dynamic-linker=$(ls $out/lib/ld-*) '' + lib.optionalString useBSDCompatHeaders '' install -D ${queue_h} $dev/include/sys/queue.h install -D ${cdefs_h} $dev/include/sys/cdefs.h From 558f7424f26076e1bb2260f13c04a9eb88127f97 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 11 Mar 2018 21:00:19 -0500 Subject: [PATCH 117/491] musl: make libc -> {ldso,ldd} symlinks relative Minor touchup while rebuilding things anyway. --- pkgs/os-specific/linux/musl/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index cd102cca00f1..3d515f7b762f 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { --replace -fno-asynchronous-unwind-tables "" ''; + patches = [ + # Minor touchup to build system making dynamic linker symlink relative + (fetchurl { + url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch; + sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; + }) + ]; preConfigure = '' configureFlagsArray+=("--syslibdir=$out/lib") ''; @@ -80,7 +87,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin # Create 'ldd' symlink, builtin - ln -s $out/lib/libc.so $out/bin/ldd + ln -rs $out/lib/libc.so $out/bin/ldd # (impure) cc wrapper around musl for interactive usuage for i in musl-gcc musl-clang ld.musl-clang; do From c84dad316a8d1eb0b5c2af0bd037c169096683ca Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 25 Apr 2018 15:04:30 +0200 Subject: [PATCH 118/491] lib/generators: print paths without quotes & move function down --- lib/generators.nix | 26 +++++++++++++++----------- lib/tests/misc.nix | 8 +++++--- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index d1a8f6bf8dcd..c09384c00f57 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -143,18 +143,13 @@ rec { (This means fn is type Val -> String.) */ allowPrettyValues ? false }@args: v: with builtins; - if isInt v then toString v + let isPath = v: typeOf v == "path"; + in if isInt v then toString v else if isString v then ''"${libStr.escape [''"''] v}"'' else if true == v then "true" else if false == v then "false" - else if null == v then "null" - else if isFunction v then - let fna = lib.functionArgs v; - showFnas = concatStringsSep "," (libAttr.mapAttrsToList - (name: hasDefVal: if hasDefVal then "(${name})" else name) - fna); - in if fna == {} then "<λ>" - else "<λ:{${showFnas}}>" + else if null == v then "null" + else if isPath v then toString v else if isList v then "[ " + libStr.concatMapStringsSep " " (toPretty args) v + " ]" @@ -163,12 +158,21 @@ rec { if attrNames v == [ "__pretty" "val" ] && allowPrettyValues then v.__pretty v.val # TODO: there is probably a better representation? - else if v ? type && v.type == "derivation" then "<δ>" + else if v ? type && v.type == "derivation" then + "<δ:${v.name}>" + # "<δ:${concatStringsSep "," (builtins.attrNames v)}>" else "{ " + libStr.concatStringsSep " " (libAttr.mapAttrsToList (name: value: "${toPretty args name} = ${toPretty args value};") v) + " }" - else abort "generators.toPretty: should never happen (v = ${v})"; + else if isFunction v then + let fna = lib.functionArgs v; + showFnas = concatStringsSep "," (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then "(${name})" else name) + fna); + in if fna == {} then "<λ>" + else "<λ:{${showFnas}}>" + else abort "toPretty: should never happen (v = ${v})"; } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 5f19dd63f2d8..c683df7d7ca3 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -317,7 +317,8 @@ runTests { expr = mapAttrs (const (generators.toPretty {})) rec { int = 42; bool = true; - string = "fnord"; + string = ''fno"rd''; + path = /. + "/foo"; # toPath returns a string null_ = null; function = x: x; functionArgs = { arg ? 4, foo }: arg; @@ -328,13 +329,14 @@ runTests { expected = rec { int = "42"; bool = "true"; - string = "\"fnord\""; + string = ''"fno\"rd"''; + path = "/foo"; null_ = "null"; function = "<λ>"; functionArgs = "<λ:{(arg),foo}>"; list = "[ 3 4 ${function} [ false ] ]"; attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }"; - drv = "<δ>"; + drv = "<δ:test>"; }; }; From 4f16b36fedb9157bff36984d88338b3e80bee2e0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 08:32:49 -0500 Subject: [PATCH 119/491] radiotray-ng: 0.2.1 -> 0.2.2 https://github.com/ebruck/radiotray-ng/releases/tag/v0.2.2 --- pkgs/applications/audio/radiotray-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 60c8f90b6d15..695a5b36dbf0 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "0hqg6vn8hv5pic96klf1d9vj8fibrgiqnqb5vwrg3wvakx0y32kr"; + sha256 = "0q8k7nsjm6m0r0zs1br60niaqlwvd3myqalb5sqijzanx41aq2l6"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; From 4d40adb86d03b856e12984048ced8902e3f73fd3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 4 Apr 2018 21:47:56 -0400 Subject: [PATCH 120/491] nginx: allow basic auth passwords to be specified in a file --- .../services/web-servers/nginx/default.nix | 20 +++++++++---------- .../web-servers/nginx/vhost-options.nix | 8 ++++++++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 938a8a1fe334..815c3147e647 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -218,7 +218,10 @@ let ssl_certificate_key ${vhost.sslCertificateKey}; ''} - ${optionalString (vhost.basicAuth != {}) (mkBasicAuth vhostName vhost.basicAuth)} + ${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) '' + auth_basic secured; + auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else mkHtpasswd vhostName vhost.basicAuth}; + ''} ${mkLocations vhost.locations} @@ -248,16 +251,11 @@ let ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} } '') locations); - mkBasicAuth = vhostName: authDef: let - htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" ( - concatStringsSep "\n" (mapAttrsToList (user: password: '' - ${user}:{PLAIN}${password} - '') authDef) - ); - in '' - auth_basic secured; - auth_basic_user_file ${htpasswdFile}; - ''; + mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" ( + concatStringsSep "\n" (mapAttrsToList (user: password: '' + ${user}:{PLAIN}${password} + '') authDef) + ); in { diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index bf18108a1a3c..f014d817e80e 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -193,6 +193,14 @@ with lib; ''; }; + basicAuthFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Basic Auth password file for a vhost. + ''; + }; + locations = mkOption { type = types.attrsOf (types.submodule (import ./location-options.nix { inherit lib; From 2236f418f5b6a1b04871b96b37959fb5e22fea86 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 08:38:36 -0500 Subject: [PATCH 121/491] radiotray-ng: disable tests, they now want to download unconditionally --- pkgs/applications/audio/radiotray-ng/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 695a5b36dbf0..2ce82eb6a0a0 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -78,7 +78,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # XXX: as of 0.2.2, tries to download gmock instead of checking for provided + doCheck = false; checkPhase = "ctest"; From 42ecb0dd949cac7040878882904dfb07db3e7894 Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Wed, 25 Apr 2018 18:10:17 +0800 Subject: [PATCH 122/491] inziu-iosevka: init at 1.13.2 --- pkgs/data/fonts/inziu-iosevka/default.nix | 31 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/data/fonts/inziu-iosevka/default.nix diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix new file mode 100644 index 000000000000..536f5cb0c61d --- /dev/null +++ b/pkgs/data/fonts/inziu-iosevka/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, p7zip }: + +stdenv.mkDerivation rec { + version = "1.13.2"; + name = "inziu-iosevka-${version}"; + + package = fetchurl { + url = "http://7xpdnl.dl1.z0.glb.clouddn.com/inziu-iosevka-ttfs-${version}.7z"; + sha256 = "1i7qqcv1x6s1xkp687wq79zqg9ly6a7l5mnmg1iqgfgcbglgjbaw"; + }; + + nativeBuildInputs = [ p7zip ]; + + unpackPhase = '' + 7z x $package + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Inziu Iosevka font"; + homepage = https://be5invis.github.io/Iosevka/inziu; + # license is clarified here: https://github.com/be5invis/Iosevka/issues/265 + license = licenses.ofl; + maintainers = [ maintainers.ChengCat ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c5..7518ed65a7a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14365,6 +14365,8 @@ with pkgs; input-fonts = callPackage ../data/fonts/input-fonts { }; + inziu-iosevka = callPackage ../data/fonts/inziu-iosevka { }; + iosevka = callPackage ../data/fonts/iosevka { nodejs = nodejs-8_x; }; From cbbcd2920d4bb715f239fe3aeda6e7e2dca7887f Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Wed, 25 Apr 2018 17:34:53 +0800 Subject: [PATCH 123/491] sarasa-gothic: init at 0.5.2 --- pkgs/data/fonts/sarasa-gothic/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/data/fonts/sarasa-gothic/default.nix diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix new file mode 100644 index 000000000000..8d2afbcf80dd --- /dev/null +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, p7zip }: + +stdenv.mkDerivation rec { + version = "0.5.2"; + name = "sarasa-gothic-${version}"; + + package = fetchurl { + url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttf-${version}.7z"; + sha256 = "18ycw57k7yhrbb8njzhzk6x32xnjal61wr48qxkqy4lh9zfy0p22"; + }; + + nativeBuildInputs = [ p7zip ]; + + unpackPhase = '' + 7z x $package + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "SARASA GOTHIC is a Chinese & Japanese programming font based on Iosevka and Source Han Sans"; + homepage = https://github.com/be5invis/Sarasa-Gothic; + license = licenses.ofl; + maintainers = [ maintainers.ChengCat ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7518ed65a7a9..4d5bedfa7917 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14524,6 +14524,8 @@ with pkgs; sampradaya = callPackage ../data/fonts/sampradaya { }; + sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; + scowl = callPackage ../data/misc/scowl { }; shaderc = callPackage ../development/compilers/shaderc { }; From 0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Apr 2018 15:52:09 +0200 Subject: [PATCH 124/491] rarian: merge gnome{2,3}.rarian --- pkgs/desktops/gnome-2/default.nix | 6 ++---- pkgs/desktops/gnome-2/desktop/rarian/default.nix | 12 ------------ pkgs/desktops/gnome-3/default.nix | 4 +--- .../libraries}/rarian/default.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/rarian/default.nix rename pkgs/{desktops/gnome-3/desktop => development/libraries}/rarian/default.nix (100%) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index cc4536785251..80f2c9ce70d7 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -1,4 +1,4 @@ -{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2 +{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian , libstartup_notification, overrides ? {} }: let overridden = set // overrides; set = with overridden; { @@ -14,6 +14,7 @@ let overridden = set // overrides; set = with overridden; { gnome_desktop = gnome-desktop; gnome_settings_daemon = gnome-settings-daemon; gnome_control_center = gnome-control-center; + inherit rarian; #### PLATFORM @@ -93,9 +94,6 @@ let overridden = set // overrides; set = with overridden; { # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - zenity = callPackage ./desktop/zenity { }; metacity = callPackage ./desktop/metacity { }; diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix deleted file mode 100644 index d2bcaa7c5e10..000000000000 --- a/pkgs/desktops/gnome-2/desktop/rarian/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f35688888997..422dedbce853 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -311,9 +311,6 @@ let polari = callPackage ./apps/polari { }; - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - seahorse = callPackage ./apps/seahorse { }; vinagre = callPackage ./apps/vinagre { }; @@ -427,6 +424,7 @@ let libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libgames-support = libgnome-games-support; # added 2018-03-14 libgnome_keyring = libgnome-keyring; # added 2018-02-25 + inherit (pkgs) rarian; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/desktop/rarian/default.nix rename to pkgs/development/libraries/rarian/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e66f1ead518..eaa458529e3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4560,6 +4560,8 @@ with pkgs; rarcrack = callPackage ../tools/security/rarcrack { }; + rarian = callPackage ../development/libraries/rarian { }; + ratools = callPackage ../tools/networking/ratools { }; rawdog = callPackage ../applications/networking/feedreaders/rawdog { }; From ec371a5d98f1d1dd9ccf06cd923050b2afe976b3 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 25 Apr 2018 16:07:16 +0200 Subject: [PATCH 125/491] ipmicfg: fix patchelf args --- pkgs/applications/misc/ipmicfg/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 2efd0ee969f1..af7d257eed6e 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/opt/ipmicfg" cp Linux/64bit/* "$out/opt/ipmicfg" - patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \ + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \ + "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" ''; From 077811ebe37fd1c5ff75fec40f89111db15214c4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 19 Mar 2018 12:38:17 +0800 Subject: [PATCH 126/491] nixos lcdproc: module for lcdd/lcdproc --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/lcd.nix | 172 ++++++++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 nixos/modules/services/hardware/lcd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e7f28c670bed..b00cc7a67697 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -245,6 +245,7 @@ ./services/hardware/illum.nix ./services/hardware/interception-tools.nix ./services/hardware/irqbalance.nix + ./services/hardware/lcd.nix ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix ./services/hardware/pommed.nix diff --git a/nixos/modules/services/hardware/lcd.nix b/nixos/modules/services/hardware/lcd.nix new file mode 100644 index 000000000000..d78d742cd318 --- /dev/null +++ b/nixos/modules/services/hardware/lcd.nix @@ -0,0 +1,172 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.hardware.lcd; + pkg = lib.getBin pkgs.lcdproc; + + serverCfg = pkgs.writeText "lcdd.conf" '' + [server] + DriverPath=${pkg}/lib/lcdproc/ + ReportToSyslog=false + Bind=${cfg.serverHost} + Port=${toString cfg.serverPort} + ${cfg.server.extraConfig} + ''; + + clientCfg = pkgs.writeText "lcdproc.conf" '' + [lcdproc] + Server=${cfg.serverHost} + Port=${toString cfg.serverPort} + ReportToSyslog=false + ${cfg.client.extraConfig} + ''; + + serviceCfg = { + DynamicUser = true; + Restart = "on-failure"; + Slice = "lcd.slice"; + }; + +in with lib; { + + meta.maintainers = with maintainers; [ peterhoeg ]; + + options = with types; { + services.hardware.lcd = { + serverHost = mkOption { + type = str; + default = "localhost"; + description = "Host on which LCDd is listening."; + }; + + serverPort = mkOption { + type = int; + default = 13666; + description = "Port on which LCDd is listening."; + }; + + server = { + enable = mkOption { + type = bool; + default = false; + description = "Enable the LCD panel server (LCDd)"; + }; + + openPorts = mkOption { + type = bool; + default = false; + description = "Open the ports in the firewall"; + }; + + usbPermissions = mkOption { + type = bool; + default = false; + description = '' + Set group-write permissions on a USB device. + + + A USB connected LCD panel will most likely require having its + permissions modified for lcdd to write to it. Enabling this option + sets group-write permissions on the device identified by + and + . In order to find the + values, you can run the lsusb command. Example + output: + + + + Bus 005 Device 002: ID 0403:c630 Future Technology Devices International, Ltd lcd2usb interface + + + + In this case the vendor id is 0403 and the product id is c630. + ''; + }; + + usbVid = mkOption { + type = str; + default = ""; + description = "The vendor ID of the USB device to claim."; + }; + + usbPid = mkOption { + type = str; + default = ""; + description = "The product ID of the USB device to claim."; + }; + + usbGroup = mkOption { + type = str; + default = "dialout"; + description = "The group to use for settings permissions. This group must exist or you will have to create it."; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Additional configuration added verbatim to the server config."; + }; + }; + + client = { + enable = mkOption { + type = bool; + default = false; + description = "Enable the LCD panel client (LCDproc)"; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Additional configuration added verbatim to the client config."; + }; + + restartForever = mkOption { + type = bool; + default = true; + description = "Try restarting the client forever."; + }; + }; + }; + }; + + config = mkIf (cfg.server.enable || cfg.client.enable) { + networking.firewall.allowedTCPPorts = mkIf (cfg.server.enable && cfg.server.openPorts) [ cfg.serverPort ]; + + services.udev.extraRules = mkIf (cfg.server.enable && cfg.server.usbPermissions) '' + ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="${cfg.server.usbVid}", ATTRS{idProduct}=="${cfg.server.usbPid}", MODE="660", GROUP="${cfg.server.usbGroup}" + ''; + + systemd.services = { + lcdd = mkIf cfg.server.enable { + description = "LCDproc - server"; + wantedBy = [ "lcd.target" ]; + serviceConfig = serviceCfg // { + ExecStart = "${pkg}/bin/LCDd -f -c ${serverCfg}"; + SupplementaryGroups = cfg.server.usbGroup; + }; + }; + + lcdproc = mkIf cfg.client.enable { + description = "LCDproc - client"; + after = [ "lcdd.service" ]; + wantedBy = [ "lcd.target" ]; + serviceConfig = serviceCfg // { + ExecStart = "${pkg}/bin/lcdproc -f -c ${clientCfg}"; + # If the server is being restarted at the same time, the client will + # fail as it cannot connect, so space it out a bit. + RestartSec = "5"; + # Allow restarting for eternity + StartLimitIntervalSec = lib.mkIf cfg.client.restartForever "0"; + StartLimitBurst = lib.mkIf cfg.client.restartForever "0"; + }; + }; + }; + + systemd.targets.lcd = { + description = "LCD client/server"; + after = [ "lcdd.service" "lcdproc.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; +} From 6c748ae749faae3ff989a800ffa5095f634a6050 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 25 Apr 2018 16:42:28 +0200 Subject: [PATCH 127/491] inkscape: Fix build on NixOS The first problem that was introduced in a276d5160cc4b307d97261b419e183f was a linking error: ld: cannot find -licui18n ld: cannot find -licuuc ld: cannot find -licudata So I added icu to the buildInputs. The second problem was that the interpreter wasn't patched in share/filters, apparently this is only needed when building with autotools: make[3]: Entering directory '/build/inkscape-0.92.3/share/filters' ./i18n.py ./filters.svg > ./filters.svg.h ./i18n.py: /usr/bin/env: bad interpreter: No such file or directory A similar error also occurs for share/palettes, share/patterns, share/symbols and share/templates, so I added patching the interpreter there as well. Switching to autotools in Inkscape is a very bad idea, because upstream currently still has their own autotools files in the 0.92.x tree but master already has them removed, see this commit: https://gitlab.com/inkscape/inkscape/commit/e471a664f923f517b68071f2e33fbb6ce070f8b7 However for the sake of trying to not break Inkscape on Darwin again, I tried to keep the fixes minimal and not went back to CMake. I did however mark the stuff that's unneeded for CMake, so that we can avoid forgetting to remove that crap once we get back to CMake. Signed-off-by: aszlig Cc: @matthewbauer --- pkgs/applications/graphics/inkscape/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 9a8ef6bd7744..37af9f6b86c7 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,6 +4,7 @@ , gsl, python2, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, potrace, autoreconfHook , intltool +, icu # Not needed for building with CMake , lib }: @@ -27,6 +28,13 @@ stdenv.mkDerivation rec { patchShebangs share/extensions patchShebangs fix-roff-punct + # XXX: Not needed for CMake: + patchShebangs share/filters + patchShebangs share/palettes + patchShebangs share/patterns + patchShebangs share/symbols + patchShebangs share/templates + # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. substituteInPlace src/extension/implementation/script.cpp \ @@ -38,7 +46,7 @@ stdenv.mkDerivation rec { perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace python2Env + libvisio libcdr libexif potrace python2Env icu ]; enableParallelBuilding = true; From ac0fd5a90968e4820aa8bbc4c5c5cc6ddcba58a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Wed, 25 Apr 2018 18:03:31 +0200 Subject: [PATCH 128/491] kitty: 0.8.2 -> 0.9.0 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 52f1c9fb1a1d..496353325255 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -5,7 +5,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.8.2"; + version = "0.9.0"; name = "kitty-${version}"; format = "other"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c"; + sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8"; }; buildInputs = [ From c19eeccc64c2be30a030859f9edaa03c132e812d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Wed, 25 Apr 2018 18:16:20 +0200 Subject: [PATCH 129/491] clojure: 1.9.0.358 -> 1.9.0.375 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index b35f6032d5aa..4340b68d8f74 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "clojure-${version}"; - version = "1.9.0.358"; + version = "1.9.0.375"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "0fi5kni6rdqjy6qgklf4xf7p1pgbsrdwd17iy6lrlg2vb8n8nksp"; + sha256 = "17a82dw5akhzlz4az9bh6s8rnz6nfgq50d8si0lwg212niq3c599"; }; buildInputs = [ makeWrapper ]; From c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Apr 2018 05:28:16 +0000 Subject: [PATCH 130/491] ocamlPackages.findlib: 1.7.3 -> 1.8.0 --- .../tools/ocaml/findlib/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 6f136a7ef289..e25b94714b68 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,22 +1,33 @@ { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: +let param = + if stdenv.lib.versionAtLeast ocaml.version "4" + then { + version = "1.8.0"; + sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb"; + } else { + version = "1.7.3"; + sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; + sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; + }) ]; + }; +in + stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - version = "1.7.3"; + inherit (param) version; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; + inherit (param) sha256; }; buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; - sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; - }) - ]; + patches = [ ./ldconf.patch ./install_topfind.patch ] + ++ (param.patches or []); dontAddPrefix=true; From 5c4ee2a3ab9f278b12d9196e59307e65f5fed88c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Apr 2018 12:47:27 +0000 Subject: [PATCH 131/491] ocaml: init at 4.07.0+beta2 --- pkgs/development/compilers/ocaml/4.07.nix | 9 +++++++++ pkgs/development/compilers/ocaml/generic.nix | 3 ++- pkgs/top-level/ocaml-packages.nix | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ocaml/4.07.nix diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix new file mode 100644 index 000000000000..b39d57cc092b --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "07"; + patch_version = "0+beta2"; + sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n"; + + # If the executable is stripped it does not work + dontStrip = true; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 03ae6e518d0b..d8af0722c941 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation (args // rec { ; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; + buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses + ++ optionals useX11 [ libX11 xproto ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f095ccb34ab5..741a58ce588a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1042,6 +1042,8 @@ in rec ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { }); + ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { }); + ocamlPackages_latest = ocamlPackages_4_06; ocamlPackages = ocamlPackages_4_05; From e609551090c02c5c31ec39c090f96df9dcb7f12e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 25 Apr 2018 18:48:16 +0200 Subject: [PATCH 132/491] vim-nix: 2018-04-15 -> 2018-04-24 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a48f9943779a..0134d5fae48a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -280,11 +280,11 @@ rec { }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-04-15"; + name = "vim-nix-2018-04-24"; src = fetchgit { url = "https://github.com/LnL7/vim-nix"; - rev = "bf5779180bf0e3cb6c967f87d6262a976e055e32"; - sha256 = "023c932vybycj8zasvgvp7xhp42i2iy26msjgjsgzfwmdf5w877y"; + rev = "dae3d30a145f1d0e50658dafd88f95cd4b5e323d"; + sha256 = "1x3gaiz2wbqykzhk0zj0krjp81m5rxhk80pcg96f4gyqp7hxrx78"; }; dependencies = []; From 00528006cfc998db81abb77d5aebe7115bbd664f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 25 Apr 2018 19:20:57 +0200 Subject: [PATCH 133/491] guitarix: 0.36.1 -> 0.37.0 --- pkgs/applications/audio/guitarix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index bcb301687089..62bc2fa6f36f 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.36.1"; + version = "0.37.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0"; + sha256 = "17dsd32yd92l7xq1x0b8jsws5yif2pk4zbfjbc560hgarym6r8x6"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; From 30357e203ad73748a2fc81735d3660e403d5161c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 12:49:51 -0500 Subject: [PATCH 134/491] lsof: 4.90 -> 4.91 --- pkgs/development/tools/misc/lsof/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ae62c8c7aaef..005fb09fba09 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -4,13 +4,13 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in stdenv.mkDerivation rec { name = "lsof-${version}"; - version = "4.90"; + version = "4.91"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; src = fetchurl { - urls = ["https://fossies.org/linux/misc/lsof_4.90.tar.bz2"] ++ # Mirrors seem to be down... + urls = ["https://fossies.org/linux/misc/lsof_${version}.tar.bz2"] ++ # Mirrors seem to be down... ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] ++ map ( # the tarball is moved after new version is released @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" ) [ false true ] ; - sha256 = "1xhn3amvl5mmwji5g90nkw7lfmh2494v18qbv1f729hrg468853g"; + sha256 = "18sh4hbl9jw2szkf0gvgan8g13f3g4c6s2q9h3zq5gsza9m99nn9"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; From 0009ae3d5e1ad620215c2b8409eeec668de60552 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Apr 2018 19:55:29 +0200 Subject: [PATCH 135/491] onboard: fix missing typelibs --- pkgs/applications/misc/onboard/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index d4847e4ce493..de64705d832b 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -88,6 +88,7 @@ in python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ glibcLocales + gobjectIntrospection # populate GI_TYPELIB_PATH intltool pkgconfig ]; From c1f45f76ad0c84f4e5a3f968de08f97c2150f9ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 25 Apr 2018 14:58:23 -0400 Subject: [PATCH 136/491] sacrifice: fix runtime on darwin --- pkgs/applications/science/physics/sacrifice/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index d6aeeedc086d..99d6df77f853 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { "--with-pythia=${pythia}" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia + ''; + enableParallelBuilding = true; meta = { From 524b29471bc3683650005ebffec042fb15e0937c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 12 Apr 2018 21:29:58 -0300 Subject: [PATCH 137/491] onestepback: init at 0.98 --- pkgs/misc/themes/onestepback/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/misc/themes/onestepback/default.nix diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix new file mode 100644 index 000000000000..609e027d9eba --- /dev/null +++ b/pkgs/misc/themes/onestepback/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + version = "0.98"; + +in fetchzip { + name = "onestepback-${version}"; + + url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; + + postFetch = '' + mkdir -p $out/share/themes + unzip $downloadedFile -x OneStepBack/LICENSE -d $out/share/themes + ''; + + sha256 = "0sjacvx7020lzc89r5310w83wclw96gzzczy3mss54ldkgmnd0mr"; + + meta = with stdenv.lib; { + description = "Gtk theme inspired by the NextStep look"; + homepage = https://www.opendesktop.org/p/1013663/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f8c3e0765cd..85212825a0e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19609,6 +19609,8 @@ with pkgs; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; + onestepback = callPackage ../misc/themes/onestepback { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { From ba52ae50488de85a9cf60a3a04f1c9ca7122ec74 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 19 Mar 2018 22:41:06 -0400 Subject: [PATCH 138/491] treewide: isArm -> isAarch32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilà we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile --- lib/systems/doubles.nix | 2 +- lib/systems/for-meta.nix | 2 +- lib/systems/inspect.nix | 7 +++++-- lib/systems/parse.nix | 2 +- nixos/lib/qemu-flags.nix | 2 +- nixos/modules/config/gnu.nix | 4 ++-- nixos/modules/virtualisation/qemu-vm.nix | 2 +- pkgs/applications/audio/sunvox/default.nix | 2 +- .../instant-messengers/toxic/default.nix | 2 +- pkgs/applications/virtualization/qemu/default.nix | 6 +++--- pkgs/build-support/bintools-wrapper/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- .../development/compilers/gcc/snapshot/default.nix | 2 +- pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 6 +++--- pkgs/development/compilers/ghc/8.4.1.nix | 4 ++-- pkgs/development/compilers/ghc/8.4.2.nix | 4 ++-- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/development/compilers/go/1.10.nix | 4 ++-- pkgs/development/compilers/go/1.4.nix | 2 +- pkgs/development/compilers/go/1.9.nix | 4 ++-- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/generic.nix | 4 ++-- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- pkgs/development/compilers/sbcl/default.nix | 2 +- .../haskell-modules/configuration-common.nix | 10 +++++----- .../haskell-modules/generic-builder.nix | 2 +- pkgs/development/interpreters/perl/default.nix | 2 +- pkgs/development/interpreters/picolisp/default.nix | 2 +- .../interpreters/spidermonkey/1.8.5.nix | 8 ++++---- pkgs/development/libraries/ffmpeg/generic.nix | 14 +++++++------- pkgs/development/libraries/freetype/default.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/gnu-efi/default.nix | 2 +- pkgs/development/libraries/icu/base.nix | 2 +- pkgs/development/libraries/jemalloc/common.nix | 2 +- pkgs/development/libraries/libdrm/default.nix | 2 +- pkgs/development/libraries/libtoxcore/default.nix | 2 +- pkgs/development/libraries/libtoxcore/new-api.nix | 4 ++-- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/libvpx/git.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 6 +++--- pkgs/development/libraries/pixman/default.nix | 2 +- pkgs/development/libraries/pth/default.nix | 2 +- pkgs/development/libraries/v8/3.16.14.nix | 4 ++-- pkgs/development/libraries/v8/6_x.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- .../libraries/webrtc-audio-processing/default.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- pkgs/development/tools/misc/uhd/default.nix | 4 ++-- .../apple-source-releases/system_cmds/default.nix | 2 +- pkgs/os-specific/linux/kbd/default.nix | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/uclibc/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- pkgs/tools/networking/cjdns/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/system/storebrowse/default.nix | 2 +- pkgs/top-level/all-packages.nix | 14 +++++++------- 69 files changed, 110 insertions(+), 107 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 012a1786a3cc..c6618083ce72 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ in rec { none = []; - arm = filterDoubles predicates.isArm; + arm = filterDoubles predicates.isAarch32; aarch64 = filterDoubles predicates.isAarch64; x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index 43c0195c3f18..9e85cea3ad11 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -7,7 +7,7 @@ in rec { all = [ {} ]; # `{}` matches anything none = []; - arm = [ patterns.isArm ]; + arm = [ patterns.isAarch32 ]; aarch64 = [ patterns.isAarch64 ]; x86 = [ patterns.isx86 ]; i686 = [ patterns.isi686 ]; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index d7fabf684b72..b87320594cab 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -9,8 +9,8 @@ rec { isx86_64 = { cpu = cpuTypes.x86_64; }; isPowerPC = { cpu = cpuTypes.powerpc; }; isx86 = { cpu = { family = "x86"; }; }; - isArm = { cpu = { family = "arm"; }; }; - isAarch64 = { cpu = { family = "aarch64"; }; }; + isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; + isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; isWasm = { cpu = { family = "wasm"; }; }; @@ -41,6 +41,9 @@ rec { isEfi = map (family: { cpu.family = family; }) [ "x86" "arm" "aarch64" ]; + + # Deprecated + isArm = isAarch32; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 381108d76fe2..018fd172e687 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -72,7 +72,7 @@ rec { armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index fcdcbf1b0077..e4c95ebdfb0d 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -9,7 +9,7 @@ ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; qemuBinary = qemuPkg: { diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index ef48ccb7b4fe..93d130970190 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -26,11 +26,11 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isArm) grub2; + ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. - boot.loader.grub.enable = !pkgs.stdenv.isArm; + boot.loader.grub.enable = !pkgs.stdenv.isAarch32; boot.loader.grub.version = 2; # GNU lsh. diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 45325c6b0d8d..2b78276fcdea 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -437,7 +437,7 @@ in # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ]) - (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) + (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) ]; # Mount the host filesystem via 9P, and bind-mount the Nix store diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ccbceddefd2f..47b0bf2e736c 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -5,7 +5,7 @@ let arch = if stdenv.isAarch64 then "arm64" - else if stdenv.isArm + else if stdenv.isAarch32 then "arm_armhf_raspberry_pi" else if stdenv.is64bit then "x86_64" diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e2e25be49f23..4934a7374058 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk_pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut libqrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a10687141615..9839aadc9c1f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,7 +4,7 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL2 @@ -29,7 +29,7 @@ let hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" else if stdenv.isi686 then "i386-softmmu" - else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch32 then "arm-softmmu" else if stdenv.isAarch64 then "aarch64-softmmu" else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5c0436b73ddf..47301bbdde69 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -57,7 +57,7 @@ let else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". - else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" + else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" @@ -176,7 +176,7 @@ stdenv.mkDerivation { sep = optionalString (!targetPlatform.isMips) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" - else if targetPlatform.isArm then endianPrefix + "arm" + else if targetPlatform.isAarch32 then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isi686 then "i386" else if targetPlatform.isMips then { diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 0a6ea59e5ac4..532c56d52573 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -289,7 +289,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 5dfdbd02cbfd..fb82eee4ab85 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -298,7 +298,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e42bb736676d..dee798eb09b1 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -318,7 +318,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index cf71f51627c9..b99ab8fce7fb 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -322,7 +322,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 0b19aa95effe..493e50d9f327 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -327,7 +327,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index e41e8789c9ed..d37cfac3fa85 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -290,7 +290,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index c56798e31ae4..cb9f78aa0813 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ]; + buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index 5cb3f2ea5ced..c88d2a8685a6 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 6520daa4d42c..192ff1ba207d 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -26,7 +26,7 @@ enableShared ? !(targetPlatform.isDarwin # On iOS, dynamic linking is not supported - && (targetPlatform.isAarch64 || targetPlatform.isArm)) + && (targetPlatform.isAarch64 || targetPlatform.isAarch32)) , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index df23f660147a..8f398458fd53 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index 296c10b9346c..cf4e57727198 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index bc3ccbdcdf51..51497e0d9cee 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 7ba547552907..69184744307d 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index b8c283fef07e..32eb0d98d188 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 829309f94268..6a92775e0c25 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index c69554e633a9..8cfe2bb7bcfe 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 648ef0d91f9e..8bad5494e8b9 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d8af0722c941..1ee6fee613c9 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -7,7 +7,7 @@ let real_url = if url == null then "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz" else url; - safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); + safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in { stdenv, fetchurl, ncurses, buildEnv @@ -15,7 +15,7 @@ in , flambdaSupport ? false }: -assert useX11 -> !stdenv.isArm && !stdenv.isMips; +assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 707f7966dd9b..529123398a57 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' + postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 0da3e9f0fd1d..29a192fcff24 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (setf features (remove x features)))) '' + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") - + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" + + stdenv.lib.optionalString stdenv.isAarch32 "(enable :arm)" + '' )) " > customize-target-features.lisp diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 785f38be3d0f..e4f2d6728640 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -932,11 +932,11 @@ self: super: { JuicyPixels = dontHaddock super.JuicyPixels; # aarch64 and armv7l fixes. - happy = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs; - servant-swagger = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger; - swagger2 = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; + happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 52d596da701a..3ab77c42cbba 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -136,7 +136,7 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !hostPlatform.isAarch32 && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 0fd55bd8d71b..3541c92fd9d6 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -86,7 +86,7 @@ let preConfigure = optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString (stdenv.isArm || stdenv.isMips) '' + '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 4618d0da9dd3..6f7f2df96bff 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; - patchPhase = optionalString stdenv.isArm '' + patchPhase = optionalString stdenv.isAarch32 '' sed -i s/-m32//g Makefile cat >>Makefile < libGLU_combined != null; @@ -153,8 +153,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport libGLU_combined - ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM - ++ optional ((isLinux || isFreeBSD) && !isArm) libva + ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 3fccce02def4..4d2455d4872b 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; # The asm for armel is written with the 'asm' keyword. - CFLAGS = optionalString stdenv.isArm "-std=gnu99"; + CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 31567f0049dd..37e0a20a957d 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index b65a8ee5fc1c..57204776decd 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 5973c89cef79..551e7e5e1f6b 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -38,7 +38,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 940b4e2aee4e..1f8a518d69e4 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ] ++ stdenv.lib.optional stdenv.isAarch32 "ARCH=arm" ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 87551ee6ee03..ee868d371ce5 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -31,7 +31,7 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isArm '' + '' + stdenv.lib.optionalString stdenv.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 1a26bd13d41c..d8866ae3ff89 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; + ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp"; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 82307e9ab163..ccae6ce50142 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-install-test-programs" ] - ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) + ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 16fca9ce3d39..9af8718dc5fe 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium libmsgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 8d0a467c82a8..785bc6f3c843 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus ]; - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ]; # Some tests fail randomly due to timeout. This kind of problem is well known # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 1e96ff9bb1ad..272761cc6af3 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -41,7 +41,7 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index ef499f238d63..e2b94dda28e7 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -43,11 +43,11 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in -assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support +assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a3c03c4f2e53..2beb7e600804 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,17 +33,17 @@ else let defaultGalliumDrivers = - if stdenv.isArm + if stdenv.isAarch32 then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then ["nouveau" "vc4" ] else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then ["nouveau"] else ["i915" "i965" "nouveau" "radeon" "r200"]; defaultVulkanDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then [] else ["intel"] ++ lib.optional enableRadv "radeon"; in diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index e70ffc3eb2f1..2987c67ae757 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck libpng; - configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; + configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; doCheck = true; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index b7b09caed9b3..6118d9c41d6f 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = stdenv.lib.optionalString stdenv.isArm '' + preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index 73f5febb6685..e1a9336e3a56 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -3,10 +3,10 @@ assert readline != null; let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index 4095ff20c2bc..adebedbf2ac1 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -4,7 +4,7 @@ }: let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then if stdenv.is64bit then"arm64" else "arm" diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index f14ec4fc6084..099794f6623d 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -10,7 +10,7 @@ let arch = if stdenv.isx86_64 then "x64" else if stdenv.isi686 then "ia32" else if stdenv.isAarch64 then "arm64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b5a3aed91d90..529091518eb6 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # Avoid this error: # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode - patchPhase = stdenv.lib.optionalString stdenv.isArm '' + patchPhase = stdenv.lib.optionalString stdenv.isAarch32 '' substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 123f679d779d..e65736a3e887 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 2ea87fe6d7f1..011d0b3e80b9 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -38,14 +38,14 @@ in stdenv.mkDerivation { # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ - [ (stdenv.lib.optionalString stdenv.isArm "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; + [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; # Build only the host software preConfigure = "cd host"; - patches = if stdenv.isArm then ./neon.patch else null; + patches = if stdenv.isAarch32 then ./neon.patch else null; postPhases = [ "installFirmware" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 2579b0b6a0a6..1bbda6ab7add 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -11,7 +11,7 @@ appleDerivation rec { apple_sdk.frameworks.IOKit openbsm ]; # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" - # + lib.optionalString hostPlatform.isArm "-D__arm__"; + # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" "-DDAEMON_GID=1" "-DDEFAULT_AT_QUEUE=\'a\'" diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index d1e40371e370..bfade509fcac 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) '' + ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4d9ec389f44e..4af5889fd1cd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -355,7 +355,7 @@ with stdenv.lib; SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default SECURITY_YAMA? y # Prevent processes from ptracing non-children processes DEVKMEM n # Disable /dev/kmem - ${optionalString (! stdenv.hostPlatform.isArm) + ${optionalString (! stdenv.hostPlatform.isAarch32) (if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack '' else '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7c9514883093..615e4f867c4d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isArm || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + (if stdenv.isAarch32 || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index c4d2bf04d7a0..180aabc94cc6 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -43,7 +43,7 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" - '' + stdenv.lib.optionalString (stdenv.isArm && cross == null) '' + '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 60462f83d108..a9de5508371a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -123,7 +123,7 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl; + ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 42288e6245e4..190fc500068c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -117,7 +117,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD - isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian; + isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index d16e730b5abf..817da08c05e3 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { stdenv.lib.optional stdenv.isLinux utillinux; buildPhase = - stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 " + stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d20cb3c37859..3dfd136ad060 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, go }: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); let diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 40332f7b0d44..179b4cb1a4c0 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchhg, go, sqlite}: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); stdenv.mkDerivation rec { name = "storebrowse-20130318212204"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaa458529e3c..d446a0127212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6471,12 +6471,12 @@ with pkgs; openjdk = openjdk8; - jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; + jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); jre8_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else if stdenv.isDarwin then jre8 @@ -6485,12 +6485,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; - jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" + jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; + jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk10.jre // { outputs = [ "jre" ]; })); jre10_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else if stdenv.isDarwin then jre10 @@ -9247,7 +9247,7 @@ with pkgs; cairo = callPackage ../development/libraries/cairo { glSupport = config.cairo.gl or (stdenv.isLinux && - !stdenv.isArm && !stdenv.isMips); + !stdenv.isAarch32 && !stdenv.isMips); }; From b9acfb4ecfbbdac123fed170f5b2806fe4e846d0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 19 Mar 2018 22:41:06 -0400 Subject: [PATCH 139/491] treewide: isArm -> isAarch32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilà we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile (cherry picked from commit ba52ae50488de85a9cf60a3a04f1c9ca7122ec74) --- lib/systems/doubles.nix | 2 +- lib/systems/for-meta.nix | 2 +- lib/systems/inspect.nix | 7 +++++-- lib/systems/parse.nix | 2 +- nixos/lib/qemu-flags.nix | 2 +- nixos/modules/config/gnu.nix | 4 ++-- pkgs/applications/audio/sunvox/default.nix | 2 +- .../instant-messengers/toxic/default.nix | 2 +- .../applications/virtualization/qemu/default.nix | 6 +++--- pkgs/build-support/bintools-wrapper/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- .../compilers/gcc/snapshot/default.nix | 2 +- pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 6 +++--- pkgs/development/compilers/ghc/8.4.1.nix | 4 ++-- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/development/compilers/go/1.10.nix | 4 ++-- pkgs/development/compilers/go/1.4.nix | 2 +- pkgs/development/compilers/go/1.9.nix | 4 ++-- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/generic.nix | 4 ++-- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- pkgs/development/compilers/sbcl/default.nix | 2 +- .../haskell-modules/configuration-common.nix | 10 +++++----- .../haskell-modules/generic-builder.nix | 2 +- pkgs/development/interpreters/perl/default.nix | 2 +- .../interpreters/picolisp/default.nix | 2 +- .../interpreters/spidermonkey/1.8.5.nix | 8 ++++---- pkgs/development/libraries/ffmpeg/generic.nix | 14 +++++++------- pkgs/development/libraries/freetype/default.nix | 2 +- pkgs/development/libraries/glibc/common-2.27.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/gnu-efi/default.nix | 2 +- pkgs/development/libraries/icu/base.nix | 2 +- pkgs/development/libraries/jemalloc/default.nix | 2 +- pkgs/development/libraries/libdrm/default.nix | 2 +- .../development/libraries/libtoxcore/default.nix | 2 +- .../development/libraries/libtoxcore/new-api.nix | 4 ++-- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/libvpx/git.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 6 +++--- pkgs/development/libraries/pixman/default.nix | 2 +- pkgs/development/libraries/pth/default.nix | 2 +- pkgs/development/libraries/v8/3.16.14.nix | 4 ++-- pkgs/development/libraries/v8/6_x.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- .../webrtc-audio-processing/default.nix | 2 +- .../python-modules/Cython/default.nix | 2 +- pkgs/development/tools/misc/binutils/2.30.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- pkgs/os-specific/linux/kbd/default.nix | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/uclibc/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- pkgs/tools/networking/cjdns/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/system/storebrowse/default.nix | 2 +- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 69 files changed, 109 insertions(+), 106 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 012a1786a3cc..c6618083ce72 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ in rec { none = []; - arm = filterDoubles predicates.isArm; + arm = filterDoubles predicates.isAarch32; aarch64 = filterDoubles predicates.isAarch64; x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index fa713b1e6136..68c68c2cd369 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -7,7 +7,7 @@ in rec { inherit (lib.systems.doubles) all mesaPlatforms; none = []; - arm = [ patterns.isArm ]; + arm = [ patterns.isAarch32 ]; aarch64 = [ patterns.isAarch64 ]; x86 = [ patterns.isx86 ]; i686 = [ patterns.isi686 ]; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index a7bd17f68a45..91ae2cd2557e 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -9,8 +9,8 @@ rec { isx86_64 = { cpu = cpuTypes.x86_64; }; isPowerPC = { cpu = cpuTypes.powerpc; }; isx86 = { cpu = { family = "x86"; }; }; - isArm = { cpu = { family = "arm"; }; }; - isAarch64 = { cpu = { family = "aarch64"; }; }; + isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; + isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; isWasm = { cpu = { family = "wasm"; }; }; @@ -43,6 +43,9 @@ rec { [ "x86" "arm" "aarch64" ]; isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; }) [ "x86" "arm" "aarch64" "mips" ]; + + # Deprecated after 18.03 + isArm = isAarch32; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 03d052f5f192..8a6c951d5e5e 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -72,7 +72,7 @@ rec { armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index fcdcbf1b0077..e4c95ebdfb0d 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -9,7 +9,7 @@ ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; qemuBinary = qemuPkg: { diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index ef48ccb7b4fe..93d130970190 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -26,11 +26,11 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isArm) grub2; + ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. - boot.loader.grub.enable = !pkgs.stdenv.isArm; + boot.loader.grub.enable = !pkgs.stdenv.isAarch32; boot.loader.grub.version = 2; # GNU lsh. diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ccbceddefd2f..47b0bf2e736c 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -5,7 +5,7 @@ let arch = if stdenv.isAarch64 then "arm64" - else if stdenv.isArm + else if stdenv.isAarch32 then "arm_armhf_raspberry_pi" else if stdenv.is64bit then "x86_64" diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e2e25be49f23..4934a7374058 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk_pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut libqrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 00303be12da2..c3d8d05eea98 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,7 +4,7 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL @@ -26,7 +26,7 @@ let hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" else if stdenv.isi686 then "i386-softmmu" - else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch32 then "arm-softmmu" else if stdenv.isAarch64 then "aarch64-softmmu" else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 8e94ccfa49bc..a5084808c3bc 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -55,7 +55,7 @@ let else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". - else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" + else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" @@ -174,7 +174,7 @@ stdenv.mkDerivation { sep = optionalString (!targetPlatform.isMips) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" - else if targetPlatform.isArm then endianPrefix + "arm" + else if targetPlatform.isAarch32 then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isi686 then "i386" else if targetPlatform.isMips then { diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index c63867a1d2db..8cee08c09261 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -258,7 +258,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 36adfd075df2..c798a67de840 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -300,7 +300,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index c436da678fd9..c729bbeb66f9 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -309,7 +309,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index b9ca8696d4e3..f2a091e34dc9 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -329,7 +329,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index df0c1578daed..3de5b4dd2702 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -333,7 +333,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index e8997b1efb06..888e455488ca 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -329,7 +329,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index c1306d374d5d..3c98b7a58f76 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -301,7 +301,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index c56798e31ae4..cb9f78aa0813 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ]; + buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index 8a08ab4b9862..c0bc2a9dd736 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 1c3f260da1c1..b2a1aafe6131 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -25,7 +25,7 @@ enableShared ? !(targetPlatform.isDarwin # On iOS, dynamic linking is not supported - && (targetPlatform.isAarch64 || targetPlatform.isArm)) + && (targetPlatform.isAarch64 || targetPlatform.isAarch32)) , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 8f7cdc9568e4..f232e0b47287 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index bc3ccbdcdf51..51497e0d9cee 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 145f6a17978d..b22bfb2bd101 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index b8c283fef07e..32eb0d98d188 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c866212170c4..955d9029d388 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index c69554e633a9..8cfe2bb7bcfe 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 648ef0d91f9e..8bad5494e8b9 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 03ae6e518d0b..54e9ae671af5 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -7,7 +7,7 @@ let real_url = if url == null then "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz" else url; - safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); + safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in { stdenv, fetchurl, ncurses, buildEnv @@ -15,7 +15,7 @@ in , flambdaSupport ? false }: -assert useX11 -> !stdenv.isArm && !stdenv.isMips; +assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 707f7966dd9b..529123398a57 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' + postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 39b84ae6a365..8006648a7dc3 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (setf features (remove x features)))) '' + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") - + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" + + stdenv.lib.optionalString stdenv.isAarch32 "(enable :arm)" + '' )) " > customize-target-features.lisp diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 08443de111dd..6d95805ddb62 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -937,11 +937,11 @@ self: super: { JuicyPixels = dontHaddock super.JuicyPixels; # armv7l fixes. - happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs; - servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger; - swagger2 = if pkgs.stdenv.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2; + happy = if pkgs.stdenv.isAarch32 then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if pkgs.stdenv.isAarch32 then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if pkgs.stdenv.isAarch32 then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if pkgs.stdenv.isAarch32 then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if pkgs.stdenv.isAarch32 then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a29056d965ac..01e2eef58cba 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -133,7 +133,7 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !hostPlatform.isAarch32 && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f7324fc6d01a..b3381c1dd8fe 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -82,7 +82,7 @@ let preConfigure = optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString (stdenv.isArm || stdenv.isMips) '' + '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 4618d0da9dd3..6f7f2df96bff 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; - patchPhase = optionalString stdenv.isArm '' + patchPhase = optionalString stdenv.isAarch32 '' sed -i s/-m32//g Makefile cat >>Makefile < libGLU_combined != null; @@ -153,8 +153,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport libGLU_combined - ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM - ++ optional ((isLinux || isFreeBSD) && !isArm) libva + ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8f16f85cabf7..be4da5a035b0 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; # The asm for armel is written with the 'asm' keyword. - CFLAGS = optionalString stdenv.isArm "-std=gnu99"; + CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix index 6c443ebbb932..272e18905c13 100644 --- a/pkgs/development/libraries/glibc/common-2.27.nix +++ b/pkgs/development/libraries/glibc/common-2.27.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d40733adf874..5179ce4a9a88 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index b65a8ee5fc1c..57204776decd 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 5973c89cef79..551e7e5e1f6b 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -38,7 +38,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index a46abe3b4f7c..bb7c35ddc9c9 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ] ++ stdenv.lib.optional stdenv.isAarch32 "ARCH=arm" ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 87551ee6ee03..ee868d371ce5 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -31,7 +31,7 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isArm '' + '' + stdenv.lib.optionalString stdenv.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 0882431cc15b..d4c9e0ff24a4 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; + ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp"; doCheck = true; patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index e5e1e2e7a399..45a71759d458 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-install-test-programs" ] - ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) + ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 16fca9ce3d39..9af8718dc5fe 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium libmsgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 8d0a467c82a8..785bc6f3c843 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus ]; - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ]; # Some tests fail randomly due to timeout. This kind of problem is well known # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 1e96ff9bb1ad..272761cc6af3 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -41,7 +41,7 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 824449a347af..a861428f0f72 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -43,11 +43,11 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in -assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support +assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3f873022f7ac..675002168005 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -32,17 +32,17 @@ else let defaultGalliumDrivers = - if stdenv.isArm + if stdenv.isAarch32 then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then ["nouveau" "vc4" ] else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then ["nouveau"] else ["i915" "i965" "nouveau" "radeon" "r200"]; defaultVulkanDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then [] else ["intel"] ++ lib.optional enableRadv "radeon"; in diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 6b891bdb38c2..98d4c737ebd1 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck libpng; - configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; + configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; doCheck = true; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index b7b09caed9b3..6118d9c41d6f 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = stdenv.lib.optionalString stdenv.isArm '' + preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index 73f5febb6685..e1a9336e3a56 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -3,10 +3,10 @@ assert readline != null; let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index 4095ff20c2bc..adebedbf2ac1 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -4,7 +4,7 @@ }: let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then if stdenv.is64bit then"arm64" else "arm" diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 4d49fdce3a92..3246c23ab021 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -10,7 +10,7 @@ let arch = if stdenv.isx86_64 then "x64" else if stdenv.isi686 then "ia32" else if stdenv.isAarch64 then "arm64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b5a3aed91d90..529091518eb6 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # Avoid this error: # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode - patchPhase = stdenv.lib.optionalString stdenv.isArm '' + patchPhase = stdenv.lib.optionalString stdenv.isAarch32 '' substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 751e064ad706..ce63970495bc 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # result is "3L" instead of "3", so let's fix it in-place. # # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' + postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isAarch32) && !isPy3k) '' sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ tests/run/cpdef_enums.pyx ''; diff --git a/pkgs/development/tools/misc/binutils/2.30.nix b/pkgs/development/tools/misc/binutils/2.30.nix index 830c07330524..2a8e6d88b934 100644 --- a/pkgs/development/tools/misc/binutils/2.30.nix +++ b/pkgs/development/tools/misc/binutils/2.30.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 05d0d21a179b..549eaf5253d3 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index d1e40371e370..bfade509fcac 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) '' + ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5fbd9955c2a3..50f5999c557f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -353,7 +353,7 @@ with stdenv.lib; SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default SECURITY_YAMA? y # Prevent processes from ptracing non-children processes DEVKMEM n # Disable /dev/kmem - ${optionalString (! stdenv.hostPlatform.isArm) + ${optionalString (! stdenv.hostPlatform.isAarch32) (if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack '' else '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fc72728cbabe..5992c1ffa95b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + (if stdenv.isAarch32 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index c4d2bf04d7a0..180aabc94cc6 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -43,7 +43,7 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" - '' + stdenv.lib.optionalString (stdenv.isArm && cross == null) '' + '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 25fee035cd5d..1b4585e065ba 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -123,7 +123,7 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl; + ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 42288e6245e4..190fc500068c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -117,7 +117,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD - isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian; + isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index d16e730b5abf..817da08c05e3 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { stdenv.lib.optional stdenv.isLinux utillinux; buildPhase = - stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 " + stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d20cb3c37859..3dfd136ad060 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, go }: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); let diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 40332f7b0d44..179b4cb1a4c0 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchhg, go, sqlite}: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); stdenv.mkDerivation rec { name = "storebrowse-20130318212204"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82ad4769977c..d38f8d201889 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5988,7 +5988,7 @@ with pkgs; # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = !stdenv.isArm; + profiledCompiler = !stdenv.isAarch32; libcCross = if targetPlatform != buildPlatform then libcCross else null; })); @@ -6352,12 +6352,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; + jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); jre8_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else if stdenv.isDarwin then jre8 @@ -6366,12 +6366,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; - jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" + jdk9 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; + jre9 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk9.jre // { outputs = [ "jre" ]; })); jre9_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre9 else if stdenv.isDarwin then jre9 @@ -9126,7 +9126,7 @@ with pkgs; cairo = callPackage ../development/libraries/cairo { glSupport = config.cairo.gl or (stdenv.isLinux && - !stdenv.isArm && !stdenv.isMips); + !stdenv.isAarch32 && !stdenv.isMips); }; 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 140/491] 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 eaa458529e3c..5ede261d5c55 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 141/491] 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 39c027706ee3..e7dd04377be7 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 142/491] 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 c85e1143d103..4c4278c30faa 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 c3e137e7cbf513d51415f619cc3c17ea35b370ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 25 Apr 2018 22:14:41 +0100 Subject: [PATCH 143/491] rubycop: 0.47.0 -> 0.55.0 --- pkgs/development/tools/rubocop/Gemfile.lock | 24 ++++++------ pkgs/development/tools/rubocop/gemset.nix | 41 ++++++++++++--------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index abc782465ccc..d6185d79f1d1 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -1,20 +1,22 @@ GEM remote: https://rubygems.org/ specs: - ast (2.3.0) - parser (2.3.3.1) - ast (~> 2.2) + ast (2.4.0) + parallel (1.12.1) + parser (2.5.1.0) + ast (~> 2.4.0) powerpack (0.1.1) - rainbow (2.2.1) - rake (12.0.0) - rubocop (0.47.0) - parser (>= 2.3.3.1, < 3.0) + rainbow (3.0.0) + rake (12.3.1) + rubocop (0.55.0) + parallel (~> 1.10) + parser (>= 2.5) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) - unicode-display_width (1.1.3) + ruby-progressbar (1.9.0) + unicode-display_width (1.3.2) PLATFORMS ruby @@ -24,4 +26,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.13.7 + 1.14.6 diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 908b5b76dd38..a2585a6e4f66 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -2,19 +2,27 @@ ast = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + type = "gem"; + }; + version = "1.12.1"; }; parser = { dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nply96nqrkgx8d3jay31sfy5p4q74dg8ymln0mdazxx5cz2n8bq"; + sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9"; type = "gem"; }; - version = "2.3.3.1"; + version = "2.5.1.0"; }; powerpack = { source = { @@ -25,45 +33,44 @@ version = "0.1.1"; }; rainbow = { - dependencies = ["rake"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri"; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; type = "gem"; }; - version = "2.2.1"; + version = "3.0.0"; }; rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; type = "gem"; }; - version = "12.0.0"; + version = "12.3.1"; }; rubocop = { - dependencies = ["parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsv3zbjl14nqyqqvcwciz15nq76l7vg97nydrdsrxs2bc5jrlsm"; + sha256 = "17qnk66q4diny1bvzbwsl1d5a26nj0mjzc2425h6nyp3xqjipz11"; type = "gem"; }; - version = "0.47.0"; + version = "0.55.0"; }; ruby-progressbar = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm"; + sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; unicode-display_width = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1r28mxyi0zwby24wyn1szj5hcnv67066wkv14wyzsc94bf04fqhx"; + sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n"; type = "gem"; }; - version = "1.1.3"; + version = "1.3.2"; }; -} +} \ No newline at end of file From 189a4f3656d0a13e86091654a615c21b1e9031ec Mon Sep 17 00:00:00 2001 From: Michiel Derhaeg Date: Wed, 25 Apr 2018 23:54:57 +0200 Subject: [PATCH 144/491] verifast: 14.5 -> 18.02 (#39480) --- .../science/logic/verifast/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index ada586fc4e6d..8229af9649f8 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -2,25 +2,30 @@ , fontconfig, libxml2, gnome2 }: assert stdenv.isLinux; - let + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.cc.cc.lib}/lib64"; + ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; patchExe = x: '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} ${x} ''; + + patchLib = x: '' + patchelf --set-rpath ${libPath} ${x} + ''; + in stdenv.mkDerivation rec { name = "verifast-${version}"; - version = "14.5"; + version = "18.02"; src = fetchurl { - url = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/${name}-x64.tar.gz"; - sha256 = "03y1s6s2j9vqgiad0vbxriipsypxaylxxd3q36n9rvrc3lf9xra9"; + url = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz"; + sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e"; }; dontStrip = true; @@ -29,10 +34,11 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -R bin $out/libexec - ${patchExe "$out/libexec/verifast-core"} - ${patchExe "$out/libexec/vfide-core"} - ln -s $out/libexec/verifast-core $out/bin/verifast - ln -s $out/libexec/vfide-core $out/bin/vfide + ${patchExe "$out/libexec/verifast"} + ${patchExe "$out/libexec/vfide"} + ${patchLib "$out/libexec/libz3.so"} + ln -s $out/libexec/verifast $out/bin/verifast + ln -s $out/libexec/vfide $out/bin/vfide ''; meta = { From 59ad9933ff5065bbc14231d7a66c87bedfa0bad7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:55:12 +0200 Subject: [PATCH 145/491] gitaly: 0.81.0 -> 0.95.0 --- .../version-management/gitaly/Gemfile | 12 ++++-- .../version-management/gitaly/Gemfile.lock | 31 ++++++++------ .../version-management/gitaly/default.nix | 4 +- .../version-management/gitaly/gemset.nix | 42 +++++++++++++------ 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 2b95446161b8..b300f27918c5 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,13 +1,19 @@ source 'https://rubygems.org' -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'rugged', '~> 0.27.0' +gem 'github-linguist', '~> 5.3.3', require: 'linguist' gem 'gitlab-markup', '~> 1.6.2' -gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.95.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false -gem 'grpc', '~> 1.8.0' +gem 'grpc', '~> 1.10.0' +gem 'sentry-raven', '~> 2.7.2', require: false + +# Detects the open source license the repository includes +# This version needs to be in sync with GitLab CE/EE +gem 'licensee', '~> 8.7.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index cb53bb10122a..2687952c805b 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -9,7 +9,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) ast (2.3.0) - charlock_holmes (0.7.5) + charlock_holmes (0.7.6) concurrent-ruby (1.0.5) diff-lcs (1.3) escape_utils (1.1.1) @@ -17,14 +17,14 @@ GEM multipart-post (>= 1.2, < 3) gemojione (3.3.0) json - gitaly-proto (0.83.0) + gitaly-proto (0.95.0) google-protobuf (~> 3.1) - grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + grpc (~> 1.10) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) @@ -60,13 +60,15 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.8.7) + grpc (1.10.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) i18n (0.8.1) json (2.1.0) jwt (2.1.0) + licensee (8.7.0) + rugged (~> 0.24) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -87,7 +89,7 @@ GEM ast (~> 2.2) posix-spawn (0.3.13) powerpack (0.1.1) - public_suffix (3.0.1) + public_suffix (3.0.2) rainbow (2.2.2) rake rake (12.1.0) @@ -118,9 +120,11 @@ GEM rubocop-rspec (1.17.0) rubocop (>= 0.50.0) ruby-progressbar (1.8.3) - rugged (0.26.0) + rugged (0.27.0) sanitize (2.1.0) nokogiri (>= 1.4.4) + sentry-raven (2.7.2) + faraday (>= 0.7.6, < 1.0) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -137,16 +141,19 @@ PLATFORMS DEPENDENCIES activesupport (~> 5.0.2) - gitaly-proto (~> 0.83.0) - github-linguist (~> 4.7.0) + gitaly-proto (~> 0.95.0) + github-linguist (~> 5.3.3) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) google-protobuf (= 3.5.1) - grpc (~> 1.8.0) + grpc (~> 1.10.0) + licensee (~> 8.7.0) rdoc (~> 4.2) rspec + rugged (~> 0.27.0) + sentry-raven (~> 2.7.2) BUNDLED WITH 1.16.1 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 7a8ba0fda744..32884d0a1cc5 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.81.0"; + version = "0.95.0"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y"; + sha256 = "0kadld8372vj0nm692mcn8j4ngph5gzzrzp8dmb4g26h10nq9k6a"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index efe786216628..9e6f01e3679d 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -28,10 +28,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y"; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; concurrent-ruby = { source = { @@ -79,19 +79,19 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv"; + sha256 = "0xwgi3902c89kx0fa176wz289nh67qm9bmx0yykrg5xx1lwk8a2j"; type = "gem"; }; - version = "0.83.0"; + version = "0.95.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd"; + sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; type = "gem"; }; - version = "4.7.6"; + version = "5.3.3"; }; github-markup = { source = { @@ -184,10 +184,10 @@ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b"; + sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82"; type = "gem"; }; - version = "1.8.7"; + version = "1.10.0"; }; i18n = { source = { @@ -213,6 +213,15 @@ }; version = "2.1.0"; }; + licensee = { + dependencies = ["rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2"; + type = "gem"; + }; + version = "8.7.0"; + }; little-plugger = { source = { remotes = ["https://rubygems.org"]; @@ -340,10 +349,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; rainbow = { dependencies = ["rake"]; @@ -460,10 +469,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy"; + sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; type = "gem"; }; - version = "0.26.0"; + version = "0.27.0"; }; sanitize = { dependencies = ["nokogiri"]; @@ -474,6 +483,15 @@ }; version = "2.1.0"; }; + sentry-raven = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + type = "gem"; + }; + version = "2.7.2"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { From ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:55:58 +0200 Subject: [PATCH 146/491] gitlab-shell: 6.0.3 -> 7.1.2 --- .../version-management/gitlab-shell/default.nix | 6 +++--- .../version-management/gitlab-shell/fixes.patch | 4 ++-- .../gitlab-shell/remove-hardcoded-locations.patch | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ca5b8a84fbf9..09c1cd13d440 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "6.0.3"; + version = "7.1.2"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk"; + sha256 = "1mkr2k2ldn5hl84acajvfify97qy80lmicxx49jbpln22vh9rcni"; }; buildInputs = [ ruby bundler go ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch index b0ee31cf39dd..29e4dccb26c7 100644 --- a/pkgs/applications/version-management/gitlab-shell/fixes.patch +++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch @@ -5,8 +5,8 @@ index 30a6b71..46b4dfa 100644 @@ -26,8 +26,8 @@ module GoBuild raise "env must be a hash" unless env.is_a?(Hash) raise "cmd must be an array" unless cmd.is_a?(Array) - -- if !system(env, *cmd) + +- unless system(env, *cmd) - abort "command failed: #{env.inspect} #{cmd.join(' ')}" - end + puts "Starting #{env.inspect} #{cmd.join(' ')}" diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index bc1aa8583867..38181399eec8 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -19,9 +19,9 @@ index 1452f95..2b40327 100644 end # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. -- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) +- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) + # Except we don't, because we're already in the right directory on nixos! -+ Kernel::exec(env, *args, unsetenv_others: true) ++ Kernel.exec(env, *args, unsetenv_others: true) end def api From 775bbc2d574560134b9bffbe06c5703e0d68cd4c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:56:45 +0200 Subject: [PATCH 147/491] gitlab-workhorse: 3.6.0 -> 4.1.0 --- .../version-management/gitlab-workhorse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 6bb696406c9d..05cf33d408a5 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "4.1.0"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz"; + sha256 = "1yqmkpszcan5cawkl9cxjngcyqlqg061ihk31isar9ifbhpv9yfv"; }; buildInputs = [ git go ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; license = licenses.mit; }; } From 04ab1ed623fb1f3d02339c789452020771d73c06 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:57:10 +0200 Subject: [PATCH 148/491] gitlab: 10.5.6 -> 10.7.0 --- .../version-management/gitlab/Gemfile | 99 +++-- .../version-management/gitlab/Gemfile.lock | 293 +++++++------- .../version-management/gitlab/default.nix | 19 +- .../version-management/gitlab/gemset.nix | 367 ++++++++++-------- 4 files changed, 409 insertions(+), 369 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 97d40857e117..d85ee9886443 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -1,6 +1,18 @@ +# --- Special code for migrating to Rails 5.0 --- +def rails5? + %w[1 true].include?(ENV["RAILS5"]) +end + +gem_versions = {} +gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' +gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0' +gem_versions['rails'] = rails5? ? '5.0.6' : '4.2.10' +gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' +# --- The end of special code for migrating to Rails 5.0 --- + source 'https://rubygems.org' -gem 'rails', '4.2.10' +gem 'rails', gem_versions['rails'] gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with @@ -9,36 +21,37 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'default_value_for', '~> 3.0.0' +gem 'default_value_for', gem_versions['default_value_for'] # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres -gem 'rugged', '~> 0.26.0' +gem 'rugged', '~> 0.27' gem 'grape-route-helpers', '~> 2.1.0' gem 'faraday', '~> 0.12' # Authentication libraries gem 'devise', '~> 4.2' -gem 'doorkeeper', '~> 4.2.0' -gem 'doorkeeper-openid_connect', '~> 1.2.0' -gem 'omniauth', '~> 1.4.2' +gem 'doorkeeper', '~> 4.3' +gem 'doorkeeper-openid_connect', '~> 1.3' +gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.5.2' +gem 'omniauth-google-oauth2', '~> 0.5.3' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 1.7.0' +gem 'omniauth-saml', '~> 1.10' gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' +gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.1' +gem 'omniauth-jwt', '~> 0.0.2' gem 'rack-oauth2', '~> 1.2.1' gem 'jwt', '~> 1.5.6' @@ -81,7 +94,7 @@ gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false # Language detection -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API gem 'grape', '~> 1.0' @@ -104,16 +117,16 @@ gem 'carrierwave', '~> 1.2' gem 'dropzonejs-rails', '~> 0.7.1' # for backups -gem 'fog-aws', '~> 1.4' +gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 0.5' +gem 'fog-google', '~> 1.3.3' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage -gem 'google-api-client', '~> 0.13.6' +gem 'google-api-client', '~> 0.19.8' # for aws storage gem 'unf', '~> 0.1.4' @@ -122,17 +135,18 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing -gem 'html-pipeline', '~> 1.11.0' +gem 'html-pipeline', '~> 2.7.1' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.2' gem 'redcarpet', '~> 3.4' +gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.2' -gem 'asciidoctor-plantuml', '0.0.7' +gem 'asciidoctor', '~> 1.5.6' +gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' @@ -148,10 +162,10 @@ group :unicorn do end # State machine -gem 'state_machines-activerecord', '~> 0.4.0' +gem 'state_machines-activerecord', '~> 0.5.1' # Issue tags -gem 'acts-as-taggable-on', '~> 4.0' +gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.0' @@ -207,7 +221,7 @@ gem 'asana', '~> 0.6.0' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 2.2.0' +gem 'kubeclient', '~> 3.0' # d3 gem 'd3_rails', '~> 3.5.0' @@ -217,10 +231,10 @@ gem 'sanitize', '~> 2.0' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -gem 'loofah', '~> 2.0.3' +gem 'loofah', '~> 2.2' # Working with license -gem 'licensee', '~> 8.7.0' +gem 'licensee', '~> 8.9' # Protect against bruteforcing gem 'rack-attack', '~> 4.4.1' @@ -234,9 +248,6 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.5' -# Faster JSON -gem 'oj', '~> 2.17.4' - # Faster blank gem 'fast_blank' @@ -256,22 +267,21 @@ gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.3.1' gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 2.5.3' +gem 'sentry-raven', '~> 2.7' gem 'premailer-rails', '~> 1.9.7' # I18n gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', '~> 4.0.9' +gem 'rails-i18n', gem_versions['rails-i18n'] gem 'gettext_i18n_rails', '~> 1.8.0' -gem 'gettext_i18n_rails_js', '~> 1.2.0' +gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.2.1' @@ -279,7 +289,6 @@ gem 'batch-loader', '~> 1.2.1' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' -gem 'peek-host', '~> 1.0.0' gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-performance_bar', '~> 1.3.0' gem 'peek-pg', '~> 1.3.0', group: :postgres @@ -299,8 +308,8 @@ group :metrics do end group :development do - gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.6.0', require: false + gem 'foreman', '~> 0.84.0' + gem 'brakeman', '~> 4.2', require: false gem 'letter_opener_web', '~> 1.3.0' gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false @@ -359,13 +368,15 @@ group :development, :test do gem 'benchmark-ips', '~> 2.3.0', require: false gem 'license_finder', '~> 3.1', require: false - gem 'knapsack', '~> 1.11.0' + gem 'knapsack', '~> 1.16' - gem 'activerecord_sane_schema_dumper', '0.2' + gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] gem 'stackprof', '~> 0.2.10', require: false gem 'simple_po_parser', '~> 1.1.2', require: false + + gem 'timecop', '~> 0.8.0' end group :test do @@ -373,21 +384,20 @@ group :test do gem 'email_spec', '~> 1.6.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' - gem 'test_after_commit', '~> 1.1' + gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. gem 'sham_rack', '~> 1.3.6' - gem 'timecop', '~> 0.8.0' gem 'concurrent-ruby', '~> 1.0.5' gem 'test-prof', '~> 0.2.5' end -gem 'octokit', '~> 4.6.2' +gem 'octokit', '~> 4.8' gem 'mail_room', '~> 0.9.1' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 0.16.2' +gem 'ruby-prof', '~> 0.17.0' # OAuth gem 'oauth2', '~> 1.4' @@ -400,7 +410,8 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # SSH host key support -gem 'net-ssh', '~> 4.1.0' +gem 'net-ssh', '~> 4.2.0' +gem 'sshkey', '~> 1.9.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -410,16 +421,18 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.94.0', require: 'gitaly' +gem 'grpc', '~> 1.10.0' + # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' -gem 'toml-rb', '~> 0.3.15', require: false +gem 'toml-rb', '~> 1.0.0', require: false # Feature toggles -gem 'flipper', '~> 0.11.0' -gem 'flipper-active_record', '~> 0.11.0' -gem 'flipper-active_support_cache_store', '~> 0.11.0' +gem 'flipper', '~> 0.13.0' +gem 'flipper-active_record', '~> 0.13.0' +gem 'flipper-active_support_cache_store', '~> 0.13.0' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 4022e2896116..a1150dfccdd2 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -40,13 +40,14 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - acts-as-taggable-on (4.0.0) - activerecord (>= 4.0) + acts-as-taggable-on (5.0.0) + activerecord (>= 4.2.8) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + aes_key_wrap (1.0.1) akismet (2.0.0) allocations (1.0.5) arel (6.0.4) @@ -55,15 +56,15 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - asciidoctor-plantuml (0.0.7) + asciidoctor (1.5.6.2) + asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) asset_sync (2.2.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) unf - ast (2.3.0) + ast (2.4.0) atomic (1.1.99) attr_encrypted (3.0.3) encryptor (~> 3.0.0) @@ -86,7 +87,7 @@ GEM coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) - bindata (2.4.1) + bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) blankslate (2.1.2.4) @@ -94,7 +95,7 @@ GEM autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.7.0) - brakeman (3.6.1) + brakeman (4.2.1) browser (2.2.0) builder (3.2.3) bullet (5.5.1) @@ -119,7 +120,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) - charlock_holmes (0.7.5) + charlock_holmes (0.7.6) childprocess (0.7.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) @@ -131,6 +132,8 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colorize (0.7.7) + commonmarker (0.17.8) + ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) @@ -140,6 +143,7 @@ GEM connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) + crass (1.0.3) creole (0.5.0) css_parser (1.5.0) addressable @@ -172,12 +176,12 @@ GEM diff-lcs (1.3) diffy (3.1.0) docile (1.1.5) - domain_name (0.5.20161021) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.6) + doorkeeper (4.3.1) railties (>= 4.2) - doorkeeper-openid_connect (1.2.0) - doorkeeper (~> 4.0) + doorkeeper-openid_connect (1.3.0) + doorkeeper (~> 4.3) json-jwt (~> 1.6) dropzonejs-rails (0.7.2) rails (> 3.1) @@ -192,7 +196,7 @@ GEM et-orbi (1.0.3) tzinfo eventmachine (1.0.8) - excon (0.57.1) + excon (0.60.0) execjs (2.6.0) expression_parser (0.9.0) factory_bot (4.8.2) @@ -208,7 +212,7 @@ GEM faraday_middleware multi_json fast_blank (1.0.0) - fast_gettext (1.4.0) + fast_gettext (1.6.0) ffaker (2.4.0) ffi (1.9.18) flay (2.10.0) @@ -216,13 +220,13 @@ GEM path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flipper (0.11.0) - flipper-active_record (0.11.0) + flipper (0.13.0) + flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) - flipper (~> 0.11.0) - flipper-active_support_cache_store (0.11.0) + flipper (~> 0.13.0) + flipper-active_support_cache_store (0.13.0) activesupport (>= 3.2, < 6) - flipper (~> 0.11.0) + flipper (~> 0.13.0) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -231,19 +235,20 @@ GEM fog-json (~> 1.0) ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (1.4.0) + fog-aws (2.0.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.44.3) + fog-core (1.45.0) builder - excon (~> 0.49) + excon (~> 0.58) formatador (~> 0.2) - fog-google (0.5.3) + fog-google (1.3.3) fog-core fog-json fog-xml + google-api-client (~> 0.19.1) fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) @@ -263,7 +268,7 @@ GEM nokogiri (>= 1.5.11, < 2.0.0) font-awesome-rails (4.7.0.1) railties (>= 3.2, < 5.1) - foreman (0.78.0) + foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.2.0) @@ -274,25 +279,25 @@ GEM gemojione (3.3.0) json get_process_mem (0.2.0) - gettext (3.2.2) + gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) gettext_i18n_rails (1.8.0) fast_gettext (>= 0.9.0) - gettext_i18n_rails_js (1.2.0) + gettext_i18n_rails_js (1.3.0) gettext (>= 3.0.2) gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.84.0) + gitaly-proto (0.94.0) google-protobuf (~> 3.1) grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-flowdock-git-hook (1.0.1) flowdock (~> 0.7) @@ -333,9 +338,9 @@ GEM json multi_json request_store (>= 1.0) - google-api-client (0.13.6) + google-api-client (0.19.8) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.5) + googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) @@ -343,9 +348,9 @@ GEM google-protobuf (3.5.1) googleapis-common-protos-types (1.0.1) google-protobuf (~> 3.0) - googleauth (0.5.3) + googleauth (0.6.2) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) @@ -353,7 +358,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.0) + grape (1.0.2) activesupport builder mustermann-grape (~> 1.0.0) @@ -369,7 +374,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.8.3) + grpc (1.10.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -386,7 +391,7 @@ GEM thor tilt hashdiff (0.3.4) - hashie (3.5.6) + hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) @@ -394,26 +399,26 @@ GEM hipchat (1.5.2) httparty mimemagic - html-pipeline (1.11.0) + html-pipeline (2.7.1) activesupport (>= 2) - nokogiri (~> 1.4) + nokogiri (>= 1.4) html2text (0.2.0) nokogiri (~> 1.6) htmlentities (4.3.4) - http (0.9.8) + http (2.2.2) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.1) + http-form_data (1.0.3) http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.2) - i18n (0.9.1) + httpclient (2.8.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) influxdb (0.2.3) @@ -425,15 +430,11 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - jquery-rails (4.3.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) json (1.8.6) - json-jwt (1.7.2) + json-jwt (1.9.2) activesupport + aes_key_wrap bindata - multi_json (>= 1.3) securecompare url_safe_base64 json-schema (2.8.0) @@ -452,13 +453,13 @@ GEM kaminari-core (= 1.0.1) kaminari-core (1.0.1) kgio (2.10.0) - knapsack (1.11.0) + knapsack (1.16.0) rake timecop (>= 0.1.0) - kubeclient (2.2.0) - http (= 0.9.8) - recursive-open-struct (= 1.0.0) - rest-client + kubeclient (3.0.0) + http (~> 2.2.2) + recursive-open-struct (~> 1.0.4) + rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) @@ -475,7 +476,7 @@ GEM toml (= 0.1.2) with_env (> 1.0) xml-simple - licensee (8.7.0) + licensee (8.9.2) rugged (~> 0.24) little-plugger (1.1.4) locale (2.1.2) @@ -486,7 +487,8 @@ GEM actionpack (>= 4, < 5.2) activesupport (>= 4, < 5.2) railties (>= 4, < 5.2) - loofah (2.0.3) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) mini_mime (>= 0.1.1) @@ -499,36 +501,35 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.0) - mini_mime (0.1.4) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.12.2) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.0) + mustermann (1.0.2) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) net-ldap (0.16.0) - net-ssh (4.1.0) + net-ssh (4.2.0) netrc (0.11.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) numerizer (0.1.1) - oauth (0.5.1) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.6.2) + octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - oj (2.17.5) - omniauth (1.4.2) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.1) @@ -549,11 +550,13 @@ GEM omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.5) + omniauth-jwt (0.0.2) + jwt + omniauth (~> 1.1) omniauth-kerberos (0.3.0) omniauth-multipassword timfel-krb5-auth (~> 0.8) @@ -562,19 +565,19 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) - omniauth-saml (1.7.0) - omniauth (~> 1.3) - ruby-saml (~> 1.4) + omniauth-saml (1.10.0) + omniauth (~> 1.3, >= 1.3.2) + ruby-saml (~> 1.7) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) + omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) + rack omniauth_crowd (2.2.3) activesupport nokogiri (>= 1.4.4) @@ -584,8 +587,8 @@ GEM orm_adapter (0.5.0) os (0.9.6) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) + parser (2.5.0.5) + ast (~> 2.4.0) parslet (1.5.0) blankslate (~> 2.0) path_expander (1.0.2) @@ -595,13 +598,11 @@ GEM railties (>= 4.0.0) peek-gc (0.0.2) peek - peek-host (1.0.0) - peek peek-mysql2 (1.1.0) atomic (>= 1.0.0) mysql2 peek - peek-performance_bar (1.3.0) + peek-performance_bar (1.3.1) peek (>= 0.1.0) peek-pg (1.3.0) concurrent-ruby @@ -646,9 +647,9 @@ GEM pry (~> 0.10) pry-rails (0.3.5) pry (>= 0.9.10) - public_suffix (3.0.0) + public_suffix (3.0.2) pyu-ruby-sasl (0.0.3.3) - rack (1.6.8) + rack (1.6.9) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) @@ -660,7 +661,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (1.5.3) + rack-protection (2.0.1) rack rack-proxy (0.6.0) rack @@ -679,12 +680,12 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) @@ -711,7 +712,7 @@ GEM re2 (1.1.1) recaptcha (3.0.0) json - recursive-open-struct (1.0.0) + recursive-open-struct (1.0.5) redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) @@ -739,7 +740,7 @@ GEM request_store (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) - rest-client (2.0.0) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) @@ -797,11 +798,13 @@ GEM rubocop (>= 0.51) rubocop-rspec (1.22.1) rubocop (>= 0.52.1) + ruby-enum (0.7.2) + i18n ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (0.16.2) + ruby-prof (0.17.0) ruby-progressbar (1.9.0) - ruby-saml (1.4.1) + ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby_parser (3.9.0) sexp_processor (~> 4.1) @@ -810,7 +813,7 @@ GEM rubyzip (1.2.1) rufus-scheduler (3.4.0) et-orbi (~> 1.0) - rugged (0.26.0) + rugged (0.27.0) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) @@ -840,7 +843,7 @@ GEM selenium-webdriver (3.5.0) childprocess (~> 0.5) rubyzip (~> 1.0) - sentry-raven (2.5.3) + sentry-raven (2.7.2) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.9.0) @@ -858,10 +861,10 @@ GEM sidekiq (>= 4.2.1) sidekiq-limit_fetch (3.4.0) sidekiq (>= 4) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) simplecov (0.14.1) @@ -895,14 +898,15 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) + sshkey (1.9.0) stackprof (0.2.10) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) + state_machines (0.5.0) + state_machines-activemodel (0.5.1) + activemodel (>= 4.1, < 6.0) + state_machines (>= 0.5.0) + state_machines-activerecord (0.5.1) + activerecord (>= 4.1, < 6.0) + state_machines-activemodel (>= 0.5.0) stringex (2.7.1) sys-filesystem (1.1.6) ffi @@ -923,12 +927,12 @@ GEM timfel-krb5-auth (0.8.3) toml (0.1.2) parslet (~> 1.5.0) - toml-rb (0.3.15) + toml-rb (1.0.0) citrus (~> 3.0, > 3.0) truncato (0.7.10) htmlentities (~> 4.3.1) nokogiri (~> 1.8.0, >= 1.7.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -937,7 +941,7 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.5) unicode-display_width (1.3.0) unicorn (5.1.0) kgio (~> 2.6) @@ -946,13 +950,13 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) - unparser (0.2.6) + unparser (0.2.7) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.5) + parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) url_safe_base64 (0.2.2) validates_hostname (1.0.6) @@ -989,13 +993,13 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord_sane_schema_dumper (= 0.2) - acts-as-taggable-on (~> 4.0) + acts-as-taggable-on (~> 5.0) addressable (~> 2.5.2) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) - asciidoctor (~> 1.5.2) - asciidoctor-plantuml (= 0.0.7) + asciidoctor (~> 1.5.6) + asciidoctor-plantuml (= 0.0.8) asset_sync (~> 2.2.0) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) @@ -1008,7 +1012,7 @@ DEPENDENCIES binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) bootstrap_form (~> 2.7.0) - brakeman (~> 3.6.0) + brakeman (~> 4.2) browser (~> 2.2) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) @@ -1018,6 +1022,7 @@ DEPENDENCIES charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) + commonmarker (~> 0.17) concurrent-ruby (~> 1.0.5) connection_pool (~> 2.0) creole (~> 0.5.0) @@ -1028,8 +1033,8 @@ DEPENDENCIES devise (~> 4.2) devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) - doorkeeper (~> 4.2.0) - doorkeeper-openid_connect (~> 1.2.0) + doorkeeper (~> 4.3) + doorkeeper-openid_connect (~> 1.3) dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) @@ -1038,26 +1043,26 @@ DEPENDENCIES fast_blank ffaker (~> 2.4) flay (~> 2.10.0) - flipper (~> 0.11.0) - flipper-active_record (~> 0.11.0) - flipper-active_support_cache_store (~> 0.11.0) + flipper (~> 0.13.0) + flipper-active_record (~> 0.13.0) + flipper-active_support_cache_store (~> 0.13.0) fog-aliyun (~> 0.2.0) - fog-aws (~> 1.4) + fog-aws (~> 2.0.1) fog-core (~> 1.44) - fog-google (~> 0.5) + fog-google (~> 1.3.3) fog-local (~> 0.3) fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) - foreman (~> 0.78.0) + foreman (~> 0.84.0) fuubar (~> 2.2.0) gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) - gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.84.0) - github-linguist (~> 4.7.0) + gettext_i18n_rails_js (~> 1.3) + gitaly-proto (~> 0.94.0) + github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.3) @@ -1065,47 +1070,46 @@ DEPENDENCIES gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) - google-api-client (~> 0.13.6) + google-api-client (~> 0.19.8) google-protobuf (= 3.5.1) gpgme grape (~> 1.0) grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) grape_logging (~> 1.7) + grpc (~> 1.10.0) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) + html-pipeline (~> 2.7.1) html2text httparty (~> 0.13.3) influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.3.1) json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) - knapsack (~> 1.11.0) - kubeclient (~> 2.2.0) + knapsack (~> 1.16) + kubeclient (~> 3.0) letter_opener_web (~> 1.3.0) license_finder (~> 3.1) - licensee (~> 8.7.0) + licensee (~> 8.9) lograge (~> 0.5) - loofah (~> 2.0.3) + loofah (~> 2.2) mail_room (~> 0.9.1) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap - net-ssh (~> 4.1.0) + net-ssh (~> 4.2.0) nokogiri (~> 1.8.2) oauth2 (~> 1.4) - octokit (~> 4.6.2) - oj (~> 2.17.4) - omniauth (~> 1.4.2) + octokit (~> 4.8) + omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.1) omniauth-azure-oauth2 (~> 0.0.9) @@ -1113,17 +1117,17 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.5.2) + omniauth-google-oauth2 (~> 0.5.3) + omniauth-jwt (~> 0.0.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) - omniauth-saml (~> 1.7.0) + omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) + omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) - peek-host (~> 1.0.0) peek-mysql2 (~> 1.1.0) peek-performance_bar (~> 1.3.0) peek-pg (~> 1.3.0) @@ -1166,17 +1170,17 @@ DEPENDENCIES rubocop (~> 0.52.1) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.16.2) + ruby-prof (~> 0.17.0) ruby_parser (~> 3.8) rufus-scheduler (~> 3.4) - rugged (~> 0.26.0) + rugged (~> 0.27) sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) select2-rails (~> 3.5.9) selenium-webdriver (~> 3.5) - sentry-raven (~> 2.5.3) + sentry-raven (~> 2.7) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) @@ -1192,14 +1196,15 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) sprockets (~> 3.7.0) + sshkey (~> 1.9.0) stackprof (~> 0.2.10) - state_machines-activerecord (~> 0.4.0) + state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) test-prof (~> 0.2.5) test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) - toml-rb (~> 0.3.15) + toml-rb (~> 1.0.0) truncato (~> 0.7.9) u2f (~> 0.2.1) uglifier (~> 2.7.2) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 7cfaeff33827..8564e4af91b1 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,15 +1,13 @@ { pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv -, ruby, tzdata, git, ps, dpkg, nettools +, ruby, tzdata, git, procps, nettools }: -/* When updating the Gemfile add `gem "activerecord-nulldb-adapter"` - to allow building the assets without a database */ - let rubyEnv = bundlerEnv { name = "gitlab-env-${version}"; inherit ruby; gemdir = ./.; + groups = [ "default" "unicorn" "ed25519" "metrics" ]; meta = with lib; { homepage = http://www.gitlab.com/; platforms = platforms.linux; @@ -18,11 +16,11 @@ let }; }; - version = "10.5.6"; + version = "10.7.0"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0"; + sha256 = "0dngh6gj8kkfcxn6ki9i96jg4x1x0vq3zzdimxz31g3j2zpd0ryz"; }; in @@ -34,16 +32,15 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0"; + sha256 = "010xhzrp6svp2a4xzmzwl4x3hk9wc1frqr66lp8x58nfmvr8hdrg"; }; buildInputs = [ - rubyEnv ruby bundler tzdata git ps dpkg nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools ]; patches = [ ./remove-hardcoded-locations.patch - ./fix-36783.patch ]; postPatch = '' @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${ps}/bin/ps -U" + --replace "ps -U" "${procps}/bin/ps -U" sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake @@ -105,6 +102,6 @@ stdenv.mkDerivation rec { passthru = { inherit rubyEnv; - inherit ruby; + ruby = rubyEnv.wrappedRuby; }; } diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 4a021f5f2d97..d14a963a8c07 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -91,10 +91,10 @@ dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h2y2zh4vrjf6bzdgvyq5a53a4gpr8xvq4a5rvq7fy1w43z4753s"; + sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; type = "gem"; }; - version = "4.0.0"; + version = "5.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -114,6 +114,14 @@ }; version = "2.5.2"; }; + aes_key_wrap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07"; + type = "gem"; + }; + version = "1.0.1"; + }; akismet = { source = { remotes = ["https://rubygems.org"]; @@ -150,19 +158,19 @@ asciidoctor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0q9yhan2mkk1lh15zcfd9g2fn6faix9yrf5skg23dp1y77jv7vm0"; + sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.6.2"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88"; + sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna"; type = "gem"; }; - version = "0.0.7"; + version = "0.0.8"; }; asset_sync = { dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; @@ -176,10 +184,10 @@ ast = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; atomic = { source = { @@ -292,10 +300,10 @@ bindata = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0anbg203zjr4crql20ss5b9xg2c6a7j8nm6hs8w3ll1h1akkpp2z"; + sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.3"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -334,10 +342,10 @@ brakeman = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxv3cgmjh6rimz2jcslj3qnh1vqqz1grrjnp6m3nywbznlv441w"; + sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v"; type = "gem"; }; - version = "3.6.1"; + version = "4.2.1"; }; browser = { source = { @@ -419,10 +427,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y"; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; childprocess = { dependencies = ["ffi"]; @@ -491,6 +499,15 @@ }; version = "0.7.7"; }; + commonmarker = { + dependencies = ["ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02iz27421qk6lnn0xwlz95w5l65dc4rnfqlwyal0h6mnawwy3b5i"; + type = "gem"; + }; + version = "0.17.8"; + }; concord = { dependencies = ["adamantium" "equalizer"]; source = { @@ -534,6 +551,14 @@ }; version = "0.4.3"; }; + crass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czijxlagzpzwchr2ldrgfi7kywg08idjpq37ndcmwh4fmz72c4l"; + type = "gem"; + }; + version = "1.0.3"; + }; creole = { source = { remotes = ["https://rubygems.org"]; @@ -681,28 +706,28 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y5c96gzyh6z4nrnkisljqngfvljdba36dww657ka0x7khzvx7jl"; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; type = "gem"; }; - version = "0.5.20161021"; + version = "0.5.20170404"; }; doorkeeper = { dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5rfvjjnlf9cn97cdrfw260zkg785k4197xqidgb35445k62mah"; + sha256 = "1yjbmkhpj25h6n5hi382gxna1303crr4v57w1ic23n0w8ll6jh0z"; type = "gem"; }; - version = "4.2.6"; + version = "4.3.1"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13k0xlr1grjj8ri26qy2zwbgi3fqxinvnygh53bnyi9qcynx5827"; + sha256 = "1sknjc7gdyswvyh6bry3l4l57hjcab0bmkyz88i9k7qbb4p1fwck"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; dropzonejs-rails = { dependencies = ["rails"]; @@ -782,10 +807,10 @@ excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kc2l7kqrj8lhmrz3v21xhsl2laps4y2xmf952m2qrgzffy1pacg"; + sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc"; type = "gem"; }; - version = "0.57.1"; + version = "0.60.0"; }; execjs = { source = { @@ -859,10 +884,10 @@ fast_gettext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8snpgxrri8jc0c35s6h3n92j8bfahh1knj94mw6i4zqhnpv40z"; + sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; ffaker = { source = { @@ -892,28 +917,28 @@ flipper = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j3zn54x0a6vvjmyhggl992df7zpcrhzv9ibr6af5gkcx502pg87"; + sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bm1wh1nrl6zbrcqk1nyqbrpddd5fvi72jyqv1j7y2df5sqwfj91"; + sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18w11dmby55cyd4azic1nsb7h632y6nx3ka8ndlrd1g6g28afvfb"; + sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flowdock = { dependencies = ["httparty" "multi_json"]; @@ -937,28 +962,28 @@ dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z5zkz7998l0bcxdp0cz4wg4ds4mhdzxd90xxqd50f52cqy85fjg"; + sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.1"; }; fog-core = { dependencies = ["builder" "excon" "formatador"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8ph79x0jp810qdzr5a73hpf39v27y0an23j7ifyk5zsq0j3maw"; + sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; type = "gem"; }; - version = "1.44.3"; + version = "1.45.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; + dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "179kk6mr84wsybm2afjckm8y95z3b5hg84xlgv8l2cv46wdql2ii"; + sha256 = "09q0khxyaqckgz2d44sp4zkw61gbmhjdww0wsqjy5mwj041bwn3i"; type = "gem"; }; - version = "0.5.3"; + version = "1.3.3"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1018,10 +1043,10 @@ dependencies = ["thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; + sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0"; type = "gem"; }; - version = "0.78.0"; + version = "0.84.0"; }; formatador = { source = { @@ -1070,10 +1095,10 @@ dependencies = ["locale" "text"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2i1zfqvaxqi01g9vvkfkf5r85c5nfj2zwpd2ib9vvkjavhn9cx"; + sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.9"; }; gettext_i18n_rails = { dependencies = ["fast_gettext"]; @@ -1088,10 +1113,10 @@ dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04lkmy6mgxdnpl4icddg00nj0ay0ylacfxrm723npzaqviml7c2x"; + sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; gherkin-ruby = { source = { @@ -1105,19 +1130,19 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ql75gbcw8px03y4pjvbnfy272mh68777f4m3sfajr1jjjp4lw8"; + sha256 = "1rnfswh0jpsiyzvsac7kwk9rpbpf4fcz9p2i8pamqamm3skgd4i6"; type = "gem"; }; - version = "0.84.0"; + version = "0.94.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd"; + sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; type = "gem"; }; - version = "4.7.6"; + version = "5.3.3"; }; github-markup = { source = { @@ -1220,10 +1245,10 @@ dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y"; + sha256 = "1gk6c21na1sizgsi71c6l6gpyjgib863jg991ycmrdnpr12mvs0q"; type = "gem"; }; - version = "0.13.6"; + version = "0.19.8"; }; google-protobuf = { source = { @@ -1246,10 +1271,10 @@ dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.2"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1264,10 +1289,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz5lx56z9hwx6ifyc7qpdwd020xb3ynv3vahvlcgm01qi7ykdhv"; + sha256 = "1nv7ijyr20can779cfgna76dwrckmscpc7nxj699lrwarr9as17v"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1300,10 +1325,10 @@ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fpbxzqacmc78m7whbv3vyfsfyk3cnfbppsy4789mwrlnbnfnp1j"; + sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82"; type = "gem"; }; - version = "1.8.3"; + version = "1.10.0"; }; haml = { dependencies = ["tilt"]; @@ -1343,10 +1368,10 @@ hashie = { source = { remotes = ["https://rubygems.org"]; - sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7"; + sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb"; type = "gem"; }; - version = "3.5.6"; + version = "3.5.7"; }; hashie-forbidden_attributes = { dependencies = ["hashie"]; @@ -1379,10 +1404,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l"; + sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; type = "gem"; }; - version = "1.11.0"; + version = "2.7.1"; }; html2text = { dependencies = ["nokogiri"]; @@ -1405,10 +1430,10 @@ dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll9x8qjp97l8gj0jx23nj7xvm0rsxj5pb3d19f7bhmdb70r0xsi"; + sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r"; type = "gem"; }; - version = "0.9.8"; + version = "2.2.2"; }; http-cookie = { dependencies = ["domain_name"]; @@ -1422,10 +1447,10 @@ http-form_data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10r6hy8wcf8n4nbdmdz9hrm8mg45lncfc7anaycpzrhfp3949xh9"; + sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.3"; }; "http_parser.rb" = { source = { @@ -1447,19 +1472,19 @@ httpclient = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg15svk9lv5r7w1hxd87di6apsr9y009af3mm01xcaccvqj4j2d"; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.3"; }; i18n = { dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s"; + sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; type = "gem"; }; - version = "0.9.1"; + version = "0.9.5"; }; ice_nine = { source = { @@ -1503,15 +1528,6 @@ }; version = "1.3.2"; }; - jquery-rails = { - dependencies = ["rails-dom-testing" "railties" "thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki"; - type = "gem"; - }; - version = "4.3.1"; - }; json = { source = { remotes = ["https://rubygems.org"]; @@ -1521,13 +1537,13 @@ version = "1.8.6"; }; json-jwt = { - dependencies = ["activesupport" "bindata" "multi_json" "securecompare" "url_safe_base64"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata" "securecompare" "url_safe_base64"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15a3v498lvsshzgjnk2dmyvjv87y3lffq71axj5xq3iz4mp1r4b2"; + sha256 = "08sisbiz851ny0bgikfqdqjn1hqpgrzsfzddpm7s5a8ln51s9x78"; type = "gem"; }; - version = "1.7.2"; + version = "1.9.2"; }; json-schema = { dependencies = ["addressable"]; @@ -1593,19 +1609,19 @@ dependencies = ["rake" "timecop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z0bp5al0b8wyzw8ff99jwr6qsh5n52xqryvzvy2nbrma9qr7dam"; + sha256 = "1q2y7mb8ii1ncdrlp46l9v2x909gdnjaid2dg5gcicj39hna36di"; type = "gem"; }; - version = "1.11.0"; + version = "1.16.0"; }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09hr5cb6rzf9876wa0c8pv3kxjj4s8hcjpf7jjdg2n9prb7hhmgi"; + sha256 = "14kmip7zprb7q6rp4lj011ikv33x193sy1642l2gmf8yv320h0sw"; type = "gem"; }; - version = "2.2.0"; + version = "3.0.0"; }; launchy = { dependencies = ["addressable"]; @@ -1647,10 +1663,10 @@ dependencies = ["rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2"; + sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc"; type = "gem"; }; - version = "8.7.0"; + version = "8.9.2"; }; little-plugger = { source = { @@ -1687,13 +1703,13 @@ version = "0.5.1"; }; loofah = { - dependencies = ["nokogiri"]; + dependencies = ["crass" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; + sha256 = "0yjs6wbcj3n06d3xjqpy3qbpx0bfa12h3x2rbpc2k33ldjlkx6zy"; type = "gem"; }; - version = "2.0.3"; + version = "2.2.2"; }; mail = { dependencies = ["mini_mime"]; @@ -1765,10 +1781,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0kzf2zx1arhjhw9c6mns0jqbmzdkd1vw25v940lvw63fzkbfv6dg"; + sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; type = "gem"; }; - version = "0.1.4"; + version = "1.0.0"; }; mini_portile2 = { source = { @@ -1797,10 +1813,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; multi_xml = { source = { @@ -1821,10 +1837,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0npddl1kf72i3m72vs72a24z2rpgspis3hbzyni9fsds96zf0zyl"; + sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -1854,10 +1870,10 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx"; type = "gem"; }; - version = "4.1.0"; + version = "4.2.0"; }; netrc = { source = { @@ -1887,10 +1903,10 @@ oauth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; + sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.4"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1905,27 +1921,19 @@ dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bppfc0q8mflbcdsb66dly3skx42vad30q0fkzwx4za908qwvjpd"; + sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg"; type = "gem"; }; - version = "4.6.2"; - }; - oj = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17c50q2ygi8jlw8dq3ghzha774ln1swbvmvai2ar7qb3bwcfgc8b"; - type = "gem"; - }; - version = "2.17.5"; + version = "4.8.0"; }; omniauth = { dependencies = ["hashie" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kvr0g12fawf491jmdaxzzr6qyd1r8ixzkcdr0zscs42fqsxv79i"; + sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg"; type = "gem"; }; - version = "1.4.2"; + version = "1.8.1"; }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; @@ -1991,13 +1999,22 @@ version = "1.0.2"; }; omniauth-google-oauth2 = { - dependencies = ["jwt" "multi_json" "omniauth" "omniauth-oauth2"]; + dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sri7pn9pm7nr93zj7j1g4gqd3rpibqw7v09s1c6fihh5cmjz3fz"; + sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.3"; + }; + omniauth-jwt = { + dependencies = ["jwt" "omniauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qxr95z5p7fs13mg04zp76ldplgk6n8fkwbn17mlzlry1ihcrgxr"; + type = "gem"; + }; + version = "0.0.2"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -2030,10 +2047,10 @@ dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aykbg5qfm37ywrq34dydrhxa5jwpski71dpspgp2fi6dinx09f5"; + sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -2048,10 +2065,10 @@ dependencies = ["omniauth" "ruby-saml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1garppa83v53yr9bwfx51v4hqwfr5h4aq3d39gn2fmysnfav7c1x"; + sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p"; type = "gem"; }; - version = "1.7.0"; + version = "1.10.0"; }; omniauth-shibboleth = { dependencies = ["omniauth"]; @@ -2063,13 +2080,13 @@ version = "1.2.1"; }; omniauth-twitter = { - dependencies = ["json" "omniauth-oauth"]; + dependencies = ["omniauth-oauth" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833"; + sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; type = "gem"; }; - version = "1.2.1"; + version = "1.4.0"; }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; @@ -2117,10 +2134,10 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3"; + sha256 = "1sj8dlqs5l2pa5y2412r4d5fi7qvf26n8vpciz7k9fy0ch327gdc"; type = "gem"; }; - version = "2.4.0.2"; + version = "2.5.0.5"; }; parslet = { dependencies = ["blankslate"]; @@ -2157,15 +2174,6 @@ }; version = "0.0.2"; }; - peek-host = { - dependencies = ["peek"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11ra0hzdkdywp3cmaizcisliy26jwz7k0r9nkgm87y7amqk1wh8b"; - type = "gem"; - }; - version = "1.0.0"; - }; peek-mysql2 = { dependencies = ["atomic" "mysql2" "peek"]; source = { @@ -2179,10 +2187,10 @@ dependencies = ["peek"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08i2gvn59hsbysbmnakxdcpm0jvhh6rl00pr5i3zqf2f5dd0sjz6"; + sha256 = "1a0ly4p8xnrb3pnf273qq2d5bm2w19p829n4n2730rijd42pa2n4"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; peek-pg = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; @@ -2326,10 +2334,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.2"; }; pyu-ruby-sasl = { source = { @@ -2342,10 +2350,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + sha256 = "03w1ri5l91q800f1bdcdl5rbagy7s4kml136b42s2lmxmznxhr07"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.9"; }; rack-accept = { dependencies = ["rack"]; @@ -2386,10 +2394,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; type = "gem"; }; - version = "1.5.3"; + version = "2.0.1"; }; rack-proxy = { dependencies = ["rack"]; @@ -2431,19 +2439,19 @@ dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ny7mbjxhq20rzg4pivvyvk14irmc7cn20kxfk3vc0z2r2c49p8r"; + sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; rails-html-sanitizer = { dependencies = ["loofah"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; + sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -2561,10 +2569,10 @@ recursive-open-struct = { source = { remotes = ["https://rubygems.org"]; - sha256 = "102bgpfkjsaghpb1qs1ah5s89100dchpimzah2wxdy9rv9318rqw"; + sha256 = "0p8x9w9zzv56ka6czdmzl5sbsqjhnb9lkchvw55rf5lp8h0z3r6z"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.5"; }; redcarpet = { source = { @@ -2674,10 +2682,10 @@ dependencies = ["http-cookie" "mime-types" "netrc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v2jp2ilpb2rm97yknxcnay9lfagcm4k82pfsmmcm9v290xm1ib7"; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.2"; }; retriable = { source = { @@ -2844,6 +2852,15 @@ }; version = "1.22.1"; }; + ruby-enum = { + dependencies = ["i18n"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + type = "gem"; + }; + version = "0.7.2"; + }; ruby-fogbugz = { dependencies = ["crack"]; source = { @@ -2856,10 +2873,10 @@ ruby-prof = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag"; + sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.0"; }; ruby-progressbar = { source = { @@ -2873,10 +2890,10 @@ dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1abhf16vbyzck4pv06qd5c59780glaf682ssjzpjwd9h9d7nqvl5"; + sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3"; type = "gem"; }; - version = "1.4.1"; + version = "1.7.2"; }; ruby_parser = { dependencies = ["sexp_processor"]; @@ -2923,10 +2940,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy"; + sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; type = "gem"; }; - version = "0.26.0"; + version = "0.27.0"; }; safe_yaml = { source = { @@ -3029,10 +3046,10 @@ dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19qqb7whayd170y45asc3cr3mbxfd46fv6s4jbs5xx1wphy4q80i"; + sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; type = "gem"; }; - version = "2.5.3"; + version = "2.7.2"; }; settingslogic = { source = { @@ -3099,10 +3116,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.1"; }; simple_po_parser = { source = { @@ -3225,6 +3242,14 @@ }; version = "1.3.13"; }; + sshkey = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + type = "gem"; + }; + version = "1.9.0"; + }; stackprof = { source = { remotes = ["https://rubygems.org"]; @@ -3236,28 +3261,28 @@ state_machines = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1xg84kdglz0k1pshf2q604zybjpribzcz2b651sc1j27kd86w787"; + sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; state_machines-activemodel = { dependencies = ["activemodel" "state_machines"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p6560jsb4flapd1vbc50bqjk6dzykkwbmyivchyjh5ncynsdb8v"; + sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.1"; }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5wx1s2i3qc4p2knkf2n9h8b49pla9rjidkwxqzi781qm40wdxx"; + sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.1"; }; stringex = { source = { @@ -3379,10 +3404,10 @@ dependencies = ["citrus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "03sr3k193i1r5bh9g4zc7iq9jklapmwj0rndcvhr9q7v5xm7x4rf"; + sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d"; type = "gem"; }; - version = "0.3.15"; + version = "1.0.0"; }; truncato = { dependencies = ["htmlentities" "nokogiri"]; @@ -3397,10 +3422,10 @@ dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.5"; }; u2f = { source = { @@ -3439,10 +3464,10 @@ unf_ext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; type = "gem"; }; - version = "0.0.7.4"; + version = "0.0.7.5"; }; unicode-display_width = { source = { @@ -3482,10 +3507,10 @@ dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jhpgvghn764myi5iwlys98f71yspwgrzimzz11108jnhl5rcx7l"; + sha256 = "0k2asbk9k5kzq8jidy3frqcmn58i9cvaizn8f6g5xlx1pn70bx1w"; type = "gem"; }; - version = "0.2.6"; + version = "0.2.7"; }; url_safe_base64 = { source = { From 783fb86de498769dd4c14fd0f3a59c746cec5f95 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:58:05 +0200 Subject: [PATCH 149/491] gitlab module: update to gitlab 10.7 --- nixos/modules/services/misc/gitlab.nix | 29 +++++++++----------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 20d7ec90dcc9..be13fed860bd 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -8,9 +8,6 @@ let cfg = config.services.gitlab; ruby = cfg.packages.gitlab.ruby; - bundler = pkgs.bundler; - - gemHome = "${cfg.packages.gitlab.rubyEnv}/${ruby.gemPath}"; gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; @@ -137,8 +134,6 @@ let gitlabEnv = { HOME = "${cfg.statePath}/home"; - GEM_HOME = gemHome; - BUNDLE_GEMFILE = "${cfg.packages.gitlab}/share/gitlab/Gemfile"; UNICORN_PATH = "${cfg.statePath}/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; GITLAB_STATE_PATH = "${cfg.statePath}"; @@ -158,19 +153,17 @@ let gitlab-rake = pkgs.stdenv.mkDerivation rec { name = "gitlab-rake"; - buildInputs = [ cfg.packages.gitlab cfg.packages.gitlab.rubyEnv pkgs.makeWrapper ]; - phases = "installPhase fixupPhase"; - buildPhase = ""; + buildInputs = [ pkgs.makeWrapper ]; + dontBuild = true; + unpackPhase = ":"; installPhase = '' mkdir -p $out/bin - makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/bundle $out/bin/gitlab-bundle \ + makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package ]}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' - makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \ - --add-flags "exec rake" ''; }; @@ -482,10 +475,10 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; + ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid"; }; }; @@ -493,11 +486,9 @@ in { after = [ "network.target" "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; environment.HOME = gitlabEnv.HOME; - environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}"; environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; - path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ]; + path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ]; serviceConfig = { - #PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; User = cfg.user; Group = cfg.group; @@ -529,7 +520,7 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; ExecStart = @@ -658,10 +649,10 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\""; + ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/unicorn -c ${cfg.statePath}/config/unicorn.rb -E production"; }; }; From 94f5e5ad14e99700e82576167515ba784dbfe98b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 20:01:07 +0200 Subject: [PATCH 150/491] Revert "gitlab: disable" This reverts commit 68c4605f1a251b97cb0fcde251ce52d498e2cef8. Gitlab has been fixed --- nixos/modules/module-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1261fe950928..8ef76b9d81ed 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -327,7 +327,7 @@ ./services/misc/geoip-updater.nix ./services/misc/gitea.nix #./services/misc/gitit.nix - #./services/misc/gitlab.nix + ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gitweb.nix ./services/misc/gogs.nix From 7673593c85623fa7065ea7ef56bcd0a50f2fbea1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 26 Apr 2018 00:14:38 +0200 Subject: [PATCH 151/491] gem-config.grpc: disable format hardening --- pkgs/development/ruby-modules/gem-config/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a447cd1a1032..83ab5e0d86ff 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -145,6 +145,7 @@ in grpc = attrs: { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; + hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ]; }; From c600f02e430b49c8907a63a12c62ee407b95cf5d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 26 Apr 2018 00:16:26 +0200 Subject: [PATCH 152/491] cups-kyodialog3: init at 8.1601 --- pkgs/misc/cups/drivers/kyodialog3/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/misc/cups/drivers/kyodialog3/default.nix diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix new file mode 100644 index 000000000000..bc48b2c8f339 --- /dev/null +++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -0,0 +1,65 @@ +{ stdenv, lib, fetchzip, cups + + # Can either be "EU" or "Global"; it's unclear what the difference is + , region ? "Global" +}: + +let + platform = + if stdenv.system == "x86_64-linux" then "64bit" + else if stdenv.system == "i686-linux" then "32bit" + else throw "Unsupported system: ${stdenv.system}"; + debPlatform = + if platform == "64bit" then "amd64" + else "i386"; + debRegion = if region == "EU" then "EU." else ""; + + # TODO: add Qt4 for kyodialog3 application + libPath = lib.makeLibraryPath [ cups ]; +in +stdenv.mkDerivation rec { + name = "cups-kyodialog3-${version}"; + version = "8.1601"; + + dontPatchELF = true; + dontStrip = true; + + src = fetchzip { + url = "https://usa.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/us/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz"; + sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal"; + }; + + installPhase = '' + mkdir -p $out + cd $out + + # unpack the debian archive + ar p ${src}/KyoceraLinuxPackages/${region}/${platform}/kyodialog3.en${debRegion}_0.5-0_${debPlatform}.deb data.tar.gz | tar -xz + rm -Rf KyoceraLinuxPackages + + # strip $out/usr + mv usr/* . + rmdir usr + + # allow cups to find the ppd files + mkdir -p share/cups/model + mv share/ppd/kyocera share/cups/model/Kyocera + rmdir share/ppd + + # prepend $out to all references in ppd and desktop files + find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; + find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; + + # patchELF all executables + find -type f -executable -exec patchelf --set-rpath ${libPath} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; + ''; + + meta = with lib; { + description = "CUPS drivers for several Kyocera printers"; + homepage = "https://www.kyoceradocumentsolutions.com"; + license = licenses.unfree; + maintainers = [ maintainers.steveej ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4235616748c7..8bdd4f5ae50b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19994,6 +19994,8 @@ with pkgs; cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + cups-kyodialog3 = callPackage ../misc/cups/drivers/kyodialog3 {}; + cups-dymo = callPackage ../misc/cups/drivers/dymo {}; cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {}; From 3e3b39f173f9abc99da84084a1f4657c9de885bd Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 26 Apr 2018 01:41:53 +0200 Subject: [PATCH 153/491] qemu: 2.11.1 -> 2.12.0 --- .../virtualization/qemu/default.nix | 10 +- .../virtualization/qemu/statfs-flags.patch | 197 ------------------ 2 files changed, 3 insertions(+), 204 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/statfs-flags.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9839aadc9c1f..0496adb6f409 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -21,8 +21,8 @@ with stdenv.lib; let - version = "2.11.1"; - sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr"; + version = "2.12.0"; + sha256 = "17377xxbmwbrnh895a108z944pqi39hzrbw4jzgj8pcipi3s3x69"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -69,11 +69,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "ga" ]; - patches = [ ./no-etc-install.patch ./statfs-flags.patch (fetchpatch { - name = "glibc-2.27-memfd.patch"; - url = "https://git.qemu.org/?p=qemu.git;a=patch;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0"; - sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; - }) ] + patches = [ ./no-etc-install.patch ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ diff --git a/pkgs/applications/virtualization/qemu/statfs-flags.patch b/pkgs/applications/virtualization/qemu/statfs-flags.patch deleted file mode 100644 index 52a470a2869a..000000000000 --- a/pkgs/applications/virtualization/qemu/statfs-flags.patch +++ /dev/null @@ -1,197 +0,0 @@ -commit 909fe47c7009aa9a75fe9470c5f8d3dd5b50917a -Author: Shea Levy -Date: Sun Feb 18 13:50:11 2018 -0500 - - linux-user: Support f_flags in statfs when available. - - Signed-off-by: Shea Levy - -diff --git a/configure b/configure -index 913e14839d..52fe2bf941 100755 ---- a/configure -+++ b/configure -@@ -5303,6 +5303,22 @@ if compile_prog "" "" ; then - have_utmpx=yes - fi - -+########################################## -+# Check for newer fields of struct statfs on Linux -+ -+if test "$linux_user" = "yes"; then -+ cat > $TMPC < -+ -+int main(void) { -+ struct statfs fs; -+ fs.f_flags = 0; -+} -+EOF -+ if compile_object ; then -+ have_statfs_flags=yes -+ fi -+fi - ########################################## - # checks for sanitizers - -@@ -6518,6 +6534,10 @@ if test "$have_utmpx" = "yes" ; then - echo "HAVE_UTMPX=y" >> $config_host_mak - fi - -+if test "$have_statfs_flags" = "yes" ; then -+ echo "HAVE_STATFS_FLAGS=y" >> $config_host_mak -+fi -+ - if test "$ivshmem" = "yes" ; then - echo "CONFIG_IVSHMEM=y" >> $config_host_mak - fi -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 82b35a6bdf..77481eca2c 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -9534,6 +9534,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, - __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]); - __put_user(stfs.f_namelen, &target_stfs->f_namelen); - __put_user(stfs.f_frsize, &target_stfs->f_frsize); -+#ifdef HAVE_STATFS_FLAGS -+ __put_user(stfs.f_flags, &target_stfs->f_flags); -+#endif - memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); - unlock_user_struct(target_stfs, arg2, 1); - } -diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h -index a35c52a60a..64aa49d3c5 100644 ---- a/linux-user/syscall_defs.h -+++ b/linux-user/syscall_defs.h -@@ -362,7 +362,14 @@ struct kernel_statfs { - int f_ffree; - kernel_fsid_t f_fsid; - int f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ int f_frsize; -+ int f_flags; -+ int f_spare[4]; -+#else - int f_spare[6]; -+#endif -+ - }; - - struct target_dirent { -@@ -2223,7 +2230,12 @@ struct target_statfs { - /* Linux specials */ - target_fsid_t f_fsid; - int32_t f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[5]; -+#else - int32_t f_spare[6]; -+#endif - }; - #else - struct target_statfs { -@@ -2239,7 +2251,12 @@ struct target_statfs { - /* Linux specials */ - target_fsid_t f_fsid; - abi_long f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[5]; -+#else - abi_long f_spare[6]; -+#endif - }; - #endif - -@@ -2255,7 +2272,12 @@ struct target_statfs64 { - uint64_t f_bavail; - target_fsid_t f_fsid; - uint32_t f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[5]; -+#else - uint32_t f_spare[6]; -+#endif - }; - #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \ - defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \ -@@ -2271,7 +2293,12 @@ struct target_statfs { - target_fsid_t f_fsid; - abi_long f_namelen; - abi_long f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[4]; -+#else - abi_long f_spare[5]; -+#endif - }; - - struct target_statfs64 { -@@ -2285,7 +2312,12 @@ struct target_statfs64 { - target_fsid_t f_fsid; - abi_long f_namelen; - abi_long f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[4]; -+#else - abi_long f_spare[5]; -+#endif - }; - #elif defined(TARGET_S390X) - struct target_statfs { -@@ -2299,7 +2331,13 @@ struct target_statfs { - kernel_fsid_t f_fsid; - int32_t f_namelen; - int32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[4]; -+#else - int32_t f_spare[5]; -+#endif -+ - }; - - struct target_statfs64 { -@@ -2313,7 +2351,12 @@ struct target_statfs64 { - kernel_fsid_t f_fsid; - int32_t f_namelen; - int32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[4]; -+#else - int32_t f_spare[5]; -+#endif - }; - #else - struct target_statfs { -@@ -2327,7 +2370,12 @@ struct target_statfs { - target_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[4]; -+#else - uint32_t f_spare[5]; -+#endif - }; - - struct target_statfs64 { -@@ -2341,7 +2389,12 @@ struct target_statfs64 { - target_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[4]; -+#else - uint32_t f_spare[5]; -+#endif - }; - #endif - From ca52152a9198ae42e894829f8f192d39ac173356 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 25 Apr 2018 21:36:13 -0400 Subject: [PATCH 154/491] boto{3,core}: {1.6.0,1.9.3} -> {1.7.9,1.10.9} Yeah yeah, I want parallel glob expansion but you get what I mean. These two packages like getting upgraded together so to minimize incompatibilities I'm upgrading them both in the same commit. --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index ccada6dd1404..042ad9cf7932 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.6.0"; + version = "1.7.9"; src = fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "14d60wc5kff2gjkrm0yfz0179s0qg3f1qqldv8hnf37ny6yvfwn3"; + sha256 = "0yqym19nlayjm1qlh6vvinmk5xw0zskil971n2v9s65ray7sn5lv"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 5276fdb9329d..cd9c5729611c 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.9.3"; + version = "1.10.9"; src = fetchPypi { inherit pname version; - sha256 = "d5b892ab86cd3e8d6cb570dd5275bf1c600cbbf9f07a40a22bcdd9023c0e844f"; + sha256 = "19vlf2w05h9818hrhx8al4r9ngfhvhf2pxcwka9s7bc51qnhx4xh"; }; propagatedBuildInputs = [ From 7e1db6b41d00032652032ca3bedaaac4a2f0b8e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 20:36:43 -0700 Subject: [PATCH 155/491] xmrig: 2.5.2 -> 2.5.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmrig/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.5.3 with grep in /nix/store/csidwxna34qv298smf6sflwaj93xr9p0-xmrig-2.5.3 - directory tree listing: https://gist.github.com/5aaeee0849eb7acb740cae01310a19f9 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 42d9e448991a..88adbfff3b9a 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c"; + sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp"; }; nativeBuildInputs = [ cmake ]; From 3a8fb11949826e7730f3a11cecd4dd0e86069491 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 20:40:14 -0700 Subject: [PATCH 156/491] yubikey-personalization: 1.18.1 -> 1.19.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/yubikey-personalization/versions. These checks were done: - built on NixOS - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize -h’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize --help’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize -V’ and found version 1.19.0 - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp -h’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp --help’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp -V’ and found version 1.19.0 - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo -h’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo --help’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo help’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo -V’ and found version 1.19.0 - found 1.19.0 with grep in /nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0 - directory tree listing: https://gist.github.com/6592e44c4a66c1b7cf2c9f4c2a75c3ab --- pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 462f8d8e99a2..48827ec0aae4 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "0mjjkk6p8d0kblj6vzld4v188y40ynprvd2hnfh7m1hs28wbkzcz"; + sha256 = "104lc0nnqdr365fa7c4vrq67rxp1dp8idndsh9jlhnj9dnhszj1b"; }; nativeBuildInputs = [ pkgconfig ]; From 7cbf00847ca66dbb474c734a5051ebc7e526a0e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 21:44:13 -0700 Subject: [PATCH 157/491] thefuck: 3.25 -> 3.26 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/thefuck/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/.thefuck-wrapped -h’ got 0 exit code - ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/.thefuck-wrapped --help’ got 0 exit code - ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/thefuck -h’ got 0 exit code - ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/thefuck --help’ got 0 exit code - found 3.26 with grep in /nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26 - directory tree listing: https://gist.github.com/7fd81df3f197603f76bdf8c0ae663dcb --- pkgs/tools/misc/thefuck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 788529125da5..7befd344a4d8 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.25"; + version = "3.26"; src = fetchFromGitHub { owner = "nvbn"; repo = "${pname}"; rev = version; - sha256 = "090mg809aac932lgqmjxm4za53lg3bjprj562sp189k47xs4wijv"; + sha256 = "0iyihbp94z38xajy8yfbn3ky7irnam1zwyswg34cw4kkfgggrwhz"; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; From 518eca82567b69349f987f8b0a015ade0a974aff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 21:45:09 -0700 Subject: [PATCH 158/491] tini: 0.17.0 -> 0.18.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/tini/versions. These checks were done: - built on NixOS - ran ‘/nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0/bin/tini -h’ got 0 exit code - ran ‘/nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0/bin/tini --version’ and found version 0.18.0 - found 0.18.0 with grep in /nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0 - directory tree listing: https://gist.github.com/c992fd0a24dfc0365d6b62ac567d395c --- pkgs/applications/virtualization/tini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index c027541c01c1..25c19cd79c7f 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.17.0"; + version = "0.18.0"; name = "tini-${version}"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="0y16xk89811a6g2srg63jv5b2221dirzrhha7mj056a6jq5ql2f0"; + sha256 ="1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; From 28440ed27697bbd592a6fea7c4556c919d362688 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 22:04:55 -0700 Subject: [PATCH 159/491] smplayer: 18.3.0 -> 18.4.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/smplayer/versions. These checks were done: - built on NixOS - ran ‘/nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0/bin/smplayer -h’ got 0 exit code - ran ‘/nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0/bin/smplayer --help’ got 0 exit code - found 18.4.0 with grep in /nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0 - directory tree listing: https://gist.github.com/25ca7c094ad35c4c5ed4c2c33dfb9be2 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index ef614d41d00d..49444e350de4 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.3.0"; + name = "smplayer-18.4.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0y7kwcngd0d2d863wnppfvjm1n1l60nn6lsf9r0g4hsf19gkrd46"; + sha256 = "0q2fbg41djyxsy6jinlnidpcqxvs9bi91ga3fwlgnfh6kxsw2ldd"; }; buildInputs = [ qtscript ]; From d97d463d190936da38e6be5f842fa160a878ba7e Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 23 Apr 2018 00:46:22 -0700 Subject: [PATCH 160/491] perlPackages.ListMoreUtilsXS: Fix build on Darwin --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9d6cd97bc8c..3278311f25c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8592,6 +8592,9 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz; sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"; }; + preConfigure = '' + export LD=$CC + ''; propagatedBuildInputs = [ XSLoader ]; meta = { description = "Provide the stuff missing in List::Util in XS"; From 566d7531e55af3b5c8659e2a2850a275f8ddd09f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 23:12:48 -0700 Subject: [PATCH 161/491] radicale: 2.1.8 -> 2.1.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/radicale/versions. These checks were done: - built on NixOS - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped -h’ got 0 exit code - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped --help’ got 0 exit code - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped --version’ and found version 2.1.9 - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale -h’ got 0 exit code - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale --help’ got 0 exit code - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale --version’ and found version 2.1.9 - found 2.1.9 with grep in /nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9 - directory tree listing: https://gist.github.com/e41acc1e5d5f2db9d8498cf5a989eb7f --- pkgs/servers/radicale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 937bf327995f..171fcc887d21 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, python3Packages }: let - version = "2.1.8"; - sha256 = "0fnsk61s328dg16iv0chqxayni8ahkbcb84z012w0d9417i806lc"; + version = "2.1.9"; + sha256 = "1sywxn7j9bq39qwq74h327crc44j9049cykai1alv44agx8s1nhz"; in python3Packages.buildPythonApplication { From 274579cc95ae33457b5cd643ea030d1f530eb31e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 24 Nov 2016 15:40:04 +0100 Subject: [PATCH 162/491] 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 963147b18a04..9074a4345eae 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 944cf7a6f5e2..208e01110625 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 1ec8160f8ca9b05fc19d23bac5b6d8c87a19ad39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 23:57:03 -0700 Subject: [PATCH 163/491] php: 7.2.4 -> 7.2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/php/versions. These checks were done: - built on NixOS - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar.phar help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phpdbg help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm --help’ got 0 exit code - found 7.2.5 with grep in /nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5 - directory tree listing: https://gist.github.com/c9aa24f676de9bcd4cc434c086932362 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7cb9b4dea7f6..301aa99637d0 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.4"; - sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i"; + version = "7.2.5"; + sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk"; }; } From 769093b867c79608b52e415086617bc907f8c38b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 00:52:29 -0700 Subject: [PATCH 164/491] ott: 0.27 -> 0.28 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/ott/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28/bin/ott --help’ got 0 exit code - ran ‘/nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28/bin/ott.opt --help’ got 0 exit code - found 0.28 with grep in /nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28 - directory tree listing: https://gist.github.com/177f63b8c23bae6301ced29fb0e617c4 --- pkgs/applications/science/logic/ott/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 6fcc8f9c111f..d21487ef92fa 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ott-${version}"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb"; + sha256 = "0mzbrvqayqpns9zzg4m1scxx24dv9askhn51dawyb9pisvlyvai0"; }; nativeBuildInputs = [ pkgconfig ]; From 8898063828e5813682bf2c8aa751e0e48d989296 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 01:20:56 -0700 Subject: [PATCH 165/491] openvpn: 2.4.5 -> 2.4.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openvpn/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.4.6 with grep in /nix/store/5hj70y409c0b01zmx4rddiicgq7jajb2-openvpn-2.4.6 - directory tree listing: https://gist.github.com/ce0bc5e31d7d26ead341febdc7bdc6ee --- pkgs/tools/networking/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 31fccbffa790..d96652e456df 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23"; + sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g"; }; nativeBuildInputs = [ pkgconfig ]; From 4176d58331e9a1781725bd14bde26b3d09a56704 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 01:22:20 -0700 Subject: [PATCH 166/491] packagekit: 1.1.9 -> 1.1.10 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/packagekit/versions. These checks were done: - built on NixOS - ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkcon -h’ got 0 exit code - ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkcon --help’ got 0 exit code - ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkmon -h’ got 0 exit code - ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkmon --help’ got 0 exit code - found 1.1.10 with grep in /nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10 - directory tree listing: https://gist.github.com/1d641323594032d2e935bd1e088bf409 --- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index b40c8ea26aa2..5eb20169412d 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1zs7xkk3b2izdnis7ir5h93p8f2i9513663h2xhxb0sh6i2h18y4"; + sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs"; }; buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] From 8440100b4f88e3ac9e1816a72f7f2e6a4c9719d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Apr 2018 10:10:47 +0100 Subject: [PATCH 167/491] inziu-iosevka: disable hydra build due its size Build is i/o bound --- pkgs/data/fonts/inziu-iosevka/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix index 536f5cb0c61d..f76e4cb61df0 100644 --- a/pkgs/data/fonts/inziu-iosevka/default.nix +++ b/pkgs/data/fonts/inziu-iosevka/default.nix @@ -27,5 +27,7 @@ stdenv.mkDerivation rec { license = licenses.ofl; maintainers = [ maintainers.ChengCat ]; platforms = platforms.all; + # large package, mainly i/o bound + hydraPlatforms = []; }; } From 0c02d1539465b263e16b1f946c03e3f023e2159e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Apr 2018 10:15:12 +0100 Subject: [PATCH 168/491] sarasa-gothic: disable hydra build due its size Build is i/o bound --- pkgs/data/fonts/sarasa-gothic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 8d2afbcf80dd..0d0ff700a303 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -26,5 +26,7 @@ stdenv.mkDerivation rec { license = licenses.ofl; maintainers = [ maintainers.ChengCat ]; platforms = platforms.all; + # large package, mainly i/o bound + hydraPlatforms = []; }; } From 89fb95b93fd4710755bcbb062f383cca63144925 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 02:54:03 -0700 Subject: [PATCH 169/491] libwps: 0.4.8 -> 0.4.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwps/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2html -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2raw -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2raw --version’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2text -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2csv -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2raw -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2raw --version’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2text -v’ and found version 0.4.9 - found 0.4.9 with grep in /nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9 - directory tree listing: https://gist.github.com/a3fdf5973402ddf0aa6d1a0ecd058d41 --- pkgs/development/libraries/libwps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 84748d601a64..2f89c0abdfc6 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "163gdqaanqfs767aj6zdzagqldngn8i7f0hbmhhxlxr0wmvx6c9q"; + sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6"; }; nativeBuildInputs = [ pkgconfig ]; From 7ebebcb3259e1e4e6de259f8d86af90f5dda2e6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:01:35 -0700 Subject: [PATCH 170/491] libmwaw: 0.3.13 -> 0.3.14 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/libmwaw/versions. These checks were done: - built on NixOS - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwawFile -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwawZip -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2csv -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2html -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2raw -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2raw --version’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2svg -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2text -v’ and found version 0.3.14 - found 0.3.14 with grep in /nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14 - directory tree listing: https://gist.github.com/e6bf3abafc8b9634a51796eb8969b268 --- pkgs/development/libraries/libmwaw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 35137a09cd9c..79718b47745c 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.13"; + version="0.3.14"; name="${baseName}-${version}"; - hash="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.13/libmwaw-0.3.13.tar.xz"; - sha256="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv"; + hash="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.14/libmwaw-0.3.14.tar.xz"; + sha256="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"; }; nativeBuildInputs = [ pkgconfig ]; From cd3047f313773bbe60df63f512dcf9271c60b34a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:33:31 -0700 Subject: [PATCH 171/491] 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 d4ad1c038601..4ad2f7ba34dc 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 96fddac69122ab50fe04975cb4f85dff99d7b9f5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 26 Apr 2018 18:36:42 +0800 Subject: [PATCH 172/491] wp-cli: 1.5.0 -> 1.5.1 --- pkgs/development/tools/wp-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index e35bdd22e2d7..9dbdcfaa8aab 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "17dgbcalvz5gw6xqgcywh6jrybj0qlglm16cgbshjsp6axwxa5gn"; + sha256 = "1lnjbl6rcv32g6akj4552ncyqmbsawmx1dnbmxr0rjj7wr8484f1"; }; completion = fetchurl { From f8bd1b18686e50c5b43d59fe357bd2c184ec0558 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:42:34 -0700 Subject: [PATCH 173/491] libsass: 3.5.2 -> 3.5.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsass/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.5.3 with grep in /nix/store/mp09kp6kk1mnb0m6szp8r8cjswpky236-libsass-3.5.3 - directory tree listing: https://gist.github.com/693ae2149cf8d174efe563ad97396c0a --- pkgs/development/libraries/libsass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index ec4fa6b7427a..3afe0e905e74 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1qjpicbjsj9gf8s00ma0d6kw6qfnc29fhrqdkvq8427wfffj654r"; + sha256 = "1lfdq2ahskf9yd0m71jlx3r4n6a0dhg4wxpnwbrvj2a23k7db7zi"; }; patchPhase = '' From fb4f737b87fd384a33d1786eb38c59e51f05cdc5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:55:58 -0700 Subject: [PATCH 174/491] jruby: 9.1.16.0 -> 9.1.17.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/jruby/versions. These checks were done: - built on NixOS - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby -h’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby --help’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby.bash -h’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby.bash --help’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/ruby -h’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/ruby --help’ got 0 exit code - found 9.1.17.0 with grep in /nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0 - directory tree listing: https://gist.github.com/20468ca63db765e0d42a1c93191f0901 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index b9cc38ee68a3..050d5accd2cb 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.16.0"; + version = "9.1.17.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r"; + sha256 = "1mfzs3mcpx8gmzidilzhpsxhgbblsflq35ww199m46pgiyzzf8ka"; }; buildInputs = [ makeWrapper ]; From 52fff3955318c7a7c92088ca9a123d7db888f071 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 26 Apr 2018 18:56:21 +0800 Subject: [PATCH 175/491] dbus-broker: 11 -> 13 --- pkgs/os-specific/linux/dbus-broker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 67e4df3d6f9d..c57650e0806f 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "11"; + version = "13"; src = fetchFromGitHub { - owner = "bus1"; - repo = "dbus-broker"; - rev = "v${version}"; - sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b"; + owner = "bus1"; + repo = "dbus-broker"; + rev = "v${version}"; + sha256 = "1yjkxpnl54pky6ha3y8dsds57lnk10lmriyzpzy0ha2npng2614x"; fetchSubmodules = true; }; From 2821265dfd15ba39e1873cd035720f3343df5791 Mon Sep 17 00:00:00 2001 From: Stefan Matting Date: Wed, 11 Apr 2018 15:43:36 +0200 Subject: [PATCH 176/491] Swap incorrect TheanoWithoutCuda with TheanoWithCuda --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b78cb40656d..7748120cd49c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13056,13 +13056,13 @@ in { }; TheanoWithoutCuda = self.Theano.override { - cudaSupport = true; - cudnnSupport = true; + cudaSupport = false; + cudnnSupport = false; }; TheanoWithCuda = self.Theano.override { - cudaSupport = false; - cudnnSupport = false; + cudaSupport = true; + cudnnSupport = true; }; thespian = callPackage ../development/python-modules/thespian { }; From 1f1124859d9cbb705b60d8c012a7af61ab4abf94 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Apr 2018 15:11:23 +0300 Subject: [PATCH 177/491] dante: add extra build inputs Add PAM, SASL and UPnP support. --- pkgs/servers/dante/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index ee139ea2652c..1c093facde5c 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "dante-${version}"; version = "1.4.2"; @@ -9,15 +9,17 @@ stdenv.mkDerivation (rec { sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms"; }; + buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ]; + configureFlags = [ "--with-libc=libc.so.6" ]; - meta = { + meta = with stdenv.lib; { description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity."; homepage = "https://www.inet.no/dante/"; - maintainers = [ stdenv.lib.maintainers.arobyn ]; - license = stdenv.lib.licenses.bsdOriginal; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.arobyn ]; + license = licenses.bsdOriginal; + platforms = platforms.linux; }; -}) +} From bd140fb41d5123a06568a98589271a23b6f0c398 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Apr 2018 15:14:13 +0300 Subject: [PATCH 178/491] dante service: restart only on failure Normal exit code shouldn't result in a restart. --- nixos/modules/services/networking/dante.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index 32acce51e692..67da28308e9a 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -54,7 +54,8 @@ in Type = "simple"; ExecStart = "${pkgs.dante}/bin/sockd -f ${confFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - Restart = "always"; + # Can crash sometimes; see https://github.com/NixOS/nixpkgs/pull/39005#issuecomment-381828708 + Restart = "on-failure"; }; }; }; From b827307c52215c1ef4696e6d7d3c307892ec5231 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Apr 2018 15:15:09 +0300 Subject: [PATCH 179/491] dante service: default for logoutput Log to journald via syslog by default; also improve option type. --- nixos/modules/services/networking/dante.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index 67da28308e9a..20d4faa1cdb1 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -6,6 +6,7 @@ let confFile = pkgs.writeText "dante-sockd.conf" '' user.privileged: root user.unprivileged: dante + logoutput: syslog ${cfg.config} ''; @@ -21,11 +22,10 @@ in enable = mkEnableOption "Dante SOCKS proxy"; config = mkOption { - default = null; - type = types.nullOr types.str; + type = types.lines; description = '' - Contents of Dante's configuration file - NOTE: user.privileged/user.unprivileged are set by the service + Contents of Dante's configuration file. + NOTE: user.privileged, user.unprivileged and logoutput are set by the service. ''; }; }; @@ -33,7 +33,7 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.config != null; + { assertion = cfg.config != ""; message = "please provide Dante configuration file contents"; } ]; From 29c66d9f09a25b0c6a61ff84b57cbded68d11193 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 04:30:01 -0700 Subject: [PATCH 180/491] kid3: 3.6.0 -> 3.6.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/kid3/versions. These checks were done: - built on NixOS - ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli -h’ got 0 exit code - ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli --help’ got 0 exit code - ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli help’ got 0 exit code - found 3.6.1 with grep in /nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1 - directory tree listing: https://gist.github.com/b9be08ae08dde4714bfceaebaf277eab --- pkgs/applications/audio/kid3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 680542dc405b..4c9540607eb6 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p"; + sha256 = "1bbnd6jgahdiqmsbw6c3x4h517m50db592fnq1w0v4k5aaav4i26"; }; buildInputs = with stdenv.lib; From 50a4977252f231d5b8f533ef5d81e9be7c24ded8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 04:43:51 -0700 Subject: [PATCH 181/491] hwinfo: 21.52 -> 21.53 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/hwinfo/versions. These checks were done: - built on NixOS - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo -h’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo --help’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo --version’ and found version 21.53 - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/check_hd help’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo -h’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo --help’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo help’ got 0 exit code - found 21.53 with grep in /nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53 - directory tree listing: https://gist.github.com/c3f6d76aa5a198a4ded2f2598380a0ef --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 67258399d8bc..839be268b5b4 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.52"; + version = "21.53"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1kva5bhylxbxgp2lv48av8mzcyybigj45rbwl9736l1kiv58i21r"; + sha256 = "1hrazksr95pxl5p0r0x3cdph1ps98cls2v9avg0qs0qf9y18hady"; }; patchPhase = '' From e0ad325cd46db4d8763cd3417aeb479835cc6290 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 26 Apr 2018 08:02:21 -0400 Subject: [PATCH 182/491] docker: 18.03.0 -> 18.03.1 --- pkgs/applications/virtualization/docker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 61899d12974f..2a271a96ecd4 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -198,13 +198,13 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_03 = dockerGen rec { - version = "18.03.0-ce"; - rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit - sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g"; + version = "18.03.1-ce"; + rev = "9ee9f402cd1eba817c5591a64f1d770c87c421a4"; # git commit + sha256 = "1jm3jmcbkvvy3s8pi3xcpir6mwxjfbad46lbif4bnpjfd2r5irrx"; runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; - containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c"; - containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; + containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; + containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; From 14ebf244feb78f191a48a7f8cda26b6e36a218ca Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 26 Apr 2018 08:08:53 -0400 Subject: [PATCH 183/491] oh-my-zsh: 2018-04-06 -> 2018-04-25 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 5412f4ce8967..1ff9455adece 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2018-04-06"; + version = "2018-04-25"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "62b8a70a7c5d0c939d8dabfef48796a092d1a55f"; - sha256 = "02na47pa2ly17yvwa2nhzyrp8iarawyirhfw3779sh0w78vgw1gs"; + rev = "9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8"; + sha256 = "0pjw5m7wpmcfdhrj322icplw3hsbbdxjgfw12kr2zpzl95xqkkhs"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 70e070afa7685126eef21456682807da0c9f16c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 05:57:09 -0700 Subject: [PATCH 184/491] fastjet: 3.3.0 -> 3.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fastjet/versions. These checks were done: - built on NixOS - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config -h’ got 0 exit code - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --help’ got 0 exit code - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --version’ and found version 3.3.1 - found 3.3.1 with grep in /nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1 - directory tree listing: https://gist.github.com/aa455f4d0802d2b2b76678ecccfe3eab --- pkgs/development/libraries/physics/fastjet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 0ee68415b89c..b4ffccb5360c 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fastjet-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "03x75mmnlw2m0a7669k82rf9a7dgjwygf8wjbk8cdgnb82c5pnp9"; + sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn"; }; buildInputs = [ python2 ]; From 8a3cdb993d1c7e62dc62dd7239852930f2e71997 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 06:18:41 -0700 Subject: [PATCH 185/491] 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 533721034575..3854c577188f 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 5a62cfe4d3d119a3b7c2708e6f4489b7d9041c03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 06:55:28 -0700 Subject: [PATCH 186/491] darktable: 2.4.2 -> 2.4.3 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/darktable/versions. These checks were done: - built on NixOS - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cltest help’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest -h’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest --help’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest help’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped -h’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped --help’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped help’ got 0 exit code - found 2.4.3 with grep in /nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3 - directory tree listing: https://gist.github.com/70f09e7ec3ef4b1bba88d54f066cf9df --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index d81fea5ea398..4de49524f82f 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.3"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r"; + sha256 = "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; From bea11a34fbcefe24a66cf64c7388124db567a17d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 25 Apr 2018 14:47:39 +0300 Subject: [PATCH 187/491] haskellPackages.encoding: fix build with Cabal 2.0 --- .../haskell-modules/configuration-common.nix | 3 + .../patches/encoding-Cabal-2.0.patch | 67 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e4f2d6728640..cfa80062e3be 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1028,6 +1028,9 @@ self: super: { indexed-list-literals = self.indexed-list-literals_0_2_0_0; }; + # https://github.com/dmwit/encoding/pull/3 + encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; + } // diff --git a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch new file mode 100644 index 000000000000..510e450945b8 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch @@ -0,0 +1,67 @@ +From 67bb87ceff53f0178c988dd4e15eeb2daee92b84 Mon Sep 17 00:00:00 2001 +From: Gregor Kleen +Date: Tue, 20 Feb 2018 17:46:24 +0100 +Subject: [PATCH] Relax upper version bounds on dependencies + +--- + Setup.hs | 20 ++++++++++++++++---- + encoding.cabal | 4 ++-- + stack.yaml | 4 ++-- + 3 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/Setup.hs b/Setup.hs +index de719e6..fe5b84c 100644 +--- a/Setup.hs ++++ b/Setup.hs +@@ -1,13 +1,25 @@ ++{-# LANGUAGE CPP #-} ++ + module Main where + + import Distribution.Simple + import Data.Encoding.Preprocessor.Mapping + import Data.Encoding.Preprocessor.XMLMappingBuilder + ++#if MIN_VERSION_Cabal(2,0,0) ++main = defaultMainWithHooks (simpleUserHooks ++ {hookedPreProcessors = ( ("mapping" , \_ _ _ -> mappingPreprocessor) ++ : ("mapping2", \_ _ _ -> mappingPreprocessor) ++ : ("xml" , \_ _ _ -> xmlPreprocessor) ++ : (hookedPreProcessors simpleUserHooks) ++ ) ++ }) ++#else + main = defaultMainWithHooks (simpleUserHooks +- {hookedPreProcessors = (("mapping",\_ _ -> mappingPreprocessor) +- :("mapping2",\_ _ -> mappingPreprocessor) +- :("xml",\_ _ -> xmlPreprocessor) +- :(hookedPreProcessors simpleUserHooks) ++ {hookedPreProcessors = ( ("mapping" , \_ _ -> mappingPreprocessor) ++ : ("mapping2", \_ _ -> mappingPreprocessor) ++ : ("xml" , \_ _ -> xmlPreprocessor) ++ : (hookedPreProcessors simpleUserHooks) + ) + }) ++#endif +diff --git a/encoding.cabal b/encoding.cabal +index ec20617..f221715 100644 +--- a/encoding.cabal ++++ b/encoding.cabal +@@ -36,7 +36,7 @@ Source-Repository this + + Custom-Setup + Setup-Depends: base >=3 && <5, +- Cabal >=1.24 && <1.25, ++ Cabal >=1.24 && <2.1, + containers, + filepath, + ghc-prim, +@@ -51,7 +51,7 @@ Library + extensible-exceptions >=0.1 && <0.2, + ghc-prim >=0.3 && <0.6, + mtl >=2.0 && <2.3, +- regex-compat >=0.71 && <0.95 ++ regex-compat >=0.71 && <0.96 + + Extensions: CPP + From 94c6dbbaaa6245d4d13554565d3f1f310d81b84c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 07:08:01 -0700 Subject: [PATCH 188/491] cgal: 4.11.1 -> 4.12 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/cgal/versions. These checks were done: - built on NixOS - ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_CMakeLists -h’ got 0 exit code - ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_CMakeLists help’ got 0 exit code - ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_cmake_script -h’ got 0 exit code - ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_cmake_script --help’ got 0 exit code - found 4.12 with grep in /nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12 - directory tree listing: https://gist.github.com/35067880611978f76a8e3f3adac7f12a --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index cdb37a84c801..23a539491d0e 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.11.1"; + version = "4.12"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "04nn1lzsjdglzjygc72cq09xrvpqwwnbf6l0xz8bfwfp4x9g10jf"; + sha256 = "0n4yvg2rkrlb1bwhykrg4iyqg4whxadcs441k10xx0r75i6220mn"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; From 1cbbf3088e8bfe9c09795327d1e81e6a9628e2cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 07:24:38 -0700 Subject: [PATCH 189/491] bdf2psf: 1.178 -> 1.184 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/bdf2psf/versions. These checks were done: - built on NixOS - ran ‘/nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184/bin/bdf2psf -h’ got 0 exit code - ran ‘/nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184/bin/bdf2psf --help’ got 0 exit code - found 1.184 with grep in /nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184 - directory tree listing: https://gist.github.com/8810c5939feee7c4840d8eae52e98832 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index e06c2dee000d..5e4b6994094a 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.178"; + version = "1.184"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1ngxa7hzfhvfhkvyc2qib3qyql5zz8rjg559wpi2jsi4hibj84vc"; + sha256 = "0lyxiwm0586b8gyl13ks2rqqa6abkqaxc4i08hvwyza1k1cqm2jc"; }; buildInputs = [ dpkg ]; From 5164104ef2a7fe37df7721e052c1e30b54df4435 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 07:48:41 -0700 Subject: [PATCH 190/491] accountsservice: 0.6.46 -> 0.6.47 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/accountsservice/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.6.47 with grep in /nix/store/gd55py0d0scns044hqccrihgsv9k8g9r-accountsservice-0.6.47 - directory tree listing: https://gist.github.com/0f7bbf0eb1486bf773f561276689270a --- pkgs/development/libraries/accountsservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index f12dfb4635b2..1d15aafcf935 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.46"; + version = "0.6.47"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "09ddndbha2wh22a0k5150d2wy0v8k8zj3vmbdijyirqwhf5vjr8q"; + sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From c7a567315f1d14db9bf25aec45553ee9be3812fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 07:51:42 -0700 Subject: [PATCH 191/491] batctl: 2018.0 -> 2018.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/batctl/versions. These checks were done: - built on NixOS - ran ‘/nix/store/8djn6psqrxjc66chnig215c5z8il9zaw-batctl-2018.1/bin/batctl -h’ got 0 exit code - found 2018.1 with grep in /nix/store/8djn6psqrxjc66chnig215c5z8il9zaw-batctl-2018.1 - directory tree listing: https://gist.github.com/13f600b1fb0404e8b5b78d0e2e32f5c5 --- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index ef1d51501e85..a1a2cff70a83 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2018.0"; + ver = "2018.1"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1x7gy6agwk68s2cbhc4wfhvhdy2ccrq0vi7jzaj94pn8nqshi5ss"; + sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7"; }; nativeBuildInputs = [ pkgconfig ]; From 1d0625499854b583c57267a744111ba8a1d0cfaf Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 26 Apr 2018 10:14:51 -0500 Subject: [PATCH 192/491] release-combined: don't include tests.chromium The chromium package will frequently time out . Note that this is unrelated to the test but a side effect because the test depends on chromium. https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.chromium.x86_64-linux See also #39476 --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index e010b532a688..4d6ff334d347 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -58,7 +58,7 @@ in rec { nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) - nixos.tests.chromium.x86_64-linux or [] + #nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) From 18e4125b8873419308944e7adb805d6ad8b5da95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 17:32:18 +0200 Subject: [PATCH 193/491] Revert "checkbashism: 2.0.0.2 -> 2.18.1" This reverts commit c4ac43a20ccf6a53587e3a5b5d6f2c87e4a9de5c. See https://github.com/NixOS/nixpkgs/pull/38102. --- pkgs/development/tools/misc/checkbashisms/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 6f4330ef0a9a..2564b42731b3 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "2.18.1"; + version = "2.0.0.2"; name = "checkbashisms-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "1yaygfzv5jzvcbahz6sdfnzhch9mxgsrlsym2ad62nk0svsnp24n"; + url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; + sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; }; buildInputs = [ perl ]; From 38364c0b07b9343e67e331bdcad1891511690c0b Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 26 Apr 2018 10:36:57 -0500 Subject: [PATCH 194/491] inkscape: don't patch share/filters This should not be needed because they are using `#!/usr/bin/env python` as the shebang and in fact it will break inkscape.x86_64-darwin. https://hydra.nixos.org/build/73283875/ --- pkgs/applications/graphics/inkscape/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 37af9f6b86c7..eb349e412068 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { patchShebangs fix-roff-punct # XXX: Not needed for CMake: - patchShebangs share/filters patchShebangs share/palettes patchShebangs share/patterns patchShebangs share/symbols From 3d4aa7e95def212895c36262355ca6349cfe7d5a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Apr 2018 07:27:23 -0500 Subject: [PATCH 195/491] qemu: workaround 'struct sysinfo' conflict musl <--> linux Most everyone using musl patches the linux headers instead, but various software uses a local workaround like the one added in this commit (psutils, for example). It's not obvious to me which project has the "bug", and I'm reluctant to even propose modifying our headers without clear answer on the issue. Also, modifying those headers triggers rebuild-all-the-things. Hopefully upstream projects sort this out, in the meantime adding this define is a bit of a kludge but does the job. ------- For the curious, the patch usually is something like this: https://patchwork.kernel.org/patch/3833241/ Here's an updated version that also ensures kernel users get the sysinfo struct as expected too: https://raw.githubusercontent.com/openwrt/openwrt/e3c43ade0bae9491aeea50fa361e846bb5002dc0/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch (cherry picked from commit dtzWill/nixpkgs@91b5f5a463f5545fbf4f916b3c624840fcb9f300) --- pkgs/applications/virtualization/qemu/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0496adb6f409..dd68eb19380f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { preConfigure = '' unset CPP # intereferes with dependency calculation + '' + optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; configureFlags = From 00610fe0903e0aa300e4f7797a6d84d13f3d8ce9 Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 26 Apr 2018 18:15:21 +0200 Subject: [PATCH 196/491] qemu-riscv: remove, obsolete with qemu 2.12 upstream qemu 2.12 includes riscv support --- .../virtualization/qemu/riscv.nix | 30 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/riscv.nix diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix deleted file mode 100644 index 2159ad4b4dc9..000000000000 --- a/pkgs/applications/virtualization/qemu/riscv.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ qemu, fetchFromGitHub, lib }: let - src = fetchFromGitHub { - owner = "riscv"; - repo = "riscv-qemu"; - rev = "f733c7b5f86147216e14aff90c03ccdd76056bef"; - sha256 = "1ppr9qqwi7qqh8m6dgk1hrzg8zri240il27l67vfayd8ijagb9zq"; - fetchSubmodules = true; - }; - version = "2.11.92"; - revCount = "60378"; - shortRev = builtins.substring 0 9 src.rev; - targets = [ "riscv32-linux-user" "riscv32-softmmu" - "riscv64-linux-user" "riscv64-softmmu" - ]; -in lib.overrideDerivation qemu (orig: { - name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; - inherit src; -# <<<<<<< HEAD -# # https://github.com/riscv/riscv-qemu/pull/109 -# patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ]; -# ======= - # The pulseaudio and statfs patches are in 2.12.0+, which this is based on - patches = [ - ./force-uid0-on-9p.patch - ./no-etc-install.patch - ]; - - configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; - postInstall = null; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1606e82ca89..fb490a4753bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17424,8 +17424,6 @@ with pkgs; inherit (darwin.stubs) rez setfile; }; - qemu-riscv = lowPrio (callPackage ../applications/virtualization/qemu/riscv.nix {}); - qgis = callPackage ../applications/gis/qgis { inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; From 2a4dc39e1e6f70569ba5664cf3de1c49adf063be Mon Sep 17 00:00:00 2001 From: Mark Karpov Date: Thu, 26 Apr 2018 23:19:52 +0700 Subject: [PATCH 197/491] pytaglib: init at 1.4.3 (#39498) --- maintainers/maintainer-list.nix | 5 +++ .../python-modules/pytaglib/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pytaglib/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0f05c363a656..299f4d1c82a8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2521,6 +2521,11 @@ github = "fstamour"; name = "Francis St-Amour"; }; + mrkkrp = { + email = "markkarpov92@gmail.com"; + github = "mrkkrp"; + name = "Mark Karpov"; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix new file mode 100644 index 000000000000..6674a89180af --- /dev/null +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, taglib +, cython +, pytest +, glibcLocales +}: + +buildPythonPackage rec { + pname = "pytaglib"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "44ab26dc4b33962b8db0bb8856e7b166539c0c555bc933a6bbbc96f4ec51c7a2"; + }; + + buildInputs = [ taglib cython ]; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.utf-8 pytest . + ''; + + meta = { + homepage = https://github.com/supermihi/pytaglib; + description = "Python 2.x/3.x bindings for the Taglib audio metadata library"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.mrkkrp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7748120cd49c..f24d6ff955bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8220,6 +8220,8 @@ in { }; }; + pytaglib = callPackage ../development/python-modules/pytaglib { }; + pyte = callPackage ../development/python-modules/pyte { }; graphviz = buildPythonPackage rec { From a026242e4a2353d33dea47c09617f0988eae779f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Apr 2018 12:24:45 -0500 Subject: [PATCH 198/491] netbsd: remove broken attributes --- pkgs/os-specific/bsd/netbsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 42633232c71a..e382fcbb9f0d 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -287,7 +287,7 @@ let }; in rec { - inherit compat libc libutil install make mtree netBSDDerivation; + inherit compat install make netBSDDerivation; getent = netBSDDerivation { path = "usr.bin/getent"; From 4539f1f2f72ab4d95642506c4481379f09d2699c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Apr 2018 12:29:58 -0500 Subject: [PATCH 199/491] netbsd: install db.h to compat --- pkgs/os-specific/bsd/netbsd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index e382fcbb9f0d..387d0cd270ee 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -196,6 +196,7 @@ let install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h + install -D $NETBSDSRCDIR/include/db.h $out/include/db.h ''; extraPaths = [ libc.src libutil.src (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") From e521bada21b18bcb623c549b5d153d5612afbf96 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Apr 2018 12:31:06 -0500 Subject: [PATCH 200/491] netbsd: propagate compat --- pkgs/os-specific/bsd/netbsd/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 387d0cd270ee..03d93f3d9086 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -288,7 +288,7 @@ let }; in rec { - inherit compat install make netBSDDerivation; + inherit compat install netBSDDerivation; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -309,6 +309,7 @@ in rec { sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "7.1.2"; nativeBuildInputs = [ ]; + propagatedBuildInputs = [ compat ]; extraPaths = [ (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") @@ -358,7 +359,8 @@ in rec { libedit = netBSDDerivation { path = "lib/libedit"; - buildInputs = [ compat libterminfo ]; + buildInputs = [ libterminfo libcurses ]; + propagatedBuildInputs = [ compat ]; patchPhase = '' sed -i '1i #undef bool_t' el.h ''; @@ -380,7 +382,8 @@ in rec { path = "lib/libcurses"; version = "7.1.2"; sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; - buildInputs = [ compat libterminfo ]; + buildInputs = [ libterminfo ]; + propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr }; From 968e8a1099859bf41cc34ca453bda897cdb8380c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Apr 2018 17:57:53 +0000 Subject: [PATCH 201/491] netbsd: fix getent with musl --- pkgs/os-specific/bsd/netbsd/default.nix | 58 +++++++++++++------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 03d93f3d9086..f64c36932e34 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -25,6 +25,7 @@ let "-D__warn_references(a,b)=" "-D__strong_alias(a,b)=" "-D__va_list=va_list" + "-D__scanflike(a,b)=" ]; # Definitions passed to share/mk/*.mk. Should be pretty simple - @@ -210,9 +211,36 @@ let version = "7.1.2"; sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8"; extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ makeMinimal mandoc groff compat ]; + nativeBuildInputs = [ makeMinimal mandoc groff ]; + buildInputs = [ compat fts ]; RENAME = "-D"; }; + + fts = netBSDDerivation { + pname = "fts"; + path = "include/fts.h"; + sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; + version = "7.1.2"; + nativeBuildInputs = [ ]; + propagatedBuildInputs = [ compat ]; + extraPaths = [ + (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") + (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") + (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + ]; + buildPhase = '' + cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ + -o lib/libc/gen/fts.o + ar -rsc libfts.a lib/libc/gen/fts.o + ''; + installPhase = '' + install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 + install -D include/fts.h $out/include/fts.h + install -D lib/libc/include/namespace.h $out/include/namespace.h + install -D libfts.a $out/lib/libfts.a + ''; + setupHook = ./fts-setup-hook.sh; + }; # END BOOTSTRAPPING libutil = netBSDDerivation { @@ -288,7 +316,7 @@ let }; in rec { - inherit compat install netBSDDerivation; + inherit compat install netBSDDerivation fts; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -303,32 +331,6 @@ in rec { version = "7.1.2"; }; - fts = netBSDDerivation { - pname = "fts"; - path = "include/fts.h"; - sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "7.1.2"; - nativeBuildInputs = [ ]; - propagatedBuildInputs = [ compat ]; - extraPaths = [ - (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") - (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") - (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") - ]; - buildPhase = '' - cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ - -o lib/libc/gen/fts.o - ar -rsc libfts.a lib/libc/gen/fts.o - ''; - installPhase = '' - install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 - install -D include/fts.h $out/include/fts.h - install -D lib/libc/include/namespace.h $out/include/namespace.h - install -D libfts.a $out/lib/libfts.a - ''; - setupHook = ./fts-setup-hook.sh; - }; - games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; From 6ed855289e5910aa2ff5082d03b70fb1fe150a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 20:20:01 +0200 Subject: [PATCH 202/491] python.pkgs.pyhomematic: 0.1.41 -> 0.1.42 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 18e477dbd814..0967659a641f 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.41"; + version = "0.1.42"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "01j6y2ypi7a8ffnkqd8j8vnpszza2cxqpiqbnk1dwbg9w9pwwq53"; + sha256 = "0h7bq66q22kzj1xwhxmr7knibsmb4csjwq3jr19fyl9sxxmgqwqy"; }; # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126 From f925480215a14420d893021dc2c6f2b78a66f137 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 26 Apr 2018 18:11:05 +0200 Subject: [PATCH 203/491] grafana: 5.0.4 -> 5.1.0 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index d2a0d0463895..df89e67bffc1 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.0.4"; + version = "5.1.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90"; + sha256 = "1j8l8v5iq1mpvc8j7vbwqqd0xhv9ysl05lxwm524cqljynslaq8f"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc"; + sha256 = "08wha1n3lqn27pc3bc3sg94y47npy69ydh2ad1rbkmvllnjbwx3z"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From a95a0a932ba7d57e30b19377b90099e439e866d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 26 Apr 2018 20:27:41 +0200 Subject: [PATCH 204/491] pspg: 1.0.0 -> 1.1.0 --- pkgs/tools/misc/pspg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index b9543dc143cf..ddd76a344e01 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig }: +{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }: stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "1swrg4bg7i4xpdrsg8dsfldbxaffni04x8i1s0g6h691qcin675v"; + sha256 = "10r6jfcqw4wclp84f07g3bda844csgm4sh7cjsnk2smmal7nhybs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnugrep ncurses ]; + buildInputs = [ gnugrep ncurses readline ]; preBuild = '' makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" From 6c5d860c8b3e0995d01505da86559ebde731a9df Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 26 Apr 2018 20:01:10 +0200 Subject: [PATCH 205/491] gst_all_1: fix botched merge 23741692 merged staging incorrectly --- pkgs/development/libraries/gstreamer/bad/default.nix | 10 +--------- pkgs/development/libraries/gstreamer/good/default.nix | 3 ++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 8ebd70921135..de1a3700cc2b 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -13,13 +13,7 @@ assert faacSupport -> faac != null; let - inherit (stdenv.lib) optional optionalString; - - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." (lib.getVersion openjpeg))); - + inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "gst-plugins-bad-1.14.0"; @@ -76,6 +70,4 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) wildmidi # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin ++ optional (!stdenv.isDarwin) mjpegtools; - - enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 21376ce79c1c..11e0894df3c3 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -12,7 +12,7 @@ assert gtkSupport -> gtk3 != null; let - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "gst-plugins-good-1.14.0"; @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { libsoup libshout lame mpg123 twolame libintl ncurses ] + ++ optional gtkSupport gtk3 # for gtksink ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; From 489b0a5f47a6bbf0397111ea0ba222b3b4cdeb6d Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Thu, 26 Apr 2018 21:41:30 +0200 Subject: [PATCH 206/491] shotcut: 17.11 -> 18.03.06 --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6b1389c97ab0..59c1463577e8 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "17.11"; + version = "18.03.06"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1bw2cjpzycddxi9b21haiaslv0ikia85wwgkfm2xl2m15w5j8510"; + sha256 = "1b8hfym89i1nmrx80y16z06zsff5qba7gpga8jydnw1lmcscdash"; }; enableParallelBuilding = true; From c12caf34d256cd717107bde2f5160ec773a15605 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Thu, 26 Apr 2018 21:42:22 +0200 Subject: [PATCH 207/491] shotcut: add myself as maintainer --- pkgs/applications/video/shotcut/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 59c1463577e8..0a786312214a 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; homepage = https://shotcut.org; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu woffs ]; platforms = platforms.linux; }; } From 537d14f4e2c8ef908641223bc80fe8e2bca74e90 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt <> Date: Thu, 26 Apr 2018 21:59:33 +0200 Subject: [PATCH 208/491] chromium: See if Hydra obeys a 24h meta.timeout --- pkgs/applications/networking/browsers/chromium/browser.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e35d894e0e7e..cca26b541240 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -51,5 +51,6 @@ mkChromiumDerivation (base: rec { license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + timeout = 86400; # 24 hours }; }) From bae15c811f182132c77f3c20b6785c9297e8498f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 26 Apr 2018 22:50:36 +0200 Subject: [PATCH 209/491] sympow: don't use placeholder --- pkgs/development/libraries/science/math/sympow/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index fd677f5c0b7b..c83b3d1737cf 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -34,11 +34,13 @@ stdenv.mkDerivation rec { makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \ --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \ --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then - mkdir -p "$SYMPOW_LOCAL" - cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL" + mkdir -p "$SYMPOW_LOCAL" + cp -r @out@/share/sympow/* "$SYMPOW_LOCAL" chmod -R +xw "$SYMPOW_LOCAL" fi' \ --run 'cd "$SYMPOW_LOCAL"' + substituteInPlace $out/bin/sympow --subst-var out + runHook postInstall ''; From f3ff2b1fa638ba5c32bbf90edeedc00102033139 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 27 Apr 2018 00:37:40 +0300 Subject: [PATCH 210/491] handbrake: 1.0.7 -> 1.1.0 & according changes --- pkgs/applications/video/handbrake/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 6ce2ae08eeb4..d13995f6e9bd 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ # # Only tested on Linux -{ stdenv, lib, fetchFromGitHub, +{ stdenv, lib, fetchurl, python2, pkgconfig, yasm, harfbuzz, zlib, autoconf, automake, cmake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, @@ -25,16 +25,24 @@ }: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.1.0"; name = "handbrake-${version}"; - src = fetchFromGitHub { - owner = "HandBrake"; - repo = "HandBrake"; - rev = "${version}"; - sha256 = "1pdrvicq40s8n23n6k8k097kkjs3ah5wbz1mvxnfy3h2mh5rwk57"; + src = fetchurl { + url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; + sha256 = "1nj0ihflisxcfkmsk7fm3b5cn7cpnpg66dk2lkp2ip6qidppqbm0"; }; + patched_libav_12 = libav_12.overrideAttrs (super: { + # 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream. + patches = (super.patches or []) ++ [( + fetchurl { + url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/9e1f245708a157231c427c0ef9b91729d59a30e1/contrib/ffmpeg/A21-mp4-sdtp.patch''; + sha256 = "14grzyvb1qbb90k31ibabnwmwnrc48ml6h2z0rjamdv83q45jq4g"; + }) + ]; + }); + nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; @@ -48,7 +56,7 @@ stdenv.mkDerivation rec { glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev - ] ++ (if useFfmpeg then [ ffmpeg ] else [ libav_12 ]) + ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ]) ++ lib.optional useFdk fdk_aac; dontUseCmakeConfigure = true; @@ -58,11 +66,6 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs scripts - # `configure` errors out when trying to read the current year which is too low - substituteInPlace make/configure.py \ - --replace developer release \ - --replace 'repo.date.strftime("%Y-%m-%d %H:%M:%S")' '""' - substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 From 1cfc5f1da21b1527bc86e1b368bbda3885f125d1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Apr 2018 18:08:53 -0400 Subject: [PATCH 211/491] pythia: 8.226 -> 8.235, enable lhapdf6 plugin --- pkgs/development/libraries/physics/pythia/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index eca2807ce153..3f9f3f8498bd 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.226"; + version = "8.235"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g"; + sha256 = "17cfgs7v469pdnnzvlmdagcdhi0h419znqmaws90l9d8cmhhsbz8"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--with-hepmc2=${hepmc}" + "--with-lhapdf6=${lhapdf}" ]; enableParallelBuilding = true; From 2f47c93ec848ae4b9594a13406f71982282ce0d7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Apr 2018 18:09:26 -0400 Subject: [PATCH 212/491] sacrifice: set LD_LIBRARY_PATH for pythia plugins to work --- pkgs/applications/science/physics/sacrifice/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 99d6df77f853..6c25f720ebf9 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia }: +{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { name = "sacrifice-${version}"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost hepmc lhapdf pythia ]; + nativeBuildInputs = [ makeWrapper ]; patches = [ ./compat.patch @@ -27,8 +28,11 @@ stdenv.mkDerivation rec { "--with-pythia=${pythia}" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = if stdenv.isDarwin then '' install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia + '' else '' + wrapProgram $out/bin/run-pythia \ + --prefix LD_LIBRARY_PATH : "${pythia}/lib" ''; enableParallelBuilding = true; From 6ca343103bb8f6a32db5c63c122aad72e0ecbe40 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 27 Apr 2018 00:12:54 +0200 Subject: [PATCH 213/491] check-meta.nix: specify meta.timeout --- pkgs/stdenv/generic/check-meta.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 1350e7d37301..a5c8ca705231 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -170,6 +170,8 @@ let isIbusEngine = bool; isGutenprint = bool; badPlatforms = platforms; + # Hydra build timeout + timeout = int; }; checkMetaAttr = k: v: From 9badee01c1540629f6841177d0067682fbc7f437 Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 26 Apr 2018 14:04:13 +0200 Subject: [PATCH 214/491] teamviewer 12.0.90041 -> 13.1.3026 bump, move to qt5, drop i686 support --- .../networking/remote/teamviewer/default.nix | 61 +++++-------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 17 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 260500e9d337..5365228ae657 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,28 +1,13 @@ -{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }: +{ stdenv, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: -let - ld32 = - if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" - else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" - else throw "Unsupported system ${stdenv.system}"; - ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - - mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); - - deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]); - tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); - tvldpath64 = lib.makeLibraryPath (deps pkgs); -in stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "12.0.90041"; + version = "13.1.3026"; src = fetchurl { - # There is a 64-bit package, but it has no differences apart from Debian dependencies. - # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. - url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb"; - sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg"; + url = "https://dl.tvcdn.de/download/linux/version_13x/teamviewer_${version}_amd64.deb"; + sha256 = "14zaa1xjdfmgbbq40is5mllqcd9zan03sblkzajswd5gps7crsik"; }; unpackPhase = '' @@ -30,6 +15,10 @@ stdenv.mkDerivation rec { tar xf data.tar.* ''; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; + propagatedBuildInputs = [ qtquickcontrols ]; + installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications cp -a opt/teamviewer/* $out/share/teamviewer @@ -46,41 +35,23 @@ stdenv.mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils - pushd $out/share/teamviewer/tv_bin + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop - sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config - ${if stdenv.system == "x86_64-linux" then '' - sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config - '' else '' - sed -i "/TV_LD64_PATH=.*/d" script/tvw_config - ''} - - sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop - - for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do - echo "patching $i" - patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true - done - for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do - echo "patching $i" - patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true - done - ${if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 - '' else '' - rm TVGuiSlave.64 - ''} - popd + substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_aux \ + --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' + substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ + --replace '/var/run/' '/run/' + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" ''; - dontPatchELF = true; dontStrip = true; meta = with stdenv.lib; { homepage = http://www.teamviewer.com; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jagajaga dasuxullebt ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06ee..605ca9bac0e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5107,9 +5107,7 @@ with pkgs; ted = callPackage ../tools/typesetting/ted { }; - teamviewer = callPackage ../applications/networking/remote/teamviewer { - stdenv = stdenv_32bit; - }; + teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; telnet = callPackage ../tools/networking/telnet { }; From dc62e8509a793097a8b86b3707f876ba1f5532bf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:03:28 +0200 Subject: [PATCH 215/491] nixos/caddy: fix ca api endpoint, now uses v2 --- nixos/modules/services/web-servers/caddy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index d8efa24bc6d5..2124a42f01a1 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -25,8 +25,8 @@ in { }; ca = mkOption { - default = "https://acme-v01.api.letsencrypt.org/directory"; - example = "https://acme-staging.api.letsencrypt.org/directory"; + default = "https://acme-v02.api.letsencrypt.org/directory"; + example = "https://acme-staging-v02.api.letsencrypt.org/directory"; type = types.string; description = "Certificate authority ACME server. The default (Let's Encrypt production server) should be fine for most people."; }; From 1ae220b689a3dc8cd118a27196391b0e2460043b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:04:08 +0200 Subject: [PATCH 216/491] pssh: add explicit references to openssh and rsync --- pkgs/tools/networking/pssh/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index ddaf419e5658..22c359620507 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { name = "pssh-${version}"; @@ -11,6 +11,15 @@ pythonPackages.buildPythonApplication rec { sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq"; }; + postPatch = '' + for f in bin/*; do + substituteInPlace $f \ + --replace "'ssh'" "'${openssh}/bin/ssh'" \ + --replace "'scp'" "'${openssh}/bin/scp'" \ + --replace "'rsync'" "'${rsync}/bin/rsync'" + done + ''; + meta = with stdenv.lib; { description = "Parallel SSH Tools"; longDescription = '' From c208823e2d43b8475273107a7299cceff5d23592 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:07:05 +0200 Subject: [PATCH 217/491] youtubeDL: 2018.04.16 -> 2018.04.25 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1f7d8c549e42..55c785b06da0 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { pname = "youtube-dl"; - version = "2018.04.16"; + version = "2018.04.25"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d"; + sha256 = "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw"; }; nativeBuildInputs = [ makeWrapper ]; From 70bcb507986de789614bedbaa84adc525947f13e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:09:30 +0200 Subject: [PATCH 218/491] smcroute: fix smcroutectl --- pkgs/servers/smcroute/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index b1d614bc5cf0..40472c59a873 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: stdenv.mkDerivation rec { name = "smcroute-${version}"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libcap ]; + + configureFlags = [ + "--localstatedir=/var" + "--with-systemd=\$(out)/lib/systemd/system" + ]; meta = with stdenv.lib; { description = "Static multicast routing daemon"; From b5655751a1efef57d90032ae73d3c6676c057ed9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:22:35 +0200 Subject: [PATCH 219/491] EmptyEpsilon: init at 2018.02.15 --- pkgs/games/empty-epsilon/default.nix | 58 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/games/empty-epsilon/default.nix diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix new file mode 100644 index 000000000000..d7742d316647 --- /dev/null +++ b/pkgs/games/empty-epsilon/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python }: + +let + + version = "2018.02.15"; + + serious-proton = stdenv.mkDerivation rec { + name = "serious-proton-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "daid"; + repo = "SeriousProton"; + rev = "EE-${version}"; + sha256 = "0b4n4pn7x3y63i9y15f8983zlpdvmx7151iph1lcc49j3hmpd0gy"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ sfml libX11 ]; + + meta = with lib; { + description = "C++ game engine coded on top of SFML used for EmptyEpsilon"; + homepage = https://github.com/daid/SeriousProton; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; + }; + +in + + +stdenv.mkDerivation rec { + name = "empty-epsilon-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "daid"; + repo = "EmptyEpsilon"; + rev = "EE-${version}"; + sha256 = "1by0wrw00frrlcs1kd003zkmfkwa1pnbnva2qn8km3xnl9chf11d"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ serious-proton sfml glew libX11 python ]; + + cmakeFlags = [ + "-DSERIOUS_PROTON_DIR=${serious-proton.src}" + ]; + + meta = with lib; { + description = "Open source bridge simulator based on Artemis"; + homepage = https://daid.github.io/EmptyEpsilon/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06ee..0e07f2374482 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19017,6 +19017,8 @@ with pkgs; egoboo = callPackage ../games/egoboo { }; + EmptyEpsilon = callPackage ../games/empty-epsilon { }; + endless-sky = callPackage ../games/endless-sky { }; enyo-doom = libsForQt5.callPackage ../games/enyo-doom { }; From b151b050d58a60f2b4db1ac407ed379c24fb71af Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 27 Apr 2018 01:55:27 +0200 Subject: [PATCH 220/491] accountsservice: change url to https --- pkgs/development/libraries/accountsservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 1d15aafcf935..289bc45d2037 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.6.47"; src = fetchurl { - url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus interface for user account query and manipulation"; - homepage = http://www.freedesktop.org/wiki/Software/AccountsService; + homepage = https://www.freedesktop.org/wiki/Software/AccountsService; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; From a22b3e91b61d1f27bf326885a89db91531e28e91 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 26 Apr 2018 17:20:08 -0700 Subject: [PATCH 221/491] configuration-ghc-8.4.x.nix: Remove reference to non-existent bv_0_5 --- .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index fe6bc699fb98..b38b17e34751 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -41,12 +41,6 @@ self: super: { ## Shadowed: - ## Needs bump to a versioned attribute - ## • No instance for (GHC.Base.Semigroup BV) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid BV’ - bv = super.bv_0_5; - ## Needs bump to a versioned attribute ## Issue: https://github.com/sol/doctest/issues/189 doctest = overrideCabal super.doctest_0_15_0 (drv: { From 88695c6e9497c018d0565b4078f4dc1acd280afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 27 Apr 2018 02:42:12 +0200 Subject: [PATCH 222/491] Revert "release-combined: don't include tests.chromium" This reverts commit 1d0625499854b583c57267a744111ba8a1d0cfaf. We now get a build and maybe have a workaround #39570; /cc #39476. --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 4d6ff334d347..e010b532a688 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -58,7 +58,7 @@ in rec { nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) - #nixos.tests.chromium.x86_64-linux or [] + nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) From ffe9f0a2bb7ed94eb0461a0947b847a3356d386c Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 27 Apr 2018 10:19:37 +0930 Subject: [PATCH 223/491] awsebcli: pin pathspec dependency to 0.5.5 pathspec has been bumped to 0.5.6 in c705acef and awsebcli's setup.py refuses to use that version. --- pkgs/tools/virtualization/awsebcli/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 3b3bda0f22dc..5f847e7eb907 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -19,6 +19,14 @@ let }; }); + pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { + version = "0.5.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3"; + }; + }); + requests = super.requests.overridePythonAttrs (oldAttrs: rec { version = "2.9.1"; src = oldAttrs.src.override { From e8dcf87007cea397304289c723fab1e2898c7a3c Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 27 Apr 2018 10:28:03 +0930 Subject: [PATCH 224/491] awsebcli: 3.12.3 -> 3.12.4 --- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 5f847e7eb907..b55ac457305b 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -54,11 +54,11 @@ let }; in with localPython.pkgs; buildPythonApplication rec { pname = "awsebcli"; - version = "3.12.3"; + version = "3.12.4"; src = fetchPypi { inherit pname version; - sha256 = "0jj6xhvsrgvc5pm05zbd95zvx36ssywq70j6q1kzcdv1flfzzyp9"; + sha256 = "128dgxyz2bgl3r4jdkbmjs280004bm0dwzln7p6ly3yjs2x37jl6"; }; checkInputs = [ From 564a6288b89678b5aaaeb4e1ef7d08257ff9cac4 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 27 Apr 2018 10:35:26 +0930 Subject: [PATCH 225/491] maintainers: update email address Trying to move away from .au ccTLD. --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 299f4d1c82a8..30597373fc52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1241,7 +1241,7 @@ name = "Mabry Cervin"; }; eqyiel = { - email = "r@rkm.id.au"; + email = "ruben@maher.fyi"; github = "eqyiel"; name = "Ruben Maher"; }; From 047c9372ab1314d8e3fab13b9f21359fdf3a643c Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 26 Apr 2018 20:47:16 -0500 Subject: [PATCH 226/491] inkscape: fix on darwin again I have no idea why but this broke Darwin. So added a conditional for the shebang patching. https://hydra.nixos.org/build/73283875 --- pkgs/applications/graphics/inkscape/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index eb349e412068..5978612fdf33 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -29,10 +29,13 @@ stdenv.mkDerivation rec { patchShebangs fix-roff-punct # XXX: Not needed for CMake: - patchShebangs share/palettes - patchShebangs share/patterns - patchShebangs share/symbols - patchShebangs share/templates + ${lib.optionalString (!stdenv.isDarwin) '' + patchShebangs share/filters + patchShebangs share/palettes + patchShebangs share/patterns + patchShebangs share/symbols + patchShebangs share/templates + ''} # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. From 8efe41dfb226d95f6394475e0f027c0ac14989a3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Apr 2018 01:56:39 +0000 Subject: [PATCH 227/491] linux: 4.14.36 -> 4.14.37 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 47784e770127..d9aef3a21930 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.36"; + version = "4.14.37"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hxwd3kl5g7zrcl3b00nxdv0zjkmmfrk1i5v3hrjm0dmsw249qna"; + sha256 = "14lfj2vfxw36k8cbmzs280w4h81yz5xhlhq5550kww906vnyg5w1"; }; } // (args.argsOverride or {})) From 7f3832bf93fb9c308052d8deec184de95ce0ee92 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Apr 2018 01:56:53 +0000 Subject: [PATCH 228/491] linux: 4.16.4 -> 4.16.5 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index d46c95e1a593..3da2cda30e22 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.4"; + version = "4.16.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0v494vm1vbyfk8xmvgf27chsjpy9x7q0iwdaana8vnih2ai6vdcs"; + sha256 = "0f1a8ggjb2jxc8n3hvypc81xbwylwkqi0mnynd9q316ay152zb1r"; }; } // (args.argsOverride or {})) From ddc23593e1885e04663fe735e29c4f45978a6d87 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 01:59:36 +0000 Subject: [PATCH 229/491] netbsd: fix links installer --- pkgs/os-specific/bsd/netbsd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f64c36932e34..f0220fc05d22 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -280,6 +280,9 @@ let --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \ --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.links.mk \ + --replace '-o ''${LINKSOWN_''${.ALLSRC:T}:U''${LINKSOWN}}' "" \ + --replace '-g ''${LINKSGRP_''${.ALLSRC:T}:U''${LINKSGRP}}' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \ --replace '-o ''${MANOWN} -g ''${MANGRP}' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \ @@ -338,6 +341,7 @@ in rec { patchPhase = '' sed -i '1i #include ' adventure/save.c ''; + buildInputs = [ compat libcurses ]; }; who = netBSDDerivation { From ff3b88713c4e5bfeb839e59b3ad4753043d3b47c Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Fri, 27 Apr 2018 12:01:24 +1000 Subject: [PATCH 230/491] 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 000000000000..802a03bd4c7a --- /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 0e07f2374482..fbb5d864e88b 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 4975378b2139f24b1368f44e9e3d44e34c3e48ad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Apr 2018 02:04:08 +0000 Subject: [PATCH 231/491] linux-copperhead: 4.15.18.a -> 4.14.36.a The 4.15.x series is EOL'd, we should instead follow the LTS kernel --- pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index 5685e6dd904d..dfe58119da26 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.18"; + version = "4.14.36"; revision = "a"; - sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6"; + sha256 = "052ck8giy5nxy7871crhx6cdkgzzzpffdm8ilq1ys0rd3vldzl9b"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 19f6fe6e9c616ff64ace9ae2c2a13068732a0bcb Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Wed, 25 Apr 2018 15:39:43 +0800 Subject: [PATCH 232/491] fcitx-libpinyin: fix data path --- .../fcitx-engines/fcitx-libpinyin/datapath.patch | 16 ++++++++++++++++ .../fcitx-engines/fcitx-libpinyin/default.nix | 10 ++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch new file mode 100644 index 000000000000..84dd5fc8f462 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch @@ -0,0 +1,16 @@ +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -9,12 +9,7 @@ char* FcitxLibPinyinGetSysPath(LIBPINYIN_LANGUAGE_TYPE type) + #ifdef LIBPINYIN_TOOLS_FOUND + if (type == LPLT_Simplified) { + #endif +- /* portable detect here */ +- if (getenv("FCITXDIR")) { +- syspath = fcitx_utils_get_fcitx_path_with_filename("datadir", "libpinyin/data"); +- } else { +- syspath = strdup(LIBPINYIN_PKGDATADIR "/data"); +- } ++ syspath = strdup(LIBPINYIN_PKGDATADIR "/data"); + #ifdef LIBPINYIN_TOOLS_FOUND + } + else { diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index f2610efd2eb4..4468f1fa263a 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ]; + # With a typical installation via NixOS option i18n.inputMethod.fcitx.engines, + # the FCITXDIR environment variable is set to $out of fcitx-with-plugins, + # which leads to an incorrect path for pinyin data. + # + # It is impossible or difficult to fix this issue without patching. We want + # FCITXDIR to point into libpinyin, which is currently not symlinked within + # fcitx-with-plugins (only fcitx-libpinyin is symlinked). Also, FCITXDIR + # doesn't accept multiple directories. + patches = [ ./datapath.patch ]; + preInstall = '' substituteInPlace src/cmake_install.cmake \ --replace ${fcitx} $out From 2cfda31cff8516512288ccccb9b4489d5239e0e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 26 Apr 2018 22:20:30 -0500 Subject: [PATCH 233/491] vale: 0.10.1 -> 0.11.2 --- pkgs/tools/text/vale/default.nix | 10 +- pkgs/tools/text/vale/deps.nix | 519 +++++++++++++++---------------- 2 files changed, 250 insertions(+), 279 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 057f1c48a1f2..84ef164ce248 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,16 +2,16 @@ buildGoPackage rec { name = "vale-${version}"; - version = "0.10.1"; - rev = "${version}"; + version = "0.11.2"; + rev = "v${version}"; - goPackagePath = "github.com/ValeLint/vale"; + goPackagePath = "github.com/errata-ai/vale"; src = fetchFromGitHub { inherit rev; - owner = "ValeLint"; + owner = "errata-ai"; repo = "vale"; - sha256 = "1iyc9mny3nb6j3allj3szkiygc2v3gi7l7syq9ifjrm1wknk8wrf"; + sha256 = "0zs6bdwnc5fpa0skw1xhdwg6jzsc7wcb8lsfj235jc8jd2w13mvm"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/text/vale/deps.nix b/pkgs/tools/text/vale/deps.nix index 7bf61f433cee..e63becb5b4b3 100644 --- a/pkgs/tools/text/vale/deps.nix +++ b/pkgs/tools/text/vale/deps.nix @@ -1,275 +1,246 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/ValeLint/gospell"; - fetch = { - type = "git"; - url = "https://github.com/ValeLint/gospell"; - rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; - sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; - }; - } - - { - goPackagePath = "github.com/client9/gospell"; - fetch = { - type = "git"; - url = "https://github.com/client9/gospell"; - rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; - sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; - }; - } - - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a"; - sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q"; - }; - } - - { - goPackagePath = "github.com/jdkato/prose"; - fetch = { - type = "git"; - url = "https://github.com/jdkato/prose"; - rev = "4d68d1b77f66e36b6897a79f59f434d558e5e0c2"; - sha256 = "1g2wwj6azpcjy6j7pk4dqx868v3hrqwjg5d737p4441a55026prj"; - }; - } - - { - goPackagePath = "github.com/jdkato/regexp"; - fetch = { - type = "git"; - url = "https://github.com/jdkato/regexp"; - rev = "38ab2f7842bf2a539528aa7d0014b37421b886e1"; - sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw"; - }; - } - - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "941b50ebc6efddf4c41c8e4537a5f68a4e686b24"; - sha256 = "0dw492z5w0fzv1cxm3xx26n8qpqjaf2ybiwpmvimzyhv65n8nrf8"; - }; - } - - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; - sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; - }; - } - - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; - }; - } - - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - }; - } - - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; - }; - } - - { - goPackagePath = "github.com/montanaflynn/stats"; - fetch = { - type = "git"; - url = "https://github.com/montanaflynn/stats"; - rev = "eeaced052adbcfeea372c749c281099ed7fdaa38"; - sha256 = "0kamcla633692n81w0j0d423ws3qdds97r2c0i193ypsh9xknpq9"; - }; - } - - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "be5337e7b39e64e5f91445ce7e721888dbab7387"; - sha256 = "04zg261i4bq29bc460nyx9r2j70mj0sbxlprn87ylk8y5j2m1d1w"; - }; - } - - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - - { - goPackagePath = "github.com/remeh/sizedwaitgroup"; - fetch = { - type = "git"; - url = "https://github.com/remeh/sizedwaitgroup"; - rev = "4b44541c93591ee0e73747d6081e61bd8c58b5c7"; - sha256 = "1kz7h8r09c95r3hc8bngznc4lrnkz2vm50lrl96cqxja0pw8jl92"; - }; - } - - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "0b647d0506a698cca42caca173e55559b12a69f2"; - sha256 = "1bv6mvnrqrcrp5d45l5p07q855sval8l3jzw1cf2dajkpcpysqln"; - }; - } - - { - goPackagePath = "github.com/shogo82148/go-shuffle"; - fetch = { - type = "git"; - url = "https://github.com/shogo82148/go-shuffle"; - rev = "4789c7c401f229b3ae1673acbccca451480660cd"; - sha256 = "1gaii1h51df8vr28ww5np8nhvfcy4plv0nja9b9h0cmcxa3jf1lp"; - }; - } - - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; - sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; - sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; - }; - } - - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; - }; - } - - { - goPackagePath = "github.com/xrash/smetrics"; - fetch = { - type = "git"; - url = "https://github.com/xrash/smetrics"; - rev = "a3153f7040e90324c58c6287535e26a0ac5c1cc1"; - sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ab5485076ff3407ad2d02db054635913f017b0ed"; - sha256 = "10805rk5rfgc3ivx35r9qmnps8hy3k3m57g0j6mz10w96k8i7pk7"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "14ac33bf8474b62c65cae263af2e4d3b543cc699"; - sha256 = "1453l5v5kizq142fiq3bg5hka7b0yvnf9fsq8y2ayj4bc9h5vqf3"; - }; - } - - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333"; - sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg"; - }; - } - - { - goPackagePath = "gopkg.in/neurosnap/sentences.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/neurosnap/sentences.v1"; - rev = "a7f18ead1433a139742a8b42ce7a059cfb484d60"; - sha256 = "1b64xv5anfbnq6354jaygxapwgkdhbszzi604b96sm682brwl0p7"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; - sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; - }; - } - +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/ValeLint/gospell"; + fetch = { + type = "git"; + url = "https://github.com/ValeLint/gospell"; + rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; + sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; + }; + } + { + goPackagePath = "github.com/client9/gospell"; + fetch = { + type = "git"; + url = "https://github.com/client9/gospell"; + rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; + sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "507f6050b8568533fb3f5504de8e5205fa62a114"; + sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "f00a7392b43971b2fdb562418faab1f18da2067a"; + sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29"; + }; + } + { + goPackagePath = "github.com/jdkato/prose"; + fetch = { + type = "git"; + url = "https://github.com/jdkato/prose"; + rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; + sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; + }; + } + { + goPackagePath = "github.com/jdkato/regexp"; + fetch = { + type = "git"; + url = "https://github.com/jdkato/regexp"; + rev = "38ab2f7842bf2a539528aa7d0014b37421b886e1"; + sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; + sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + }; + } + { + goPackagePath = "github.com/montanaflynn/stats"; + fetch = { + type = "git"; + url = "https://github.com/montanaflynn/stats"; + rev = "1bf9dbcd8cbe1fdb75add3785b1d4a9a646269ab"; + sha256 = "0qnx3hvd3lhwnmxg7nr4nwl5kbsc7ffnjk9ifyk0f05h61l3v9pz"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "d5dd8a50526aadb3d5f2c9b5233277bc2db90e88"; + sha256 = "0l7y3mmwkzpa7p56drw6d6416j9zfapznfyr1dab44d6kk48rvjx"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/remeh/sizedwaitgroup"; + fetch = { + type = "git"; + url = "https://github.com/remeh/sizedwaitgroup"; + rev = "5582a674300c427060d06980c142aeb52ed20040"; + sha256 = "152a1xnaswh9fx6f71llggm513c6ch171gc61jk3b6b0il6npb57"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "16ac584625fae401e2778e7af317dc415844c44b"; + sha256 = "0g0dbqm76aqsc2a43j95i0h5138cmlgnldhkv3blgn0ga6s8ypfg"; + }; + } + { + goPackagePath = "github.com/shogo82148/go-shuffle"; + fetch = { + type = "git"; + url = "https://github.com/shogo82148/go-shuffle"; + rev = "27e6095f230d6c769aafa7232db643a628bd87ad"; + sha256 = "0nig0q0f0v6ay2w0k3r0pqlvjp1yg9s06f00qpizp679vc46gqs1"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; + sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; + sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; + sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + }; + } + { + goPackagePath = "github.com/xrash/smetrics"; + fetch = { + type = "git"; + url = "https://github.com/xrash/smetrics"; + rev = "a3153f7040e90324c58c6287535e26a0ac5c1cc1"; + sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "5f9ae10d9af5b1c89ae6904293b14b064d4ada23"; + sha256 = "10vzmdg8z73krbp2qhsqygvqd0f0s98376mrxm614xdcdljn73dn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "bb9c189858d91f42db229b04d45a4c3d23a7662a"; + sha256 = "0z20pql3hzlplcc8ywfq7a1s8mfixmcp84k656fdkmkdjfyvsl0v"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "bda519ae5f4cbc60d391ff8610711627a08b86ae"; + sha256 = "05vcc3ssxyrk8g3sr4gs888vllgjqfq11na63qz2pvaiy7m0rqrs"; + }; + } + { + goPackagePath = "gopkg.in/neurosnap/sentences.v1"; + fetch = { + type = "git"; + url = "https://github.com/neurosnap/sentences"; + rev = "b0f23a5b35b961fe821f49e51235242d2a8193f3"; + sha256 = "0f5lmww1g4frd5avmqw120zzklcxk5z4l20r4d8zix7406ry7zrg"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } ] \ No newline at end of file From 51190e4d8c2f83aeb7da135f179997268ca1184f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 08:41:11 +0200 Subject: [PATCH 234/491] php56: 5.6.35 -> 5.6.36 Changelog: http://www.php.net/ChangeLog-5.php#5.6.36 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7cb9b4dea7f6..b128224e6b7a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -338,8 +338,8 @@ let in { php56 = generic { - version = "5.6.35"; - sha256 = "14ivsxdny0s7qm9pf773pafs8xzlzzpmaz039lwymn11rblsfy7f"; + version = "5.6.36"; + sha256 = "0ahp9vk33dpsqgld0gg4npff67v0l39hs3wk5dm6h3lablzhwsk2"; }; php70 = generic { From bd547f6688e75b45278a0d5b28a4dae1762c4728 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 09:00:36 +0200 Subject: [PATCH 235/491] php70: 7.0.29 -> 7.0.30 Changelog: http://www.php.net/ChangeLog-7.php#7.0.30 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b128224e6b7a..a5afd5878f56 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -343,8 +343,8 @@ in { }; php70 = generic { - version = "7.0.29"; - sha256 = "1g1z1nhnmq0idsb9rfb46cdddfimaacw3yal291i2ypzqpal54cq"; + version = "7.0.30"; + sha256 = "0l0bhnlgxmfl7mrdykmxfl53simxsksdcnbg5ymqz6r31i03hgr1"; }; php71 = generic { From 73d5006abcf983d91f31f1962ec1a7649fd23981 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 07:05:56 +0000 Subject: [PATCH 236/491] netbsd: more cleanup --- pkgs/os-specific/bsd/netbsd/default.nix | 130 ++++++++++++++++++------ 1 file changed, 100 insertions(+), 30 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f0220fc05d22..67ad3687c2c6 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -15,19 +15,11 @@ let extraPaths = [ ]; - nativeBuildInputs = [ makeMinimal mandoc groff install yacc flex ]; + nativeBuildInputs = [ makeMinimal mandoc groff install stat + yacc flex tsort lorder ]; buildInputs = [ compat ]; installFlags = [ "includes" ]; - # These should be coverd in nbcompat, but are missing, sadly - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__warn_references(a,b)=" - "-D__strong_alias(a,b)=" - "-D__va_list=va_list" - "-D__scanflike(a,b)=" - ]; - # Definitions passed to share/mk/*.mk. Should be pretty simple - # eventually maybe move it to a configure script. DESTDIR = "$(out)"; @@ -46,8 +38,12 @@ let LIBUTIL=""; LIBSSL = ""; LIBCRYPTO = ""; + LIBCRYPT = ""; LIBCURSES = ""; + LIBTERMINFO = ""; + LIBM = ""; "LIBDO.terminfo" = "_external"; + "LIBDO.curses" = "_external"; _GCC_CRTBEGIN = ""; _GCC_CRTBEGINS = ""; _GCC_CRTEND = ""; @@ -75,7 +71,6 @@ let # not using bsd binutils SHLIB_WARNTEXTREL = "no"; SHLIB_MKMAP = "no"; - OBJCOPY = "true"; PRESERVE = "-p"; MACHINE_ARCH = hostPlatform.parsed.cpu.name; @@ -85,9 +80,8 @@ let # but without they end up using gcc on Darwin stdenv preConfigure = '' export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} - '' + lib.optionalString (!builtins.hasAttr "nativeBuildInputs" attrs) '' - # hack until #38657 is fixed - export PATH=${install}/bin:$PATH + # Parallel building. Needs the space. + export makeFlags+=" -j $NIX_BUILD_CORES" ''; postUnpack = '' @@ -110,12 +104,14 @@ let fi ''; - # need to create directories for xinstall to work + # Need to create directories for xinstall to work. Unused ones + # will be removed in the postInstall. preInstall = '' mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR + $out$DOCDIR $out$LOCALEDIR $out/usr/games for i in 1 2 3 4 5 6 7 8 9; do - mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i $out$DOCDIR/reference/ref$i + mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ + $out$DOCDIR/reference/ref$i done mkdir -p $out/usr/include ''; @@ -126,7 +122,6 @@ let cd $out/usr find . -type d -exec mkdir -p $out/\{} \; find . -type f -exec mv \{} $out/\{} \; - find . -type d -delete fi find $out -type d -empty -delete @@ -147,8 +142,6 @@ let buildInputs = []; nativeBuildInputs = []; - NIX_CFLAGS_COMPILE = ""; - NIX_LDFLAGS = ""; patchPhase = '' patchShebangs configure @@ -174,8 +167,6 @@ let # override defaults to prevent infinite recursion nativeBuildInputs = [ makeMinimal ]; buildInputs = [ zlib ]; - NIX_CFLAGS_COMPILE = ""; - NIX_LDFLAGS = ""; # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later @@ -198,6 +189,19 @@ let install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h install -D $NETBSDSRCDIR/include/db.h $out/include/db.h + install -D $NETBSDSRCDIR/include/netconfig.h $out/include/netconfig.h + install -D $NETBSDSRCDIR/include/rpc/types.h $out/include/rpc/types.h + install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h + install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h + + # Remove lingering /usr references + if [ -d $out/usr ]; then + cd $out/usr + find . -type d -exec mkdir -p $out/\{} \; + find . -type f -exec mv \{} $out/\{} \; + fi + + find $out -type d -empty -delete ''; extraPaths = [ libc.src libutil.src (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") @@ -241,6 +245,27 @@ let ''; setupHook = ./fts-setup-hook.sh; }; + + stat = netBSDDerivation { + path = "usr.bin/stat"; + version = "7.1.2"; + sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; + nativeBuildInputs = [ makeMinimal mandoc groff install ]; + }; + + tsort = netBSDDerivation { + path = "usr.bin/tsort"; + version = "7.1.2"; + sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; + nativeBuildInputs = [ makeMinimal mandoc groff install ]; + }; + + lorder = netBSDDerivation { + path = "usr.bin/lorder"; + version = "7.1.2"; + sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; + nativeBuildInputs = [ makeMinimal mandoc groff install ]; + }; # END BOOTSTRAPPING libutil = netBSDDerivation { @@ -267,7 +292,7 @@ let version = "7.1.2"; patchPhase = '' # make needs this to pick up our sys make files - NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" # can't set owner or group in Nix build # maybe there is a better way to trick it? @@ -293,13 +318,10 @@ let substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \ --replace '-o ''${LIBOWN} -g ''${LIBGRP}' "" - - substituteInPlace $NETBSDSRCDIR/share/mk/Makefile \ - --replace /usr/share/mk /share/mk + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ --replace '-Wl,--fatal-warnings' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace ' ''${_ARFL} ''${.TARGET} `NM=''${NM} ''${LORDER} ''${.ALLSRC:M*o} | ''${TSORT}`' ' ''${_ARFL} ''${.TARGET} ''${.ALLSRC:M*o}' \ --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ --replace '-Wl,--whole-archive' "" \ --replace '-Wl,--no-whole-archive' "" @@ -340,8 +362,36 @@ in rec { version = "7.1.2"; patchPhase = '' sed -i '1i #include ' adventure/save.c + + # Disable some games that don't build. They should be possible to + # build but need to look at how to implement stuff in Linux. + substituteInPlace Makefile \ + ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \ + --replace atc "" \ + --replace boggle "" \ + --replace dm "" \ + --replace fortune "" \ + --replace hunt "" \ + --replace larn "" \ + --replace phantasia "" \ + --replace rogue "" \ + --replace sail "" \ + --replace trek "" \ + --replace dab "" ''; - buildInputs = [ compat libcurses ]; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-DOXTABS=XTABS" + "-DRANDOM_MAX=RAND_MAX" + "-DINFTIM=-1" + ]; + buildInputs = [ compat libcurses libterminfo libressl ]; + extraPaths = [ + (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4") + who.src + ]; }; who = netBSDDerivation { @@ -358,8 +408,8 @@ in rec { }; fingerd = netBSDDerivation { - path = "usr.bin/fingerd"; - sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqz00"; + path = "libexec/fingerd"; + sha256 = "1hhdq70hrxxkjnjfmjm3w8w9g9xq2ngxaxk0chy4vm7chg9nfpmp"; version = "7.1.2"; }; @@ -367,9 +417,17 @@ in rec { path = "lib/libedit"; buildInputs = [ libterminfo libcurses ]; propagatedBuildInputs = [ compat ]; + postBuild = "mkdir -p $out/usr/include/readline"; patchPhase = '' sed -i '1i #undef bool_t' el.h + substituteInPlace config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" ''; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; version = "7.1.2"; sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca"; }; @@ -389,8 +447,20 @@ in rec { version = "7.1.2"; sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; buildInputs = [ libterminfo ]; + NIX_CFLAGS_COMPILE = [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ]; propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr + patchPhase = '' + substituteInPlace printw.c \ + --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ + --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' + substituteInPlace scanw.c \ + --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' + ''; }; nbperf = netBSDDerivation { From 707f7ca1d213c0f945b1ed73f702874dd5f6317c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 09:25:58 +0200 Subject: [PATCH 237/491] php71: 7.1.16 -> 7.1.17 Changelog: http://www.php.net/ChangeLog-7.php#7.1.17 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index a5afd5878f56..d494060c3882 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.16"; - sha256 = "1rg7n12rd2v1p2yar615kqcdxpvphw3p89lpgajjgwy0qzwjm3il"; + version = "7.1.17"; + sha256 = "1kyvg1dvn2zddlc7apl8c74wlwz45rxx10fr1s4z6l1cannf6971"; }; php72 = generic { From ee9d0a85d976378c4d54131b000d31b0c014c7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 08:30:57 +0100 Subject: [PATCH 238/491] masterpdfeditor: use autoPatchelfHook --- .../misc/masterpdfeditor/default.nix | 86 ++++++++----------- 1 file changed, 38 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 5ea49f28afd8..525be09d9686 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,52 +1,42 @@ -{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: - let - version = "4.3.89"; - in - stdenv.mkDerivation { - name = "masterpdfeditor-${version}"; - src = fetchurl { - url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; - }; - libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc - glibc - sane-backends - qtbase - qtsvg - libXext - libX11 - libXdmcp - libXau - libxcb - ]; - dontStrip = true; - installPhase = '' - p=$out/opt/masterpdfeditor - mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps +{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb, autoPatchelfHook }: +let + version = "4.3.89"; +in stdenv.mkDerivation { + name = "masterpdfeditor-${version}"; + src = fetchurl { + url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; + }; - substituteInPlace masterpdfeditor4.desktop \ - --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4.png $out/share/pixmaps/ - cp -v masterpdfeditor4.desktop $out/share/applications + nativeBuildInputs = [ autoPatchelfHook ]; - cp -v masterpdfeditor4 $p/ - ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v -r stamps templates lang fonts $p + buildInputs = [ sane-backends qtbase qtsvg ]; - install -D license.txt $out/share/$name/LICENSE + dontStrip = true; - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $p/masterpdfeditor4 - ''; - meta = with stdenv.lib; { - description = "Master PDF Editor"; - homepage = "https://code-industry.net/free-pdf-editor/"; - license = licenses.unfreeRedistributable; - platforms = with platforms; [ "x86_64-linux" ]; - maintainers = with maintainers; [ cmcdragonkai flokli ]; - }; - } + installPhase = '' + p=$out/opt/masterpdfeditor + mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps + + substituteInPlace masterpdfeditor4.desktop \ + --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" + cp -v masterpdfeditor4.png $out/share/pixmaps/ + cp -v masterpdfeditor4.desktop $out/share/applications + + cp -v masterpdfeditor4 $p/ + ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $p + + install -D license.txt $out/share/$name/LICENSE + ''; + + meta = with stdenv.lib; { + description = "Master PDF Editor"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = with platforms; [ "x86_64-linux" ]; + maintainers = with maintainers; [ cmcdragonkai flokli ]; + }; +} From 5f0e6404dca24492a76880e635b5fe7617277e94 Mon Sep 17 00:00:00 2001 From: StillerHarpo Date: Fri, 27 Apr 2018 09:43:07 +0200 Subject: [PATCH 239/491] monetdb: init at 11.29.3 (#39306) monetdb: init at 11.29.3 --- pkgs/servers/sql/monetdb/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/sql/monetdb/default.nix diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix new file mode 100644 index 000000000000..5f7e879819e9 --- /dev/null +++ b/pkgs/servers/sql/monetdb/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, bison, openssl }: + +let + version = "11.29.3"; +in stdenv.mkDerivation rec { + + name = "monetdb-${version}"; + + src = fetchurl { + url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; + sha256 = "18l4jkkryki5az5n7gnalfdxz6ibnkg3q2z4cwh1010b313wqi8s"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bison openssl ]; + + meta = with stdenv.lib; { + description = "An open source database system"; + homepage = https://www.monetdb.org/; + license = licenses.mpl20; + platforms = platforms.unix; + maintainers = [ maintainers.StillerHarpo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be3f27574b5..66eb5866682b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1322,6 +1322,8 @@ with pkgs; metabase = callPackage ../servers/metabase { }; + monetdb = callPackage ../servers/sql/monetdb { }; + mp3blaster = callPackage ../applications/audio/mp3blaster { }; mp3fs = callPackage ../tools/filesystems/mp3fs { }; From e5e5dc3377604a8502d2383067798645961a5d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 08:51:43 +0100 Subject: [PATCH 240/491] aangifte: remove ancient versions Packages were either absent or the hashes were broken, so I highly doubt somebody is using 4+ years old tax programs. --- .../taxes/aangifte-2006/builder.sh | 17 -------- .../taxes/aangifte-2006/default.nix | 21 ---------- .../taxes/aangifte-2007/builder.sh | 19 --------- .../taxes/aangifte-2007/default.nix | 24 ----------- .../taxes/aangifte-2008/builder.sh | 19 --------- .../taxes/aangifte-2008/default.nix | 25 ----------- .../taxes/aangifte-2009/default.nix | 40 ------------------ .../taxes/aangifte-2010/default.nix | 40 ------------------ .../taxes/aangifte-2011/default.nix | 40 ------------------ .../taxes/aangifte-2012/default.nix | 41 ------------------- .../taxes/aangifte-2013-wa/default.nix | 41 ------------------- .../taxes/aangifte-2013/default.nix | 41 ------------------- .../taxes/aangifte-2014-wa/default.nix | 41 ------------------- .../taxes/aangifte-2014/default.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 22 ---------- 15 files changed, 472 deletions(-) delete mode 100644 pkgs/applications/taxes/aangifte-2006/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2006/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2007/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2007/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2008/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2008/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2009/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2010/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2011/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2012/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2013-wa/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2013/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2014-wa/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2014/default.nix diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh deleted file mode 100644 index 1b709b613bd4..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix deleted file mode 100644 index 5883e51f712e..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libX11, libXext}: - -stdenv.mkDerivation { - name = "aangifte2006-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2006_linux.tar.gz; - sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc"; - }; - - inherit libX11 libXext; - - meta = { - description = "Elektronische aangifte IB 2006"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix deleted file mode 100644 index 43fb26d811a3..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2007-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2007_linux.tar.gz; - sha256 = "13p3gv086jn95wvmfygdmk9qjn0qxqdv7pp0v5pmw6i5hp8rmjxf"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2007"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix deleted file mode 100644 index b9fad2fa10bd..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2008-1"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2008_linux.tar.gz; - sha256 = "0p46bc1b14hgf07illg3crjgjdflkcknk4nzm7b73cwkni57scx3"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix deleted file mode 100644 index d4230d426ece..000000000000 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2009-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz; - sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix deleted file mode 100644 index 602368d2017b..000000000000 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2010-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz; - sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix deleted file mode 100644 index 80c772705142..000000000000 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2011-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2011_linux.tar.gz; - sha256 = "0br9cfy3ibykzbhc1mkm7plxrs251vakpd5gai0m13bwgc04jrd2"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2011ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix deleted file mode 100644 index 8066c86742c1..000000000000 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2012-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz; - sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix deleted file mode 100644 index 6f8e6d6429d3..000000000000 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz; - sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix deleted file mode 100644 index d75b60c83673..000000000000 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz; - sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix deleted file mode 100644 index 38124677f9a5..000000000000 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz; - sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix deleted file mode 100644 index 33b6f8853aa2..000000000000 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz; - sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be3f27574b5..fd56586e1bea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14671,28 +14671,6 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; - aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; - - aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; - - aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { }; - - aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { }; - - aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { }; - - aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - - aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { }; - - aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { }; - - aangifte2014 = callPackage_i686 ../applications/taxes/aangifte-2014 { }; - - aangifte2013wa = callPackage_i686 ../applications/taxes/aangifte-2013-wa { }; - - aangifte2014wa = callPackage_i686 ../applications/taxes/aangifte-2014-wa { }; - abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; From f2a15f747a41a457c48761ac4bd27c9d230b7a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 08:51:43 +0100 Subject: [PATCH 241/491] aangifte: remove ancient versions Packages were either absent or the hashes were broken, so I highly doubt somebody is using 4+ years old tax programs. --- .../taxes/aangifte-2006/builder.sh | 17 -------- .../taxes/aangifte-2006/default.nix | 21 ---------- .../taxes/aangifte-2007/builder.sh | 19 --------- .../taxes/aangifte-2007/default.nix | 24 ----------- .../taxes/aangifte-2008/builder.sh | 19 --------- .../taxes/aangifte-2008/default.nix | 25 ----------- .../taxes/aangifte-2009/default.nix | 40 ------------------ .../taxes/aangifte-2010/default.nix | 40 ------------------ .../taxes/aangifte-2011/default.nix | 40 ------------------ .../taxes/aangifte-2012/default.nix | 41 ------------------- .../taxes/aangifte-2013-wa/default.nix | 41 ------------------- .../taxes/aangifte-2013/default.nix | 41 ------------------- .../taxes/aangifte-2014-wa/default.nix | 41 ------------------- .../taxes/aangifte-2014/default.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 22 ---------- 15 files changed, 472 deletions(-) delete mode 100644 pkgs/applications/taxes/aangifte-2006/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2006/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2007/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2007/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2008/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2008/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2009/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2010/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2011/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2012/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2013-wa/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2013/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2014-wa/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2014/default.nix diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh deleted file mode 100644 index 1b709b613bd4..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix deleted file mode 100644 index 5883e51f712e..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libX11, libXext}: - -stdenv.mkDerivation { - name = "aangifte2006-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2006_linux.tar.gz; - sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc"; - }; - - inherit libX11 libXext; - - meta = { - description = "Elektronische aangifte IB 2006"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix deleted file mode 100644 index 43fb26d811a3..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2007-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2007_linux.tar.gz; - sha256 = "13p3gv086jn95wvmfygdmk9qjn0qxqdv7pp0v5pmw6i5hp8rmjxf"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2007"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix deleted file mode 100644 index b9fad2fa10bd..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2008-1"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2008_linux.tar.gz; - sha256 = "0p46bc1b14hgf07illg3crjgjdflkcknk4nzm7b73cwkni57scx3"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix deleted file mode 100644 index d4230d426ece..000000000000 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2009-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz; - sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix deleted file mode 100644 index 602368d2017b..000000000000 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2010-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz; - sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix deleted file mode 100644 index 80c772705142..000000000000 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2011-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2011_linux.tar.gz; - sha256 = "0br9cfy3ibykzbhc1mkm7plxrs251vakpd5gai0m13bwgc04jrd2"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2011ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix deleted file mode 100644 index 8066c86742c1..000000000000 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2012-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz; - sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix deleted file mode 100644 index 6f8e6d6429d3..000000000000 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz; - sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix deleted file mode 100644 index d75b60c83673..000000000000 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz; - sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix deleted file mode 100644 index 38124677f9a5..000000000000 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz; - sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix deleted file mode 100644 index 33b6f8853aa2..000000000000 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz; - sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66eb5866682b..b4a88cbe5b2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14673,28 +14673,6 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; - aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; - - aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; - - aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { }; - - aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { }; - - aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { }; - - aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - - aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { }; - - aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { }; - - aangifte2014 = callPackage_i686 ../applications/taxes/aangifte-2014 { }; - - aangifte2013wa = callPackage_i686 ../applications/taxes/aangifte-2013-wa { }; - - aangifte2014wa = callPackage_i686 ../applications/taxes/aangifte-2014-wa { }; - abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; From 53e3aa1539049d6e4603e47d7262d7928673ed9e Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Fri, 27 Apr 2018 09:03:18 +0200 Subject: [PATCH 242/491] cassandra: 3.11.1 -> 3.11.2 --- pkgs/servers/nosql/cassandra/3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index 4647260b1e28..f18b6256d3f0 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.1"; - sha256 = "1vgh4ysnl4xg8g5v6zm78h3sq308r7s17ppbw0ck4bwyfnbddvkg"; + version = "3.11.2"; + sha256 = "0867i3irsji3qkjpp2s171xmjf2r8yhwzhs24ka8hljxv457f8p9"; }) From c8b9ac9be63cbadd5da62a37670631770e0d74cd Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 25 Apr 2018 09:09:13 +1000 Subject: [PATCH 243/491] haskellPackages.base-compat-batteries: fix bad dependency --- pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ef1ebe881f54..acbcb1320e61 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -502,4 +502,9 @@ self: super: builtins.intersectAttrs super { # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 blank-canvas = dontCheck super.blank-canvas; + + # cabal2nix generates a dependency on base-compat, which is the wrong version + base-compat-batteries = super.base-compat-batteries.override { + base-compat = pkgs.haskellPackages.base-compat_0_10_1; + }; } From 12ba3954d7f27f260845663332becc450ddbd010 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Apr 2018 12:20:12 +0200 Subject: [PATCH 244/491] multi-ghc-travis: update to latest git version --- pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 781d3b096cfb..454bb5d58817 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -8,8 +8,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "848c2fe5c7d0d95b20312e86b360d5db8c95db75"; - sha256 = "1n4y6j564sxxry19xs4x0ds7fg8h1q0svw9q45477czx82qzavym"; + rev = "105005cde6bde903e477e5b9724d02bdea06bae4"; + sha256 = "1l76782aa29mi88a2brvkyi6k0v33rpihxlskx99mak06bjrmnhh"; }; isLibrary = true; isExecutable = true; From 3e446ecd564611953c75caf97a855285ef30ba38 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 2 Apr 2018 11:30:24 +0100 Subject: [PATCH 245/491] nixos/buildkite-agent: fix variable expansion in hook scripts @cleverca found this bug in the declarative hooks config. Any shell variables referenced in a hook script would get expanded by the hooks directory builder. Prevent variable expansion by quoting the here doc limit string. --- .../modules/services/continuous-integration/buildkite-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 03af9a7859ec..d647b7b9fa49 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -17,7 +17,7 @@ let hooksDir = let mkHookEntry = name: value: '' - cat > $out/${name} < $out/${name} <<'EOF' #! ${pkgs.runtimeShell} set -e ${value} From fc7ae1fefee37e2209753323b1ff57a79487dd10 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 27 Apr 2018 13:40:20 +0200 Subject: [PATCH 246/491] atom: 1.26.0 -> 1.26.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 7b989f8df1f9..ca223803f04d 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1gyxys3mwwizc88vlb6j769b6r4ibjnqs6pg5iv336b13f9acyvr"; + sha256 = "0g83qj9siq1vr2v46rzjf3dy2gns9krh6xlh7w3bhrgfk0vqkm11"; name = "${name}.deb"; }; From 503c9f8ea4c586cdff82641c9b2e6c76a5444bd8 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 27 Apr 2018 13:42:03 +0200 Subject: [PATCH 247/491] insomnia: 5.15.0 -> 5.16.0 --- pkgs/development/web/insomnia/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index df46cf3ab920..9a4aaaad3ced 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -6,7 +6,7 @@ libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, - libudev0-shim, glibc, curl + libudev0-shim, glibc, curl, openssl }: let @@ -15,14 +15,14 @@ let gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libxcb ]; - runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "17pxgxpss5jxzpmcim7hkyyj0fgyxwdiyxb2idpsna2hmhaipyxa"; + sha256 = "1cpw63ibxaa08vms7fbxr5ap2yh4vcl8q3rjfn0ag1zkimz8cg2p"; }; nativeBuildInputs = [ makeWrapper dpkg ]; From ad7bc980d27849f0862ac14cc92f611638bd0916 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 27 Apr 2018 12:54:40 +0100 Subject: [PATCH 248/491] terraform: update all plugins --- .../cluster/terraform/providers/data.nix | 75 ++++++++++--------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 0a0b20bfd15d..7aed4b95dd45 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,8 +4,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.9.0"; - sha256 = "19jqyzpcnlraxzn8bvrjzsh81j7dfadswgxfsiqzxll9xbm0k2bv"; + version = "1.9.1"; + sha256 = "11rsvzyc74v14n7g0z1mwyykaz7m6bmvi38jx711b6vpxvm2scva"; }; archive = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.13.0"; - sha256 = "09ba2r3avqbl85s8llmgkk6gwgfkzm83994kd965r481xcnfv1ny"; + version = "1.16.0"; + sha256 = "0knivwxdjkxyaqka0vvn0lh2ndbg660dw2g03iw00fx6ska1zn0c"; }; azure-classic = { @@ -46,8 +46,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.3.1"; - sha256 = "1qpf2h9qnhki4lg9pv77r0sc4acj08m0fqqagkvkinq46ypsfbp4"; + version = "1.4.0"; + sha256 = "0g1i1aasi44zn5bdivzqkk1kshq271x2lydjskyqq7jfx27myibb"; }; bitbucket = { @@ -81,22 +81,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "0.1.0"; - sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq"; + version = "1.0.0"; + sha256 = "1ar9wcgr45f2v6bqjn24zii0qwfppla8ya3gjc546sh1a7m0h9p3"; }; cloudscale = { owner = "terraform-providers"; repo = "terraform-provider-cloudscale"; - version = "1.0.0"; - sha256 = "0yqiz4xywbd3568hl6va8da81fbc1hnynlz4z0vqxgi3bs8hhdhz"; + version = "1.0.1"; + sha256 = "0lhzwbm1a2s11s0ahb3vxfvshh385fgy1ficvip4rl31dahhwrav"; }; cloudstack = { owner = "terraform-providers"; repo = "terraform-provider-cloudstack"; - version = "0.1.4"; - sha256 = "1dj6zkwv0bix31b8sjad9gil43m8c2c5d1dr10qza40f9z4agaxa"; + version = "0.1.5"; + sha256 = "139wq6rr6fczjz496fqkxh6cmscx5hfnv2hvhfwpkhvqipsnlxmq"; }; cobbler = { @@ -193,15 +193,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.8.0"; - sha256 = "1n01gj9572hhskbl4bsg0fqyg9slv8fpvzp3avmwvg5b2hsj4snh"; + version = "1.10.0"; + sha256 = "08ayi30aqw9lz8qn982vl9m3z4prah60fqq2q9hvscf6qb9g8lr0"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "1.0.1"; - sha256 = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns"; + version = "1.0.2"; + sha256 = "17pj4mm7ik9llhgckza822866x6986cdcr821f16dchvn3bfbf2i"; }; heroku = { @@ -263,8 +263,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-logentries"; - version = "0.1.0"; - sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa"; + version = "1.0.0"; + sha256 = "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq"; }; logicmonitor = { @@ -308,6 +308,13 @@ version = "1.0.0"; sha256 = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5"; }; + nsxt = + { + owner = "terraform-providers"; + repo = "terraform-provider-nsxt"; + version = "1.0.0"; + sha256 = "09yliw59wp9flfgmkznbf4syl510wpxsplzr8sa9m2vw0yc78jnq"; + }; null = { owner = "terraform-providers"; @@ -368,22 +375,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.2.0"; - sha256 = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4"; + version = "1.2.3"; + sha256 = "0vx2pvrxgpy137v3i563w0sdqqrqp6p6sls27fg76cfxrqik5dpk"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.0.0"; - sha256 = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa"; + version = "1.1.0"; + sha256 = "100zxmpgd5qbzivkc2ja75980yrlz0k50x7448wf1kp2inyylxq0"; }; panos = { owner = "terraform-providers"; repo = "terraform-provider-panos"; - version = "1.0.0"; - sha256 = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76"; + version = "1.1.0"; + sha256 = "1j3j0bdblw54g2l4xdwm9604n3qfb6zb4b8p081hs5nv004awka4"; }; postgresql = { @@ -424,8 +431,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "1.1.0"; - sha256 = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl"; + version = "1.2.0"; + sha256 = "00gzqav21h2x2spczwcddlwl0llhgy03djvjjq9g9wb5yvcf4yll"; }; rundeck = { @@ -438,8 +445,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.2.0"; - sha256 = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v"; + version = "1.3.0"; + sha256 = "1yd2xdr52z0f3ykfhsfgf57zzhjglci8mvbimdf6z8xmdgfhwjbf"; }; softlayer = { @@ -487,8 +494,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.4.2"; - sha256 = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml"; + version = "0.5.0"; + sha256 = "1cbv4bliswiwbhr9bh2m4faazhj0v89jnwn0fndfjw3rka1b97h7"; }; ultradns = { @@ -501,8 +508,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.0.0"; - sha256 = "1v4b8zs0s48gqgsh719hwi69i4h8i5vvp2g5m881z5yzv7n7haqw"; + version = "1.1.0"; + sha256 = "1g0cca662glqcz83l1skhj3nb7g386x65kwz95kyp59nvyxywvbq"; }; vcd = { @@ -515,7 +522,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.3.3"; - sha256 = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7"; + version = "1.4.1"; + sha256 = "16dgszmcsfzbflqg053av1v8wgwy8m6f2qlk55fg3ww1a59c0wy1"; }; } From 9939fb2cb6ae28e87be6ac38b85d0537eb0a097e Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 27 Apr 2018 15:11:31 +0300 Subject: [PATCH 249/491] 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 b1bf38427a83..9cbab6ad0955 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 3e8e032f30c2..e59858442c9e 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 250/491] 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 71485551ef6a..d85fc25355c8 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 d91b103c6cef..3e1ba2429f2d 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 0963abfb41e48d60315e73223d390c1b4df3ff12 Mon Sep 17 00:00:00 2001 From: xeji Date: Fri, 27 Apr 2018 15:02:24 +0200 Subject: [PATCH 251/491] maintainer-list.nix: add real name for xeji --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30597373fc52..18ed73b19324 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4044,7 +4044,7 @@ xeji = { email = "xeji@cat3.de"; github = "xeji"; - name = "xeji"; + name = "Uli Baum"; }; xnaveira = { email = "xnaveira@gmail.com"; From 048c991eb0344c368ba9b29e0168faf8b2aff9f7 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Fri, 27 Apr 2018 16:45:38 +0200 Subject: [PATCH 252/491] oauth2_proxy: use explicit upstream default for setXauthrequest --- nixos/modules/services/security/oauth2_proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index cf41625d16c8..433d97c2a7d7 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -508,9 +508,9 @@ in setXauthrequest = mkOption { type = types.nullOr types.bool; - default = null; + default = false; description = '' - Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). + Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). Setting this to 'null' means using the upstream default (false). ''; }; From 6c0806bdf0b908ce678b1dcb78a253d0dc61c9ca Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Fri, 27 Apr 2018 16:57:47 +0200 Subject: [PATCH 253/491] youtrack: init at 2018.1.41051 --- pkgs/servers/jetbrains/youtrack.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/servers/jetbrains/youtrack.nix diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix new file mode 100644 index 000000000000..7e368bf295b6 --- /dev/null +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + name = "youtrack-${version}"; + version = "2018.1.41051"; + + jar = fetchurl { + url = "https://download.jetbrains.com/charisma/${name}.jar"; + sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb"; + }; + + buildInputs = [ makeWrapper ]; + + unpackPhase = "true"; + + installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/youtrack --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = '' + Issue Tracking and Project Management Tool for Developers + ''; + maintainers = with maintainers; [ yorickvp ]; + # https://www.jetbrains.com/youtrack/buy/license.html + license = licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40792a702afa..3946a577cf64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12902,6 +12902,8 @@ with pkgs; erlang = erlangR18; }; + youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; + zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; From f135610acae39770db5413b0602544018f450299 Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Fri, 27 Apr 2018 15:31:02 +0800 Subject: [PATCH 254/491] inziu-iosevka: remove --- pkgs/data/fonts/inziu-iosevka/default.nix | 33 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/data/fonts/inziu-iosevka/default.nix diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix deleted file mode 100644 index f76e4cb61df0..000000000000 --- a/pkgs/data/fonts/inziu-iosevka/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, p7zip }: - -stdenv.mkDerivation rec { - version = "1.13.2"; - name = "inziu-iosevka-${version}"; - - package = fetchurl { - url = "http://7xpdnl.dl1.z0.glb.clouddn.com/inziu-iosevka-ttfs-${version}.7z"; - sha256 = "1i7qqcv1x6s1xkp687wq79zqg9ly6a7l5mnmg1iqgfgcbglgjbaw"; - }; - - nativeBuildInputs = [ p7zip ]; - - unpackPhase = '' - 7z x $package - ''; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; - - meta = with stdenv.lib; { - description = "Inziu Iosevka font"; - homepage = https://be5invis.github.io/Iosevka/inziu; - # license is clarified here: https://github.com/be5invis/Iosevka/issues/265 - license = licenses.ofl; - maintainers = [ maintainers.ChengCat ]; - platforms = platforms.all; - # large package, mainly i/o bound - hydraPlatforms = []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e07f2374482..b2b766eea59b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14353,8 +14353,6 @@ with pkgs; input-fonts = callPackage ../data/fonts/input-fonts { }; - inziu-iosevka = callPackage ../data/fonts/inziu-iosevka { }; - iosevka = callPackage ../data/fonts/iosevka { nodejs = nodejs-8_x; }; From 000482ffc470f798fb3aa1673b39a38680cbb567 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Fri, 27 Apr 2018 17:20:08 +0200 Subject: [PATCH 255/491] youtrack: add service --- nixos/modules/services/web-apps/youtrack.nix | 177 +++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 nixos/modules/services/web-apps/youtrack.nix diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix new file mode 100644 index 000000000000..e057e3025629 --- /dev/null +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -0,0 +1,177 @@ +{ config, lib, pkgs, options, ... }: + +with lib; + +let + cfg = config.services.youtrack; + + extraAttr = concatStringsSep " " (mapAttrsToList (k: v: "-D${k}=${v}") (stdParams // cfg.extraParams)); + mergeAttrList = lib.foldl' lib.mergeAttrs {}; + + stdParams = mergeAttrList [ + (optionalAttrs (cfg.baseUrl != null) { + "jetbrains.youtrack.baseUrl" = cfg.baseUrl; + }) + { + "java.aws.headless" = "true"; + "jetbrains.youtrack.disableBrowser" = "true"; + } + ]; +in +{ + options.services.youtrack = { + + enable = mkEnableOption "YouTrack service"; + + address = mkOption { + description = '' + The interface youtrack will listen on. + ''; + default = "127.0.0.1"; + type = types.string; + }; + + baseUrl = mkOption { + description = '' + Base URL for youtrack. Will be auto-detected and stored in database. + ''; + type = types.nullOr types.string; + default = null; + }; + + extraParams = mkOption { + default = {}; + description = '' + Extra parameters to pass to youtrack. See + https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html + for more information. + ''; + example = { + "jetbrains.youtrack.overrideRootPassword" = "tortuga"; + }; + type = types.attrsOf types.string; + }; + + package = mkOption { + description = '' + Package to use. + ''; + type = types.package; + default = pkgs.youtrack; + defaultText = "pkgs.youtrack"; + }; + + port = mkOption { + description = '' + The port youtrack will listen on. + ''; + default = 8080; + type = types.int; + }; + + statePath = mkOption { + description = '' + Where to keep the youtrack database. + ''; + type = types.string; + default = "/var/lib/youtrack"; + }; + + virtualHost = mkOption { + description = '' + Name of the nginx virtual host to use and setup. + If null, do not setup anything. + ''; + default = null; + type = types.nullOr types.string; + }; + + jvmOpts = mkOption { + description = '' + Extra options to pass to the JVM. + See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html + for more information. + ''; + type = types.string; + example = "-XX:MetaspaceSize=250m"; + default = ""; + }; + + maxMemory = mkOption { + description = '' + Maximum Java heap size + ''; + type = types.string; + default = "1g"; + }; + + maxMetaspaceSize = mkOption { + description = '' + Maximum java Metaspace memory. + ''; + type = types.string; + default = "350m"; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.youtrack = { + environment.HOME = cfg.statePath; + environment.YOUTRACK_JVM_OPTS = "-Xmx${cfg.maxMemory} -XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${extraAttr}"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + User = "youtrack"; + Group = "youtrack"; + ExecStart = ''${cfg.package}/bin/youtrack ${cfg.address}:${toString cfg.port}''; + }; + }; + + users.users.youtrack = { + description = "Youtrack service user"; + isSystemUser = true; + home = cfg.statePath; + createHome = true; + group = "youtrack"; + }; + + users.groups.youtrack = {}; + + services.nginx = mkIf (cfg.virtualHost != null) { + upstreams.youtrack.servers."${cfg.address}:${toString cfg.port}" = {}; + virtualHosts.${cfg.virtualHost}.locations = { + "/" = { + proxyPass = "http://youtrack"; + extraConfig = '' + client_max_body_size 10m; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + ''; + }; + + "/api/eventSourceBus" = { + proxyPass = "http://youtrack"; + extraConfig = '' + proxy_cache off; + proxy_buffering off; + proxy_read_timeout 86400s; + proxy_send_timeout 86400s; + proxy_set_header Connection ""; + chunked_transfer_encoding off; + client_max_body_size 10m; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + ''; + }; + + }; + }; + + }; +} From a0076a4fb6c2a95fe33edfe99b4acc1dbee63f10 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 27 Apr 2018 17:53:58 +0200 Subject: [PATCH 256/491] rubiks: fix build --- pkgs/development/libraries/science/math/rubiks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 5b20948686b4..fe448106b15d 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installFlags = [ - "PREFIX=$out" + "PREFIX=$(out)" ]; patches = [ From e7e2df17da4080c54073c897040ae03f3b6fc669 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 17:10:59 +0200 Subject: [PATCH 257/491] gwenhywfar: 4.17.0 -> 4.20.0 Upstream changes in 4.20.0: * Update bank information files for German banks because the format of ZKA files has changed in the meantime. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=208 Upstream changes in 4.19.0: * Add frontend for GTK3. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=207 Upstream changes in 4.18.0: * Show hashes for MD5, SHA1 and SHA512 in SSL certificates because some bank servers display different hashing variants. * Let GNUTLS handle the localisation of TrustStore certificates. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=206 The updater script (update.sh) actually didn't get the right file to download, so I temporarily modified it to download file number 2 because file number 1 is the GPG signature. The reason why I didn't fix the updater is because the upstream site will have different URLs in the next upcoming version, so our updater is basically end-of-life for now. I also changed the package expression to use the version from sources.nix instead of a hardcoded value. Signed-off-by: aszlig Cc: @goibhniu --- pkgs/development/libraries/aqbanking/gwenhywfar.nix | 9 +++++---- pkgs/development/libraries/aqbanking/sources.nix | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 28039cc01686..77a5a09da432 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -6,13 +6,14 @@ ] }: -stdenv.mkDerivation rec { +let + inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version; +in stdenv.mkDerivation rec { name = "gwenhywfar-${version}"; - version = "4.15.3"; + inherit version; src = let - inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId; - qstring = "package=01&release=${releaseId}&file=01"; + qstring = "package=01&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { name = "${name}.tar.gz"; diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index 1638c72e95f5..ab69240f6214 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -1,8 +1,8 @@ # This file is autogenerated from update.sh in the same directory. { - gwenhywfar.version = "4.17.0"; - gwenhywfar.sha256 = "1z9bm2r407x8vxk2nk6pndx0zhlk32j65z472ljkgjbh56mgzz8i"; - gwenhywfar.releaseId = "205"; + gwenhywfar.version = "4.20.0"; + gwenhywfar.sha256 = "1c0g3f8jk6j693774ifslx2ds4ksabgbbalhhm9gk20kpamxm22s"; + gwenhywfar.releaseId = "208"; libchipcard.version = "5.0.4"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; libchipcard.releaseId = "200"; From 191f4c210a87b2eddeabd098cd57a85fadfa0ee2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 17:24:21 +0200 Subject: [PATCH 258/491] aqbanking: 5.6.12 -> 5.7.8 Upstream changes in 5.7.8: * Update bank information files for German banks because the format of ZKA files has changed in the meantime. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=03&release=217 Upstream changes in 5.7.7: * Fix of manually adding new HBCI accounts (for example using KMyMoney). * Fix wrong truncation of account numbers in some turnovers of the SWIFT parser. * Simplified code for inserting new account data while fetching HBCI accounts. * Update information for German banks. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=03&release=216 As with the gwenhywfar update, the updater script (update.sh) actually didn't get the right file to download, so I temporarily modified it to download file number 2 because file number 1 is the GPG signature. The reason why I didn't fix the updater is because the upstream site will have different URLs in the next upcoming version, so our updater is basically end-of-life for now. I also changed the package expression to use the version from sources.nix instead of a hardcoded value. Signed-off-by: aszlig Cc: @goibhniu --- pkgs/development/libraries/aqbanking/default.nix | 9 +++++---- pkgs/development/libraries/aqbanking/sources.nix | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index ad930a705c57..b26291469e75 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -2,13 +2,14 @@ , pkgconfig, gettext, xmlsec, zlib }: -stdenv.mkDerivation rec { +let + inherit ((import ./sources.nix).aqbanking) sha256 releaseId version; +in stdenv.mkDerivation rec { name = "aqbanking-${version}"; - version = "5.6.10"; + inherit version; src = let - inherit ((import ./sources.nix).aqbanking) sha256 releaseId; - qstring = "package=03&release=${releaseId}&file=01"; + qstring = "package=03&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { name = "${name}.tar.gz"; diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index ab69240f6214..884543d282a7 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -6,7 +6,7 @@ libchipcard.version = "5.0.4"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; libchipcard.releaseId = "200"; - aqbanking.version = "5.6.12"; - aqbanking.sha256 = "08jbwmiv6f3v8iqdr44x4szna496fqcjfi6mlx04cnbx91m70lh6"; - aqbanking.releaseId = "208"; + aqbanking.version = "5.7.8"; + aqbanking.sha256 = "0s67mysskbiw1h1p0np4ph4351r7wq3nc873vylam7lsqi66xy0n"; + aqbanking.releaseId = "217"; } From cc909ff4dd02bcd7e632b7174d2599fa8f00dd7f Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 17:32:27 +0200 Subject: [PATCH 259/491] libchipcard: Don't hardcode version This is to make sure that we don't get a disparity between the version in sources.nix and the version in the package expression and it's mostly to get the package expression in par with aqbanking and gwenhywfar. Signed-off-by: aszlig Cc: @goibhniu --- pkgs/development/libraries/aqbanking/libchipcard.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index 1ac00c3fe882..9a0b70e0d97f 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, gwenhywfar, pcsclite, zlib }: -stdenv.mkDerivation rec { +let + inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; +in stdenv.mkDerivation rec { name = "libchipcard-${version}"; - version = "5.0.4"; + inherit version; src = let - inherit ((import ./sources.nix).libchipcard) sha256 releaseId; qstring = "package=02&release=${releaseId}&file=01"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { From 3dba79e6898c78fde29908ad698a41420bd7c9d8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 17:41:34 +0200 Subject: [PATCH 260/491] gwenhywfar: Support Gtk 2, Gtk 3 and Qt 5 GUIs So far we used only the defaults, which are gtk2 and qt5. However nowadays most applications have already switched to Qt 5 and Gtk 3, so let's aim for that instead. The reason Gtk 2 is still there is because GnuCash in nixpkgs is using the Gtk 2 interface, so we can drop it as soon as a newer GnuCash has landed in nixpkgs. Right now the only package that depends on this is GnuCash (and aqbanking of course), so I've tested this by not only building gwenhywfar and aqbanking but also GnuCash. I did however not test whether HBCI functionality works, only whether GnuCash starts up. Signed-off-by: aszlig Cc: @goibhniu, @peti, @domenkozar --- pkgs/development/libraries/aqbanking/gwenhywfar.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 77a5a09da432..ae402f884159 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, gtk2, libgcrypt, pkgconfig, gettext, qt4 +{ stdenv, fetchurl, gnutls, gtk2, gtk3, libgcrypt, pkgconfig, gettext, which, qt5 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -21,6 +21,10 @@ in stdenv.mkDerivation rec { inherit sha256; }; + preConfigure = '' + configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5") + ''; + postPatch = let isRelative = path: builtins.substring 0 1 path != "/"; mkSearchPath = path: '' @@ -44,11 +48,9 @@ in stdenv.mkDerivation rec { configure ''; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig gettext which ]; - buildInputs = [ gtk2 qt4 gnutls libgcrypt ]; - - QTDIR = qt4; + buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls libgcrypt ]; meta = with stdenv.lib; { description = "OS abstraction functions used by aqbanking and related tools"; From f13873f35aaff640e8cf16f3dd9dce01f6661687 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 18:23:11 +0200 Subject: [PATCH 261/491] gwenhywfar: Add OpenSSL and libgpgerror OpenSSL is needed for gct-tool and libgpgerror for RSA key utilities (src/crypt3/cryptkeyrsa.c). Signed-off-by: aszlig Cc: @goibhniu --- pkgs/development/libraries/aqbanking/gwenhywfar.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index ae402f884159..bb337e471cfc 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, gnutls, gtk2, gtk3, libgcrypt, pkgconfig, gettext, which, qt5 +{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkgconfig, gettext +, which + +# GUI support +, gtk2, gtk3, qt5 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -21,6 +25,11 @@ in stdenv.mkDerivation rec { inherit sha256; }; + configureFlags = [ + "--with-openssl-includes=${openssl.dev}/include" + "--with-openssl-libs=${openssl.out}/lib" + ]; + preConfigure = '' configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5") ''; @@ -50,7 +59,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext which ]; - buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls libgcrypt ]; + buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; meta = with stdenv.lib; { description = "OS abstraction functions used by aqbanking and related tools"; From 65c1cfce3f72436a3a9fcba8053f6a7a5c6e078e Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 16:39:45 +0000 Subject: [PATCH 262/491] nixos/networkd: Allow RequiredForOnline field in [Link] section This was previously missing. --- nixos/modules/system/boot/networkd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index eea10613ea58..e95ca27914ec 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -146,12 +146,13 @@ let # .network files have a [Link] section with different options than in .netlink files checkNetworkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "MACAddress" "MTUBytes" "ARP" "Unmanaged" + "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) (assertValueOneOf "Unmanaged" boolValues) + (assertValueOneOf "RquiredForOnline" boolValues) ]; From 192352ff2f9a736f959a569a74cd42fcdb29021c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 16:34:02 +0000 Subject: [PATCH 263/491] nixos/cupsd: Introduce services.printing.logLevel option Previously we indirectly suggested that the user use services.printing.extraConf to set this, but this doesn't work with the default merge ordering. Fix this by making it an independent option. Fixes #39611. --- nixos/modules/services/printing/cupsd.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ecab8cfc7df9..c4147986439c 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -83,6 +83,8 @@ let WebInterface ${if cfg.webInterface then "Yes" else "No"} + LogLevel ${cfg.logLevel} + ${cfg.extraConf} ''; @@ -165,6 +167,15 @@ in ''; }; + logLevel = mkOption { + type = types.str; + default = "info"; + example = "debug"; + description = '' + Specifies the cupsd logging verbosity. + ''; + }; + extraFilesConf = mkOption { type = types.lines; default = ""; @@ -180,7 +191,7 @@ in example = '' BrowsePoll cups.example.com - LogLevel debug + MaxCopies 42 ''; description = '' Extra contents of the configuration file of the CUPS daemon @@ -345,8 +356,6 @@ in services.printing.extraConf = '' - LogLevel info - DefaultAuthType Basic From a5f6cdfd7ef36c0ee3c8bda8b487d1292838862f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 17:21:35 +0200 Subject: [PATCH 264/491] lib/debug: add traceValFn, traceValSeqFn, traceValSeqNFn Being able to modify the value on-the-fly before printing is very useful in practice. --- lib/debug.nix | 9 ++++++--- lib/default.nix | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index d163e60b6957..d5e9473ff773 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -17,7 +17,8 @@ rec { traceIf = p: msg: x: if p then trace msg x else x; - traceVal = x: trace x x; + traceValFn = f: x: trace (f x) x; + traceVal = traceValFn id; traceXMLVal = x: trace (builtins.toXML x) x; traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; @@ -44,9 +45,11 @@ rec { (modify depth snip x)) y; /* `traceSeq`, but the same value is traced and returned */ - traceValSeq = v: traceVal (builtins.deepSeq v v); + traceValSeqFn = f: v: traceVal f (builtins.deepSeq v v); + traceValSeq = traceValSeqFn id; /* `traceValSeq` but with fixed depth */ - traceValSeqN = depth: v: traceSeqN depth v v; + traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v; + traceValSeqN = traceValSeqNFn id; # this can help debug your code as well - designed to not produce thousands of lines diff --git a/lib/default.nix b/lib/default.nix index c292ed33e1da..23e276732db6 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -115,11 +115,12 @@ let unknownModule mkOption; inherit (types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; - inherit (debug) addErrorContextToAttrs traceIf traceVal + inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq - traceValSeqN traceShowVal traceShowValMarked - showVal traceCall traceCall2 traceCall3 traceValIfNot runTests - testAllTrue strict traceCallXml attrNamesToStr; + traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal + traceShowValMarked showVal traceCall traceCall2 traceCall3 + traceValIfNot runTests testAllTrue strict traceCallXml + attrNamesToStr; inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs defaultOverridableDelayableArgs composedArgsAndFun maybeAttrNullable maybeAttr ifEnable checkFlag getValue From a455637d28fb209a4677f55d887aa91ca05ed44e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 17:25:03 +0200 Subject: [PATCH 265/491] lib/debug: remove the deprecated strict function The grace period was long enough. --- lib/debug.nix | 8 ++------ lib/default.nix | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index d5e9473ff773..7eaa1bd9c8b1 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -102,10 +102,6 @@ rec { # usage: { testX = allTrue [ true ]; } testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; - strict = v: - trace "Warning: strict is deprecated and will be removed in the next release" - (builtins.seq v v); - # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 # this forces deep evaluation of all arguments and the result! @@ -119,10 +115,10 @@ rec { in (str: expr: if isFunction expr then (arg: - traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (strict arg)}" (expr arg) + traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg) ) else - let r = strict expr; + let r = builtins.seq expr expr; in trace "${str}\n result:\n${builtins.toXML r}" r ); } diff --git a/lib/default.nix b/lib/default.nix index 23e276732db6..b3c4fdc0e59a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -119,7 +119,7 @@ let traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal traceShowValMarked showVal traceCall traceCall2 traceCall3 - traceValIfNot runTests testAllTrue strict traceCallXml + traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs defaultOverridableDelayableArgs composedArgsAndFun From a7fdd10bf321f2db45c7fcdb79a39d7bc75bb828 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 18:30:21 +0200 Subject: [PATCH 266/491] lib/debug: deprecate & modernize showVal The code is re-implemented in terms of `generators.toPretty`, but is strictly less general than `traceValSeqN`, so we deprecate it. --- lib/debug.nix | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 7eaa1bd9c8b1..2e052ba31d85 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -56,19 +56,25 @@ rec { traceShowVal = x: trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)); - showVal = x: - if isAttrs x then - if x ? outPath then "x is a derivation, name ${if x ? name then x.name else ""}, { ${attrNamesToStr x} }" - else "x is attr set { ${attrNamesToStr x} }" - else if isFunction x then "x is a function" - else if x == [] then "x is an empty list" - else if isList x then "x is a list, first element is: ${showVal (head x)}" - else if x == true then "x is boolean true" - else if x == false then "x is boolean false" - else if x == null then "x is null" - else if isInt x then "x is an integer `${toString x}'" - else if isString x then "x is a string `${substring 0 50 x}...'" - else "x is probably a path `${substring 0 50 (toString x)}...'"; + showVal = with lib; + trace ( "Warning: `showVal` is deprecated " + + "and will be removed in the next release, " + + "please use `traceSeqN`" ) + (let + modify = v: + let pr = f: { __pretty = f; val = v; }; + in if isDerivation v then pr + (drv: "<δ:${drv.name}:${concatStringsSep "," + (attrNames drv)}>") + else if [] == v then pr (const "[]") + else if isList v then pr (l: "[ ${go (head l)}, … ]") + else if isAttrs v then pr + (a: "{ ${ concatStringsSep ", " (attrNames a)} }") + else v; + go = x: generators.toPretty + { allowPrettyValues = true; } + (modify x); + in go); # trace the arguments passed to function and its result # maybe rewrite these functions in a traceCallXml like style. Then one function is enough From 7365671fb23861d59ece8d85de407c3127128ad8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 19:13:51 +0200 Subject: [PATCH 267/491] lib/debug: deprecate attrNamesToStr, traceXMLVal(Marked) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `attrNamesToStr` is very specific (and pretty trivial), so it doesn’t make sense to have it in the library. `traceXMLVal(Marked)` are just a builtin and `trace` and not very useful in general (trace output should not be parsed anyway). --- lib/debug.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 2e052ba31d85..fad6b769b39f 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -19,9 +19,6 @@ rec { traceValFn = f: x: trace (f x) x; traceVal = traceValFn id; - traceXMLVal = x: trace (builtins.toXML x) x; - traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; - # strict trace functions (traced structure is fully evaluated and printed) /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */ @@ -55,7 +52,12 @@ rec { # this can help debug your code as well - designed to not produce thousands of lines traceShowVal = x: trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; - attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)); + + attrNamesToStr = a: + trace ( "Warning: `attrNamesToStr` is deprecated " + + "and will be removed in the next release." ) + (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a))); + showVal = with lib; trace ( "Warning: `showVal` is deprecated " + "and will be removed in the next release, " @@ -76,6 +78,15 @@ rec { (modify x); in go); + traceXMLVal = x: + trace ( "Warning: `traceXMLVal` is deprecated " + + "and will be removed in the next release." ) + (trace (builtins.toXML x) x); + traceXMLValMarked = str: x: + trace ( "Warning: `traceXMLValMarked` is deprecated " + + "and will be removed in the next release." ) + (trace (str + builtins.toXML x) x); + # trace the arguments passed to function and its result # maybe rewrite these functions in a traceCallXml like style. Then one function is enough traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); From 562286aa560aea85448adbc0e50e636e8d3cf8d0 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 20:41:59 +0200 Subject: [PATCH 268/491] lib/debug: deprecate `traceValIfNot` The function is only used in exactly one module and overly specific (`c` must be a true predicate for `x`, if not, a specific trace is called). --- lib/debug.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index fad6b769b39f..16e8710168c3 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -93,9 +93,10 @@ rec { traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); - # FIXME: rename this? traceValIfNot = c: x: - if c x then true else trace (showVal x) false; + trace ( "Warning: `traceValIfNot` is deprecated " + + "and will be removed in the next release." ) + (if c x then true else traceSeq (showVal x) false); /* Evaluate a set of tests. A test is an attribute set {expr, expected}, denoting an expression and its expected result. The From b90104ea0edc6763505458e4143e034f1d92bc2a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 20:45:12 +0200 Subject: [PATCH 269/491] lib/debug: fix use-sites of deprecated debug functions --- nixos/modules/misc/nixpkgs.nix | 6 +++++- pkgs/misc/vim-plugins/vim-utils.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index b8a55a24394e..8fbe218b232a 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -33,7 +33,11 @@ let configType = mkOptionType { name = "nixpkgs-config"; description = "nixpkgs config"; - check = traceValIfNot isConfig; + check = x: + let traceXIfNot = c: + if c x then true + else lib.traceSeqN 1 x false; + in traceXIfNot isConfig; merge = args: fold (def: mergeConfig def.value) {}; }; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index e11419846aeb..514c1daed629 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -224,7 +224,7 @@ let else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" - else throw "turning ${lib.showVal x} into a VimL thing not implemented yet"; + else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; in assert builtins.hasAttr "vim-addon-manager" knownPlugins; '' From fd54a946ca6d42b53df8d9040263fa43f6e426e9 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 21:00:47 +0200 Subject: [PATCH 270/491] lib/debug: deprecate `addErrorContextToAttrs` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function isn’t used anywhere and `addErrorContext` is an undocumented builtin. The builtin is explicitely qualified at its two uses in the module system. --- lib/debug.nix | 10 ++++++---- lib/modules.nix | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 16e8710168c3..a792806fa79e 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -11,10 +11,6 @@ in rec { - inherit (builtins) addErrorContext; - - addErrorContextToAttrs = lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v); - traceIf = p: msg: x: if p then trace msg x else x; traceValFn = f: x: trace (f x) x; @@ -98,6 +94,12 @@ rec { + "and will be removed in the next release." ) (if c x then true else traceSeq (showVal x) false); + + addErrorContextToAttrs = attrs: + trace ( "Warning: `addErrorContextToAttrs` is deprecated " + + "and will be removed in the next release." ) + (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); + /* Evaluate a set of tests. A test is an attribute set {expr, expected}, denoting an expression and its expected result. The result is a list of failed tests, each represented as {name, diff --git a/lib/modules.nix b/lib/modules.nix index 4ef982c7ec96..6c8033322a54 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -159,7 +159,7 @@ rec { context = name: ''while evaluating the module argument `${name}' in "${key}":''; extraArgs = builtins.listToAttrs (map (name: { inherit name; - value = addErrorContext (context name) + value = builtins.addErrorContext (context name) (args.${name} or config._module.args.${name}); }) requiredArgs); @@ -309,7 +309,7 @@ rec { res.mergedValue; in opt // - { value = addErrorContext "while evaluating the option `${showOption loc}':" value; + { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; definitions = map (def: def.value) res.defsFinal; files = map (def: def.file) res.defsFinal; inherit (res) isDefined; From e49f40e1caad0827096927f1a3c631209859496a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 08:00:02 +0200 Subject: [PATCH 271/491] lib/debug: deprecate `traceCallXml` Incompletely documented, and a FIXME/bug that has been there for years. --- lib/debug.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index a792806fa79e..36f8c30353a4 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -128,7 +128,9 @@ rec { # note: if result doesn't evaluate you'll get no trace at all (FIXME) # args should be printed in any case traceCallXml = a: - if !isInt a then + trace ( "Warning: `traceCallXml` is deprecated " + + "and will be removed in the next release." ) + (if !isInt a then traceCallXml 1 "calling ${a}\n" else let nr = a; @@ -140,5 +142,5 @@ rec { else let r = builtins.seq expr expr; in trace "${str}\n result:\n${builtins.toXML r}" r - ); + )); } From 5012c49fc0c2c0e5b07c308a84dd5181a40969ca Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 08:48:04 +0200 Subject: [PATCH 272/491] lib/debug: document module & functions, prune imports --- lib/debug.nix | 120 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 38 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 36f8c30353a4..f4b261b824fd 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -1,28 +1,67 @@ +/* Collection of functions useful for debugging + broken nix expressions. + + * `trace`-like functions take two values, print + the first to stderr and return the second. + * `traceVal`-like functions take one argument + which both printed and returned. + * `traceSeq`-like functions fully evaluate their + traced value before printing (not just to “weak + head normal form” like trace does by default). + * Functions that end in `-Fn` take an additional + function as their first argument, which is applied + to the traced value before it is printed. +*/ { lib }: - let - -inherit (builtins) trace attrNamesToStr isAttrs isList isInt - isString isBool head substring attrNames; - -inherit (lib) all id mapAttrsFlatten elem isFunction; - + inherit (builtins) trace isAttrs isList isInt + head substring attrNames; + inherit (lib) id elem isFunction; in rec { - traceIf = p: msg: x: if p then trace msg x else x; + # -- TRACING -- + /* Trace msg, but only if pred is true. + + Example: + traceIf true "hello" 3 + trace: hello + => 3 + */ + traceIf = pred: msg: x: if pred then trace msg x else x; + + /* Trace the value and also return it. + + Example: + traceValFn (v: "mystring ${v}") "foo" + trace: mystring foo + => "foo" + */ traceValFn = f: x: trace (f x) x; traceVal = traceValFn id; - # strict trace functions (traced structure is fully evaluated and printed) - /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */ + /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. + + Example: + trace { a.b.c = 3; } null + trace: { a = ; } + => null + traceSeq { a.b.c = 3; } null + trace: { a = { b = { c = 3; }; }; } + => null + */ traceSeq = x: y: trace (builtins.deepSeq x x) y; - /* Like `traceSeq`, but only down to depth n. - * This is very useful because lots of `traceSeq` usages - * lead to an infinite recursion. + /* Like `traceSeq`, but only evaluate down to depth n. + This is very useful because lots of `traceSeq` usages + lead to an infinite recursion. + + Example: + traceSeqN 2 { a.b.c = 3; } null + trace: { a = { b = {…}; }; } + => null */ traceSeqN = depth: x: y: with lib; let snip = v: if isList v then noQuotes "[…]" v @@ -37,15 +76,42 @@ rec { in trace (generators.toPretty { allowPrettyValues = true; } (modify depth snip x)) y; - /* `traceSeq`, but the same value is traced and returned */ + /* A combination of `traceVal` and `traceSeq` */ traceValSeqFn = f: v: traceVal f (builtins.deepSeq v v); traceValSeq = traceValSeqFn id; - /* `traceValSeq` but with fixed depth */ + + /* A combination of `traceVal` and `traceSeqN`. */ traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v; traceValSeqN = traceValSeqNFn id; - # this can help debug your code as well - designed to not produce thousands of lines + # -- TESTING -- + + /* Evaluate a set of tests. A test is an attribute set {expr, + expected}, denoting an expression and its expected result. The + result is a list of failed tests, each represented as {name, + expected, actual}, denoting the attribute name of the failing + test and its expected and actual results. Used for regression + testing of the functions in lib; see tests.nix for an example. + Only tests having names starting with "test" are run. + Add attr { tests = ["testName"]; } to run these test only + */ + runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: + let testsToRun = if tests ? tests then tests.tests else []; + in if (substring 0 4 name == "test" || elem name testsToRun) + && ((testsToRun == []) || elem name tests.tests) + && (test.expr != test.expected) + + then [ { inherit name; expected = test.expected; result = test.expr; } ] + else [] ) tests)); + + # create a test assuming that list elements are true + # usage: { testX = allTrue [ true ]; } + testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; + + + # -- DEPRECATED -- + traceShowVal = x: trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; @@ -100,28 +166,6 @@ rec { + "and will be removed in the next release." ) (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); - /* Evaluate a set of tests. A test is an attribute set {expr, - expected}, denoting an expression and its expected result. The - result is a list of failed tests, each represented as {name, - expected, actual}, denoting the attribute name of the failing - test and its expected and actual results. Used for regression - testing of the functions in lib; see tests.nix for an example. - Only tests having names starting with "test" are run. - Add attr { tests = ["testName"]; } to run these test only - */ - runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: - let testsToRun = if tests ? tests then tests.tests else []; - in if (substring 0 4 name == "test" || elem name testsToRun) - && ((testsToRun == []) || elem name tests.tests) - && (test.expr != test.expected) - - then [ { inherit name; expected = test.expected; result = test.expr; } ] - else [] ) tests)); - - # create a test assuming that list elements are true - # usage: { testX = allTrue [ true ]; } - testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; - # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 # this forces deep evaluation of all arguments and the result! From 06156610f139dbbba43b6610f2528ad33e746529 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 08:52:54 +0200 Subject: [PATCH 273/491] CODEOWNERS: add Profpatsch to lib/debug.nix Reason: has overhauled the module quite substantially. --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4e508d739e6a..3d4855c5cf40 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -14,6 +14,7 @@ /lib @edolstra @nbp /lib/systems @nbp @ericson2314 /lib/generators.nix @edolstra @nbp @Profpatsch +/lib/debug.nix @edolstra @nbp @Profpatsch # Nixpkgs Internals /default.nix @nbp From 21b87a7bdb31f19812e0f989cc9e0304a9972e32 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 13:06:39 +0200 Subject: [PATCH 274/491] docs: initial manual entry for `lib/debug.nix` It is more of a stub for now, but at least points to the right file. --- doc/functions.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/functions.xml b/doc/functions.xml index f790512e7db1..b2e450972947 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -294,6 +294,22 @@ merge:"diff3"
+
+ Debugging Nix Expressions + + Nix is a unityped, dynamic language, this means every value can + potentially appear anywhere. Since it is also non-strict, evaluation order + and what ultimately is evaluated might surprise you. Therefore it is important + to be able to debug nix expressions. + + + In the lib/debug.nix file you will find a number of + functions that help (pretty-)printing values while evaluation is runnnig. You + can even specify how deep these values should be printed recursively, and + transform them on the fly. Please consult the docstrings in + lib/debug.nix for usage information. +
+
buildFHSUserEnv From 900cec79a0aaf0628f855ec71d0ecf3145a67d3e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 14:04:05 +0200 Subject: [PATCH 275/491] lib/debug: add replacement instructions & release notes for every deprecated function. --- lib/debug.nix | 19 ++++++--- nixos/doc/manual/release-notes/rl-1809.xml | 45 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index f4b261b824fd..91a9265a6b5e 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -117,7 +117,9 @@ rec { attrNamesToStr = a: trace ( "Warning: `attrNamesToStr` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use more specific concatenation " + + "for your uses (`lib.concat(Map)StringsSep`)." ) (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a))); showVal = with lib; @@ -142,11 +144,13 @@ rec { traceXMLVal = x: trace ( "Warning: `traceXMLVal` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use `traceValFn builtins.toXML`." ) (trace (builtins.toXML x) x); traceXMLValMarked = str: x: trace ( "Warning: `traceXMLValMarked` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use `traceValFn (x: str + builtins.toXML x)`." ) (trace (str + builtins.toXML x) x); # trace the arguments passed to function and its result @@ -157,13 +161,15 @@ rec { traceValIfNot = c: x: trace ( "Warning: `traceValIfNot` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use `if/then/else` and `traceValSeq 1`.") (if c x then true else traceSeq (showVal x) false); addErrorContextToAttrs = attrs: trace ( "Warning: `addErrorContextToAttrs` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use `builtins.addErrorContext` directly." ) (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); # example: (traceCallXml "myfun" id 3) will output something like @@ -173,7 +179,8 @@ rec { # args should be printed in any case traceCallXml = a: trace ( "Warning: `traceCallXml` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please complain if you use the function regularly." ) (if !isInt a then traceCallXml 1 "calling ${a}\n" else diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 61f9ec8ba995..2e53f0563baf 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -56,6 +56,11 @@ has the following highlights: following incompatible changes: + + + lib.strict is removed. Use builtins.seq instead. + + The clementine package points now to the free derivation. @@ -77,6 +82,46 @@ following incompatible changes: + lib.attrNamesToStr has been deprecated. Use + more specific concatenation (lib.concat(Map)StringsSep) + instead. + + + + + lib.addErrorContextToAttrs has been deprecated. Use + builtins.addErrorContext directly. + + + + + lib.showVal has been deprecated. Use + lib.traceSeqN instead. + + + + + lib.traceXMLVal has been deprecated. Use + lib.traceValFn builtins.toXml instead. + + + + + lib.traceXMLValMarked has been deprecated. Use + lib.traceValFn (x: str + builtins.toXML x) instead. + + + + + lib.traceValIfNot has been deprecated. Use + if/then/else and lib.traceValSeq + instead. + + + + + lib.traceCallXml has been deprecated. Please complain + if you use the function regularly. From 12707b88106ff0a09676aebf0a25d733fd5aac89 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 27 Apr 2018 18:44:28 +0200 Subject: [PATCH 276/491] pythonPackages.cysignals: 1.6.9 -> 1.7.1 --- pkgs/development/python-modules/cysignals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index c1fedecbff34..56d997c6b325 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cysignals"; - version = "1.6.9"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "003invnixqy1h4lb358vwrxykxzp15csaddkgq3pqqmswnva5908"; + sha256 = "15nky8siwlc7s8v23vv4m0mnxa1z6jcs2qfr26m2mkw9j9g2na2j"; }; hardeningDisable = [ From 5ec94de03c86fe12e2570c6fa870260bbfe710e8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 07:11:49 +0000 Subject: [PATCH 277/491] nixos: alsa: better docstring --- nixos/modules/services/audio/alsa.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index e3e8bb28c58b..376aad66e236 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -54,6 +54,11 @@ in description = '' Whether to enable volume and capture control with keyboard media keys. + You want to leave this disabled if you run a desktop environment + like KDE, Gnome, Xfce, etc, as those handle such things themselves. + You might want to enable this if you run a minimalistic desktop + environment or work from bare linux ttys/framebuffers. + Enabling this will turn on . ''; }; From 92265e807e60fac8bbf3c08a82715b575b5e4e7e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 07:12:04 +0000 Subject: [PATCH 278/491] nixos: xserver: add related packages --- nixos/modules/services/x11/xserver.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 5f0a0f278452..29d1f17d28c8 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -240,7 +240,10 @@ in type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; - example = [ "vesa" ]; + example = [ + "ati_unfree" "amdgpu" "amdgpu-pro" + "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" "nvidiaLegacy173" + ]; description = '' The names of the video drivers the configuration supports. They will be tried in order until one that From e8d5070e23203163afb6450a6d82fc59e0012580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 18:19:05 +0100 Subject: [PATCH 279/491] nixos/nixos-generate-config: update search command --- nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 14c611e18bc3..74b61a64667e 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -577,8 +577,8 @@ $bootLoaderConfig # Set your time zone. # time.timeZone = "Europe/Amsterdam"; - # List packages installed in system profile. To search by name, run: - # \$ nix-env -qaP | grep wget + # List packages installed in system profile. To search, run: + # \$ nix search wget # environment.systemPackages = with pkgs; [ # wget vim # ]; From 555d2db62008fb156d37b5cfa13df3e062527fa2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 20:04:00 +0200 Subject: [PATCH 280/491] selfoss: 2016-07-31 -> 2.18 Fixes PHP7 compatibility. --- pkgs/servers/web-apps/selfoss/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 14f1dffee64c..4ed9d96510c8 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "selfoss-unstable-${version}"; - version = "2016-07-31"; + name = "selfoss-${version}"; + version = "2.18"; - src = fetchFromGitHub { - owner = "SSilence"; - repo = "selfoss"; - rev = "ceb431ad9208e2c5e31dafe593c75e5eb8b65cf7"; - sha256 = "00vrpw7sb95x6lwpaxrlzxyj98k98xblqcrjr236ykv0ha97xv30"; + src = fetchurl { + url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip"; + sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b"; }; + sourceRoot = "."; + nativeBuildInputs = [ unzip ]; + installPhase = '' mkdir $out cp -ra * $out/ From 53722f25adeaf41c4af5d4b7ddab6f13cc0b435e Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Fri, 27 Apr 2018 20:20:21 +0200 Subject: [PATCH 281/491] terraform-provider-ibm: init at 0.8.0 --- .../terraform-provider-ibm/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix new file mode 100644 index 000000000000..9764e029d277 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +# +# USAGE: +# install the following package globally or in nix-shell: +# +# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) +# +# examples: +# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples +# + +buildGoPackage rec { + name = "terraform-provider-ibm-${version}"; + version = "0.8.0"; + + goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; + subPackages = [ "./" ]; + + src = fetchFromGitHub { + owner = "IBM-Cloud"; + repo = "terraform-provider-ibm"; + sha256 = "1jc1g2jadh02z4lfqnvgqk5cqrzk8pnn3cj3cwsm3ksa8pccf6w4"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = https://github.com/IBM-Cloud/terraform-provider-ibm; + description = "Terraform provider is used to manage IBM Cloud resources."; + platforms = platforms.all; + license = licenses.mpl20; + maintainers = with maintainers; [ jensbin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4a88cbe5b2b..6a6de6370e3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20944,6 +20944,8 @@ with pkgs; terraform = terraform_0_11; terraform-full = terraform_0_11-full; + terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {}; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terraform-provider-nixos = callPackage ../applications/networking/cluster/terraform-provider-nixos {}; From 89df48e9db6a75641b6a9932e0c741c8ba2c7037 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 20:35:23 +0200 Subject: [PATCH 282/491] weboob: Disable doctests requiring networking Unfortunately I haven't found a way for nose to disable doctests and the -e/--exclude flag only works on unit tests. So I'm using sed in postPatch to remove the doctests without mangling the whole docstring. I've built weboob and it now succeeds. Signed-off-by: aszlig --- pkgs/development/python-modules/weboob/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index a4b1b9c467a4..73a70a65c380 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -16,6 +16,19 @@ buildPythonPackage rec { sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9"; }; + postPatch = '' + # Disable doctests that require networking: + sed -i -n -e '/^ *def \+pagination *(.*: *$/ { + p; n; p; /"""\|'\'\'\'''/!b + + :loop + n; /^ *\(>>>\|\.\.\.\)/ { h; bloop } + x; /^ *\(>>>\|\.\.\.\)/bloop; x + p; /"""\|'\'\'\'''/b + bloop + }; p' weboob/browser/browsers.py weboob/browser/pages.py + ''; + setupPyBuildFlags = ["--qt" "--xdg"]; checkInputs = [ nose ]; @@ -33,7 +46,6 @@ buildPythonPackage rec { homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = stdenv.lib.licenses.agpl3; - broken = true; # 2018-04-11 }; } From 06c7d4d40dc77c79e50b54282345c1d71a1ac058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 19:55:35 +0200 Subject: [PATCH 283/491] opam: propagate `curl` and `unzip` dependencies These are required for `opam init` to succeed. Closes #14466 Cc @henrytill --- pkgs/development/tools/ocaml/opam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 63f79981e1b2..469e97e19de5 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { name = "opam-${version}"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; src = srcs.opam; @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/opam \ - --suffix PATH : ${aspcud}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin ''; doCheck = false; From 876bbce48081a84c233a2d3da7dfbe659b136bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 22:14:16 +0200 Subject: [PATCH 284/491] doc: fix typo in cross-compilation docs --- doc/cross-compilation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 10e4706b0590..0b2b85aeeef6 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -75,7 +75,7 @@ An example of such a tool is LLVM. - Although the existance of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. + Although the existence of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the mistake where possible. Still, because the concept of a target platform is so ingrained, it is best to support it as is. From be0b3e3cd0d784333c151d1c7cc7e45b6af189ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 22:22:26 +0200 Subject: [PATCH 285/491] kcov: 34 -> 35 As the maintainer currently in `meta.maintainers` appears to not have touched the package since 2015, I've also added myself there. --- pkgs/development/tools/analysis/kcov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 3c3665e72200..ce391b938cae 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kcov-${version}"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1i4pn5na8m308pssk8585nmqi8kwd63a9h2rkjrn4w78ibmxvj01"; + sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw"; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = http://simonkagstrom.github.io/kcov/index.html; license = licenses.gpl2; - maintainers = [ maintainers.gal_bolle ]; + maintainers = with maintainers; [ gal_bolle ekleog ]; platforms = platforms.linux; }; } From df85ddd229adcdd75f67e78eb4513d7df0cea947 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 27 Apr 2018 19:04:31 +0200 Subject: [PATCH 286/491] bspwm: 0.9.4 -> 0.9.5 --- pkgs/applications/window-managers/bspwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index c494ee266be3..49af25e4bc2f 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1srgsszp184zg123wdij0zp57c16m7lmal51rhflyx2c9fiiqm9l"; + sha256 = "09h3g1rxxjyw861mk32lj774nmwkx8cwxq4wfgmf4dpbizymvhhr"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; From 1a244d9a3572b5cb7e62224a265007d00c81fdd8 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 27 Apr 2018 22:54:07 +0200 Subject: [PATCH 287/491] bspwm: add rvolosatovs to maintainers --- pkgs/applications/window-managers/bspwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 49af25e4bc2f..0538228d4b4e 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager based on binary space partitioning"; homepage = https://github.com/baskerville/bspwm; - maintainers = with maintainers; [ meisternu epitrochoid ]; + maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; license = licenses.bsd2; platforms = platforms.linux; }; From 5c7b7c360be8083cfcc57f7e377b01d8135f32c2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 27 Apr 2018 20:21:20 +0200 Subject: [PATCH 288/491] pythonPackages.opentimestamps: 0.2.1 -> 0.3.0 --- .../python-modules/opentimestamps/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index 1271a46f047d..370378f097a4 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -2,15 +2,17 @@ , bitcoinlib, GitPython, pysha3 }: buildPythonPackage rec { - name = "opentimestamps-${version}"; - version = "0.2.1"; + pname = "opentimestamps"; + version = "0.3.0"; disabled = (!isPy3k); + # We can't use the pypi source because it doesn't include README.md which is + # needed in setup.py src = fetchFromGitHub { owner = "opentimestamps"; repo = "python-opentimestamps"; - rev = "python-opentimestamps-v0.2.1"; - sha256 = "1cilv1ls9mdqk8zriqfkz7xcl8i1ncm0f89n4c8k4s82kf5y56rm"; + rev = "python-opentimestamps-v${version}"; + sha256 = "1i843mbz4h9vqc3y2x09ix6bv9wc0gzq36zhbnmf5by08iaiydks"; }; # Remove a failing test which expects the test source file to reside in the From 4e79f2fb42e54711b864a1f02cb54a2b2e653be2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 27 Apr 2018 20:21:50 +0200 Subject: [PATCH 289/491] opentimestamps-client: 0.5.1 -> 0.6.0 --- pkgs/tools/misc/opentimestamps-client/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index a062aa992be6..3fbd874503de 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -1,19 +1,21 @@ { lib, buildPythonApplication, fetchFromGitHub, isPy3k -, opentimestamps, GitPython, pysocks }: +, opentimestamps, appdirs, GitPython, pysocks }: buildPythonApplication rec { - name = "opentimestamps-client-${version}"; - version = "0.5.1"; + pname = "opentimestamps-client"; + version = "0.6.0"; disabled = (!isPy3k); + # We can't use the pypi source because it doesn't include README.md which is + # needed in setup.py src = fetchFromGitHub { owner = "opentimestamps"; repo = "opentimestamps-client"; - rev = "opentimestamps-client-v0.5.1"; - sha256 = "0s549xkb75r5wyvjlfmac8a1df6w0y55l98f492zsihdns1d6rzq"; + rev = "opentimestamps-client-v${version}"; + sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp"; }; - propagatedBuildInputs = [ opentimestamps GitPython pysocks ]; + propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; meta = { description = "Command-line tool to create and verify OpenTimestamps proofs"; From 468f3ce0edfc753110e70ad82589acc7487c640a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 23:02:09 +0100 Subject: [PATCH 290/491] nixos/xserver: remove nvidiaLegacy173 from videoDrivers.examples see https://github.com/NixOS/nixpkgs/commit/92265e807e60fac8bbf3c08a82715b575b5e4e7e#commitcomment-28773179 --- nixos/modules/services/x11/xserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 29d1f17d28c8..1404231f837e 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -242,7 +242,7 @@ in default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" - "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" "nvidiaLegacy173" + "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" ]; description = '' The names of the video drivers the configuration From 4317f7ab26942b4fad23f616932a1df1611bd44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 23:52:50 +0200 Subject: [PATCH 291/491] kcov: fix build on aarch64 Apparently, without this patch `NT_PRSTATUS` is not found. So the patch adds the include apparently necessary. `NT_PRSTATUS` is also defined in ``, which would likely have been a better name, were it not in the `linux/` directory, which is a priori not stable. The need to do that is kind of weird (the change was introduced in [1], and fedora apparently didn't need this additional import), but I'll try to upstream it. [1] https://github.com/SimonKagstrom/kcov/pull/239 --- .../tools/analysis/kcov/aarch64_nt_prstatus.patch | 12 ++++++++++++ pkgs/development/tools/analysis/kcov/default.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch new file mode 100644 index 000000000000..d5c3662e9abf --- /dev/null +++ b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch @@ -0,0 +1,12 @@ +diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc +index 59b615f..e02cddf 100644 +--- a/src/engines/ptrace.cc ++++ b/src/engines/ptrace.cc +@@ -21,6 +21,7 @@ + + #if defined(__aarch64__) + # include ++# include + #endif + + #include diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index ce391b938cae..7d75d9a34e1a 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; + patches = [ ./aarch64_nt_prstatus.patch ]; + enableParallelBuilding = true; meta = with stdenv.lib; { From 14568ddaabd23a96ffa537728888e1d8e8ee687a Mon Sep 17 00:00:00 2001 From: Sander Hollaar Date: Sat, 28 Apr 2018 00:19:05 +0200 Subject: [PATCH 292/491] netcat-openbsd: 1.187 -> 1.190: (#39605) http://metadata.ftp-master.debian.org/changelogs/main/n/netcat-openbsd/netcat-openbsd_1.190-1_changelog --- pkgs/tools/networking/netcat-openbsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 2d9776abfcfc..1a79e17c6598 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: stdenv.mkDerivation rec { - version = "1.187"; + version = "1.190"; deb-version = "${version}-1"; name = "netcat-openbsd-${version}"; srcs = [ (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw"; + sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38"; }) (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q"; + sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv"; }) ]; From df3566c9560b3305bd33faf4bc7580dc55f4f71e Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Sun, 25 Mar 2018 16:49:54 -0400 Subject: [PATCH 293/491] unifi, nixos/unifi: support LTS (5.6.36) and release (5.7.20) Ubiquiti has both a LTS and current version of their Unifi controller software. The latter adds new features, but may drop support for some devices. This adds the capability to use either for the unifi module but defaults to the LTS version, which was the previous behavior. --- nixos/modules/services/networking/unifi.nix | 37 ++++++++++++++++++--- pkgs/servers/unifi/default.nix | 28 ++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 55 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 8e5f0bfc070d..94958bfdd83e 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -4,22 +4,22 @@ let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; cmd = '' - @${pkgs.jre}/bin/java java \ + @${cfg.jrePackage}/bin/java java \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ -jar ${stateDir}/lib/ace.jar ''; mountPoints = [ { - what = "${pkgs.unifi}/dl"; + what = "${cfg.unifiPackage}/dl"; where = "${stateDir}/dl"; } { - what = "${pkgs.unifi}/lib"; + what = "${cfg.unifiPackage}/lib"; where = "${stateDir}/lib"; } { - what = "${pkgs.mongodb}/bin"; + what = "${cfg.mongodbPackage}/bin"; where = "${stateDir}/bin"; } { @@ -41,6 +41,33 @@ in ''; }; + services.unifi.jrePackage = mkOption { + type = types.package; + default = pkgs.jre8; + defaultText = "pkgs.jre8"; + description = '' + The JRE package to use. Check the release notes to ensure it is supported. + ''; + }; + + services.unifi.unifiPackage = mkOption { + type = types.package; + default = pkgs.unifiLTS; + defaultText = "pkgs.unifiLTS"; + description = '' + The unifi package to use. + ''; + }; + + services.unifi.mongodbPackage = mkOption { + type = types.package; + default = pkgs.mongodb; + defaultText = "pkgs.mongodb"; + description = '' + The mongodb package to use. + ''; + }; + services.unifi.dataDir = mkOption { type = types.str; default = "${stateDir}/data"; @@ -137,7 +164,7 @@ in rm -rf "${stateDir}/webapps" mkdir -p "${stateDir}/webapps" chown unifi "${stateDir}/webapps" - ln -s "${pkgs.unifi}/webapps/ROOT" "${stateDir}/webapps/ROOT" + ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT" ''; postStop = '' diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index e9d2fd07dc56..dac4bf6899a1 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,21 +2,37 @@ , dpkg , fetchurl , unzip +, useLTS ? false }: -stdenv.mkDerivation rec { - name = "unifi-controller-${version}"; - version = "5.6.36"; - src = fetchurl { +let + versions = { + stable = { + version = "5.7.20"; + sha256 = "1ylj4i5mcv6z9n32275ccdf1rqk74zilqsih3r6xzhm30pxrd8dd"; + }; + lts = { + version = "5.6.36"; + sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi"; + }; + }; + selectedVersion = + let attr = if useLTS then "lts" else "stable"; + in versions."${attr}"; +in + +stdenv.mkDerivation { + name = "unifi-controller-${selectedVersion.version}"; + src = with selectedVersion; fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi"; + inherit sha256; }; buildInputs = [ dpkg ]; unpackPhase = '' - dpkg-deb -x ${src} ./ + dpkg-deb -x $src ./ ''; doConfigure = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bd29155a977..ef5a7c1d8ba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12909,6 +12909,7 @@ with pkgs; axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; + unifiLTS = callPackage ../servers/unifi { useLTS=true; }; virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; From 3ee2db1ab1cdede280dbcab66fd85329e2345bb6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 22:32:20 +0000 Subject: [PATCH 294/491] netbsd: fix games on linux --- pkgs/os-specific/bsd/netbsd/default.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 67ad3687c2c6..75bd85be49dc 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -108,10 +108,10 @@ let # will be removed in the postInstall. preInstall = '' mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR $out/usr/games + $out$DOCDIR $out$LOCALEDIR for i in 1 2 3 4 5 6 7 8 9; do mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ - $out$DOCDIR/reference/ref$i + $out$DOCDIR/reference/ref$i done mkdir -p $out/usr/include ''; @@ -363,8 +363,10 @@ in rec { patchPhase = '' sed -i '1i #include ' adventure/save.c - # Disable some games that don't build. They should be possible to - # build but need to look at how to implement stuff in Linux. + # Disable some games that don't build. They should be possible + # to build but need to look at how to implement stuff in + # Linux. macOS is missing gettime. TODO try to get these + # working. substituteInPlace Makefile \ ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \ --replace atc "" \ @@ -378,6 +380,9 @@ in rec { --replace sail "" \ --replace trek "" \ --replace dab "" + substituteInPlace Makefile.inc \ + --replace 2555 555 \ + --replace 2550 550 ''; NIX_CFLAGS_COMPILE = [ "-D__noinline=" @@ -387,6 +392,17 @@ in rec { "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" ]; + postBuild = '' + mkdir -p $out/usr/games $out/usr/share/games/ching \ + $out/usr/share/games/quiz.db \ + $out/usr/libexec/ching $out/var/games/hackdir + touch $out/var/games/hackdir/perm + ''; + preFixup = '' + mkdir -p $out/bin + mv $out/games/* $out/bin + rmdir $out/games + ''; buildInputs = [ compat libcurses libterminfo libressl ]; extraPaths = [ (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4") From e421c427d2c9cca60567b6057dfb1ff71e07278b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Apr 2018 18:33:42 -0400 Subject: [PATCH 295/491] fastjet: add veprbl to maintainers --- pkgs/development/libraries/physics/fastjet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 0ee68415b89c..2f3dfea9a51a 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; homepage = http://fastjet.fr/; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; } From e2fb669bc5154e13dfe78cd19b7727ed7a0248e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 22:52:54 +0000 Subject: [PATCH 296/491] netbsd: fix finger --- pkgs/os-specific/bsd/netbsd/default.nix | 28 +++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 75bd85be49dc..c44e25b00fc0 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -340,6 +340,19 @@ let sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m"; }; + who = netBSDDerivation { + path = "usr.bin/who"; + version = "7.1.2"; + sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; + patchPhase = '' + substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ + --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \ + --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ + --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" \ + --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" + ''; + }; + in rec { inherit compat install netBSDDerivation fts; @@ -410,17 +423,20 @@ in rec { ]; }; - who = netBSDDerivation { - path = "usr.bin/who"; - version = "7.1.2"; - sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; - }; - finger = netBSDDerivation { path = "usr.bin/finger"; sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; version = "7.1.2"; extraPaths = [ who.src ]; + NIX_CFLAGS_COMPILE = [ + "-DSUPPORT_UTMP" + "-USUPPORT_UTMPX" + ]; + patchPhase = '' + + ${who.patchPhase} + + ''; }; fingerd = netBSDDerivation { From fa850e8fda68c92984760f9ff9086e8cde6ef835 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 27 Apr 2018 18:52:46 -0400 Subject: [PATCH 297/491] 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 000000000000..c04bc84c156d --- /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 10053f926da1..d98e2aec1d2c 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 92808e667fd909ecd2a1502b20d9dd163986aec8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Sat, 28 Apr 2018 00:58:40 +0200 Subject: [PATCH 298/491] blobfuse: init at 1.0.1-RC-Preview (#39073) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/filesystems/blobfuse/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/tools/filesystems/blobfuse/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18ed73b19324..aec6f67a9191 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1726,6 +1726,11 @@ github = "jbedo"; name = "Justin Bedő"; }; + jbgi = { + email = "jb@giraudeau.info"; + github = "jbgi"; + name = "Jean-Baptiste Giraudeau"; + }; jcumming = { email = "jack@mudshark.org"; name = "Jack Cummings"; diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix new file mode 100644 index 000000000000..f847cde98a9e --- /dev/null +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: + +stdenv.mkDerivation rec { + name = "blobfuse-${version}"; + version = "1.0.1-RC-Preview"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-storage-fuse"; + rev = "v${version}"; + sha256 = "143rxgfmprir4a7frrv8llkv61jxzq50w2v8wn32vx6gl6vci1zs"; + }; + + buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "Mount an Azure Blob storage as filesystem through FUSE"; + license = licenses.mit; + maintainers = with maintainers; [ jbgi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef5a7c1d8ba9..31e091b810eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -838,6 +838,8 @@ with pkgs; boost = boost160; }; + blobfuse = callPackage ../tools/filesystems/blobfuse { }; + blockdiag = pythonPackages.blockdiag; blsd = callPackage ../tools/misc/blsd { From b1950f081dcb1906ee20babf08c6377167a85f2d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Apr 2018 19:16:32 -0400 Subject: [PATCH 299/491] fastjet: update license in meta Fixes: 70e070 ('fastjet: 3.3.0 -> 3.3.1') --- pkgs/development/libraries/physics/fastjet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 2f3dfea9a51a..812d741fec96 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://fastjet.fr/; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; From 99b8d106e987b7fcddf4a92bd54e7f2ba8b0006a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:32:19 -0500 Subject: [PATCH 300/491] netcat-gnu: move to pkgs/tools/networking/netcat --- pkgs/tools/networking/{netcat-gnu => netcat}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/tools/networking/{netcat-gnu => netcat}/default.nix (100%) diff --git a/pkgs/tools/networking/netcat-gnu/default.nix b/pkgs/tools/networking/netcat/default.nix similarity index 100% rename from pkgs/tools/networking/netcat-gnu/default.nix rename to pkgs/tools/networking/netcat/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31e091b810eb..8e61a555aacd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3877,7 +3877,7 @@ with pkgs; netcat = netcat-openbsd; - netcat-gnu = callPackage ../tools/networking/netcat-gnu { }; + netcat-gnu = callPackage ../tools/networking/netcat { }; netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; From 949bb9887254be8b56cd7837e09bc7366b3e097f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:33:05 -0500 Subject: [PATCH 301/491] libressl: build netcat --- pkgs/development/libraries/libressl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index ae03ef7ecb97..8f028bcb5461 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -11,6 +11,8 @@ let inherit sha256; }; + configureFlags = [ "--enable-nc" ]; + enableParallelBuilding = true; outputs = [ "bin" "dev" "out" "man" ]; From c65000af91d91708a1afbb4cb24b1daac068aaa0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 00:33:51 +0000 Subject: [PATCH 302/491] openbsd: fixup mg --- pkgs/os-specific/bsd/default.nix | 2 +- pkgs/os-specific/bsd/openbsd/default.nix | 28 +- pkgs/os-specific/bsd/openbsd/nc.patch | 421 ----------------------- 3 files changed, 18 insertions(+), 433 deletions(-) delete mode 100644 pkgs/os-specific/bsd/openbsd/nc.patch diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix index a8301ea2a8fc..5f094a8dad3f 100644 --- a/pkgs/os-specific/bsd/default.nix +++ b/pkgs/os-specific/bsd/default.nix @@ -3,6 +3,6 @@ rec { netbsd = recurseIntoAttrs (callPackages ./netbsd {}); openbsd = recurseIntoAttrs (callPackages ./openbsd { - inherit (netbsd) compat netBSDDerivation libcurses; + inherit (netbsd) compat netBSDDerivation libcurses libterminfo; }); } diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix index 9ccc0adaa2df..6d909e1c5566 100644 --- a/pkgs/os-specific/bsd/openbsd/default.nix +++ b/pkgs/os-specific/bsd/openbsd/default.nix @@ -1,4 +1,4 @@ -{ fetchcvs, netBSDDerivation, compat, libcurses, libressl }: +{ fetchcvs, netBSDDerivation, compat, libcurses, libterminfo }: let fetchOpenBSD = path: version: sha256: fetchcvs { @@ -21,22 +21,28 @@ in { path = "usr.bin/mg"; version = "6.3"; sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc"; - buildInputs = [ compat libcurses ]; + buildInputs = [ compat libcurses libterminfo ]; patchPhase = '' NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys" + substituteInPlace fileio.c \ + --replace "bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec" "bp->b_fi.fi_mtime.tv_sec != sb.st_mtim.tv_sec" \ + --replace "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec" "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtim.tv_nsec" \ + --replace "bp->b_fi.fi_mtime = sb.st_mtimespec" "bp->b_fi.fi_mtime = sb.st_mtim" + substituteInPlace Makefile \ + --replace "-o root -g wheel" "" \ + --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" + ''; + NIX_CFLAGS_COMPILE = [ "-DTCSASOFT=0x10" "-Dpledge(a,b)=0" ]; + preBuild = '' + cc -c $BSDSRCDIR/lib/libc/stdlib/strtonum.c -o strtonum.o + NIX_LDFLAGS+=" strtonum.o" ''; extraPaths = [ (fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9") (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") - ]; - }; - - nc = openBSDDerivation { - path = "usr.bin/nc"; - version = "6.3"; - sha256 = "0fmnh6ccxab0qvhmgspyd3wra1ps2516i0j6hwkvna2lcny20xvr"; - patches = [ ./nc.patch ]; - buildInputs = [ compat libressl ]; + (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") + (fetchOpenBSD "lib/libc/stdlib/strtonum.c" "6.3" "0xn3qxvb3g76hz698sjkf85p07zrcdv2g31inp8caqw2mpk6jadv") + ]; }; } diff --git a/pkgs/os-specific/bsd/openbsd/nc.patch b/pkgs/os-specific/bsd/openbsd/nc.patch deleted file mode 100644 index de6fb2d04c41..000000000000 --- a/pkgs/os-specific/bsd/openbsd/nc.patch +++ /dev/null @@ -1,421 +0,0 @@ ---- a/nc.1 -+++ b/nc.1 -@@ -204,9 +204,6 @@ Proxy authentication is only supported f - Specifies the source port - .Nm - should use, subject to privilege restrictions and availability. --It is an error to use this option in conjunction with the --.Fl l --option. - .It Fl R Ar CAfile - Specifies the filename from which the root CA bundle for certificate - verification is loaded, in PEM format. -@@ -258,6 +255,7 @@ For IPv4 TOS value - may be one of - .Ar critical , - .Ar inetcontrol , -+.Ar lowcost , - .Ar lowdelay , - .Ar netcontrol , - .Ar throughput , ---- a/netcat.c -+++ b/netcat.c -@@ -32,6 +32,8 @@ - * *Hobbit* . - */ - -+#define _GNU_SOURCE -+ - #include - #include - #include -@@ -41,6 +43,49 @@ - #include - #include - #include -+#ifdef __linux__ -+# include -+#endif -+ -+#ifndef IPTOS_LOWDELAY -+# define IPTOS_LOWDELAY 0x10 -+# define IPTOS_THROUGHPUT 0x08 -+# define IPTOS_RELIABILITY 0x04 -+# define IPTOS_LOWCOST 0x02 -+# define IPTOS_MINCOST IPTOS_LOWCOST -+#endif /* IPTOS_LOWDELAY */ -+ -+# ifndef IPTOS_DSCP_AF11 -+# define IPTOS_DSCP_AF11 0x28 -+# define IPTOS_DSCP_AF12 0x30 -+# define IPTOS_DSCP_AF13 0x38 -+# define IPTOS_DSCP_AF21 0x48 -+# define IPTOS_DSCP_AF22 0x50 -+# define IPTOS_DSCP_AF23 0x58 -+# define IPTOS_DSCP_AF31 0x68 -+# define IPTOS_DSCP_AF32 0x70 -+# define IPTOS_DSCP_AF33 0x78 -+# define IPTOS_DSCP_AF41 0x88 -+# define IPTOS_DSCP_AF42 0x90 -+# define IPTOS_DSCP_AF43 0x98 -+# define IPTOS_DSCP_EF 0xb8 -+#endif /* IPTOS_DSCP_AF11 */ -+ -+#ifndef IPTOS_DSCP_CS0 -+# define IPTOS_DSCP_CS0 0x00 -+# define IPTOS_DSCP_CS1 0x20 -+# define IPTOS_DSCP_CS2 0x40 -+# define IPTOS_DSCP_CS3 0x60 -+# define IPTOS_DSCP_CS4 0x80 -+# define IPTOS_DSCP_CS5 0xa0 -+# define IPTOS_DSCP_CS6 0xc0 -+# define IPTOS_DSCP_CS7 0xe0 -+#endif /* IPTOS_DSCP_CS0 */ -+ -+#ifndef IPTOS_DSCP_EF -+# define IPTOS_DSCP_EF 0xb8 -+#endif /* IPTOS_DSCP_EF */ -+ - - #include - #include -@@ -268,10 +315,14 @@ main(int argc, char *argv[]) - uflag = 1; - break; - case 'V': -+# if defined(RT_TABLEID_MAX) - rtableid = (int)strtonum(optarg, 0, - RT_TABLEID_MAX, &errstr); - if (errstr) - errx(1, "rtable %s: %s", errstr, optarg); -+# else -+ errx(1, "no alternate routing table support available"); -+# endif - break; - case 'v': - vflag = 1; -@@ -320,7 +371,11 @@ main(int argc, char *argv[]) - oflag = optarg; - break; - case 'S': -+# if defined(TCP_MD5SIG) - Sflag = 1; -+# else -+ errx(1, "no TCP MD5 signature support available"); -+# endif - break; - case 'T': - errstr = NULL; -@@ -345,35 +400,23 @@ main(int argc, char *argv[]) - argc -= optind; - argv += optind; - -+# if defined(RT_TABLEID_MAX) - if (rtableid >= 0) - if (setrtable(rtableid) == -1) - err(1, "setrtable"); -- -- if (family == AF_UNIX) { -- if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) -- err(1, "pledge"); -- } else if (Fflag && Pflag) { -- if (pledge("stdio inet dns sendfd tty", NULL) == -1) -- err(1, "pledge"); -- } else if (Fflag) { -- if (pledge("stdio inet dns sendfd", NULL) == -1) -- err(1, "pledge"); -- } else if (Pflag && usetls) { -- if (pledge("stdio rpath inet dns tty", NULL) == -1) -- err(1, "pledge"); -- } else if (Pflag) { -- if (pledge("stdio inet dns tty", NULL) == -1) -- err(1, "pledge"); -- } else if (usetls) { -- if (pledge("stdio rpath inet dns", NULL) == -1) -- err(1, "pledge"); -- } else if (pledge("stdio inet dns", NULL) == -1) -- err(1, "pledge"); -+# endif - - /* Cruft to make sure options are clean, and used properly. */ - if (argv[0] && !argv[1] && family == AF_UNIX) { - host = argv[0]; - uport = NULL; -+ } else if (!argv[0] && lflag) { -+ if (sflag) -+ errx(1, "cannot use -s and -l"); -+ if (pflag) -+ errx(1, "cannot use -p and -l"); -+ if (zflag) -+ errx(1, "cannot use -z and -l"); - } else if (argv[0] && !argv[1]) { - if (!lflag) - usage(1); -@@ -385,12 +428,6 @@ main(int argc, char *argv[]) - } else - usage(1); - -- if (lflag && sflag) -- errx(1, "cannot use -s and -l"); -- if (lflag && pflag) -- errx(1, "cannot use -p and -l"); -- if (lflag && zflag) -- errx(1, "cannot use -z and -l"); - if (!lflag && kflag) - errx(1, "must use -l with -k"); - if (uflag && usetls) -@@ -425,8 +462,8 @@ main(int argc, char *argv[]) - } else { - strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX", - UNIX_DG_TMP_SOCKET_SIZE); -- if (mktemp(unix_dg_tmp_socket_buf) == NULL) -- err(1, "mktemp"); -+ if (mkstemp(unix_dg_tmp_socket_buf) == -1) -+ err(1, "mkstemp"); - unix_dg_tmp_socket = unix_dg_tmp_socket_buf; - } - } -@@ -901,8 +938,10 @@ remote_connect(const char *host, const c - if (sflag || pflag) { - struct addrinfo ahints, *ares; - -+# if defined (SO_BINDANY) - /* try SO_BINDANY, but don't insist */ - setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on)); -+# endif - memset(&ahints, 0, sizeof(struct addrinfo)); - ahints.ai_family = res->ai_family; - ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -@@ -994,9 +1033,15 @@ local_listen(char *host, char *port, str - res->ai_protocol)) < 0) - continue; - -+ ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x)); -+ if (ret == -1) -+ err(1, NULL); -+ -+# if defined(SO_REUSEPORT) - ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x)); - if (ret == -1) - err(1, NULL); -+# endif - - set_common_sockopts(s, res->ai_family); - -@@ -1452,11 +1497,13 @@ set_common_sockopts(int s, int af) - { - int x = 1; - -+# if defined(TCP_MD5SIG) - if (Sflag) { - if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG, - &x, sizeof(x)) == -1) - err(1, NULL); - } -+# endif - if (Dflag) { - if (setsockopt(s, SOL_SOCKET, SO_DEBUG, - &x, sizeof(x)) == -1) -@@ -1467,9 +1514,14 @@ set_common_sockopts(int s, int af) - IP_TOS, &Tflag, sizeof(Tflag)) == -1) - err(1, "set IP ToS"); - -+#if defined(IPV6_TCLASS) - else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, - IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1) - err(1, "set IPv6 traffic class"); -+#else -+ else if (af == AF_INET6) -+ errx(1, "can't set IPv6 traffic class (unavailable)"); -+#endif - } - if (Iflag) { - if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, -@@ -1487,19 +1539,34 @@ set_common_sockopts(int s, int af) - IP_TTL, &ttl, sizeof(ttl))) - err(1, "set IP TTL"); - -+#if defined(IPV6_UNICAST_HOPS) - else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, - IPV6_UNICAST_HOPS, &ttl, sizeof(ttl))) - err(1, "set IPv6 unicast hops"); -+#else -+ else if (af == AF_INET6) -+ errx(1, "can't set IPv6 unicast hops (unavailable)"); -+#endif - } - - if (minttl != -1) { -+#if defined(IP_MINTTL) - if (af == AF_INET && setsockopt(s, IPPROTO_IP, - IP_MINTTL, &minttl, sizeof(minttl))) - err(1, "set IP min TTL"); -+#else -+ if (af == AF_INET) -+ errx(1, "can't set IP min TTL (unavailable)"); -+#endif - -+#if defined(IPV6_MINHOPCOUNT) - else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, - IPV6_MINHOPCOUNT, &minttl, sizeof(minttl))) - err(1, "set IPv6 min hop count"); -+#else -+ else if (af == AF_INET6) -+ errx(1, "can't set IPv6 min hop count (unavailable)"); -+#endif - } - } - -@@ -1534,6 +1601,7 @@ process_tos_opt(char *s, int *val) - { "cs7", IPTOS_DSCP_CS7 }, - { "ef", IPTOS_DSCP_EF }, - { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, -+ { "lowcost", IPTOS_LOWCOST }, - { "lowdelay", IPTOS_LOWDELAY }, - { "netcontrol", IPTOS_PREC_NETCONTROL }, - { "reliability", IPTOS_RELIABILITY }, -@@ -1741,7 +1812,7 @@ help(void) - \t-Z Peer certificate file\n\ - \t-z Zero-I/O mode [used for scanning]\n\ - Port numbers can be individual or ranges: lo-hi [inclusive]\n"); -- exit(1); -+ exit(0); - } - - void ---- a/socks.c -+++ b/socks.c -@@ -219,11 +219,11 @@ socks_connect(const char *host, const ch - buf[2] = SOCKS_NOAUTH; - cnt = atomicio(vwrite, proxyfd, buf, 3); - if (cnt != 3) -- err(1, "write failed (%zu/3)", cnt); -+ err(1, "write failed (%zu/3)", (size_t)cnt); - - cnt = atomicio(read, proxyfd, buf, 2); - if (cnt != 2) -- err(1, "read failed (%zu/3)", cnt); -+ err(1, "read failed (%zu/3)", (size_t)cnt); - - if (buf[1] == SOCKS_NOMETHOD) - errx(1, "authentication method negotiation failed"); -@@ -272,11 +272,11 @@ socks_connect(const char *host, const ch - - cnt = atomicio(vwrite, proxyfd, buf, wlen); - if (cnt != wlen) -- err(1, "write failed (%zu/%zu)", cnt, wlen); -+ err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen); - - cnt = atomicio(read, proxyfd, buf, 4); - if (cnt != 4) -- err(1, "read failed (%zu/4)", cnt); -+ err(1, "read failed (%zu/4)", (size_t)cnt); - if (buf[1] != 0) { - errx(1, "connection failed, SOCKSv5 error: %s", - socks5_strerror(buf[1])); -@@ -285,12 +285,12 @@ socks_connect(const char *host, const ch - case SOCKS_IPV4: - cnt = atomicio(read, proxyfd, buf + 4, 6); - if (cnt != 6) -- err(1, "read failed (%zu/6)", cnt); -+ err(1, "read failed (%zu/6)", (size_t)cnt); - break; - case SOCKS_IPV6: - cnt = atomicio(read, proxyfd, buf + 4, 18); - if (cnt != 18) -- err(1, "read failed (%zu/18)", cnt); -+ err(1, "read failed (%zu/18)", (size_t)cnt); - break; - default: - errx(1, "connection failed, unsupported address type"); -@@ -310,11 +310,11 @@ socks_connect(const char *host, const ch - - cnt = atomicio(vwrite, proxyfd, buf, wlen); - if (cnt != wlen) -- err(1, "write failed (%zu/%zu)", cnt, wlen); -+ err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen); - - cnt = atomicio(read, proxyfd, buf, 8); - if (cnt != 8) -- err(1, "read failed (%zu/8)", cnt); -+ err(1, "read failed (%zu/8)", (size_t)cnt); - if (buf[1] != 90) { - errx(1, "connection failed, SOCKSv4 error: %s", - socks4_strerror(buf[1])); -@@ -328,39 +328,39 @@ socks_connect(const char *host, const ch - - /* Try to be sane about numeric IPv6 addresses */ - if (strchr(host, ':') != NULL) { -- r = snprintf(buf, sizeof(buf), -+ r = snprintf((char*)buf, sizeof(buf), - "CONNECT [%s]:%d HTTP/1.0\r\n", - host, ntohs(serverport)); - } else { -- r = snprintf(buf, sizeof(buf), -+ r = snprintf((char*)buf, sizeof(buf), - "CONNECT %s:%d HTTP/1.0\r\n", - host, ntohs(serverport)); - } - if (r == -1 || (size_t)r >= sizeof(buf)) - errx(1, "hostname too long"); -- r = strlen(buf); -+ r = strlen((char*)buf); - - cnt = atomicio(vwrite, proxyfd, buf, r); - if (cnt != r) -- err(1, "write failed (%zu/%d)", cnt, r); -+ err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r); - - if (authretry > 1) { - char resp[1024]; - - proxypass = getproxypass(proxyuser, proxyhost); -- r = snprintf(buf, sizeof(buf), "%s:%s", -+ r = snprintf((char*)buf, sizeof(buf), "%s:%s", - proxyuser, proxypass); - if (r == -1 || (size_t)r >= sizeof(buf) || -- b64_ntop(buf, strlen(buf), resp, -+ b64_ntop(buf, strlen((char*)buf), resp, - sizeof(resp)) == -1) - errx(1, "Proxy username/password too long"); -- r = snprintf(buf, sizeof(buf), "Proxy-Authorization: " -+ r = snprintf((char*)buf, sizeof(buf), "Proxy-Authorization: " - "Basic %s\r\n", resp); - if (r == -1 || (size_t)r >= sizeof(buf)) - errx(1, "Proxy auth response too long"); -- r = strlen(buf); -+ r = strlen((char*)buf); - if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r) -- err(1, "write failed (%zu/%d)", cnt, r); -+ err(1, "write failed (%zu/%d)", (size_t)cnt, r); - } - - /* Terminate headers */ -@@ -368,22 +368,22 @@ socks_connect(const char *host, const ch - err(1, "write failed (%zu/2)", cnt); - - /* Read status reply */ -- proxy_read_line(proxyfd, buf, sizeof(buf)); -+ proxy_read_line(proxyfd, (char*)buf, sizeof(buf)); - if (proxyuser != NULL && -- strncmp(buf, "HTTP/1.0 407 ", 12) == 0) { -+ strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) { - if (authretry > 1) { - fprintf(stderr, "Proxy authentication " - "failed\n"); - } - close(proxyfd); - goto again; -- } else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 && -- strncmp(buf, "HTTP/1.1 200 ", 12) != 0) -+ } else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 && -+ strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0) - errx(1, "Proxy error: \"%s\"", buf); - - /* Headers continue until we hit an empty line */ - for (r = 0; r < HTTP_MAXHDRS; r++) { -- proxy_read_line(proxyfd, buf, sizeof(buf)); -+ proxy_read_line(proxyfd, (char*)buf, sizeof(buf)); - if (*buf == '\0') - break; - } \ No newline at end of file From 3c3b82234a6faa5a4c07323d0066452055d1ea81 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:34:41 -0500 Subject: [PATCH 303/491] netcat-openbsd: remove --- .../networking/netcat-openbsd/default.nix | 51 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/tools/networking/netcat-openbsd/default.nix diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix deleted file mode 100644 index 1a79e17c6598..000000000000 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: - -stdenv.mkDerivation rec { - version = "1.190"; - deb-version = "${version}-1"; - name = "netcat-openbsd-${version}"; - - srcs = [ - (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38"; - }) - (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libbsd ]; - - sourceRoot = name; - - prePatch = '' - for i in $(cat ../debian/patches/series); do - patch -p1 < "../debian/patches/$i" - done - ''; - - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6"; - sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr"; - }) - ]; - - installPhase = '' - runHook preInstall - install -Dm0755 nc $out/bin/nc - install -Dm0644 nc.1 $out/share/man/man1/nc.1 - runHook postInstall - ''; - - meta = with stdenv.lib; { - homepage = https://packages.debian.org/netcat-openbsd; - description = "TCP/IP swiss army knife, OpenBSD variant"; - platforms = platforms.linux; - maintainers = with maintainers; [ willibutz ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b4dd2bf915d..a7f59d1268fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,6 +138,7 @@ mapAliases (rec { mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 ncat = nmap; # added 2016-01-26 + netcat-openbsd = libressl.bin; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e61a555aacd..0b59862c20ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3879,8 +3879,6 @@ with pkgs; netcat-gnu = callPackage ../tools/networking/netcat { }; - netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; - nethogs = callPackage ../tools/networking/nethogs { }; netkittftp = callPackage ../tools/networking/netkit/tftp { }; From 6bc19398bed6a4062979c86454e41581f0bddbc7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 01:03:34 +0000 Subject: [PATCH 304/491] openbsd: remove --- pkgs/os-specific/bsd/default.nix | 3 -- pkgs/os-specific/bsd/openbsd/default.nix | 48 ------------------------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/os-specific/bsd/openbsd/default.nix diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix index 5f094a8dad3f..a75c132b55a2 100644 --- a/pkgs/os-specific/bsd/default.nix +++ b/pkgs/os-specific/bsd/default.nix @@ -2,7 +2,4 @@ rec { netbsd = recurseIntoAttrs (callPackages ./netbsd {}); - openbsd = recurseIntoAttrs (callPackages ./openbsd { - inherit (netbsd) compat netBSDDerivation libcurses libterminfo; - }); } diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix deleted file mode 100644 index 6d909e1c5566..000000000000 --- a/pkgs/os-specific/bsd/openbsd/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchcvs, netBSDDerivation, compat, libcurses, libterminfo }: - -let - fetchOpenBSD = path: version: sha256: fetchcvs { - cvsRoot = "anoncvs@anoncvs.ca.openbsd.org:/cvs"; - module = "src/${path}"; - inherit sha256; - tag = "OPENBSD_${builtins.replaceStrings ["."] ["_"] version}"; - }; - - # OpenBSD is a fork of NetBSD - # We can build it with minimal changes - openBSDDerivation = attrs: netBSDDerivation (attrs // { - name = "${attrs.pname or (baseNameOf attrs.path)}-openbsd-${attrs.version}"; - src = fetchOpenBSD attrs.path attrs.version attrs.sha256; - }); - -in { - - mg = openBSDDerivation { - path = "usr.bin/mg"; - version = "6.3"; - sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc"; - buildInputs = [ compat libcurses libterminfo ]; - patchPhase = '' - NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys" - substituteInPlace fileio.c \ - --replace "bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec" "bp->b_fi.fi_mtime.tv_sec != sb.st_mtim.tv_sec" \ - --replace "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec" "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtim.tv_nsec" \ - --replace "bp->b_fi.fi_mtime = sb.st_mtimespec" "bp->b_fi.fi_mtime = sb.st_mtim" - substituteInPlace Makefile \ - --replace "-o root -g wheel" "" \ - --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" - ''; - NIX_CFLAGS_COMPILE = [ "-DTCSASOFT=0x10" "-Dpledge(a,b)=0" ]; - preBuild = '' - cc -c $BSDSRCDIR/lib/libc/stdlib/strtonum.c -o strtonum.o - NIX_LDFLAGS+=" strtonum.o" - ''; - extraPaths = [ - (fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9") - (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") - (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") - (fetchOpenBSD "lib/libc/stdlib/strtonum.c" "6.3" "0xn3qxvb3g76hz698sjkf85p07zrcdv2g31inp8caqw2mpk6jadv") - ]; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06ee..beffac76715f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21379,5 +21379,5 @@ with pkgs; mount wall hostname more sysctl; inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) - netbsd openbsd; + netbsd; } From 004111c27e11684d6945f82124110c5f17c1bf01 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 01:03:47 +0000 Subject: [PATCH 305/491] netbsd: small fixups --- pkgs/os-specific/bsd/netbsd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index c44e25b00fc0..f9c8653447fe 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -11,7 +11,7 @@ let netBSDDerivation = attrs: stdenv.mkDerivation ((rec { name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; - src = fetchNetBSD attrs.path attrs.version attrs.sha256; + src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; @@ -187,6 +187,7 @@ let install -D $NETBSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h + install -D $NETBSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h install -D $NETBSDSRCDIR/include/db.h $out/include/db.h install -D $NETBSDSRCDIR/include/netconfig.h $out/include/netconfig.h From d11f290f670d04071f893deea891a373e1548821 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 01:31:06 +0000 Subject: [PATCH 306/491] netbsd: cleanup and musl suppot --- pkgs/os-specific/bsd/netbsd/default.nix | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f9c8653447fe..0cd2b4ffc6e8 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -405,6 +405,7 @@ in rec { "-DOXTABS=XTABS" "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" + (if hostPlatform.isMusl then "-include sys/ttydefaults.h -include sys/file.h" else "") ]; postBuild = '' mkdir -p $out/usr/games $out/usr/share/games/ching \ @@ -424,21 +425,19 @@ in rec { ]; }; - finger = netBSDDerivation { - path = "usr.bin/finger"; - sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; - version = "7.1.2"; - extraPaths = [ who.src ]; - NIX_CFLAGS_COMPILE = [ - "-DSUPPORT_UTMP" - "-USUPPORT_UTMPX" - ]; - patchPhase = '' - - ${who.patchPhase} - - ''; - }; + # finger = netBSDDerivation { + # path = "usr.bin/finger"; + # sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; + # version = "7.1.2"; + # extraPaths = [ who.src ]; + # NIX_CFLAGS_COMPILE = [ + # "-DSUPPORT_UTMP" + # "-USUPPORT_UTMPX" + # ]; + # patchPhase = '' + # ${who.patchPhase} + # ''; + # }; fingerd = netBSDDerivation { path = "libexec/fingerd"; From 5f419f3df7f71b9dd88e513fcdd1303a5d5b99dd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 20:50:15 -0500 Subject: [PATCH 307/491] netbsd: improve darwin support --- pkgs/os-specific/bsd/netbsd/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 0cd2b4ffc6e8..343b61bab383 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -68,10 +68,10 @@ let HOST_SH = "${bash}/bin/sh"; - # not using bsd binutils SHLIB_WARNTEXTREL = "no"; SHLIB_MKMAP = "no"; PRESERVE = "-p"; + OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; MACHINE_ARCH = hostPlatform.parsed.cpu.name; MACHINE_CPU = hostPlatform.parsed.cpu.name; @@ -393,7 +393,7 @@ in rec { --replace rogue "" \ --replace sail "" \ --replace trek "" \ - --replace dab "" + --replace dab "" substituteInPlace Makefile.inc \ --replace 2555 555 \ --replace 2550 550 @@ -469,6 +469,7 @@ in rec { version = "7.1.2"; sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; + MKPIC = if stdenv.isDarwin then "no" else "yes"; extraPaths = [ (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") ]; @@ -483,10 +484,11 @@ in rec { "-D__scanflike(a,b)=" "-D__va_list=va_list" "-D__warn_references(a,b)=" - ]; + ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr - patchPhase = '' + MKPIC = if stdenv.isDarwin then "no" else "yes"; + patchPhase = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' From e375bd4a9e789105b84eabf61f11b1d55b7131d3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 16:23:21 +0200 Subject: [PATCH 308/491] gdk_pixbuf: export moduleDir --- pkgs/development/libraries/gdk-pixbuf/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 6bfa6bdc2fb9..069b78f6bcac 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "gdk_pixbuf"; }; + + # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc + moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders"; }; meta = with stdenv.lib; { From 3ebb162d902906c2eb65bd4978f9d77a8a841522 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 28 Apr 2018 00:59:26 +0200 Subject: [PATCH 309/491] gegl_0_4: init at 0.4.0 --- pkgs/development/libraries/gegl/4.0.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/gegl/4.0.nix diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix new file mode 100644 index 000000000000..a8e50945c3fd --- /dev/null +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which +, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw +, libwebp, gnome3, libintl }: + +let + version = "0.4.0"; +in stdenv.mkDerivation rec { + name = "gegl-${version}"; + + src = fetchurl { + url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + sha256 = "1ighk4z8nlqrzyj8w97s140hzj59564l3xv6fpzbr97m1zx2nkfh"; + }; + + # needs fonts otherwise, don't know how to pass them + configureFlags = [ "--disable-docs" ]; + + enableParallelBuilding = true; + + doCheck = true; + + buildInputs = [ + libpng cairo libjpeg librsvg pango gtk bzip2 + libraw libwebp gnome3.gexiv2 + ]; + + propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc + + nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; + + meta = with stdenv.lib; { + description = "Graph-based image processing framework"; + homepage = http://www.gegl.org; + license = licenses.gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1c63060734e..c9513d60db47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8904,6 +8904,10 @@ with pkgs; gtk = self.gtk2; }; + gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { + gtk = self.gtk2; + }; + geoclue = callPackage ../development/libraries/geoclue {}; geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; From 59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 27 Apr 2018 22:44:25 -0400 Subject: [PATCH 310/491] nixos docs: Move generated XML in to a specific subdirectory to allow easier hacking --- nixos/doc/manual/configuration/configuration.xml | 3 +-- nixos/doc/manual/default.nix | 11 ++++++++--- nixos/doc/manual/man-configuration.xml | 2 +- nixos/doc/manual/manual.xml | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 8677c13db40f..f092c7e207ff 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -25,9 +25,8 @@ effect after you run nixos-rebuild. - + - diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index ac22712baf87..c396c799c638 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -102,13 +102,18 @@ let
''; + generatedSources = runCommand "generated-docbook" {} '' + mkdir $out + ln -s ${modulesDoc} $out/modules.xml + ln -s ${optionsDocBook} $out/options-db.xml + printf "%s" "${version}" > $out/version + ''; + copySources = '' cp -prd $sources/* . # */ + ln -s ${generatedSources} ./generated chmod -R u+w . - ln -s ${modulesDoc} configuration/modules.xml - ln -s ${optionsDocBook} options-db.xml - printf "%s" "${version}" > version ''; toc = builtins.toFile "toc.xml" diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml index 05531b3909a3..89d321d69726 100644 --- a/nixos/doc/manual/man-configuration.xml +++ b/nixos/doc/manual/man-configuration.xml @@ -31,7 +31,7 @@ therein. You can use the following options in configuration.nix. - + diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 9aa332f026da..a7825579e03d 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -6,7 +6,7 @@ NixOS Manual - Version + Version @@ -39,7 +39,7 @@ Configuration Options - + From 2f893ff53db6e812230e3fe8bf4b1c10f34ccdde Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 07:20:40 +0200 Subject: [PATCH 311/491] autoPatchelfHook: Provide a better derivation name Thanks to @Ericson2314 for the suggestion to provide a name for the hook script. Comment was posted here: https://github.com/NixOS/nixpkgs/pull/34506#discussion_r167421856 Very useful if you use some other hooks and autoPatchelfHook so you don't just get a bunch of "hook" derivations. Tested by quickly building (not running) teamviewer and masterpdfeditor. Signed-off-by: aszlig Reported-by: John Ericson --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c060c588e8c..3795cce452a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -80,7 +80,7 @@ with pkgs; ../build-support/setup-hooks/autoreconf.sh; autoPatchelfHook = makeSetupHook - { deps = [ file ]; } + { name = "auto-patchelf-hook"; deps = [ file ]; } ../build-support/setup-hooks/auto-patchelf.sh; ensureNewerSourcesHook = { year }: makeSetupHook {} From 1c235abda6446eb787d33feb5eb329d72531ce9c Mon Sep 17 00:00:00 2001 From: davidak Date: Sat, 28 Apr 2018 07:58:52 +0200 Subject: [PATCH 312/491] elementary-xfce-icon-theme: 2017-11-28 -> 0.11 --- pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 724f3a066cc8..8a831a630d86 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "elementary-xfce-icon-theme-${version}"; - version = "2017-11-28"; + version = "0.11"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; - rev = "b5cc6f044ed24e388ed2fffed1d02f43ce76f5e6"; - sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y"; + rev = "elementary-xfce-${version}"; + sha256 = "1hgbw9wwsgrbrs8lgdhba2m8m1cvqbcy27b87kjws6jsa00f5hx6"; }; nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; From 0ff0d138e4e9d68853c463a540d61718aa91cffb Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 28 Apr 2018 04:00:55 -0400 Subject: [PATCH 313/491] nixos docs: Add a makefile for hacking on the nixos docs --- nixos/doc/manual/Makefile | 8 ++++++++ nixos/doc/manual/default.nix | 1 + nixos/doc/manual/manual.xml | 3 ++- nixos/doc/manual/options-to-docbook.xsl | 8 ++++---- nixos/release.nix | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 nixos/doc/manual/Makefile diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile new file mode 100644 index 000000000000..b15fbaa270fc --- /dev/null +++ b/nixos/doc/manual/Makefile @@ -0,0 +1,8 @@ +debug: + nix-shell --packages xmloscopy \ + --run 'xmloscopy --docbook5 ./manual.xml ./manual-combined.xml' + +generated: ./options-to-docbook.xsl + nix-build ../../release.nix \ + --attr manualGeneratedSources.x86_64-linux \ + --out-link ./generated diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index c396c799c638..2c6309474b37 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -229,6 +229,7 @@ let ''; in rec { + inherit generatedSources; # The NixOS options in JSON format. optionsJSON = runCommand "options-json" diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index a7825579e03d..676924e5c8b2 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -39,7 +39,8 @@ Configuration Options - + diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl index 7b45b233ab2a..43a69806a2b0 100644 --- a/nixos/doc/manual/options-to-docbook.xsl +++ b/nixos/doc/manual/options-to-docbook.xsl @@ -15,9 +15,9 @@ - - - + + Configuration Options + @@ -100,7 +100,7 @@ - + diff --git a/nixos/release.nix b/nixos/release.nix index 2f779280e6b2..4994cd98302f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -124,7 +124,6 @@ let preferLocalBuild = true; }; - in rec { channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; }; @@ -132,6 +131,7 @@ in rec { manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub)); manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); + manualGeneratedSources = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.generatedSources); options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; From a77dc213a7825f5dd13c7989e38d82e64816d881 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 28 Apr 2018 04:04:56 -0400 Subject: [PATCH 314/491] nixos manual: update xi:include for configuruation.nix's options-db --- nixos/doc/manual/man-configuration.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml index 89d321d69726..37ffb9d648a9 100644 --- a/nixos/doc/manual/man-configuration.xml +++ b/nixos/doc/manual/man-configuration.xml @@ -31,7 +31,8 @@ therein. You can use the following options in configuration.nix. - + From 74fcb1c770e3a5178a7ee089b3caf406f7bf94bf Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 28 Apr 2018 04:15:16 -0400 Subject: [PATCH 315/491] nixos docs: include note about make for debugging the nixos docs --- .../development/writing-documentation.xml | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml index 59a287717acb..8b787fae1fe0 100644 --- a/nixos/doc/manual/development/writing-documentation.xml +++ b/nixos/doc/manual/development/writing-documentation.xml @@ -18,13 +18,25 @@ The DocBook sources of the are in the nixos/doc/manual - subdirectory of the Nixpkgs repository. If you make modifications to - the manual, it's important to build it before committing. You can do - that as follows: - - nix-build nixos/release.nix -A manual.x86_64-linux + subdirectory of the Nixpkgs repository. + + You can quickly validate your edits with make: + + + + $ cd /path/to/nixpkgs/nixos/doc/manual + $ make + + + + Once you are done making modifications to the manual, it's important + to build it before committing. You can do that as follows: + + +nix-build nixos/release.nix -A manual.x86_64-linux + When this command successfully finishes, it will tell you where the manual got generated. The HTML will be accessible through the From bf325f1bd7f148a6043add54446f983700dd2c64 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 28 Apr 2018 11:08:42 +0200 Subject: [PATCH 316/491] quassel: 0.12.4 -> 0.12.5 (fixes RCE & remote crash) It was found that Quassel could be remotely crashed and had an unauthenticated RCE vulnerability. The public annoucement can be found on the oss-sec archive [1]. The bump to 0.12.5 is supposed fixe both issues. [1] http://seclists.org/oss-sec/2018/q2/77 --- pkgs/applications/networking/irc/quassel/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/source.nix b/pkgs/applications/networking/irc/quassel/source.nix index f3941ee976e4..20daba788997 100644 --- a/pkgs/applications/networking/irc/quassel/source.nix +++ b/pkgs/applications/networking/irc/quassel/source.nix @@ -1,9 +1,9 @@ { fetchurl }: rec { - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { url = "https://github.com/quassel/quassel/archive/${version}.tar.gz"; - sha256 = "0q2qlhy1d6glw9pwxgcgwvspd1mkk3yi6m21dx9gnj86bxas2qs2"; + sha256 = "04f42x87a4wkj3va3wnmj2jl7ikqqa7d7nmypqpqwalzpzk7kxwv"; }; } From dda74d9e50dbd8a412de743a53e9cfd585407342 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Apr 2018 12:48:06 +0300 Subject: [PATCH 317/491] nixos/qemu-vm: Always add a virtio RNG device to the quest mke2fs has this annoying property that it uses getrandom() to get random numbers (for whatever purposes) which blocks until the kernel's secure RNG has sufficient entropy, which it usually doesn't in the early boot (except if your CPU supports RDRAND) where we may need to create the root disk. So let's give the VM a virtio RNG to avoid the boot getting stuck at mke2fs. --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 2b78276fcdea..3d4bd315f812 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -77,6 +77,7 @@ let -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ + -device virtio-rng-pci \ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ From ea5787ad5291ee1c131326cb9c9fec03d359edff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 28 Apr 2018 13:02:20 +0100 Subject: [PATCH 318/491] cups-kyodialog3: use autoPatchelfHook, add missing qt4 --- pkgs/misc/cups/drivers/kyodialog3/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix index bc48b2c8f339..073bd4ccbbfc 100644 --- a/pkgs/misc/cups/drivers/kyodialog3/default.nix +++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchzip, cups +{ stdenv, lib, fetchzip, cups, autoPatchelfHook # Can either be "EU" or "Global"; it's unclear what the difference is - , region ? "Global" + , region ? "Global", qt4 }: let @@ -9,19 +9,15 @@ let if stdenv.system == "x86_64-linux" then "64bit" else if stdenv.system == "i686-linux" then "32bit" else throw "Unsupported system: ${stdenv.system}"; - debPlatform = + debPlatform = if platform == "64bit" then "amd64" else "i386"; debRegion = if region == "EU" then "EU." else ""; - - # TODO: add Qt4 for kyodialog3 application - libPath = lib.makeLibraryPath [ cups ]; in stdenv.mkDerivation rec { name = "cups-kyodialog3-${version}"; version = "8.1601"; - dontPatchELF = true; dontStrip = true; src = fetchzip { @@ -29,6 +25,10 @@ stdenv.mkDerivation rec { sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal"; }; + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ cups qt4 ]; + installPhase = '' mkdir -p $out cd $out @@ -49,9 +49,6 @@ stdenv.mkDerivation rec { # prepend $out to all references in ppd and desktop files find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; - - # patchELF all executables - find -type f -executable -exec patchelf --set-rpath ${libPath} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; meta = with lib; { @@ -61,5 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.steveej ]; platforms = platforms.linux; }; - } From 1f34893553398a9c83140958fbe6e656acd785db Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 28 Apr 2018 13:08:52 +0100 Subject: [PATCH 319/491] hyena: fix hyena & pdfmod builds on higher versions of mono Helps with #36711 --- pkgs/development/libraries/hyena/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index edd35bd27e44..f99aa0b6f0cf 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build/dll-map-makefile-verifier patchShebangs build/private-icon-theme-installer + substituteInPlace configure --replace lib/mono/2.0/ lib/mono/2.0-api/ find -name Makefile.in | xargs -n 1 -d '\n' sed -e 's/^dnl/#/' -i ''; From 9f2b67d89b10b2f5375e77c976990f87c869d6fd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:27:10 +0200 Subject: [PATCH 320/491] Revert ".version: remove final newline" This reverts commit e109784f84d44cc73abeaa6c96c5a5d5bf9e3e06. --- .editorconfig | 4 ---- .version | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index f5df33889e6b..7b40ff1ff568 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,7 +26,3 @@ indent_size = 4 # Match diffs, avoid to trim trailing whitespace [*.{diff,patch}] trim_trailing_whitespace = false - -# https://github.com/NixOS/nixpkgs/pull/39336#discussion_r183387754 -[.version] -insert_final_newline = false diff --git a/.version b/.version index c1b80a502792..770bde1f44b3 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -18.09 \ No newline at end of file +18.09 From f66cdc71a3300581501fd953f8e359b7ff824933 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:30:12 +0200 Subject: [PATCH 321/491] osquery: use `stdenv.lib.nixpkgsVersion` This way easier to understand and the officially recommended approach. /cc @dezgeg @fpletz --- pkgs/tools/system/osquery/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 2a719efd79b3..b88186a610bf 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "nixos;${builtins.readFile "${toString path}/.version"}"; + OSQUERY_PLATFORM = "nixos;${stdenv.lib.nixpkgsVersion}"; src = fetchFromGitHub { owner = "facebook"; From 39909289f452fcd60127cbd2372f22ac35f25d08 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 20:33:35 +0200 Subject: [PATCH 322/491] lib: deduplicate version/suffix references The logic regarding the generated `.version-suffix` file is already defined in `lib/trivial.nix` and shouldn't be duplicated in `nixos/version`. --- lib/trivial.nix | 9 +++++---- nixos/modules/misc/version.nix | 6 ++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index a928e1dbca98..a6a4abba1189 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -58,11 +58,12 @@ rec { inherit (lib.strings) fileContents; + version = fileContents ../.version; + suffix = let suffixFile = ../.version-suffix; in + if pathExists suffixFile then fileContents suffixFile else "pre-git"; + # Return the Nixpkgs version number. - nixpkgsVersion = - let suffixFile = ../.version-suffix; in - fileContents ../.version - + (if pathExists suffixFile then fileContents suffixFile else "pre-git"); + nixpkgsVersion = version + suffix; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index b8f0a223c910..d9d60b725093 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.system.nixos; - releaseFile = "${toString pkgs.path}/.version"; - suffixFile = "${toString pkgs.path}/.version-suffix"; revisionFile = "${toString pkgs.path}/.git-revision"; gitRepo = "${toString pkgs.path}/.git"; gitCommitId = lib.substring 0 7 (commitIdFromGitRepo gitRepo); @@ -25,14 +23,14 @@ in nixos.release = mkOption { readOnly = true; type = types.str; - default = fileContents releaseFile; + default = trivial.version; description = "The NixOS release (e.g. 16.03)."; }; nixos.versionSuffix = mkOption { internal = true; type = types.str; - default = if pathExists suffixFile then fileContents suffixFile else "pre-git"; + default = trivial.suffix; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; From 9274ea390348e17f766732e7fbd335e3bc164954 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 Apr 2018 10:31:05 +0200 Subject: [PATCH 323/491] treewide: rename version attributes As suggested in https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745 the versioning attributes in `lib` should be consistent to `nixos/version` which implicates the following changes: * `lib.trivial.version` -> `lib.trivial.release` * `lib.trivial.suffix` -> `lib.trivial.versionSuffix` * `lib.nixpkgsVersion` -> `lib.version` As `lib.nixpkgsVersion` is referenced several times in `NixOS/nixpkgs`, `NixOS/nix` and probably several user's setups. As the rename will cause a notable impact it's better to keep `lib.nixpkgsVersion` as alias with a warning yielded by `builtins.trace`. --- doc/Makefile | 2 +- doc/default.nix | 2 +- lib/default.nix | 2 +- lib/trivial.nix | 8 +++++--- nixos/doc/manual/release-notes/rl-1809.xml | 5 +++++ nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- nixos/modules/misc/version.nix | 4 ++-- pkgs/tools/system/osquery/default.nix | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 0ddae8631f3c..952ef4bfcbb9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -64,7 +64,7 @@ manual-full.xml: ${MD_TARGETS} .version *.xml .version: nix-instantiate --eval \ - -E '(import ../lib).nixpkgsVersion' > .version + -E '(import ../lib).version' > .version %.section.xml: %.section.md pandoc $^ -w docbook+smart \ diff --git a/doc/default.nix b/doc/default.nix index 8abde58bb114..e5be364506ff 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -30,7 +30,7 @@ pkgs.stdenv.mkDerivation { ]; postPatch = '' - echo ${lib.nixpkgsVersion} > .version + echo ${lib.version} > .version ''; installPhase = '' diff --git a/lib/default.nix b/lib/default.nix index b3c4fdc0e59a..60ce01a93cd2 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -58,7 +58,7 @@ let replaceStrings seq stringLength sub substring tail; inherit (trivial) id const concat or and boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info - nixpkgsVersion mod compare splitByAndCompare + nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions diff --git a/lib/trivial.nix b/lib/trivial.nix index a6a4abba1189..251cb796db0e 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -58,12 +58,14 @@ rec { inherit (lib.strings) fileContents; - version = fileContents ../.version; - suffix = let suffixFile = ../.version-suffix; in + release = fileContents ../.version; + versionSuffix = let suffixFile = ../.version-suffix; in if pathExists suffixFile then fileContents suffixFile else "pre-git"; # Return the Nixpkgs version number. - nixpkgsVersion = version + suffix; + version = release + versionSuffix; + + nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 2e53f0563baf..949dbf0e0c1e 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -123,6 +123,11 @@ following incompatible changes: lib.traceCallXml has been deprecated. Please complain if you use the function regularly. + + The attribute lib.nixpkgsVersion has been deprecated in favor of + lib.version. Please refer to the discussion in + NixOS/nixpkgs#39416 for further reference. + diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 347e6b9c6e0d..9461144fad5a 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -6,7 +6,7 @@ set -e set -o pipefail -version=$(nix-instantiate --eval --strict '' -A lib.nixpkgsVersion | sed s/'"'//g) +version=$(nix-instantiate --eval --strict '' -A lib.version | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index d9d60b725093..74c86443ab90 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -23,14 +23,14 @@ in nixos.release = mkOption { readOnly = true; type = types.str; - default = trivial.version; + default = trivial.release; description = "The NixOS release (e.g. 16.03)."; }; nixos.versionSuffix = mkOption { internal = true; type = types.str; - default = trivial.suffix; + default = trivial.versionSuffix; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index b88186a610bf..a0aaa846bc73 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "nixos;${stdenv.lib.nixpkgsVersion}"; + OSQUERY_PLATFORM = "nixos;${stdenv.lib.version}"; src = fetchFromGitHub { owner = "facebook"; From ba1b2ef24386d306409cbf3f95a4a57f796bc3ba Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 28 Apr 2018 15:22:48 +0200 Subject: [PATCH 324/491] makemkv: 1.10.8 -> 1.12.2, switch from qt4 to qt5 --- pkgs/applications/video/makemkv/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index a4b08e1ce47c..acc9c88d2ffe 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl -, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav +, openssl, qt5, libGLU_combined, zlib, pkgconfig, libav }: stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.10.8"; + ver = "1.12.2"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29"; + sha256 = "0ylybq0776am5yy064b55q0jja1q1p9dscwmn7f1p3igzv15rypj"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7"; + sha256 = "063rgb88zbh4zwysyhjn4awykcnc90qgsx6d8ggm27wy849306v1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [openssl qt4 libGLU_combined zlib libav]; + buildInputs = [openssl qt5.qtbase libGLU_combined zlib libav]; - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ] + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt5.qtbase zlib ] + ":" + stdenv.cc.cc + "/lib64"; meta = with stdenv.lib; { From f8d0c9e3c3b92f8af058b742eb7553d53c3502a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Apr 2018 02:31:07 +0200 Subject: [PATCH 325/491] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/bb8ed19628062fa0afd844771b20ee50a49a1721. --- .../haskell-modules/hackage-packages.nix | 1269 +++++++++++++---- 1 file changed, 1019 insertions(+), 250 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8d25c173d75a..8b035359730b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6110,14 +6110,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "GLFW-b_1_4_8_4" = callPackage + "GLFW-b_3_2_1_0" = callPackage ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit , test-framework, test-framework-hunit }: mkDerivation { pname = "GLFW-b"; - version = "1.4.8.4"; - sha256 = "1xww650q80ii9f80v9kpz56lwgd1cirvhqjdca1vq9xs8k30hfd0"; + version = "3.2.1.0"; + sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i"; libraryHaskellDepends = [ base bindings-GLFW deepseq ]; testHaskellDepends = [ base bindings-GLFW deepseq HUnit test-framework @@ -9534,16 +9534,18 @@ self: { }) {}; "Hastodon" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, http-conduit - , http-types, mime-types, MissingH, text + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , exceptions, http-client, http-conduit, http-types, mime-types + , MissingH, resourcet, text, transformers }: mkDerivation { pname = "Hastodon"; - version = "0.3.2"; - sha256 = "0qdq23mg1nszsf3ldbdawdkcmbv18cmny6529k9kwlfq9fhdm83x"; + version = "0.4.0"; + sha256 = "00zq3kzzazqlgbh45xc6py3m23x448af34d4y3z903by79fid79f"; libraryHaskellDepends = [ - aeson base bytestring http-client http-conduit http-types - mime-types MissingH text + aeson attoparsec base bytestring conduit exceptions http-client + http-conduit http-types mime-types MissingH resourcet text + transformers ]; homepage = "https://github.com/syucream/hastodon"; description = "mastodon client module for Haskell"; @@ -14039,14 +14041,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libGL;}; - "OpenGLRaw_3_3_0_0" = callPackage + "OpenGLRaw_3_3_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, libGL , text, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "3.3.0.0"; - sha256 = "145j4fa4vs7x5r6x5i0733qc9aw27ggzax3xpjc7pmibmrkri20p"; + version = "3.3.0.1"; + sha256 = "0jzipa8avnrsw2via8ks012illwg2in27l01y1bp35ci0w2f92fq"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -16596,7 +16598,7 @@ self: { description = "A .NET Bridge for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + }) {inherit (pkgs) glib; mono = null;}; "Saturnin" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, either @@ -21062,6 +21064,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "access-token-provider" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring + , bytestring, containers, exceptions, filepath, http-client + , http-client-tls, http-types, katip, lens, lens-aeson, mtl, random + , safe-exceptions, stm, tasty, tasty-hunit, text, th-format + , transformers, unliftio, unliftio-core, uuid + }: + mkDerivation { + pname = "access-token-provider"; + version = "0.1.0.0"; + sha256 = "03832v0aab3imqim8f6g1r0jj2pfrrca45qnvpkw7ry7krbq5z7q"; + libraryHaskellDepends = [ + aeson aeson-casing base base64-bytestring bytestring containers + exceptions filepath http-client http-client-tls http-types katip + lens lens-aeson mtl random safe-exceptions stm text th-format + transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions http-client http-types + katip lens mtl random safe-exceptions tasty tasty-hunit text + th-format unliftio unliftio-core uuid + ]; + homepage = "https://github.com/mtesseract/access-token-provider#readme"; + description = "Provides Access Token for Services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "accuerr" = callPackage ({ mkDerivation, base, bifunctors, lens, semigroups }: mkDerivation { @@ -30397,8 +30426,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.25"; - sha256 = "0p5pg2ix0ppan0cz4b0pk16ihfcnvqwb8g93k4bh7d304ca5xdk4"; + version = "0.2.0.26"; + sha256 = "14s8bic1kvsigmi5nmjdca6pkh223axygr74nmygjbvwmryfxcxn"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -32479,6 +32508,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backprop_0_1_5_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, criterion, deepseq + , directory, hmatrix, lens, microlens, mnist-idx, mwc-random + , primitive, random, reflection, time, transformers + , type-combinators, vector + }: + mkDerivation { + pname = "backprop"; + version = "0.1.5.2"; + sha256 = "1mb99dwpng07vsaa3vhl6b0kn8ym6qz7i9a0gyj8hafxawbrznfh"; + libraryHaskellDepends = [ + base binary deepseq microlens primitive random reflection + transformers type-combinators vector + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory hmatrix lens mnist-idx + mwc-random time transformers vector + ]; + homepage = "https://github.com/mstksg/backprop#readme"; + description = "Heterogeneous automatic differentation (backpropagation)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -33510,8 +33563,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.1"; - sha256 = "1zjjmz36lxxrxgx449212q878mzavjpwx5jad0lk9ninpas16h5v"; + version = "0.1.0.2"; + sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -33790,6 +33843,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-core_0_7_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty + , tasty-hunit, text, time, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.7.2.1"; + sha256 = "0v9mspr3r7g5n73pgdwipgx2z23cd5g537g8afd1hj22p7d993jw"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri tagged text time vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + homepage = "http://travis.athougies.net/projects/beam.html"; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable @@ -37079,10 +37154,8 @@ self: { ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { pname = "bitwise"; - version = "0.1.1.1"; - sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d"; - revision = "2"; - editedCabalFile = "1dqddxjf4kpb16k51z40qlnl0shw6gmpf1c1ckdn4q8jm61bmlgn"; + version = "1.0.0.1"; + sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -40244,6 +40317,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-little_0_1_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp + , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "bv-little"; + version = "0.1.1"; + sha256 = "153bd5y55scp6qd9q7vnkhp8zwj3qssyr4qy8wpfj8k9xp8xdrk8"; + libraryHaskellDepends = [ + base deepseq hashable integer-gmp mono-traversable primitive + QuickCheck + ]; + testHaskellDepends = [ + base deepseq hashable mono-traversable QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq hashable ]; + homepage = "https://github.com/recursion-ninja/bv-little"; + description = "Efficient little-endian bit vector library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils , prettyclass, QuickCheck, random @@ -43950,11 +44047,11 @@ self: { }: mkDerivation { pname = "cautious"; - version = "0.0.0.0"; - sha256 = "0kr9aipbi95hz97lbidifsfm51rsjlpjgkbvnyiwrh1cckh6q0zw"; + version = "0.1.0.0"; + sha256 = "054n9vy4h4qs208gfi7ryvb40y50pmaxcrslxplk95vg0pvg4k1w"; libraryHaskellDepends = [ - aeson base genvalidity-hspec-aeson hspec hspec-discover QuickCheck - transformers validity + aeson base genvalidity genvalidity-hspec-aeson hspec hspec-discover + QuickCheck transformers validity ]; testHaskellDepends = [ aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson @@ -46113,6 +46210,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cisco-spark-api_0_1_0_3" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 + , bytestring, conduit, data-default, hspec, http-conduit + , http-types, network-uri, optparse-applicative, text, utf8-string + , wai, warp + }: + mkDerivation { + pname = "cisco-spark-api"; + version = "0.1.0.3"; + sha256 = "1fi8cadjszb92yih5ilagay8c9fj4aiwdx2qx1pwdc756jgjm5ky"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bitset-word8 bytestring conduit data-default + http-conduit network-uri text + ]; + executableHaskellDepends = [ + aeson base bytestring conduit data-default http-conduit + optparse-applicative text utf8-string + ]; + testHaskellDepends = [ + aeson async attoparsec base bytestring conduit data-default hspec + http-conduit http-types network-uri text wai warp + ]; + homepage = "https://github.com/nshimaza/webex-teams-api#readme"; + description = "A Haskell bindings for Webex Teams API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "citation-resolve" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers , curl, data-default, directory, doctest, download-curl, either @@ -47279,8 +47406,8 @@ self: { }: mkDerivation { pname = "clifm"; - version = "0.3.1.0"; - sha256 = "17kd2cfxc9dswlqv141f2anc0g19xhj9w5mk3xicx7vyr6j43y0y"; + version = "0.4.1.0"; + sha256 = "0q0m662sg4n2k9lgx82d72gi16widm74a7j08psnjmwhk55ir3cb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47681,7 +47808,7 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + }) {inherit (pkgs) glib; mono = null;}; "clr-inline" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive @@ -50120,12 +50247,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_4_0_1" = callPackage + "composition-prelude_1_4_0_3" = callPackage ({ mkDerivation, base, cpphs }: mkDerivation { pname = "composition-prelude"; - version = "1.4.0.1"; - sha256 = "172fnixh4jgmwfsaxg0fyji0i745pbjwk00l3yh5pwng9swzi6ik"; + version = "1.4.0.3"; + sha256 = "0vzd71yqnbx5pk4yvan1sbjdgg3b7k476jiyr36pjyi1ysdm13qj"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ cpphs ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; @@ -54102,8 +54229,8 @@ self: { }: mkDerivation { pname = "crc"; - version = "0.0.1.1"; - sha256 = "1swn00ksnqkqfjh1q9ck8zd5y9vb2yaf7rsxyy9i47d8p93m5g74"; + version = "0.1.0.0"; + sha256 = "0cvyzw1c63s1cbs9ypa5xxj7kjl57v0ggkxsxncnl7sqlkpn6s74"; libraryHaskellDepends = [ base bytestring vector ]; testHaskellDepends = [ base bytestring conduit conduit-extra resourcet tasty tasty-golden @@ -54806,6 +54933,8 @@ self: { pname = "crypto-enigma"; version = "0.0.2.11"; sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1"; + revision = "1"; + editedCabalFile = "1wh09ma0xr8lgj0a2ybp6kxisi36cl2kiqz2akhy915v6gpkjkyz"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -54813,6 +54942,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-enigma_0_0_2_12" = callPackage + ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck + , split + }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.0.2.12"; + sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b"; + libraryHaskellDepends = [ base containers MissingH mtl split ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + homepage = "https://github.com/orome/crypto-enigma-hs"; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "crypto-multihash" = callPackage ({ mkDerivation, base, base58-bytestring, bytestring, containers , cryptonite, hspec, memory, QuickCheck, string-conversions @@ -55473,8 +55618,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.1"; - sha256 = "117ih5cssflaa7mvg4a4vz5sfsylivb8n0ri90211pml3d5idwpf"; + version = "0.7.2"; + sha256 = "0c16h2m8zkpyjbclvqpd8kq46ciw6qwc94d6v2d66c3g0ixx53vx"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -55491,8 +55636,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.3.1"; - sha256 = "0fwzsmb9syk144d445cw1d9pjx3vn18pxi161yafv2q7q4m57i3g"; + version = "5.3.2"; + sha256 = "1v3ssy2rfgwz9wwv8kmaifyrphyl5w66p9zmrg1bi0vbzwxnr57q"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -55509,8 +55654,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.2"; - sha256 = "1h827ijkwa5fyg1jphaa19fr4wxs5l76m89xl44989jnb7blbkcd"; + version = "0.3.3"; + sha256 = "0k4pk96cx2f6rhz18mrdkkz7ic2fdzpqkxf1x596990az7pjg7g3"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse hashable transformers wl-pprint @@ -55543,8 +55688,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.1.0"; - sha256 = "0w591ij97i1kkv2z5fix8zlvw9shagxq6lpkic71ldpvv1a4cf8q"; + version = "0.2.2.0"; + sha256 = "19cplqpyd7vhn28z0k8mxmscja05w9xb8q4bbvq5qd0h8liqxsqg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -55560,8 +55705,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.8.1"; - sha256 = "15k5in43w4ivkzi6qs5z19fh3pd2fg5ih1dyd1vk736lawlivx20"; + version = "0.0.9.0"; + sha256 = "0vvsqbnd1yjwijz4g0y9av6d20m73b5swln4v7gna3jd16mrg2k1"; libraryHaskellDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -66066,8 +66211,8 @@ self: { }: mkDerivation { pname = "dtab"; - version = "1.0.0.1"; - sha256 = "0sg0pf8nsy4fdx8gqpqv6k29v01gz4bq5y1id28v9j8rj0mgv5nn"; + version = "1.1"; + sha256 = "18h4876saf2f8k052qf76j5w89x7nay12nlf7hc5dkwf4c9y5hq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66077,7 +66222,7 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring ]; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -66376,6 +66521,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "duration" = callPackage + ({ mkDerivation, base, doctest, hspec, parsec, template-haskell + , time + }: + mkDerivation { + pname = "duration"; + version = "0.1.0.0"; + sha256 = "18qjn97njhra7brps58rl44vyc0hmfc83prgm519q7dyf3159cd0"; + libraryHaskellDepends = [ base parsec template-haskell time ]; + testHaskellDepends = [ + base doctest hspec parsec template-haskell time + ]; + homepage = "https://github.com/ryota-ka/duration#readme"; + description = "A tiny compile-time time utility library inspired by zeit/ms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dustme" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, async, attoparsec , base, bytestring, containers, deepseq, extra, hashable, hspec @@ -69658,6 +69820,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eq_4_2" = callPackage + ({ mkDerivation, base, semigroupoids }: + mkDerivation { + pname = "eq"; + version = "4.2"; + sha256 = "1s3h77i0h4z3dg97sqqjl027rz0k82h48cpzp0c7a75g0qx70q21"; + libraryHaskellDepends = [ base semigroupoids ]; + homepage = "http://github.com/ekmett/eq/"; + description = "Leibnizian equality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "equal-files" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, filemanip , transformers, utility-ht @@ -70263,8 +70438,8 @@ self: { }: mkDerivation { pname = "etc"; - version = "0.3.1.0"; - sha256 = "0l938jhlx1jgb46b9ykdc741r0v7wkklrc1ga5v81r3b52civb1c"; + version = "0.3.2.0"; + sha256 = "1j4qjw1hqw5q9i47ixiwcr3zpcs1x39l46mh5yii5xkqmwlw9gk0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base hashable rio text typed-process unliftio @@ -71803,8 +71978,8 @@ self: { }: mkDerivation { pname = "expiring-containers"; - version = "0.1.0.2"; - sha256 = "006n6zwdgrdh0717wd85kwxrbpv3fl5srbc77acglms41pcn72yz"; + version = "0.1.1.1"; + sha256 = "0v35m5bl6y5l4m8gfs6wrcs0pqmgk52aaa261jg92jkvhji21ki5"; libraryHaskellDepends = [ base containers hashable int-multimap time timestamp unordered-containers @@ -72539,8 +72714,8 @@ self: { }: mkDerivation { pname = "fake"; - version = "0.1.1"; - sha256 = "0xp737s8067bynh03d6zhi8w71pl1q8mrk5si80mykn401dzw7ir"; + version = "0.1.1.1"; + sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -77645,6 +77820,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_0_2" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers + , distributive, exceptions, mtl, profunctors, semigroupoids + , semigroups, template-haskell, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "free"; + version = "5.0.2"; + sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg"; + libraryHaskellDepends = [ + base bifunctors comonad containers distributive exceptions mtl + profunctors semigroupoids semigroups template-haskell transformers + transformers-base transformers-compat + ]; + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-concurrent" = callPackage ({ mkDerivation, base, type-aligned }: mkDerivation { @@ -78221,6 +78417,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "friendly" = callPackage + ({ mkDerivation, base, bifunctors, lens, optparse-applicative }: + mkDerivation { + pname = "friendly"; + version = "0.1.0.0"; + sha256 = "0ikbfki5yvagc3xjbqwmzzp29idfviaylnan6cr39kna6fc8ajgx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bifunctors lens optparse-applicative + ]; + description = "Attempt to pretty-print any input"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "friendly-time" = callPackage ({ mkDerivation, base, hspec, old-locale, time }: mkDerivation { @@ -84458,8 +84669,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180409"; - sha256 = "05cwyh3x432k3czrd59py0jsvl3qjg8ky7nc0rxkw6pbzwpgcb8c"; + version = "6.20180427"; + sha256 = "0pjdb0mk5hmjl0sra37ap3cr5xp9pa7fyikqmz4156hzk925rrds"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -85488,6 +85699,8 @@ self: { pname = "gl"; version = "0.8.0"; sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda"; + revision = "1"; + editedCabalFile = "17m5vagiq1v7zg6409f56qqy28jd0xp13yk44s661rcwj0f4pd14"; setupHaskellDepends = [ base Cabal containers directory filepath hxt transformers ]; @@ -86421,8 +86634,8 @@ self: { ({ mkDerivation, base, gmp, recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.11"; - sha256 = "00sml2d5jbfc0qy0nvrmk9xv31zk66anzz5r4d7h049asq0zh20n"; + version = "0.1.0.12"; + sha256 = "0l3qd8hps55am4ddj4x83f0vyi1rwhh7gj36k465n4m1pz7ndxrx"; libraryHaskellDepends = [ base recursion-schemes ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; @@ -88350,19 +88563,22 @@ self: { }) {}; "google-oauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, http-conduit - , http-types, load-env + ({ mkDerivation, base, bytestring, hoauth2, hspec, http-client-tls + , http-conduit, load-env, safe-exceptions, text, transformers + , uri-bytestring }: mkDerivation { pname = "google-oauth2"; - version = "0.2.2"; - sha256 = "0n408kh48d7ky09j9zw9ad4mhbv1v7gq6i3ya4f6fhkjqqgw8c1j"; + version = "0.3.0.0"; + sha256 = "119p792prspir2vxk53jzkr90rava2qnixr1jkbmx5si63h9l01z"; libraryHaskellDepends = [ - aeson base bytestring HTTP http-conduit + base bytestring hoauth2 http-client-tls safe-exceptions text + transformers uri-bytestring ]; testHaskellDepends = [ - base bytestring hspec http-conduit http-types load-env + base bytestring hoauth2 hspec http-conduit load-env text ]; + homepage = "https://github.com/pbrisbin/google-oauth2#readme"; description = "Google OAuth2 token negotiation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -90710,19 +90926,19 @@ self: { "gtk-sni-tray" = callPackage ({ mkDerivation, base, bytestring, containers, dbus, directory , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut - , gtk3, hslogger, optparse-applicative, status-notifier-item, text - , transformers, unix + , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative + , status-notifier-item, text, transformers, unix }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.0.0"; - sha256 = "0a9yxhir33zg1bkv9nyazkrjawv2w9qr43n4prrifib7r976b7pj"; + version = "0.1.1.0"; + sha256 = "16wif6b94ipw49810jyjgl6h8mhx7bkz0pkl8ri6ir9ljp0mnvp0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk - gi-gdkpixbuf gi-glib gi-gtk hslogger status-notifier-item text - transformers unix + gi-gdkpixbuf gi-glib gi-gtk gtk-strut haskell-gi haskell-gi-base + hslogger status-notifier-item text transformers unix ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ @@ -91539,6 +91755,58 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hOpenPGP_2_6_1" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-conduit, bytestring, bzlib, conduit, conduit-extra + , containers, criterion, crypto-cipher-types, cryptonite + , data-default-class, errors, hashable, incremental-parser + , ixset-typed, lens, memory, monad-loops, nettle, network + , network-uri, newtype, openpgp-asciiarmor, QuickCheck + , quickcheck-instances, resourcet, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers + , wl-pprint-extras, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.6.1"; + sha256 = "1al531lrsgfsqjc21117l420pcd7ymv4vdzywka189lkd8p5yzj7"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-conduit bytestring bzlib + conduit conduit-extra containers crypto-cipher-types cryptonite + data-default-class errors hashable incremental-parser ixset-typed + lens memory monad-loops nettle network-uri newtype + openpgp-asciiarmor resourcet semigroups split text time + time-locale-compat transformers unliftio-core unordered-containers + wl-pprint-extras zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype QuickCheck quickcheck-instances + resourcet semigroups split tasty tasty-hunit tasty-quickcheck text + time time-locale-compat transformers unliftio-core + unordered-containers wl-pprint-extras zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bifunctors binary + binary-conduit bytestring bzlib conduit conduit-extra containers + criterion crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype openpgp-asciiarmor resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers wl-pprint-extras zlib + ]; + homepage = "https://salsa.debian.org/clint/hOpenPGP"; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB" = callPackage ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel @@ -96896,8 +97164,8 @@ self: { }: mkDerivation { pname = "haskell-igraph"; - version = "0.4.0"; - sha256 = "19bhfcrfj4jxd6znqzslax6sd4w1icwp4rn3h0w31qpjv54x171f"; + version = "0.5.0"; + sha256 = "1hil0zl4pnvkh0ingp0bgi0m7mhmvf1pqr7qskjxm6pa9kqybrw9"; libraryHaskellDepends = [ base bytestring bytestring-lexing cereal cereal-conduit colour conduit data-default-class hashable hxt primitive split @@ -96920,8 +97188,8 @@ self: { }: mkDerivation { pname = "haskell-import-graph"; - version = "1.0.3"; - sha256 = "1fh3nn4hqcj6lc3m1zlxykxk2dbchh3cdz63k8zfpl7dr2d91132"; + version = "1.0.4"; + sha256 = "17ac5k98aqx77lq398kgvyiylpmkvxdmxzqbh7wk1fl9kphwsdm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106808,8 +107076,8 @@ self: { pname = "hoist-error"; version = "0.1.0.2"; sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; - revision = "2"; - editedCabalFile = "0yg8w9cy4qff8hkv0057qqwiapfhh2sxx43j64wgdp8vb8jar97w"; + revision = "3"; + editedCabalFile = "1f2znb9x4f4m8h3d66pdyi7fqjr6v120mjqswj40dy7p2wmd6dm6"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -108425,18 +108693,20 @@ self: { }) {}; "hpc-threshold" = callPackage - ({ mkDerivation, base, bytestring, interpolate, pcre-heavy }: + ({ mkDerivation, base, bytestring, deepseq, hspec, interpolate + , pcre-heavy + }: mkDerivation { pname = "hpc-threshold"; - version = "0.1.0.0"; - sha256 = "113m7fpm4zffvzwnqjzd45mbc18acgj5c1b9z5hqwklygjjjpx4a"; + version = "0.1.0.3"; + sha256 = "0f16iq5d6d865ifg9lwbli16p5svzy3hjp05fkivqnl3p7hmd297"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring interpolate pcre-heavy ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base deepseq hspec ]; homepage = "https://github.com/eckyputrady/hpc-threshold#readme"; - description = "Small utility for validating whether HPC result is above defined thresholds"; + description = "Ensure the code coverage is above configured thresholds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -109376,23 +109646,24 @@ self: { "hs-multiaddr" = callPackage ({ mkDerivation, base, bytes, bytestring, cereal, either-unwrap - , filepath, hspec, iproute, multihash, sandi + , filepath, hs-multihash, hspec, iproute, sandi }: mkDerivation { pname = "hs-multiaddr"; - version = "0.1.0.1"; - sha256 = "0bac505a3fvz46zbh60vl0m6jj5snjbmj925vxhv6bpdydidi8hw"; + version = "0.1.4"; + sha256 = "0vmyqrgrw1fqm26mgb1bwdivv5iwgypb5186awva665gvp8p30ib"; libraryHaskellDepends = [ - base bytes bytestring cereal filepath iproute multihash sandi + base bytes bytestring cereal filepath hs-multihash iproute sandi ]; testHaskellDepends = [ - base bytestring either-unwrap hspec iproute multihash sandi + base bytestring either-unwrap hs-multihash hspec iproute sandi ]; - homepage = "https://github.com/MatrixAI/haskell-multiaddr#readme"; - description = "Multiaddr Library for LibP2P"; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/MatrixAI/hs-multiaddr#readme"; + description = "Multiaddr library"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {hs-multihash = null;}; "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: @@ -113682,8 +113953,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.1.0.3"; - sha256 = "0bzja2n7hxj530d3pfh58zn29vapl341fy7x6ggvp5sfgsysg7ll"; + version = "1.1.0.4"; + sha256 = "03ffmff09k6aqpd9rv41bfi566pr6hk4vdjm0my2wfypbn2mrgb0"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -114591,6 +114862,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http-reverse-proxy_0_6_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , conduit, conduit-extra, containers, hspec, http-client + , http-conduit, http-types, network, resourcet, streaming-commons + , text, transformers, unliftio, wai, wai-logger, warp, word8 + }: + mkDerivation { + pname = "http-reverse-proxy"; + version = "0.6.0"; + sha256 = "1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive conduit + conduit-extra containers http-client http-types network resourcet + streaming-commons text transformers unliftio wai wai-logger word8 + ]; + testHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra hspec + http-conduit http-types network resourcet streaming-commons + transformers unliftio wai warp + ]; + homepage = "https://github.com/fpco/http-reverse-proxy"; + description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -115502,6 +115799,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hvega" = callPackage + ({ mkDerivation, aeson, base, text, vector }: + mkDerivation { + pname = "hvega"; + version = "0.1.0.0"; + sha256 = "14czd3qhji2aq4x23v0a1fhschnq1azd8spiar9pw5z12z4n9j1l"; + libraryHaskellDepends = [ aeson base text vector ]; + homepage = "https://github.com/DougBurke/hvega"; + description = "Create Vega and Vega-Lite visualizations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-balancedparens" = callPackage ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector @@ -115812,17 +116121,16 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, temporary, transformers - , unix + , either, hspec, monad-loops, rdkafka, transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.4.3"; - sha256 = "18pyayl0xyb045db5584cfbbvzvmkwm3zkpvks30vrz9sb5jx1qd"; + version = "2.4.4"; + sha256 = "1zw35ikrp0r07rvnm3fah3p9xj8h8bw2h4nwv94ih1ff2ab2glhf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors bytestring containers temporary transformers unix + base bifunctors bytestring containers transformers unix ]; librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; @@ -118320,6 +118628,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell-hvega" = callPackage + ({ mkDerivation, aeson, base, hvega, ihaskell, text }: + mkDerivation { + pname = "ihaskell-hvega"; + version = "0.1.0.0"; + sha256 = "0fwn0c7v5g67gkrzq7k3myy3cxk5b176svzcgaidfs7ckl3hbsnm"; + libraryHaskellDepends = [ aeson base hvega ihaskell text ]; + homepage = "https://github.com/githubuser/ihaskell-hvega#readme"; + description = "IHaskell display instance for hvega types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ihaskell-inline-r" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , filepath, ihaskell, ihaskell-blaze, inline-r, template-haskell @@ -119279,6 +119599,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "incremental-parser_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.3.1"; + sha256 = "1nygr5hs547innw9f5wx8ifpkiq01ckbhx34266ds6rmnjsqxzby"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + homepage = "https://github.com/blamario/incremental-parser"; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -120305,8 +120646,8 @@ self: { }: mkDerivation { pname = "int-multimap"; - version = "0.1.0.1"; - sha256 = "0xi0n9hhra6pzqnxahf109qgifxnsgvc9v9jl0qmnxzz5yki1pvg"; + version = "0.2"; + sha256 = "17hwqly7v5224fddan9nkywv4pp478nby7iswaj32x27qwn9p11f"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -120525,8 +120866,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.30"; - sha256 = "0axjmswi9jgyd9kkhyjwbviqbh693vvki4hvwcg7rq6dsgl0lgk8"; + version = "0.1.31"; + sha256 = "0d6pc7mza12889wbzxy7gb5fb86v3b5pm2cdvcvnh6gd6x4ii336"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -125661,6 +126002,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-kafka" = callPackage + ({ mkDerivation, aeson, base, bytestring, hw-kafka-client, katip }: + mkDerivation { + pname = "katip-kafka"; + version = "0.0.1"; + sha256 = "1w5w3sccvh1rl0zd69k0nya0bbf9jwi9ahb7q1c761jq5333gv8q"; + libraryHaskellDepends = [ + aeson base bytestring hw-kafka-client katip + ]; + homepage = "https://github.com/s9gf4ult/katip-kafka"; + description = "Katip scribe to send logs to Kafka"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "katip-rollbar" = callPackage ({ mkDerivation, aeson, async, base, hostname, http-client, katip , rollbar-hs, stm-chans, text, time @@ -128154,8 +128509,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.8"; - sha256 = "0609xpjcq294ypjq4blw1cb3a6jnjzm9gwzr54dnp3afhindbq3m"; + version = "1.2.0.9"; + sha256 = "0narp1zhvyannd627bafh6yhk8y5lfw6f5nqr9wi1qvbynmlmhmg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -130767,8 +131122,8 @@ self: { }: mkDerivation { pname = "lens-utils"; - version = "1.4.4"; - sha256 = "0ry04ghvbyxa236s150hfs5fa0fsip312ivflg70j49n02ypxr91"; + version = "1.4.5"; + sha256 = "00xcwyl12w95k14rc12ww2i0kgbrv39q1lvq5kfj3z7l5hv4fg0g"; libraryHaskellDepends = [ aeson base containers data-default lens monoid split template-haskell @@ -137885,6 +138240,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mapalgebra" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, deepseq, hmatrix, HUnit-approx, massiv, massiv-io + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "mapalgebra"; + version = "0.1.0"; + sha256 = "1d4cdwkrbvkh53h3vkzghikmbnba3x1j84r0wgsc90cnr2im5san"; + libraryHaskellDepends = [ + base bytestring containers data-default deepseq hmatrix massiv + massiv-io vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq hmatrix + HUnit-approx massiv massiv-io QuickCheck tasty tasty-hunit + tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default deepseq hmatrix + massiv massiv-io vector + ]; + homepage = "https://github.com/fosskers/mapalgebra"; + description = "Efficient, polymorphic Map Algebra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mappy" = callPackage ({ mkDerivation, ansi-terminal, base, containers, directory , haskeline, hspec, parsec, QuickCheck @@ -137930,10 +138312,11 @@ self: { ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "marihana"; - version = "0.2.1.0"; - sha256 = "03aw0chicgmyj3ix7nz0dc5mpck0409bv1d7lfs5wn9z4mmynqiv"; + version = "0.2.2.0"; + sha256 = "0xg2ldcm01b352zjv9rh0vvdbhxbcwfvi8464ymh4ms8nh3x4hb6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath process ]; executableHaskellDepends = [ base directory filepath process ]; testHaskellDepends = [ base directory filepath process ]; @@ -138759,26 +139142,27 @@ self: { , config-ini, connection, containers, directory, filepath, gitrev , hashable, Hclip, mattermost-api, mattermost-api-qc , microlens-platform, mtl, process, quickcheck-text, semigroups - , skylighting, stm, stm-delay, strict, string-conversions, tasty - , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time - , timezone-olson, timezone-series, transformers, Unique, unix - , unordered-containers, utf8-string, vector, vty, word-wrap - , xdg-basedir + , skylighting-core, stm, stm-delay, strict, string-conversions + , tasty, tasty-hunit, tasty-quickcheck, temporary, text + , text-zipper, time, timezone-olson, timezone-series, transformers + , Unique, unix, unordered-containers, utf8-string, vector, vty + , word-wrap, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40800.0.2"; - sha256 = "0fgk0my3r0vcw545xqjcda8ikj5cbfzgg9vxfs3jzdcnsa0rgcyf"; + version = "40900.0.1"; + sha256 = "1ygnh27dv5hprb5fqqxwjxsf43ik784pwdagndn3sdiddy2k3yf7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers directory filepath gitrev hashable Hclip mattermost-api microlens-platform - mtl process semigroups skylighting stm stm-delay strict temporary - text text-zipper time timezone-olson timezone-series transformers - unix unordered-containers utf8-string vector vty word-wrap - xdg-basedir + mtl process semigroups skylighting-core stm stm-delay strict + temporary text text-zipper time timezone-olson timezone-series + transformers unix unordered-containers utf8-string vector vty + word-wrap xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -138803,8 +139187,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40800.0.2"; - sha256 = "1l2yb9nvy2haw5kyjjij465g45w8xm8vm97jbkx5jb3p4cs44xl8"; + version = "40900.1.0"; + sha256 = "1ngpinpal50s8bizwvnpafx6zh8zqb7m0yc21lcp7ybh4yhwikad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138828,8 +139212,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40800.0.2"; - sha256 = "04whpcbcd5cqnwfrskk3r2gjmyvap2m7d8xsjdry56kil6iqznk5"; + version = "40900.1.0"; + sha256 = "0mdwi6130hz508bxbhriyg7fr6rqpbalmjwwizvj9nb7cz1dmrsl"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -141043,26 +141427,25 @@ self: { }) {}; "mighttpd2" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , byteorder, bytestring, case-insensitive, conduit, conduit-extra - , directory, filepath, hspec, http-client, http-date, http-types - , io-choice, network, old-locale, parsec, resourcet - , streaming-commons, time, transformers, unix, unix-time - , unordered-containers, wai, wai-app-file-cgi, wai-http2-extra - , wai-logger, warp + ({ mkDerivation, array, async, auto-update, base, byteorder + , bytestring, case-insensitive, conduit, conduit-extra, directory + , filepath, hspec, http-client, http-date, http-types, io-choice + , network, old-locale, parsec, resourcet, streaming-commons, time + , transformers, unix, unix-time, unordered-containers, wai + , wai-app-file-cgi, wai-http2-extra, wai-logger, warp }: mkDerivation { pname = "mighttpd2"; - version = "3.4.2"; - sha256 = "0a5i9cs0rjap7i4gyda6dgglckn3ys0ldl0qkvnxvm87bcyyfc3k"; + version = "3.4.3"; + sha256 = "0afa25kaagdznfg1kbm5hbmlfk75p7rws0x9fjb505wrr12jipbh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async auto-update base blaze-builder byteorder bytestring - case-insensitive conduit conduit-extra directory filepath http-date - http-types io-choice network parsec resourcet streaming-commons - unix unix-time unordered-containers wai wai-app-file-cgi warp + array async auto-update base byteorder bytestring case-insensitive + conduit conduit-extra directory filepath http-date http-types + io-choice network parsec resourcet streaming-commons unix unix-time + unordered-containers wai wai-app-file-cgi warp ]; executableHaskellDepends = [ base bytestring conduit-extra directory filepath http-client @@ -151074,8 +151457,8 @@ self: { pname = "np-extras"; version = "0.3.1.1"; sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; - revision = "1"; - editedCabalFile = "1m4sfcpb9dcawckfk6nb2qib402s958zjgspd4svxrzdyaqqg4i3"; + revision = "2"; + editedCabalFile = "01jp7y4lsdxlfrbi5vqsc5iyjzzc996w7g88amkkfg5k6amlxb9r"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -155493,7 +155876,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_1_3" = callPackage + "pandoc_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , Cabal, case-insensitive, cmark-gfm, containers, criterion @@ -155508,8 +155891,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.1.3"; - sha256 = "023h0jdn996q37p8b5wdi1hifq17drrwbfq92c6imxwk2a4rl3jf"; + version = "2.2"; + sha256 = "0sc51sw7g9jni9jamj7rcdn9fqf5476gzp7cahhkjj29xak88a8g"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -155579,6 +155962,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_14_3_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat + , bytestring, Cabal, containers, data-default, directory, filepath + , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec + , process, rfc5051, setenv, split, syb, tagsoup, temporary, text + , time, unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.14.3.1"; + sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers data-default directory + filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec + rfc5051 setenv split syb tagsoup text time unordered-containers + vector xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base base-compat bytestring filepath + pandoc pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base base-compat bytestring containers directory filepath mtl + pandoc pandoc-types process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -157554,8 +157973,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.6.1.0"; - sha256 = "1i6vql76j5439bwdd1z7haphgm4x82rh08s22fc70hmfzkrln733"; + version = "0.6.1.1"; + sha256 = "153d2ij27jjsh0h014d1v3y06diri1njbmwzvq2kgwdbdqgkhf0y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158556,8 +158975,8 @@ self: { }: mkDerivation { pname = "pedersen-commitment"; - version = "0.1.0"; - sha256 = "10flwinxxs1vg2giqqyazcgxrykqsj6m0kgd62b8f4wzmygws4r1"; + version = "0.2.0"; + sha256 = "1dxh20abilyf29jg6dbl9al300v7wzd1avv36p4hf8x2xwvwr4v7"; libraryHaskellDepends = [ base bytestring containers cryptonite memory mtl protolude text ]; @@ -158567,7 +158986,7 @@ self: { ]; homepage = "https://github.com/adjoint-io/pedersen-commitment#readme"; description = "An implementation of Pedersen commitment schemes"; - license = stdenv.lib.licenses.asl20; + license = stdenv.lib.licenses.mit; }) {}; "peg" = callPackage @@ -158946,6 +159365,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perhaps" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, mtl + , transformers, transformers-compat + }: + mkDerivation { + pname = "perhaps"; + version = "0"; + sha256 = "16bm069pqrdsbscyp9m1r7cciqppkvlmgn4xgzp3yyfh69z095gn"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/perhaps/"; + description = "Perhaps, a monad"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "period" = callPackage ({ mkDerivation, base, hspec, HUnit, old-locale , optparse-applicative, parsec, text, text-show, time @@ -159077,6 +159514,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-types-HDBC-pg_0_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, convertible, dlist, HDBC + , persistable-record, relational-query, relational-query-HDBC + , text-postgresql + }: + mkDerivation { + pname = "persistable-types-HDBC-pg"; + version = "0.0.3.1"; + sha256 = "1dmvwr21q5g15v50b5ycnyvqbrfg75pw5kdvmi4sp03yldk0fsdc"; + libraryHaskellDepends = [ + base bytestring convertible dlist HDBC persistable-record + relational-query relational-query-HDBC text-postgresql + ]; + testHaskellDepends = [ + base relational-query relational-query-HDBC text-postgresql + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "HDBC and Relational-Record instances of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -165616,6 +166075,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-relative-time" = callPackage + ({ mkDerivation, base, genvalidity-hspec, genvalidity-time, hspec + , QuickCheck, time, validity, validity-time + }: + mkDerivation { + pname = "pretty-relative-time"; + version = "0.0.0.0"; + sha256 = "0k28jh5mw5qfw4d1hfdj2f53qwmn3apy1yxwyxjbr50m2924j8f2"; + libraryHaskellDepends = [ base time validity validity-time ]; + testHaskellDepends = [ + base genvalidity-hspec genvalidity-time hspec QuickCheck time + validity validity-time + ]; + homepage = "https://github.com/NorfairKing/pretty-relative-time#readme"; + description = "Pretty relative time"; + license = stdenv.lib.licenses.mit; + }) {}; + "pretty-show" = callPackage ({ mkDerivation, array, base, filepath, ghc-prim, happy , haskell-lexer, pretty @@ -168063,6 +168540,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20180426" = callPackage + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20180426"; + sha256 = "0pfxsh2ds3dwm6mq6g85vhq8rdgc93bn84pq1b4lk3sf71sqs2ii"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion random ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -171981,8 +172475,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.0.8"; - sha256 = "05rad5dckya26mai39623n5bvhvk13yjxikrc6r7yc6nvlkkh8zb"; + version = "4.0.9"; + sha256 = "0wz36zclpckkm8w7mmdzbklrr08ggyqsk7j4wfxbh4gxa0ry7yj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179148,16 +179642,16 @@ self: { }: mkDerivation { pname = "runmany"; - version = "0.1.2"; - sha256 = "1c672mxmgw3d7r3fbnjm9i7b74v00xrf95riwl2a52a1lpkmb0ip"; + version = "0.1.3"; + sha256 = "19pgmq009f5kpsilixbnsx5frl9c12v6in0blifandr9q3n9is9c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ async base bytestring optparse-applicative process stm ]; - homepage = "https://github.com/jwiegley/runmany"; + homepage = "https://github.com/jwiegley/runmany#readme"; description = "Run multiple commands, interleaving output and errors"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -185009,8 +185503,8 @@ self: { }: mkDerivation { pname = "servant-tracing"; - version = "0.1.0.1"; - sha256 = "0dff51fywa1z1png1hhwpn4f8av2jxdsplin8h80aad459czaid2"; + version = "0.1.0.2"; + sha256 = "0qpamaf3ydfb8197iz2prjh9nxwxi03cdfsp3jl28rhbqrc2xpry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188224,16 +188718,16 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-discover + ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.1"; - sha256 = "17nvwph2g5xzi8lqgyrsbskdm9flwr7h3ch7yf4rnbx3bg37bvsh"; + version = "0.4.0.2"; + sha256 = "0zqy3ffndyvz97wfs0ha0d5j6045gfdh0p6rmz6dv87j9mqmfpl0"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ - base doctest doctest-discover tasty tasty-quickcheck + base doctest doctest-driver-gen tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/dzhus/simple-vec3#readme"; @@ -188931,6 +189425,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skeletal-set" = callPackage + ({ mkDerivation, base, containers, mtl, smallcheck, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "skeletal-set"; + version = "0.1.0.0"; + sha256 = "0f8mc705bk6nc6l95y65fvcxi772fwvqy3cgm0sb3rv13h4rn468"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers mtl smallcheck tasty tasty-discover tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + description = "Skeletal set - a set with equivalence relation different from equality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "skeleton" = callPackage ({ mkDerivation, argparser, attoparsec, base, bytestring, filepath , hex, posix-escape, process, time @@ -192105,6 +192616,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sorted-list_0_2_1_0" = callPackage + ({ mkDerivation, base, criterion, deepseq }: + mkDerivation { + pname = "sorted-list"; + version = "0.2.1.0"; + sha256 = "1x2ygkh32q2kk5g7b7hnrl8z8azvgwsj36f3ndg79pzhghapdr5l"; + libraryHaskellDepends = [ base deepseq ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; + description = "Type-enforced sorted lists and related functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sorting" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -192779,6 +193304,8 @@ self: { pname = "species"; version = "0.4.0.1"; sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; + revision = "1"; + editedCabalFile = "1pvk34n7lsbpng9b6m6nrhhr44z1pilh292j3lfnx69hvxhvaq93"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -194223,86 +194750,82 @@ self: { "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base64-bytestring, bindings-uname - , blaze-builder, bytestring, Cabal, clock, conduit, conduit-extra - , containers, cryptonite, cryptonite-conduit, deepseq, directory - , echo, exceptions, extra, fast-logger, file-embed, filelock - , filepath, fsnotify, generic-deriving, gitrev, hackage-security - , hashable, hastache, hpack, hpc, hspec, http-client - , http-client-tls, http-conduit, http-types, memory, microlens - , microlens-mtl, mintty, monad-logger, mono-traversable, mtl + , attoparsec, base, base64-bytestring, bindings-uname, bytestring + , Cabal, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, deepseq, directory, echo, exceptions, extra + , file-embed, filelock, filepath, fsnotify, generic-deriving + , gitrev, hackage-security, hashable, hpack, hpc, hspec + , http-client, http-client-tls, http-conduit, http-types, memory + , microlens, mintty, monad-logger, mono-traversable, mtl, mustache , neat-interpolation, network-uri, open-browser , optparse-applicative, optparse-simple, path, path-io, persistent - , persistent-sqlite, persistent-template, pid1, pretty, primitive + , persistent-sqlite, persistent-template, pretty, primitive , process, project-template, QuickCheck, regex-applicative-text - , resourcet, retry, semigroups, smallcheck, split, stm, store + , resourcet, retry, rio, semigroups, smallcheck, split, stm, store , store-core, streaming-commons, tar, template-haskell, temporary , text, text-metrics, th-reify-many, time, tls, transformers - , unicode-transforms, unix, unix-compat, unliftio + , typed-process, unicode-transforms, unix, unix-compat, unliftio , unordered-containers, vector, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.6.5"; - sha256 = "0f5a0znxwmib03vhqkw0yiv89a82z43wlm7zwfyx30gfz6iqqp7f"; + version = "1.7.1"; + sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r"; revision = "1"; - editedCabalFile = "11bmzlf3gxbz2gij0l2999a296z4c12l27f7jfyfka8l1k15d6b1"; + editedCabalFile = "12ym80mwlvg3zwbjhmby4k467hxa0yip0314w658ivn0sq6vgycw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - hackage-security hashable hastache hpack hpc http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving hackage-security hashable hpack hpc + http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template pid1 + path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template regex-applicative-text - resourcet retry semigroups split stm store store-core + resourcet retry rio semigroups split stm store store-core streaming-commons tar template-haskell temporary text text-metrics - th-reify-many time tls transformers unicode-transforms unix - unix-compat unliftio unordered-containers vector yaml zip-archive - zlib + th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; executableHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - gitrev hackage-security hashable hastache hpack hpc http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving gitrev hackage-security hashable hpack + hpc http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative optparse-simple path path-io persistent persistent-sqlite - persistent-template pid1 pretty primitive process project-template - regex-applicative-text resourcet retry semigroups split stm store - store-core streaming-commons tar template-haskell temporary text - text-metrics th-reify-many time tls transformers unicode-transforms - unix unix-compat unliftio unordered-containers vector yaml - zip-archive zlib + persistent-template pretty primitive process project-template + regex-applicative-text resourcet retry rio semigroups split stm + store store-core streaming-commons tar template-haskell temporary + text text-metrics th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; testHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - hackage-security hashable hastache hpack hpc hspec http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving hackage-security hashable hpack hpc hspec + http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template pid1 + path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template QuickCheck - regex-applicative-text resourcet retry semigroups smallcheck split - stm store store-core streaming-commons tar template-haskell + regex-applicative-text resourcet retry rio semigroups smallcheck + split stm store store-core streaming-commons tar template-haskell temporary text text-metrics th-reify-many time tls transformers - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -194386,6 +194909,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stack-network" = callPackage + ({ mkDerivation, ansi-terminal, async, base, binary, bytestring + , Cabal, clock, configurator, directory, dirstream + , distributed-process-lifted, distributed-process-simplelocalnet + , exceptions, filepath, hspec, lifted-base, mtl + , optparse-applicative, pipes, pipes-safe, process, raw-strings-qq + , system-fileio, system-filepath, temporary, text, transformers + , yaml + }: + mkDerivation { + pname = "stack-network"; + version = "0.1.0.0"; + sha256 = "0l2r6r89lj1197ybsfgjxikhpgravw12zjpaz62gcsvdhdcflsak"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath lifted-base + mtl optparse-applicative pipes pipes-safe process system-fileio + system-filepath temporary text transformers + ]; + executableHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath lifted-base + mtl optparse-applicative pipes pipes-safe process system-fileio + system-filepath temporary text transformers + ]; + testHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath hspec + lifted-base mtl optparse-applicative pipes pipes-safe process + raw-strings-qq system-fileio system-filepath temporary text + transformers yaml + ]; + homepage = "https://github.com/McGizzle/stack-network#readme"; + description = "A program for extending Stack to add distributed capabilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stack-prism" = callPackage ({ mkDerivation, base, profunctors, tagged, template-haskell , transformers @@ -198072,18 +198637,18 @@ self: { "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , file-embed, filepath, haskell-src-exts, HUnit, mtl - , optparse-applicative, strict, syb, test-framework + , optparse-applicative, semigroups, strict, syb, test-framework , test-framework-hunit, yaml }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.0.2"; - sha256 = "0w0hh08b1zlp3disxp20yrg20vblqgk5y3arf8xbfiznzf05x5zr"; + version = "0.9.1.1"; + sha256 = "0qvaxivxvgaz4zpgc6275j9psdipj2p7y3msv9py11z1y6r5izss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath - haskell-src-exts mtl syb yaml + haskell-src-exts mtl semigroups syb yaml ]; executableHaskellDepends = [ aeson base bytestring containers directory file-embed filepath @@ -200802,6 +201367,8 @@ self: { pname = "taffybar"; version = "1.0.2"; sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9"; + revision = "1"; + editedCabalFile = "02ip0c6fq3ra6zhhq2adxjx8j4w07x19zndkk0jj6jn6kj5qggf3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -200988,16 +201555,14 @@ self: { }: mkDerivation { pname = "tagged-transformer"; - version = "0.8"; - sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7"; - revision = "1"; - editedCabalFile = "06h1v2q35dzc69vfshzvwcpai176dd3bp89hvgcm5r6dyii6bqlg"; + version = "0.8.1"; + sha256 = "1ffwxr312vi3fqhgnad5b6gqkgz3j27c30z551j8zisjx0hn3zx0"; libraryHaskellDepends = [ base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged ]; homepage = "http://github.com/ekmett/tagged-transformer"; - description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; + description = "Monad transformer carrying an extra phantom type tag"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -202610,14 +203175,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "teardown_0_4_0_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, criterion, rio, tasty + "teardown_0_4_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, gauge, rio, tasty , tasty-hunit, typed-process, unliftio }: mkDerivation { pname = "teardown"; - version = "0.4.0.0"; - sha256 = "0y2ihw74fnnygzp22nyy7285d3rcp6kw2gjkzys82blwrbdwdlsk"; + version = "0.4.1.0"; + sha256 = "1w8yblzn0i8i03bfg97qgq4c6i6l2p04krvwg41q157rcgb91gq0"; libraryHaskellDepends = [ ansi-wl-pprint base rio typed-process unliftio ]; @@ -202625,10 +203190,10 @@ self: { base rio tasty tasty-hunit typed-process unliftio ]; benchmarkHaskellDepends = [ - base criterion rio typed-process unliftio + base gauge rio typed-process unliftio ]; homepage = "https://github.com/roman/Haskell-teardown#readme"; - description = "Build composable components for your application with clear teardown semantics"; + description = "Build safe and composable teardown sub-routines for resources"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -204230,6 +204795,30 @@ self: { license = "GPL"; }) {}; + "texmath_0_10_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.10.1.2"; + sha256 = "08fqlnl7r2izsl3rasa27ybnnijmn8ypvi0lbzsb3vs8rsq318px"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -210650,8 +211239,8 @@ self: { ({ mkDerivation, base, generics-sop }: mkDerivation { pname = "tuple-sop"; - version = "0.1.0.0"; - sha256 = "08g0jzqngw1bkrn212rj6d5h7ppfar7q1p8b79049ivrich6zspj"; + version = "0.2.0.1"; + sha256 = "1l2llpn3b3v5hly3bpzyhzagnrrs830xgpqaab8w1rcbhkmqby12"; libraryHaskellDepends = [ base generics-sop ]; testHaskellDepends = [ base generics-sop ]; homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme"; @@ -210902,8 +211491,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.38"; - sha256 = "19k1z6wrizym21a29hx31yhv4y5m1w0474iqm8idyxih4fya3k7s"; + version = "1.0.1.39"; + sha256 = "148lan5d4mzngkfq5l5rsz20s9dcgn71y145d1y59pr7nnlg3ipw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211951,8 +212540,8 @@ self: { }: mkDerivation { pname = "type-natural"; - version = "0.8.0.1"; - sha256 = "0ybcivp219h8xw9k31f5cimlnj63y5s2br3rahxgdacvhdb678zg"; + version = "0.8.1.0"; + sha256 = "0gp0bkcc3zx2mi8pi0j6vqigif6sy2w54pkb2qv7dlmvvijm6ra2"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger singletons template-haskell @@ -213661,8 +214250,8 @@ self: { }: mkDerivation { pname = "uniprot-kb"; - version = "0.1.1.2"; - sha256 = "15mlmappp5k8lamgmpkmyahi5vimxk3a1821c6cabs28r4d9rywy"; + version = "0.1.2.0"; + sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -218424,8 +219013,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.1.0"; - sha256 = "17209hslyqfx3lyh1a8sii3gn1ygsb5a81nampx1ym6f6gx9g3lh"; + version = "1.1.2.0"; + sha256 = "0l52494zi9r3fq3nx21r8pkbb7zkynz1gbrn58k8pramx7nhksb1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/achirkin/vulkan#readme"; description = "Low-level low-overhead vulkan api bindings"; @@ -218545,20 +219134,19 @@ self: { "wai-app-file-cgi" = callPackage ({ mkDerivation, array, attoparsec, attoparsec-conduit, base - , blaze-builder, blaze-html, bytestring, case-insensitive, conduit - , conduit-extra, containers, data-default-class, directory, doctest - , filepath, hspec, HTTP, http-client, http-conduit, http-date - , http-types, io-choice, lifted-base, mime-types, network, process - , sockaddr, static-hash, text, transformers, unix, wai, wai-conduit - , warp, word8 + , bytestring, case-insensitive, conduit, conduit-extra, containers + , data-default-class, directory, doctest, filepath, hspec, HTTP + , http-client, http-conduit, http-date, http-types, io-choice + , lifted-base, mime-types, network, process, sockaddr, static-hash + , text, transformers, unix, wai, wai-conduit, warp, word8 }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.4"; - sha256 = "1gcrfcvll4lpd8qrpcai00cn2zs8ql46z1chlqkbi7jk31r14qy0"; + version = "3.1.6"; + sha256 = "1w2hmy0q8dvg575sxmc69f9x7pcf1fx6lypzxsaxyfyazvhi4krc"; libraryHaskellDepends = [ - array attoparsec attoparsec-conduit base blaze-builder blaze-html - bytestring case-insensitive conduit conduit-extra containers + array attoparsec attoparsec-conduit base bytestring + case-insensitive conduit conduit-extra containers data-default-class directory filepath http-client http-conduit http-date http-types io-choice lifted-base mime-types network process sockaddr static-hash text transformers unix wai wai-conduit @@ -219700,6 +220288,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-throttle_0_2_2_1" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder, containers + , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm + , text, token-bucket, transformers, wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-throttle"; + version = "0.2.2.1"; + sha256 = "1z4n7ja5kq7cl2117w8wx0kz3fjdzr3mlvx6m76jbgp0504vjgja"; + libraryHaskellDepends = [ + base bytestring bytestring-builder containers hashable http-types + mtl network stm text token-bucket transformers wai + ]; + testHaskellDepends = [ + base bytestring hspec http-types HUnit QuickCheck stm transformers + wai wai-extra + ]; + description = "WAI Middleware for Request Throttling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-verbs" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, http-types , mmorph, monad-control, monad-control-aligned, monad-logger, mtl @@ -220334,6 +220944,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_22" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.22"; + sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network unix unix-compat + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -220971,20 +221617,26 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, cryptonite, http-client, http-client-tls, memory - , template-haskell, text, transformers, vector + ({ mkDerivation, aeson, async, base, basement, bytestring, cereal + , cryptonite, data-default, exceptions, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations, http-client + , http-client-tls, machines, memory, mtl, parsec, split, stm + , tagged, template-haskell, text, time, transformers }: mkDerivation { pname = "web3"; - version = "0.6.0.0"; - sha256 = "1dwwxvh11867f18lw9g2rjqsjawqa92p6063x64izdl1qj5qnwv9"; + version = "0.7.0.0"; + sha256 = "0mlrscl6f6l2jcsgw4x97p2qcd26d73wy8m13gbnhrh04d4kmd9h"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring cryptonite - http-client http-client-tls memory template-haskell text - transformers vector + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop http-client http-client-tls machines memory + mtl parsec tagged template-haskell text transformers + ]; + testHaskellDepends = [ + async base bytestring data-default generics-sop hspec hspec-contrib + hspec-discover hspec-expectations memory split stm tagged text time + transformers ]; - testHaskellDepends = [ base memory text ]; homepage = "https://github.com/airalab/hs-web3#readme"; description = "Ethereum API for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -227406,6 +228058,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-bin_1_6_0_2" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, Cabal, conduit, conduit-extra, containers + , data-default-class, directory, file-embed, filepath, fsnotify + , http-client, http-client-tls, http-reverse-proxy, http-types + , network, optparse-applicative, parsec, process, project-template + , resourcet, say, shakespeare, split, stm, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp + , warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.0.2"; + sha256 = "0x1lr6xm4h3x1ld42xs946aq4sn0g5x147bxqjxr5bfswj7vjk5k"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base base64-bytestring blaze-builder bytestring Cabal + conduit conduit-extra containers data-default-class directory + file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types network optparse-applicative parsec + process project-template resourcet say shakespeare split stm + streaming-commons tar template-haskell text time transformers + transformers-compat unix-compat unliftio unordered-containers wai + wai-extra warp warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -227588,6 +228273,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_4" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec + , hspec-expectations, http-types, HUnit, monad-logger, mtl, network + , old-locale, parsec, path-pieces, primitive, QuickCheck, random + , resourcet, safe, semigroups, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.4"; + sha256 = "09r714ibpml8mqbqhnckync5a0kb7fyz079m9lapmvhq1yvl4zld"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq deepseq-generics directory fast-logger + http-types monad-logger mtl old-locale parsec path-pieces primitive + random resourcet safe semigroups shakespeare template-haskell text + time transformers unix-compat unliftio unordered-containers vector + wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces QuickCheck random resourcet shakespeare + streaming-commons template-haskell text transformers unliftio wai + wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -227888,6 +228614,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-bootstrap4_1_0_0" = callPackage + ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }: + mkDerivation { + pname = "yesod-form-bootstrap4"; + version = "1.0.0"; + sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq"; + libraryHaskellDepends = [ + base shakespeare text yesod-core yesod-form + ]; + homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme"; + description = "renderBootstrap4"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -228821,6 +229562,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_3" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , network, persistent, pretty-show, semigroups, text, time + , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.3"; + sha256 = "0mxjkk6bkxgjpdifvz7qlqg0ms1xh19b8r7f96lp0pcnfksnil4d"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network persistent pretty-show semigroups text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit text + unliftio wai wai-extra xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test From e39a75cd350f03d13b3bded2bb605629f5031330 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:16:17 +0200 Subject: [PATCH 326/491] haskell-pandoc: update override for ghc-8.4.x --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index b38b17e34751..09de2116098d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -575,7 +575,7 @@ self: super: { brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; matrix = self.matrix_0_3_6_1; - pandoc = self.pandoc_2_1_3; + pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; # https://github.com/xmonad/xmonad/issues/155 From 99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:27:21 +0200 Subject: [PATCH 327/491] haskell-hpack: use latest version for ghc-8.4.x to fix the build --- .../configuration-ghc-8.4.x.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 09de2116098d..2440e3b7a9dc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -293,23 +293,6 @@ self: super: { }; }); - ## Unmerged. PR: https://github.com/sol/hpack/pull/277 - ## Issue: https://github.com/sol/hpack/issues/276 - hpack = overrideCabal super.hpack (drv: { - ## • No instance for (Semigroup Dependencies) - ## arising from the 'deriving' clause of a data type declaration - ## Possible fix: - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "hpack"; - rev = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6"; - sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y"; - }; - ## Setup: Encountered missing dependencies: - ## http-client -any, http-client-tls -any, http-types -any - libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ http-client http-client-tls http-types ]); - }); - ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 monadplus = overrideCabal super.monadplus (drv: { ## • No instance for (Semigroup (Partial a b)) @@ -574,6 +557,7 @@ self: super: { # Older versions don't compile. brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; + hpack = self.hpack_0_28_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; From c60c6a2443ab45169996aba33ae883622bbc1026 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:30:57 +0200 Subject: [PATCH 328/491] git-annex: update sha256 hash for new 6.2018042 version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cfa80062e3be..82ac96d2c85d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -82,7 +82,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "011kiyy1anj99ab70npl5i7pcqri0pdk04s4cvdm39zyas5m9lbd"; + sha256 = "05rygb8jm4nh7ggzihz6664hcgwkbqspi8gbpkpf7l7wwvzdm1rd"; }; })).overrideScope (self: super: { aws = dontCheck (self.aws_0_18); From f0549be090185a07da2be4b26f654a487c45243f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:32:01 +0200 Subject: [PATCH 329/491] haskell-stack: update overrides for the new 1.7.1 version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 82ac96d2c85d..ec8e7a1bc2b7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -863,8 +863,8 @@ self: super: { testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); - # https://github.com/fpco/stackage/issues/3126 - stack = doJailbreak super.stack; + # Needs newer versions than what we have in LTS-11.x at the moment. + stack = super.stack.overrideScope (self: super: { hpack = self.hpack_0_28_2; }); # These packages depend on each other, forming an infinite loop. scalendar = markBroken (super.scalendar.override { SCalendar = null; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index b6fdb75e5506..d1bb60e83958 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -84,10 +84,11 @@ self: super: { purescript = doJailbreak (super.purescript); # These packages need Cabal 2.2.x, which is not the default. - distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); From 8564e93d2d695c08b1cfd8f5df9e6ca3928ead4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:43:19 +0200 Subject: [PATCH 330/491] haskell-c2hs: drop hacky override and try the current version again --- .../haskell-modules/configuration-common.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ec8e7a1bc2b7..8c7ef561f171 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -845,17 +845,8 @@ self: super: { # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 stack2nix = doJailbreak super.stack2nix; - # Hacks to work around https://github.com/haskell/c2hs/issues/192. - c2hs = (overrideCabal super.c2hs { - version = "0.26.2-28-g8b79823"; - doCheck = false; - src = pkgs.fetchFromGitHub { - owner = "deech"; - repo = "c2hs"; - rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; - sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; - }; - }); + # Work around https://github.com/haskell/c2hs/issues/192. + c2hs = dontCheck super.c2hs; # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { From 9f144e857870d706e85c6655d563258a291c3963 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:45:52 +0200 Subject: [PATCH 331/491] haskell-hspec-smallcheck: use latest version for ghc-8.4.x to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 2440e3b7a9dc..da65c2698228 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -558,6 +558,7 @@ self: super: { brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; + hspec-smallcheck = self.hspec-smallcheck_0_5_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; From 65adfc73ad6226c01d80ed2a19aefd02225e453d Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 28 Apr 2018 14:19:15 +0100 Subject: [PATCH 332/491] zerotierone: 1.2.4 -> 1.2.8 --- pkgs/tools/networking/zerotierone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 77df8cbf6f7d..ec6c9c196788 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.8"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "0n035f2qslw1srxjlm0szrnvb3va3sspbpxqqhng08dp68vmn9wz"; + sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8"; }; preConfigure = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; license = licenses.gpl3; - maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ]; + maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ]; platforms = platforms.x86_64 ++ platforms.aarch64; }; } From 75cfbdf33b0423c2bd8f9fb20393267ef02bbf9d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 15 Apr 2018 13:43:42 +0100 Subject: [PATCH 333/491] buildFHSUserEnv: change to root directory after chroot Fixes #38525 --- pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c index c03a1710f451..7e49e9e78d78 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -118,6 +118,7 @@ int main(gint argc, gchar **argv) { bind("/", prefix); fail_if(chroot(prefix)); + fail_if(chdir("/")); fail_if(execvp(*argv, argv)); } From 1b1b76f70a9dbf59ad8e833f9de3a60f14cf5471 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 17:24:31 +0200 Subject: [PATCH 334/491] nixos/tests/chromium: Wait 10s after new window This is a very very very ugly workaround and it's because Chromium seems to eat keystroke for a few seconds after a new window is created. I haven't found a better solution yet, so let's at least unbreak the test until we come up with a better way. Thanks to @vcunat for bringing this to my attention and also doing the initial bisect. The change that brought up this problem was 2b29e401531306d044f797a5dfa, which updated Chromium from version 65.0.3325.181 to version 66.0.3359.117. Unfortunately the upstream changelog[1] is way too large to actually guess what the breaking change is. [1]: https://chromium.googlesource.com/chromium/src/+log/65.0.3325.181..66.0.3359.117?pretty=fuller&n=10000 Signed-off-by: aszlig Cc: @bendlas, @vcunat --- nixos/tests/chromium.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 65c314e22e1d..c341e83961a8 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -94,6 +94,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { ''}"); if ($status == 0) { $ret = 1; + + # XXX: Somehow Chromium is not accepting keystrokes for a few + # seconds after a new window has appeared, so let's wait a while. + $machine->sleep(10); + last; } $machine->sleep(1); From c7713e9775ba66a1685fb52dc632114b352790d4 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 28 Apr 2018 19:39:15 +0200 Subject: [PATCH 335/491] mono: change default version to "latest" (5.8), because 4.0 does not evaluate due to security --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac46ff0f4cc..788d346684b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6706,12 +6706,12 @@ with pkgs; mlton = callPackage ../development/compilers/mlton { }; - mono = mono40; + mono = mono58; - mono40 = callPackage ../development/compilers/mono/4.0.nix { + mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; - }; + }); mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix { inherit (darwin) libobjc; @@ -6738,10 +6738,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }); - mono58 = lowPrio (callPackage ../development/compilers/mono/5.8.nix { + mono58 = callPackage ../development/compilers/mono/5.8.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; - }); + }; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; From d71df79998c59522634073b252210392d482da28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Apr 2018 19:58:03 +0200 Subject: [PATCH 336/491] home-assistant: 0.67.1 -> 0.68.0 --- pkgs/servers/home-assistant/component-packages.nix | 13 +++++++++---- pkgs/servers/home-assistant/default.nix | 8 ++++---- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3a74a43d14d5..c2f06cd6a8e3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.67.1"; + version = "0.68.0"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -86,7 +86,7 @@ "device_tracker.unifi" = ps: with ps; [ pyunifi ]; "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; - "device_tracker.xiaomi_miio" = ps: with ps; [ ]; + "device_tracker.xiaomi_miio" = ps: with ps; [ construct ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "discovery" = ps: with ps; [ netdisco ]; "dominos" = ps: with ps; [ ]; @@ -99,10 +99,12 @@ "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "enocean" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; + "eufy" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ construct ]; "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "folder_watcher" = ps: with ps; [ watchdog ]; + "fritzbox" = ps: with ps; [ ]; "frontend" = ps: with ps; [ ]; "gc100" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; @@ -110,6 +112,7 @@ "hdmi_cec" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; "homekit" = ps: with ps; [ ]; + "homekit_controller" = ps: with ps; [ ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; "http" = ps: with ps; [ aiohttp-cors ]; @@ -166,6 +169,7 @@ "media_extractor" = ps: with ps; [ ]; "media_player.anthemav" = ps: with ps; [ ]; "media_player.aquostv" = ps: with ps; [ ]; + "media_player.blackbird" = ps: with ps; [ ]; "media_player.bluesound" = ps: with ps; [ xmltodict ]; "media_player.braviatv" = ps: with ps; [ ]; "media_player.cast" = ps: with ps; [ PyChromecast ]; @@ -294,7 +298,6 @@ "sensor.dovado" = ps: with ps; [ ]; "sensor.dsmr" = ps: with ps; [ ]; "sensor.dweet" = ps: with ps; [ ]; - "sensor.ebox" = ps: with ps; [ ]; "sensor.eddystone_temperature" = ps: with ps; [ construct ]; "sensor.eliqonline" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; @@ -354,6 +357,7 @@ "sensor.serial" = ps: with ps; [ ]; "sensor.serial_pm" = ps: with ps; [ ]; "sensor.shodan" = ps: with ps; [ ]; + "sensor.sht31" = ps: with ps; [ ]; "sensor.sma" = ps: with ps; [ ]; "sensor.snmp" = ps: with ps; [ pysnmp ]; "sensor.sochain" = ps: with ps; [ ]; @@ -378,6 +382,7 @@ "sensor.twitch" = ps: with ps; [ ]; "sensor.uber" = ps: with ps; [ ]; "sensor.ups" = ps: with ps; [ ]; + "sensor.uscis" = ps: with ps; [ ]; "sensor.vasttrafik" = ps: with ps; [ ]; "sensor.waqi" = ps: with ps; [ ]; "sensor.waze_travel_time" = ps: with ps; [ ]; @@ -434,7 +439,7 @@ "twilio" = ps: with ps; [ twilio ]; "upcloud" = ps: with ps; [ ]; "updater" = ps: with ps; [ distro ]; - "upnp" = ps: with ps; [ miniupnpc ]; + "upnp" = ps: with ps; [ ]; "usps" = ps: with ps; [ ]; "vacuum.roomba" = ps: with ps; [ ]; "vacuum.xiaomi_miio" = ps: with ps; [ construct ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0f15b21e4685..0751ffb3c9ed 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -8,10 +8,10 @@ let py = python3.override { packageOverrides = self: super: { aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.1.1"; + version = "3.1.3"; src = oldAttrs.src.override { inherit version; - sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f"; + sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad"; }; }); pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { @@ -58,7 +58,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.67.1"; + hassVersion = "0.68.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -73,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "02czbqdsdar8rjkr0r5g6j1x9caazcir2w1hp595z4cn90c0342f"; + sha256 = "037gc2sghg5n0li087vvjcf6657rd31wv0m5r23b2cdfds8lxk4w"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index fbafa87e622e..678b5d3826c7 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180404.0"; + version = "20180426.0"; src = fetchPypi { inherit pname version; - sha256 = "ac36d4f5e30e93b02dadd2ecdc07218fde3d97ffc2f69a6f1acf5e601cd4e5ad"; + sha256 = "60ff4e0b0c4538fa0be0db9407f95333546940e119a8d3edb9b0d7e1c86b1f3b"; }; propagatedBuildInputs = [ user-agents ]; From e22ba26c7b33cb262e8c393c5fbaea6579100acd Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Tue, 17 Apr 2018 16:21:28 +0100 Subject: [PATCH 337/491] binutils: apply patch on aarch64 to fix https://sourceware.org/bugzilla/show_bug.cgi?id=22764 (cherry picked from commit 5ce2d3355d4bcda5e1393b0cfb52b834e82d2546) --- .../tools/misc/binutils/default.nix | 8 +- ...RCH64_ABS32-R_AARCH64_ABS16-absolute.patch | 130 ++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e65736a3e887..ac055171658b 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -64,7 +64,13 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch - ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch; + ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch + ++ stdenv.lib.optionals targetPlatform.isAarch64 [ + # Version 2.30 introduced strict requirements on ELF relocations which cannot + # be satisfied on aarch64 platform. Add backported fix from bugzilla. + # https://sourceware.org/bugzilla/show_bug.cgi?id=22764 + ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch + ]; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch new file mode 100644 index 000000000000..6a04b3cc5588 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch @@ -0,0 +1,130 @@ +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index c310da6ed3..d31f46171f 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,10 @@ ++2018-02-05 Renlin Li ++ ++ PR ld/22764 ++ * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the ++ R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the ++ check for writeable section as well. ++ + 2018-01-27 Nick Clifton + + This is the 2.30 release: +diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c +index d5711e0eb1..973188220b 100644 +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -7074,10 +7074,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, + #if ARCH_SIZE == 64 + case BFD_RELOC_AARCH64_32: + #endif +- if (bfd_link_pic (info) +- && (sec->flags & SEC_ALLOC) != 0 +- && (sec->flags & SEC_READONLY) != 0) ++ if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0) + { ++ if (h != NULL ++ /* This is an absolute symbol. It represents a value instead ++ of an address. */ ++ && ((h->root.type == bfd_link_hash_defined ++ && bfd_is_abs_section (h->root.u.def.section)) ++ /* This is an undefined symbol. */ ++ || h->root.type == bfd_link_hash_undefined)) ++ break; ++ ++ /* For local symbols, defined global symbols in a non-ABS section, ++ it is assumed that the value is an address. */ + int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; + _bfd_error_handler + /* xgettext:c-format */ +diff --git a/ld/ChangeLog b/ld/ChangeLog +index 6337cd0cb6..1aaa6da3b5 100644 +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -1,3 +1,11 @@ ++2018-02-05 Renlin Li ++ ++ PR ld/22764 ++ * testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address. ++ * testsuite/ld-aarch64/emit-relocs-259.s: Likewise. ++ * testsuite/ld-aarch64/pr22764.s: New. ++ * testsuite/ld-aarch64/pr22764.d: New. ++ + 2018-01-27 Nick Clifton + + This is the 2.30 release: +diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp +index f31089361b..d766f3736b 100644 +--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp ++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp +@@ -275,6 +275,7 @@ run_dump_test "pr17415" + run_dump_test_lp64 "tprel_g2_overflow" + run_dump_test "tprel_add_lo12_overflow" + run_dump_test "protected-data" ++run_dump_test_lp64 "pr22764" + + # ifunc tests + run_dump_test "ifunc-1" +diff --git a/ld/testsuite/ld-aarch64/emit-relocs-258.s b/ld/testsuite/ld-aarch64/emit-relocs-258.s +index f724776243..87bb657c5d 100644 +--- a/ld/testsuite/ld-aarch64/emit-relocs-258.s ++++ b/ld/testsuite/ld-aarch64/emit-relocs-258.s +@@ -1,5 +1,6 @@ ++.global dummy + .text +- ++dummy: + ldr x0, .L1 + + .L1: +diff --git a/ld/testsuite/ld-aarch64/emit-relocs-259.s b/ld/testsuite/ld-aarch64/emit-relocs-259.s +index 7e1ba3ceb4..0977c9d869 100644 +--- a/ld/testsuite/ld-aarch64/emit-relocs-259.s ++++ b/ld/testsuite/ld-aarch64/emit-relocs-259.s +@@ -1,5 +1,6 @@ ++.global dummy + .text +- ++dummy: + ldr x0, .L1 + + .L1: +diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d +new file mode 100644 +index 0000000000..997519f469 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/pr22764.d +@@ -0,0 +1,18 @@ ++#source: pr22764.s ++#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs ++#notarget: aarch64_be-*-* ++#objdump: -dr ++#... ++ ++Disassembly of section \.text: ++ ++0000000000010000 \<\.text\>: ++ 10000: d503201f nop ++ ... ++ 10004: R_AARCH64_ABS64 sym_abs1 ++ 1000c: 00000002 \.word 0x00000002 ++ 1000c: R_AARCH64_ABS32 sym_abs2 ++ 10010: 0003 \.short 0x0003 ++ 10010: R_AARCH64_ABS16 sym_abs3 ++ 10012: 0000 \.short 0x0000 ++ 10014: d503201f nop +diff --git a/ld/testsuite/ld-aarch64/pr22764.s b/ld/testsuite/ld-aarch64/pr22764.s +new file mode 100644 +index 0000000000..25e36b4a12 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/pr22764.s +@@ -0,0 +1,6 @@ ++ .text ++ nop ++ .xword sym_abs1 ++ .word sym_abs2 ++ .short sym_abs3 ++ nop From e8012dd2ddf0bc84bc8f76aaf2b958f553536da5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 19:01:55 +0000 Subject: [PATCH 338/491] scala: 2.12.5 -> 2.12.6 --- pkgs/development/compilers/scala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index bfbd9d05d05b..a25d4f6e6544 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.5"; + name = "scala-2.12.6"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "18bah2n3jfvc3cb10n4b3d6pwm3rwlqp7lrfvafjxccmlklzyqdj"; + sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs"; }; propagatedBuildInputs = [ jre ] ; From 2eb42290e7fbe634a87720d7d954864049729a00 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 19:05:46 +0000 Subject: [PATCH 339/491] linux-copperhead: 4.14.36.a -> 4.14.37.a --- pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index dfe58119da26..76b59ee75fb1 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.36"; + version = "4.14.37"; revision = "a"; - sha256 = "052ck8giy5nxy7871crhx6cdkgzzzpffdm8ilq1ys0rd3vldzl9b"; + sha256 = "0dwi17hx13kkccqc2315dnb8sfdc0jgv9v4b1xd10v2pnq7qb0x8"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 844c08ec0a5b79abb16d9de5bd39ed492f4fc214 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 19:46:25 +0000 Subject: [PATCH 340/491] linux-copperhead: Add 4.16.5.a Separate LTS and stable kernel releases --- ...-hardened.nix => linux-copperhead-lts.nix} | 0 .../linux/kernel/linux-copperhead-stable.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 21 ++++++++----- 3 files changed, 44 insertions(+), 7 deletions(-) rename pkgs/os-specific/linux/kernel/{linux-copperhead-hardened.nix => linux-copperhead-lts.nix} (100%) create mode 100644 pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix similarity index 100% rename from pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix rename to pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix new file mode 100644 index 000000000000..86b7eaa8823e --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: + +with stdenv.lib; + +let + version = "4.16.5"; + revision = "a"; + sha256 = "150cwq51x3cnnvnd7izizi93jmiqs0na15p8ip4vkm5frspmnks7"; + + # modVersion needs to be x.y.z, will automatically add .0 if needed + modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); + + # branchVersion needs to be x.y + branchVersion = concatStrings (intersperse "." (take 2 (splitString "." version))); + + modDirVersion = "${modVersion}-hardened"; +in +buildLinux (args // { + inherit modDirVersion; + + version = "${version}-${revision}"; + extraMeta.branch = "${branchVersion}"; + + src = fetchFromGitHub { + inherit sha256; + owner = "copperhead"; + repo = "linux-hardened"; + rev = "${version}.${revision}"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afd6a60ee060..3bc6ca6e96c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13321,11 +13321,19 @@ with pkgs; ]; }; - linux_copperhead = callPackage ../os-specific/linux/kernel/linux-copperhead-hardened.nix { + linux_copperhead_lts = callPackage ../os-specific/linux/kernel/linux-copperhead-lts.nix { kernelPatches = with kernelPatches; [ - kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.tag_hardened + bridge_stp_helper + modinst_arg_list_too_long + tag_hardened + ]; + }; + + linux_copperhead_stable = callPackage ../os-specific/linux/kernel/linux-copperhead-stable.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + modinst_arg_list_too_long + tag_hardened ]; }; @@ -13661,9 +13669,8 @@ with pkgs; linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - linuxPackages_copperhead_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead); - linux_copperhead_hardened = linuxPackages_copperhead_hardened.kernel; - linux_hardened_copperhead = linux_copperhead_hardened; # alias for backward compatibility + linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts); + linuxPackages_copperhead_stable = recurseIntoAttr (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable); # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); From 094683ac36e9595a9997a40cd155db5705c0266c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Feb 2018 18:48:15 +0100 Subject: [PATCH 341/491] =?UTF-8?q?syncthing-gtk:=200.9.2.7=20=E2=86=92=20?= =?UTF-8?q?0.9.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/syncthing-gtk/default.nix | 12 +++--- ...sable-syncthing-binary-configuration.patch | 40 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index ae715aa4321c..4db546651dd9 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: buildPythonApplication rec { - version = "0.9.2.7"; + version = "0.9.3.1"; name = "syncthing-gtk-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; + sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb"; }; nativeBuildInputs = [ @@ -18,8 +18,8 @@ buildPythonApplication rec { ]; buildInputs = [ - gtk3 librsvg - libnotify + gtk3 librsvg libappindicator-gtk3 + libnotify gnome3.adwaita-icon-theme # Schemas with proxy configuration gnome3.gsettings-desktop-schemas ]; @@ -32,7 +32,7 @@ buildPythonApplication rec { ./disable-syncthing-binary-configuration.patch (substituteAll { src = ./paths.patch; - killall = "${psmisc}/bin/killall"; + killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall"; syncthing = "${syncthing}/bin/syncthing"; }) ]; diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch index 6c516e98acb1..14c2b62e6e38 100644 --- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch +++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch @@ -1,5 +1,5 @@ ---- a/find-daemon.glade -+++ b/find-daemon.glade +--- a/glade/find-daemon.glade ++++ b/glade/find-daemon.glade @@ -112,6 +112,7 @@ True @@ -16,6 +16,24 @@ True True 0.51999998092651367 +--- a/glade/ui-settings.glade ++++ b/glade/ui-settings.glade +@@ -943,6 +943,7 @@ + _Browse... + True + True ++ False + True + True + 0.51999998092651367 +@@ -974,6 +975,7 @@ + + True + True ++ False + True + + --- a/syncthing_gtk/configuration.py +++ b/syncthing_gtk/configuration.py @@ -168,6 +168,8 @@ @@ -57,21 +75,3 @@ self.add_page(GenerateKeysPage()) self.add_page(HttpSettingsPage()) self.add_page(SaveSettingsPage()) ---- a/ui-settings.glade -+++ b/ui-settings.glade -@@ -943,6 +943,7 @@ - _Browse... - True - True -+ False - True - True - 0.51999998092651367 -@@ -974,6 +975,7 @@ - - True - True -+ False - True - - From 5c8c4710bae57549b4c4dfd4c772cb67a6e7a7e3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 20:19:00 +0000 Subject: [PATCH 342/491] openjdk: 10.0.0 -> 10.0.1 --- pkgs/development/compilers/openjdk/10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 9cc774727b71..7882fa49b07e 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -17,8 +17,8 @@ let "i386" else "amd64"; - update = "10"; - build = "46"; + update = "10.0.1"; + build = "10"; repover = "jdk-${update}+${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz"; - sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg"; + sha256 = "1fg0rl5pd3f2y3v3bq8p3zdkrpa1pyslwdln4s64clyr7spvxkjw"; }; outputs = [ "out" "jre" ]; From 9774c8a0dedce5d07f5247eff5582122e6b620ac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 20:20:13 +0000 Subject: [PATCH 343/491] linux-copperhead: Fix test --- nixos/tests/kernel-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix index 0af978f1851f..aa133c9b0aa7 100644 --- a/nixos/tests/kernel-copperhead.nix +++ b/nixos/tests/kernel-copperhead.nix @@ -6,14 +6,14 @@ import ./make-test.nix ({ pkgs, ...} : { machine = { config, lib, pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_copperhead_hardened; + boot.kernelPackages = pkgs.linuxPackages_copperhead_lts; }; testScript = '' $machine->succeed("uname -a"); $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_hardened.kernel.modDirVersion}'"); + $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_lts.kernel.modDirVersion}'"); $machine->succeed("uname -a | grep 'hardened'"); ''; }) From 1cf5aad65bc087d71e8c7ba000e34ccc01f723c8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 16:32:15 -0400 Subject: [PATCH 344/491] linux-copperhead: Fix all-packages reference --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bc6ca6e96c2..3ba524aa722a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13670,7 +13670,7 @@ with pkgs; linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts); - linuxPackages_copperhead_stable = recurseIntoAttr (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable); + linuxPackages_copperhead_stable = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable); # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); From 7cd7e4ce267faac9acfa2dd421d3583ec6f43d01 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 28 Apr 2018 22:35:19 +0200 Subject: [PATCH 345/491] weechat: 2.0 -> 2.1 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b2ea28f0cf85..dec933489af9 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -29,12 +29,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn"; + sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; From f5268994be469e66d0967d5a45eccb5e0976f690 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 28 Apr 2018 22:36:22 +0200 Subject: [PATCH 346/491] weechat-matrix-bridge: 2018-01-10 -> 2017-03-29 --- .../instant-messengers/weechat-matrix-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix index f1338bc0df35..85faebf95a3d 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix @@ -1,12 +1,12 @@ { stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { - name = "weechat-matrix-bridge-2017-03-28"; + name = "weechat-matrix-bridge-2018-01-10"; src = fetchFromGitHub { owner = "torhve"; repo = "weechat-matrix-protocol-script"; - rev = "0052e7275ae149dc5241226391c9b1889ecc3c6b"; - sha256 = "14x58jd44g08sfnp1gx74gq2na527v5jjpsvv1xx4b8mixwy20hi"; + rev = "a8e4ce04665c09ee7f24d6b319cd85cfb56dfbd7"; + sha256 = "0822xcxvwanwm8qbzqhn3f1m6hhxs29pyf8lnv6v29bl8136vcq3"; }; patches = [ From 4797fe8da41c4fa4291ce4e1ac3434ea4e04fb1e Mon Sep 17 00:00:00 2001 From: Ilya Kolpakov Date: Sat, 28 Apr 2018 21:02:49 +0200 Subject: [PATCH 347/491] pythonPackages.patsy: 0.3.0 -> 0.5.0 --- .../python-modules/patsy/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +--------- 2 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/patsy/default.nix diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix new file mode 100644 index 000000000000..9efa3126ce3b --- /dev/null +++ b/pkgs/development/python-modules/patsy/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchPypi +, buildPythonPackage +, nose +, six +, numpy +, scipy # optional, allows spline-related features (see patsy's docs) +, parameterized +}: + +buildPythonPackage rec { + pname = "patsy"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fw888zd2s7f5zxm9f98ss93qhwv0sqnbdy21ipj33ccqgakhpz0"; + }; + + checkInputs = [ nose parameterized ]; + checkPhase = "nosetests -v"; + + propagatedBuildInputs = [ + six + numpy + scipy + ]; + + meta = { + description = "A Python package for describing statistical models"; + homepage = https://github.com/pydata/patsy; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ilya-kolpakov ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f24d6ff955bd..50589b6938d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9673,24 +9673,7 @@ in { }; }; - patsy = buildPythonPackage rec { - name = "patsy-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/p/patsy/${name}.zip"; - sha256 = "a55dd4ca09af4b9608b81f30322beb450510964c022708ab50e83a065ccf15f0"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [six numpy]; - - meta = { - description = "A Python package for describing statistical models"; - homepage = "https://github.com/pydata/patsy"; - license = licenses.bsd2; - }; - }; + patsy = callPackage ../development/python-modules/patsy { }; paste = buildPythonPackage rec { name = "paste-${version}"; From f2adf2059a8cce0e7619f65ba1f2d8f38f5efad5 Mon Sep 17 00:00:00 2001 From: Ilya Kolpakov Date: Sat, 28 Apr 2018 21:06:12 +0200 Subject: [PATCH 348/491] pythonPackages.pymc3: init at 3.2 --- .../python-modules/pymc3/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/pymc3/default.nix diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix new file mode 100644 index 000000000000..308958abb6d0 --- /dev/null +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -0,0 +1,64 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, Theano +, pandas +, patsy +, joblib +, tqdm +, six +, h5py +, pytest +, nose +, parameterized +, matplotlib +}: + +buildPythonPackage rec { + pname = "pymc3"; + version = "3.2"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hpzhkpv7sbwkcva7x914yvzcf1d1a952ynbcx6mvlgv5lqghc39"; + }; + + # No need for coverage stats in Nix builds + postPatch = '' + substituteInPlace setup.py --replace ", 'pytest-cov'" "" + ''; + + propagatedBuildInputs = [ + Theano + pandas + patsy + joblib + tqdm + six + h5py + ]; + + checkInputs = [ + pytest + nose + parameterized + ]; + + # The test suite is computationally intensive and test failures are not + # indicative for package usability hence tests are disabled by default. + doCheck = false; + + # For some reason tests are run as a part of the *install* phase if enabled. + # Theano writes compiled code to ~/.theano hence we set $HOME. + preInstall = "export HOME=$(mktemp -d)"; + postInstall = "rm -rf $HOME"; + + meta = { + description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; + homepage = http://github.com/pymc-devs/pymc3; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ilya-kolpakov ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50589b6938d0..93444be7302a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8244,6 +8244,8 @@ in { pygraphviz = callPackage ../development/python-modules/pygraphviz { }; + pymc3 = callPackage ../development/python-modules/pymc3 { }; + pympler = buildPythonPackage rec { pname = "Pympler"; version = "0.4.3"; From 15268306febdc338ec6a00e8099c1904287f598a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:19:23 +0800 Subject: [PATCH 349/491] libtoxcore: introduce 0.2.2 in addition to 0.1.11 --- .../libraries/libtoxcore/default.nix | 79 ++++++++++--------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 9af8718dc5fe..42d2fe11f7b3 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,46 +1,51 @@ { stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack , libvpx, check, libconfig, pkgconfig }: -stdenv.mkDerivation rec { - name = "libtoxcore-${version}"; - version = "0.1.11"; +let + generic = { version, sha256 }: + stdenv.mkDerivation rec { + name = "libtoxcore-${version}"; - src = fetchFromGitHub { - owner = "TokTok"; - repo = "c-toxcore"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "TokTok"; + repo = "c-toxcore"; + rev = "v${version}"; + inherit sha256; + }; + + cmakeFlags = [ + "-DBUILD_NTOX=ON" + "-DDHT_BOOTSTRAP=ON" + "-DBOOTSTRAP_DAEMON=ON" + ]; + + buildInputs = [ + libsodium libmsgpack ncurses libconfig + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + libopus libvpx + ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "P2P FOSS instant messaging application aimed to replace Skype"; + homepage = https://tox.chat; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; + }; + +in rec { + libtoxcore_0_1 = generic { + version = "0.1.11"; sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; }; - cmakeFlags = [ - "-DBUILD_NTOX=ON" - "-DDHT_BOOTSTRAP=ON" - "-DBOOTSTRAP_DAEMON=ON" - ]; - - buildInputs = [ - libsodium libmsgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ - libopus - libvpx - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - enableParallelBuilding = true; - - checkInputs = [ check ]; - - checkPhase = "ctest"; - - # for some reason the tests are not running - it says "No tests found!!" - doCheck = true; - - meta = with stdenv.lib; { - description = "P2P FOSS instant messaging application aimed to replace Skype"; - homepage = https://tox.chat; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + libtoxcore_0_2 = generic { + version = "0.2.2"; + sha256 = "1463grbbv009pj2g6dbnyk4lr871vw41962m63v21mmp6dkrr7r5"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac46ff0f4cc..fea7f1e34415 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10358,9 +10358,12 @@ with pkgs; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; - libtoxcore = callPackage ../development/libraries/libtoxcore { }; + inherit (callPackages ../development/libraries/libtoxcore {}) + libtoxcore_0_1 libtoxcore_0_2; + libtoxcore = libtoxcore_0_2; libtap = callPackage ../development/libraries/libtap { }; From 058df14f81482e05fad93b017e8a8d45cea10db5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:19:48 +0800 Subject: [PATCH 350/491] ratox: 0.4 -> 0.4.20180303 --- .../instant-messengers/ratox/default.nix | 18 ++++++++++-------- .../instant-messengers/ratox/ldlibs.patch | 5 ----- 2 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 5d004db60e3a..add337d3f085 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -5,22 +5,24 @@ with stdenv.lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); -in -stdenv.mkDerivation rec { - name = "ratox-0.4"; +in stdenv.mkDerivation rec { + name = "ratox-0.4.20180303"; src = fetchgit { url = "git://git.2f30.org/ratox.git"; - rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c"; - sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5"; + rev = "269f7f97fb374a8f9c0b82195c21de15b81ddbbb"; + sha256 = "0bpn37h8jvsqd66fkba8ky42nydc8acawa5x31yxqlxc8mc66k74"; }; - patches = [ ./ldlibs.patch ]; - buildInputs = [ libtoxcore ]; - preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; + preConfigure = '' + substituteInPlace config.mk \ + --replace '-lsodium -lopus -lvpx ' "" + + ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch deleted file mode 100644 index 1406e7143107..000000000000 --- a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib --LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread -+LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread From 88454d73b0c72137eb04f30c0e053db139d71b2a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:20:27 +0800 Subject: [PATCH 351/491] qtox: 1.13.1 -> 1.15.0 --- .../instant-messengers/qtox/default.nix | 29 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index bbad5a681807..f7a56d47dbfa 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,19 +1,23 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, - libtoxcore, - libpthreadstubs, libXdmcp, libXScrnSaver, - qtbase, qtsvg, qttools, qttranslations, - ffmpeg, filter-audio, libexif, libsodium, libopus, - libvpx, openal, pcre, qrencode, sqlcipher }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, libtoxcore +, libpthreadstubs, libXdmcp, libXScrnSaver +, qtbase, qtsvg, qttools, qttranslations +, ffmpeg, filter-audio, libexif, libsodium, libopus +, libvpx, openal, pcre, qrencode, sqlcipher +, AVFoundation ? null }: -mkDerivation rec { +let + version = "1.15.0"; + rev = "v${version}"; + +in mkDerivation rec { name = "qtox-${version}"; - version = "1.13.0"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - rev = "v${version}"; - sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y"; + sha256 = "1garwnlmg452b0bwx36rsh08s15q3zylb26l01iiwg4l9vcaldh9"; + inherit rev; }; buildInputs = [ @@ -22,17 +26,18 @@ mkDerivation rec { qtbase qtsvg qttranslations ffmpeg filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ]; + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; cmakeFlags = [ - "-DGIT_DESCRIBE=${version}" + "-DGIT_DESCRIBE=${rev}" "-DENABLE_STATUSNOTIFIER=False" "-DENABLE_GTK_SYSTRAY=False" "-DENABLE_APPINDICATOR=False" + "-DTIMESTAMP=1" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fea7f1e34415..e9224ecbe66e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17461,7 +17461,7 @@ with pkgs; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; - qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { ffmpeg = ffmpeg_2; }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; From 3f454bc90f2c569f237b9df56db75bbedd2feae3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:20:46 +0800 Subject: [PATCH 352/491] toxic: 0.7.2 -> 0.8.2 --- .../networking/instant-messengers/toxic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4934a7374058..8a45e988c07d 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "toxic-${version}"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc"; + sha256 = "0fwmk945nip98m3md58y3ibjmzfq25hns3xf0bmbc6fjpww8d5p5"; }; makeFlags = [ "PREFIX=$(out)"]; From 1b1be29bf827fc177100ae175030b2fda4132e47 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Apr 2018 20:09:17 -0400 Subject: [PATCH 353/491] openjdk: 8u172-b02 -> 8u172-b11 --- pkgs/development/compilers/openjdk/8.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 705898a74f37..7798418ebfd1 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -22,41 +22,41 @@ let throw "openjdk requires i686-linux or x86_64 linux"; update = "172"; - build = "02"; + build = "11"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0y28by4ifsaxhfrzq35654i8h9jjgvrw51hbxyg8pgfink0n30r2"; + sha256 = "08mgfqbbgnx9n6prczwm4m8pgsakya45iai1gfslqnb0adh33jpi"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0rxp4920xpd9khdg2ia1v1djcw1nndsjfis68whawi7s95zwpxy5"; + sha256 = "0dph17mpr5ni280z8rmiwlw0v46dnzyph6fq132xvxiw2i1203zg"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0sdf6rww290wgfqhaix1vjac244drdgg7hapb67wgj733kkdl711"; + sha256 = "181ixh75xjvlj0l3a58d9iqf50ivq77993yzfv0463dm44h6b8pp"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0vl3aryw3nclqprc35b2iriwfyr9fch3x8snjry1z5ajbdyd5c8b"; + sha256 = "097azhdmr7ph1gvlzjgx6s2hyxmi2s5293d5hs23dl5i9f55b6x8"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1y5fnzxdll3q0jgqxsap3xb21bm1napdlqzs7h6c2l5qldyvw692"; + sha256 = "1lvk2brd9yclzd7cdk1kvnv4mbdxzjxd595pqhdaxdxxr5anhsvm"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1yg1ik1klg8pl4b7izi2waqhs7vr6ln3fzc4k1siir4va5qhrhlm"; + sha256 = "0cl4b4c2qjyhlsa5khlxinilfaj6ai1mzji3y0263klc8q6bglwa"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "03srcj6hhvbdg1iqw85mfm1pwd6yvpykyz5nn4ydf930g4dyxfkf"; + sha256 = "00s6wm62v7gmkwy46js0lisijng40lnxscndczbgfvvz2q9zz4q1"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "12nn02jiq3vqgwhqh5yvxq1k92fy3n0jpvfpj1npq9fvimywry2k"; + sha256 = "0ab0rrmmf145nh4mibvknjni4whvzmk6fsnl7ihcn8m0zi6zyfra"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; From 6e8118b2395ab928594e20585dba1e83c8354820 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 28 Apr 2018 22:11:30 -0500 Subject: [PATCH 354/491] nix: fix stdenv.system check -- should be hostPlatform (stdenv.system is the system running the build, apparently) --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index aee6678d1167..230994897234 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -41,7 +41,7 @@ let propagatedBuildInputs = [ boehmgc ]; # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; configureFlags = [ "--with-store-dir=${storeDir}" From 7b6433b0eb3f1acf03b964636ef1bd12fac0bda5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 29 Apr 2018 12:34:38 +0800 Subject: [PATCH 355/491] gcalcli: pin older versions of needed python packages --- pkgs/applications/misc/gcalcli/default.nix | 63 +++++++++++++++------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index d3ba5a97333a..6a7a7ae604de 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -1,7 +1,38 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages +{ stdenv, lib, fetchFromGitHub, python2 , libnotify ? null }: -pythonPackages.buildPythonApplication rec { +let + py = python2.override { + packageOverrides = self: super: { + google_api_python_client = super.google_api_python_client.overridePythonAttrs (oldAttrs: rec { + version = "1.5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; + }; + }); + + oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec { + version = "1.4.12"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; + }; + }); + + uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec { + version = "0.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; + }; + # there are no checks in this version + doCheck = false; + }); + }; + }; + +in with py.pkgs; buildPythonApplication rec { version = "3.4.0"; name = "gcalcli-${version}"; @@ -12,27 +43,21 @@ pythonPackages.buildPythonApplication rec { sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; }; - propagatedBuildInputs = with pythonPackages; [ - dateutil - gflags - google_api_python_client - httplib2 - oauth2client - parsedatetime - six - vobject - ] - ++ lib.optional (!pythonPackages.isPy3k) futures; - - # there are no tests as of 3.4.0 - doCheck = false; + propagatedBuildInputs = [ + dateutil gflags httplib2 parsedatetime six vobject + # overridden + google_api_python_client oauth2client uritemplate + ] ++ lib.optional (!isPy3k) futures; postInstall = lib.optionalString stdenv.isLinux '' - substituteInPlace $out/bin/gcalcli \ - --replace "command = 'notify-send -u critical -a gcalcli %s'" \ - "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" + substituteInPlace $out/bin/gcalcli --replace \ + "command = 'notify-send -u critical -a gcalcli %s'" \ + "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" ''; + # There are no tests as of 3.4.0 + doCheck = false; + meta = with lib; { homepage = https://github.com/insanum/gcalcli; description = "CLI for Google Calendar"; From b0d3ed348474f02dd79d63149706be66231dff55 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 22 Dec 2017 08:59:08 +0100 Subject: [PATCH 356/491] =?UTF-8?q?gimp:=202.8.22=20=E2=86=92=202.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/gimp/2.8.nix | 57 ----------- pkgs/applications/graphics/gimp/default.nix | 95 +++++++++++++++++++ .../graphics/gimp/plugins/default.nix | 8 +- pkgs/applications/graphics/gimp/wrapper.nix | 5 +- pkgs/applications/graphics/sane/xsane.nix | 6 +- pkgs/top-level/all-packages.nix | 8 +- 6 files changed, 108 insertions(+), 71 deletions(-) delete mode 100644 pkgs/applications/graphics/gimp/2.8.nix create mode 100644 pkgs/applications/graphics/gimp/default.nix diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix deleted file mode 100644 index 3802fff2ad21..000000000000 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf -, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff -, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python2Packages, libexif, gettext, xorg -, AppKit, Cocoa, gtk-mac-integration }: - -let - inherit (python2Packages) pygtk wrapPython python; -in stdenv.mkDerivation rec { - name = "gimp-${version}"; - version = "2.8.22"; - - # This declarations for `gimp-with-plugins` wrapper, - # (used for determining $out/lib/gimp/${majorVersion}/ paths) - majorVersion = "2.0"; - targetPluginDir = "$out/lib/gimp/${majorVersion}/plug-ins"; - targetScriptDir = "$out/lib/gimp/${majorVersion}/scripts"; - - src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"; - }; - - buildInputs = - [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo - freetype fontconfig lcms libpng libjpeg poppler libtiff webkit - libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libexif gettext xorg.libXpm - wrapPython - ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; - - pythonPath = [ pygtk ]; - - postFixup = '' - wrapPythonProgramsIn $out/lib/gimp/2.0/plug-ins/ - wrapProgram $out/bin/gimp \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" - ''; - - passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ? - - #configureFlags = [ "--disable-print" ]; - - enableParallelBuilding = true; - - # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"; - - meta = { - description = "The GNU Image Manipulation Program"; - homepage = https://www.gimp.org/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix new file mode 100644 index 000000000000..2536367f6ceb --- /dev/null +++ b/pkgs/applications/graphics/gimp/default.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff +, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info +, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 +, harfbuzz, mypaint-brushes, libwebp, libgudev, openexr +, AppKit, Cocoa, gtk-mac-integration }: + +let + inherit (python2Packages) pygtk wrapPython python; +in stdenv.mkDerivation rec { + name = "gimp-${version}"; + version = "2.10.0"; + + src = fetchurl { + url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z"; + }; + + patches = [ + # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=371482; + sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc"; + }) + + # fix absolute paths stored in configuration + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6; + sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris"; + }) + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df; + sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh"; + }) + + # fix pc file (needed e.g. for building plug-ins) + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe; + sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; + propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc + buildInputs = [ + babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev + freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr + libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp + python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; + + pythonPath = [ pygtk ]; + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk_pixbuf.moduleDir}"; + + preConfigure = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/ + wrapProgram $out/bin/gimp-${stdenv.lib.versions.majorMinor version} \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = rec { + # The declarations for `gimp-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "${stdenv.lib.versions.major version}.0"; + targetPluginDir = "lib/gimp/${majorVersion}/plug-ins"; + targetScriptDir = "lib/gimp/${majorVersion}/scripts"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + }; + + configureFlags = [ + "--without-webkit" # old version is required + ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The GNU Image Manipulation Program"; + homepage = https://www.gimp.org/; + maintainers = with maintainers; [ jtojnar ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 0d4215dd5bc2..a19a5487b425 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -12,12 +12,12 @@ let prePhases = "extraLib"; extraLib = '' installScripts(){ - mkdir -p ${targetScriptDir}; - for p in "$@"; do cp "$p" ${targetScriptDir}; done + mkdir -p $out/${targetScriptDir}; + for p in "$@"; do cp "$p" $out/${targetScriptDir}; done } installPlugins(){ - mkdir -p ${targetPluginDir}; - for p in "$@"; do cp "$p" ${targetPluginDir}; done + mkdir -p $out/${targetPluginDir}; + for p in "$@"; do cp "$p" $out/${targetPluginDir}; done } ''; } diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 7455a69dde97..6e450b25c048 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -4,6 +4,7 @@ let allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins); selectedPlugins = if plugins == null then allPlugins else plugins; extraArgs = map (x: x.wrapArgs or "") selectedPlugins; +versionBranch = stdenv.lib.versions.majorMinor gimp.version; in symlinkJoin { name = "gimp-with-plugins-${gimp.version}"; @@ -13,14 +14,14 @@ in symlinkJoin { buildInputs = [ makeWrapper ]; postBuild = '' - for each in gimp-2.8 gimp-console-2.8; do + for each in gimp-${versionBranch} gimp-console-${versionBranch}; do wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ ${toString extraArgs} done set +x for each in gimp gimp-console; do - ln -sf "$each-2.8" $out/bin/$each + ln -sf "$each-${versionBranch}" $out/bin/$each done ''; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index ad02e1a80231..ca0f49e0c948 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb ? null -, gimpSupport ? false, gimp_2_8 ? null +, gimpSupport ? false, gimp ? null }: -assert gimpSupport -> gimp_2_8 != null; +assert gimpSupport -> gimp != null; stdenv.mkDerivation rec { name = "xsane-0.999"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb != null then [libusb] else []) - ++ stdenv.lib.optional gimpSupport gimp_2_8; + ++ stdenv.lib.optional gimpSupport gimp; meta = { homepage = http://www.sane-project.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9513d60db47..9a667a2911f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15868,16 +15868,14 @@ with pkgs; ghq = gitAndTools.ghq; - gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { - webkit = null; + gimp = callPackage ../applications/graphics/gimp { + gegl = gegl_0_4; lcms = lcms2; + inherit (gnome3) gexiv2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; - gimp = gimp_2_8; - gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { - gimp = gimp_2_8; plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied }; From 882682827a0c23537951d3ad0241df11b3dbb36e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 12 Apr 2018 22:02:37 +0200 Subject: [PATCH 357/491] gimpPlugins.lqrPlugin: use liblqr1 from pkgs --- pkgs/applications/graphics/gimp/plugins/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index a19a5487b425..444fb37ae338 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -35,15 +35,6 @@ let installPhase = "installScripts ${src}"; }; - libLQR = pluginDerivation { - name = "liblqr-1-0.4.1"; - # required by lqrPlugin, you don't havet to install this lib explicitely - src = fetchurl { - url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2; - sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; - }; - }; - in rec { gap = pluginDerivation { @@ -166,12 +157,12 @@ rec { Layer/Liquid Rescale */ name = "lqr-plugin-0.6.1"; - buildInputs = with pkgs; [ libLQR ]; + buildInputs = with pkgs; [ liblqr1 ]; src = fetchurl { url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; }; - #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; + #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; installPhase = "installPlugins src/gimp-lqr-plugin"; }; From 63a234c4a720f3457801043276e1884e451d3b85 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 02:59:26 +0200 Subject: [PATCH 358/491] ufraw: build gimp plugin --- .../graphics/gimp/plugins/default.nix | 27 +------------------ pkgs/applications/graphics/ufraw/default.nix | 24 ++++++++++++++--- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 444fb37ae338..86e3c4e20c54 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -179,32 +179,7 @@ rec { installPhase = "installPlugins gmic_gimp"; }; - # this is more than a gimp plugin ! - # either load the raw image with gimp (and the import dialog will popup) - # or use the binary - ufraw = pluginDerivation rec { - name = "ufraw-0.19.2"; - buildInputs = with pkgs; [ gtkimageview lcms ]; - # --enable-mime - install mime files, see README for more information - # --enable-extras - build extra (dcraw, nikon-curve) executables - # --enable-dst-correction - enable DST correction for file timestamps. - # --enable-contrast - enable the contrast setting option. - # --enable-interp-none: enable 'None' interpolation (mostly for debugging). - # --with-lensfun: use the lensfun library - experimental feature, read this before using it. - # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build - # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window - configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; - - src = fetchurl { - url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; - }; - installPhase = " - installPlugins ufraw-gimp - mkdir -p $out/bin - cp ufraw $out/bin - "; - }; + ufraw = pkgs.ufraw.gimpPlugin; gimplensfun = pluginDerivation rec { version = "0.2.4"; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index fc8e7a62c2ba..cb1c37aefebf 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,6 +1,9 @@ { fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib +, withGimpPlugin ? true, gimp ? null , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: +assert withGimpPlugin -> gimp != null; + stdenv.mkDerivation rec { name = "ufraw-0.22"; @@ -10,10 +13,23 @@ stdenv.mkDerivation rec { sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp"; }; - buildInputs = - [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib - libjpeg libtiff cfitsio exiv2 lcms2 lensfun - ]; + outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; + + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ + gtk2 gtkimageview bzip2 zlib + libjpeg libtiff cfitsio exiv2 lcms2 lensfun + ] ++ stdenv.lib.optional withGimpPlugin gimp; + + configureFlags = [ + "--enable-extras" + "--enable-dst-correction" + "--enable-contrast" + ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; + + postInstall = stdenv.lib.optionalString withGimpPlugin '' + moveToOutput "lib/gimp" "$gimpPlugin" + ''; meta = { homepage = http://ufraw.sourceforge.net/; From 4f420c6802575855a342d00c6685ac493c54139c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 06:05:04 +0200 Subject: [PATCH 359/491] =?UTF-8?q?gmic:=202.2.1=20=E2=86=92=202.2.2=20+?= =?UTF-8?q?=20build=20gimpPlugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../graphics/gimp/plugins/default.nix | 13 +---- pkgs/tools/graphics/gmic/default.nix | 51 +++++++++++-------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 86e3c4e20c54..600938645df8 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -166,18 +166,7 @@ rec { installPhase = "installPlugins src/gimp-lqr-plugin"; }; - gmic = - pluginDerivation rec { - inherit (pkgs.gmic) name src meta; - - buildInputs = with pkgs; [ fftw opencv curl ]; - - sourceRoot = "${name}/src"; - - buildFlags = "gimp"; - - installPhase = "installPlugins gmic_gimp"; - }; + gmic = pkgs.gmic.gimpPlugin; ufraw = pkgs.ufraw.gimpPlugin; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index a8c491b049ff..008f9af36852 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,36 +1,45 @@ -{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng, pkgconfig }: +{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig +, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng +, withGimpPlugin ? true, gimp ? null}: -stdenv.mkDerivation rec { +assert withGimpPlugin -> gimp != null; + +let + version = "2.2.2"; + + # CMakeLists.txt is missing from the tarball and Makefile is terrible + CMakeLists = fetchurl { + url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt"; + sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg"; + }; +in stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "2.2.1"; + + outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0iac1zaix2zv1dfp45ca0wk9pj6k02gf8l1vmg820z8jd12pa19w"; + sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ fftw zlib libjpeg libtiff libpng ]; + buildInputs = [ + fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick + ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ]; - sourceRoot = "${name}/src"; + cmakeFlags = [ + "-DBUILD_LIB_STATIC=OFF" + "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}" + "-DENABLE_DYNAMIC_LINKING=ON" + ]; - preBuild = '' - buildFlagsArray=( \ - CURL_CFLAGS= CURL_LIBS= \ - OPENEXR_CFLAGS= OPENEXR_LIBS= \ - OPENCV_CFLAGS= OPENCV_LIBS= \ - X11_CFLAGS="-Dcimg_display=0" X11_LIBS= \ - cli \ - ) + postPatch = '' + cp ${CMakeLists} CMakeLists.txt ''; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - - cp -v gmic $out/bin/ - cp -v ../man/gmic.1.gz $out/share/man/man1/ + preConfigure = stdenv.lib.optionalString withGimpPlugin '' + cmakeFlags="$cmakeFlags -DPLUGIN_INSTALL_PREFIX=$gimpPlugin/${gimp.targetPluginDir}" ''; meta = with stdenv.lib; { From 33615ccfa5a7c324a694f630f0b48fba8d40f9ba Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 29 Apr 2018 12:00:16 +0200 Subject: [PATCH 360/491] linux_hardened: enforce usercopy whitelisting The default is to warn only --- pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 3a82c00c5010..a00ba9ab7b8e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -78,6 +78,9 @@ ${optionalString (versionAtLeast version "4.13") '' # Perform usercopy bounds checking. HARDENED_USERCOPY y +${optionalString (versionAtLeast version "4.16") '' + HARDENED_USERCOPY_FALLBACK n +''} # Randomize allocator freelists. SLAB_FREELIST_RANDOM y From 9df35787f16636628a2c7392cc4bfeff0e815242 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 15 Apr 2018 13:26:38 +0200 Subject: [PATCH 361/491] tor-browser-bundle-bin: allow unset XAUTHORITY Apparently this can happen on e.g., fedora. Closes https://github.com/NixOS/nixpkgs/issues/38671 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8a8abb42f55e..a2094305db55 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -340,7 +340,7 @@ stdenv.mkDerivation rec { \ TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ - XAUTHORITY="\$XAUTHORITY" \ + XAUTHORITY="\''${XAUTHORITY:-}" \ DISPLAY="\$DISPLAY" \ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ \ From 49003e880c3659ecd0479cfb6b227e99b650db0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Steinpa=C3=9F?= Date: Sun, 29 Apr 2018 13:26:40 +0200 Subject: [PATCH 362/491] gnunet: Add gnunet_git. --- .../networking/p2p/gnunet/git.nix | 92 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/applications/networking/p2p/gnunet/git.nix diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix new file mode 100644 index 000000000000..6a0063dfb871 --- /dev/null +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -0,0 +1,92 @@ +{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt +, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig +, libxml2, ncurses, gettext, libunistring, libidn +, makeWrapper, autoconf, automake, texinfo, which +, withVerbose ? false }: + +let + rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; +in +stdenv.mkDerivation rec { + name = "gnunet-git-${rev}"; + + src = fetchgit { + url = https://gnunet.org/git/gnunet.git; + inherit rev; + sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; + }; + + buildInputs = [ + libextractor libmicrohttpd libgcrypt gmp curl libtool + zlib adns sqlite libxml2 ncurses libidn + pkgconfig gettext libunistring makeWrapper + autoconf automake texinfo which + ]; + + configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; + + preConfigure = '' + # Brute force: since nix-worker chroots don't provide + # /etc/{resolv.conf,hosts}, replace all references to `localhost' + # by their IPv4 equivalent. + for i in $(find . \( -name \*.c -or -name \*.conf \) \ + -exec grep -l '\' {} \;) + do + echo "$i: substituting \`127.0.0.1' to \`localhost'..." + sed -i "$i" -e's/\/127.0.0.1/g' + done + + # Make sure the tests don't rely on `/tmp', for the sake of chroot + # builds. + for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ + -exec grep -l /tmp {} \;) + do + echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." + substituteInPlace "$i" --replace "/tmp" "$TMPDIR" + done + + # Ensure NSS installation works fine + configureFlags="$configureFlags --with-nssdir=$out/lib" + + sh contrib/pogen.sh + sh bootstrap + ''; + + doCheck = false; + + /* FIXME: Tests must be run this way, but there are still a couple of + failures. + + postInstall = + '' export GNUNET_PREFIX="$out" + export PATH="$out/bin:$PATH" + make -k check + ''; + */ + + meta = { + description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + + longDescription = '' + GNUnet is a framework for secure peer-to-peer networking that + does not use any centralized or otherwise trusted services. A + first service implemented on top of the networking layer + allows anonymous censorship-resistant file-sharing. Anonymity + is provided by making messages originating from a peer + indistinguishable from messages that the peer is routing. All + peers act as routers and use link-encrypted connections with + stable bandwidth utilization to communicate with each other. + GNUnet uses a simple, excess-based economic model to allocate + resources. Peers in GNUnet monitor each others behavior with + respect to resource usage; peers that contribute to the + network are rewarded with better service. + ''; + + homepage = https://gnunet.org/; + + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ba524aa722a..b4b0f4098c88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16026,6 +16026,8 @@ with pkgs; gnunet = callPackage ../applications/networking/p2p/gnunet { }; + gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); + gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { }); gocr = callPackage ../applications/graphics/gocr { }; From 518fb36dcbd4473055ff34480a8c1fa45604d03b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 14:23:36 +0200 Subject: [PATCH 363/491] gimpPlugins.focusblur: mark as broken --- pkgs/applications/graphics/gimp/plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 600938645df8..b950ae7b2dd4 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -88,6 +88,7 @@ rec { url = "http://registry.gimp.org/files/${name}.tar.bz2"; sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h"; }; + meta.broken = true; }; resynthesizer = pluginDerivation { From 4779556ed16e95c807784285a64248cf6048da41 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 14:23:46 +0200 Subject: [PATCH 364/491] gimpPlugins.texturize: mark as broken --- pkgs/applications/graphics/gimp/plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b950ae7b2dd4..f491f5dc914a 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -139,6 +139,7 @@ rec { sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw"; }; installPhase = "installPlugins src/texturize"; + meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1 }; waveletSharpen = pluginDerivation { From 5c4b687a88c9f4d2b4fa75c1919e96260d6f2e7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Apr 2018 14:29:36 +0200 Subject: [PATCH 365/491] gimp-with-plugins: filter out broken plugins from default selection --- pkgs/applications/graphics/gimp/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 6e450b25c048..ec529519159b 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,7 +1,7 @@ { stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}: let -allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins); +allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation" && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); selectedPlugins = if plugins == null then allPlugins else plugins; extraArgs = map (x: x.wrapArgs or "") selectedPlugins; versionBranch = stdenv.lib.versions.majorMinor gimp.version; From a3b69a52c58baa8e9f801e227f85c8502dd21669 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 29 Apr 2018 20:34:41 +0800 Subject: [PATCH 366/491] uchiwa: 1.1.2 -> 1.2.0 --- pkgs/servers/monitoring/uchiwa/bower-packages.nix | 12 ++++++------ pkgs/servers/monitoring/uchiwa/src.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 618c3a33cd7c..f18ea3875516 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,15 +1,15 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "1.1.2" "1.1.2" "174flmnqjm0avpvi71ii5cvas2wkgz42is38r7n4zyrhagzlj66k") - (fetchbower "angular" "1.6.8" "~1.6.3" "07bwbahxaz5myjj7sqv7k211avs23a9j7msl373h1qvp05fblajf") + (fetchbower "uchiwa-web" "1.2.0" "1.2.0" "0733ha6bahzg9qlvhz75agi8hwwqdk99hfx9j8dhpdf1v5xkj2fz") + (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") - (fetchbower "angular-cookies" "1.6.8" "~1.6.3" "0p3skdg2pmzgwm9a0gyl1vhq4lcwyrymmii7lxlrmypjhwm83il6") + (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn") (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi") (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj") - (fetchbower "angular-resource" "1.6.8" "~1.6.3" "0pnv12c61i8giwj0fmzf38f3x6ckf24g6izrak9y7zy28nlb3y5q") - (fetchbower "angular-route" "1.6.8" "~1.6.3" "0k8sy5dkn589w8ykn65fhrcrfi7wkn7gagwwl5j5zgzj4m91wlar") - (fetchbower "angular-sanitize" "1.6.8" "~1.6.3" "0q7hy5iyjlf745yisphwa5b8rvkhc43zwwmiwfkqcdcbf3w6564l") + (fetchbower "angular-resource" "1.6.10" "~1.6.3" "1gplq8kd49qakk7ardg5xr5amwvspaz9n71kf8x49xfllda61rm0") + (fetchbower "angular-route" "1.6.10" "~1.6.3" "0vwbn7i45yvsn8c469nj141ahrn7iw85j7hy3vvhh2r373j94mai") + (fetchbower "angular-sanitize" "1.6.10" "~1.6.3" "066gsdl19s27w00wafg2skf5abdsdrlzhkcagkk1ma39dyqyl4i3") (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh") (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8") (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9") diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 3e0ead7b495b..0cf6815fbe5d 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "1.1.2-1"; - sha256 = "0fmzpjwmv7fkl0ihy2gzcgfd384k3wnifg42gzap770d6kl6yj1c"; + version = "1.2.0-1"; + sha256 = "1gj9cr0gkiivxdlq7ha6gxq9s8s26j79crijkrlrsqpg59jz063p"; } From 97adb03a9e542c9966712b9d88c84b4ed6d1a6b6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 29 Apr 2018 15:28:33 +0200 Subject: [PATCH 367/491] nixos/tests/predictable-interface-names: Refactor The Nix expression here is really hard to read with multiple (and unnecessarily) nested lets and it also generates attribute names based on the derivation generated by makeTest, which will result in these attribute names: * vm-test-run-predictableInterfaceNames * vm-test-run-predictableInterfaceNames-with-networkd * vm-test-run-unpredictableInterfaceNames * vm-test-run-unpredictableInterfaceNames-with-networkd With the refactor the attribute names are now: * predictable * predictableNetworkd * unpredictable * unpredictableNetworkd So now the code is even shorter and IMHO slightly more readable. Signed-off-by: aszlig Cc: @symphorien, @fpletz, @adisbladis --- nixos/tests/predictable-interface-names.nix | 47 ++++++++++----------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index b4c2039923cf..0b431034a7a9 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -1,27 +1,24 @@ -{ system ? builtins.currentSystem -, pkgs ? import ../.. { inherit system; } -}: -with import ../lib/testing.nix { inherit system; }; -let boolToString = x: if x then "yes" else "no"; in -let testWhenSetTo = predictable: withNetworkd: -makeTest { - name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; - meta = {}; +{ system ? builtins.currentSystem }: - machine = { config, pkgs, ... }: { - networking.usePredictableInterfaceNames = pkgs.stdenv.lib.mkForce predictable; - networking.useNetworkd = withNetworkd; - networking.dhcpcd.enable = !withNetworkd; +let + inherit (import ../lib/testing.nix { inherit system; }) makeTest pkgs; +in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { + name = pkgs.lib.optionalString (!predictable) "un" + "predictable" + + pkgs.lib.optionalString withNetworkd "Networkd"; + value = makeTest { + name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; + meta = {}; + + machine = { config, lib, ... }: { + networking.usePredictableInterfaceNames = lib.mkForce predictable; + networking.useNetworkd = withNetworkd; + networking.dhcpcd.enable = !withNetworkd; + }; + + testScript = '' + print $machine->succeed("ip link"); + $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); + $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); + ''; }; - - testScript = '' - print $machine->succeed("ip link"); - $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); - $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); - ''; -}; in -with pkgs.stdenv.lib.lists; -with pkgs.stdenv.lib.attrsets; -listToAttrs (map (drv: nameValuePair drv.name drv) ( -crossLists testWhenSetTo [[true false] [true false]] -)) +}) [[true false] [true false]]) From e55677bffa05c8e1f08e33b4bc08533684c20a50 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sun, 29 Apr 2018 17:09:11 +0300 Subject: [PATCH 368/491] tiled: 1.1.4 -> 1.1.5 --- pkgs/applications/editors/tiled/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 8444ff6eaecc..b23db38e0f45 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "0ln8lis9g23wp3w70xwbkzqmmbkd02cdx6z7msw9lrpkjzkj7mlr"; + sha256 = "1l8sx0qfkm7n2ag0ns01vrs8mzcxzva00in4xqz4zgd505qx5q9v"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free, easy to use and flexible tile map editor"; - homepage = http://www.mapeditor.org/; + homepage = https://www.mapeditor.org/; license = with licenses; [ bsd2 # libtiled and tmxviewer gpl2Plus # all the rest From 067ed1c5eb0f8620f51338f061c412621c63191d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 29 Apr 2018 16:47:59 +0200 Subject: [PATCH 369/491] instead: 3.2.0 -> 3.2.1 --- pkgs/games/instead/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 343b2948d5ea..697791d38577 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: let - version = "3.2.0"; + version = "3.2.1"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "0l57qdngxv9nbfj4ixr4fyanlazmdib2kr1nzv3g578308xzjv6a"; + sha256 = "1lnsawbrdhdixbdhm49hc4c9vz2l3fvrpbxyk1mia2hf4pdmc594"; }; NIX_LDFLAGS = "-llua -lgcc_s"; From 2085b88c01ed49b9d3d1fbc7e234cfb217fe14fd Mon Sep 17 00:00:00 2001 From: Philipp Steinpass Date: Sun, 29 Apr 2018 13:50:58 +0200 Subject: [PATCH 370/491] dehydrated: 0.6.1 -> 0.6.2 --- pkgs/tools/admin/dehydrated/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index d4211328b959..38b70d1b5d07 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,7 +1,7 @@ { stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: let pkgName = "dehydrated"; - version = "0.6.1"; + version = "0.6.2"; in stdenv.mkDerivation rec { name = pkgName + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "lukas2511"; repo = "dehydrated"; rev = "v${version}"; - sha256 = "0390fnycl3l4yqacwvaf7dp08rx2vvs27s06q7b478qzrn59flz4"; + sha256 = "19d4kam0dl6l9wfd0v54w4d085jdgi1ljksnqpjj67d6sm23f2l4"; }; buildInputs = [ makeWrapper ]; From a07881c8b83ecf08d1cca03d9c185fd940fe23f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 28 Apr 2018 01:40:57 +0200 Subject: [PATCH 371/491] chromium: skia patch appears to be still needed with 66 on aarch64 Cc @chaoflow @bendlas Replaces #39628 --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b591d5d7ba0c..ad28d829157b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,7 +160,7 @@ let sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z"; }) ] ++ optional enableWideVine ./patches/widevine.patch - ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [ + ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch ]; From 905b03bce29601c23848ea6bdb4d7b879750041f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 29 Apr 2018 00:13:03 +0200 Subject: [PATCH 372/491] chromium: fix build on aarch64 chromium build on aarch64 failed with: ``` FAILED: obj/skia/skia/convolver_neon.o g++ -MMD -MF obj/skia/skia/convolver_neon.o.d -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_SUPPORT_GPU=1 -DSK_FREETYPE_MINIMUM_RUNTIME_VERSION=\(\(\(FREETYPE_MAJOR\)\ \*\ 0x01000000\)\ \|\ \(\(FREETYPE_MINOR\)\ \*\ 0x00010000\)\ \|\ \(\(FREETYPE_PATCH\)\ \*\ 0x00000100\)\) -DSK_GAMMA_EXPONENT=1.2 -DSK_GAMMA_CONTRAST=0.2 -DSK_DEFAULT_FONT_CACHE_LIMIT=20971520 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DFT_CONFIG_CONFIG_H=\"freetype-custom-config/ftconfig.h\" -DFT_CONFIG_MODULES_H=\"freetype-custom-config/ftmodule.h\" -DFT_CONFIG_OPTIONS_H=\"freetype-custom-config/ftoption.h\" -DPDFIUM_REQUIRED_MODULES -DCHROMIUM_RESTRICT_VISIBILITY -DUSE_LIBJPEG_TURBO=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DUSE_SYSTEM_ZLIB=1 -I../.. -Igen -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/encode -I../../third_party/skia/include/gpu -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/src/gpu -I../../third_party/skia/src/sksl -I../../third_party/skia/include/codec -I../../third_party/skia/include/private -I../../third_party/skia/include/client/android -I../../third_party/skia/src/codec -I../../third_party/skia/src/core -I../../third_party/skia/src/image -I../../third_party/skia/src/images -I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf -I../../third_party/skia/src/ports -I../../third_party/skia/src/shaders -I../../third_party/skia/src/shaders/gradients -I../../third_party/skia/src/sfnt -I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy -I../../third_party/skia/third_party/gif -I../../third_party/skia/src/effects/gradients -Igen/shim_headers/libpng_shim -Igen/shim_headers/zlib_shim -I../../third_party/freetype/include -I../../third_party/freetype/src/include -I../../third_party/harfbuzz-ng/src -I../../third_party/libjpeg_turbo -I../../third_party/fontconfig/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../third_party/sfntly/src/cpp/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -pthread -fno-omit-frame-pointer -g0 -fno-builtin-abs -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -isystem/nix/store/smmxgfkqaqqh43d5gmv5p3abcq19hkzy-glib-2.56.0-dev/include/glib-2.0 -isystem/nix/store/yn3bbw1sxg19h07wzn16k0ja58wr9yiz-glib-2.56.0/lib/glib-2.0/include -isystem/nix/store/f82jgynysk9mvhyfavfzims41zkskb3c-libpng-apng-1.6.34-dev/include/libpng16 -isystem/nix/store/56i89kfi2nmjrv8hifsz6zikr6pq1avw-zlib-1.2.11-dev/include -std=gnu++14 -fno-exceptions -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -fvisibility-inlines-hidden -Wno-narrowing -c ../../skia/ext/convolver_neon.cc -o obj/skia/skia/convolver_neon.o ../../skia/ext/convolver_neon.cc: In function 'int32x4_t skia::AccumRemainder(const unsigned char*, const Fixed*, int)': ../../skia/ext/convolver_neon.cc:26:65: error: cannot convert '' to 'int32x4_t {aka __vector(4) int}' in return return {remainder[0], remainder[1], remainder[2], remainder[3]}; ^ ``` The following patch appears to fix this build issue. Source: https://chromium.googlesource.com/chromium/src.git/+/b84682f31dc99b9c90f5a04947075815697c68d9%5E%21/#F0 Suggested-by: @dezgeg --- .../networking/browsers/chromium/common.nix | 1 + .../chromium/patches/neon_buildfix.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ad28d829157b..6403f5441f36 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -162,6 +162,7 @@ let ] ++ optional enableWideVine ./patches/widevine.patch ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch + ./patches/neon_buildfix.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch new file mode 100644 index 000000000000..b44487ca634c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch @@ -0,0 +1,21 @@ +diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc +index 26b91b9..cae6bc2 100644 +--- a/skia/ext/convolver_neon.cc ++++ b/skia/ext/convolver_neon.cc + +@@ -23,7 +23,7 @@ + remainder[2] += coeff * pixels_left[i * 4 + 2]; + remainder[3] += coeff * pixels_left[i * 4 + 3]; + } +- return {remainder[0], remainder[1], remainder[2], remainder[3]}; ++ return vld1q_s32(remainder); + } + + // Convolves horizontally along a single row. The row data is given in +@@ -336,4 +336,4 @@ + } + } + +-} // namespace skia +\ No newline at end of file ++} // namespace skia From 0e5eafc1fd0e58fb4bca6d0defff36e168eacc08 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Apr 2018 17:40:18 +0200 Subject: [PATCH 373/491] awscli: 1.14.50 -> 1.15.10; fix build As reported in #39676 the build broke because of ca52152 as the bump of `pythonPackages.botocore` to 1.10.9 clashed with the wanted dependencies in `awscli`. In order to reduce the risk of accidental bugs because of loosened version constraints I bumped the AWS CLI to `1.15.10` which depends on `botocore@1.10` as well. Fixes #39676 --- pkgs/tools/admin/awscli/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 23908a8b66f9..4e7e2d402e90 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.14.50"; + version = "1.15.10"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1yiwj7cl9r1k9226mdq6pcmrs044k7p3d133lzgv9rb1dgp4053c"; + sha256 = "0nwpanbfx5h0bad8wwvvbhpjf9r6n885bbv2w8mw7vijdgclkq8x"; }; # No tests included @@ -42,6 +42,12 @@ in py.pkgs.buildPythonApplication rec { less ]; + postPatch = '' + for i in {py,cfg}; do + substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11" + done + ''; + postInstall = '' mkdir -p $out/etc/bash_completion.d echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli From 80b7298420f0ce6327f9d75f63f416d6db22231e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 28 Apr 2018 22:13:12 -0400 Subject: [PATCH 374/491] =?UTF-8?q?ldb:=201.1.27=20=E2=86=92=201.1.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #39572 --- pkgs/development/libraries/ldb/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 4f2785675f08..c178f2f76a4d 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, pkgconfig, readline, tdb, talloc, tevent -, popt, libxslt, docbook_xsl, docbook_xml_dtd_42 +, popt, libxslt, docbook_xsl, docbook_xml_dtd_42, cmocka }: stdenv.mkDerivation rec { - name = "ldb-1.1.27"; + name = "ldb-1.1.31"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d"; + sha256 = "04d53e2ab5b35688f5ed7a4471f5b273da121016e1af0630b36a36506afaeb46" ; }; outputs = [ "out" "dev" ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ python readline tdb talloc tevent popt libxslt docbook_xsl docbook_xml_dtd_42 + cmocka ]; preConfigure = '' From 80bf73b11c6e5b4f9fdf499d85a7d66f6be04f90 Mon Sep 17 00:00:00 2001 From: Matan Shenhav Date: Sun, 29 Apr 2018 21:22:12 +0300 Subject: [PATCH 375/491] pythonPackages.hdbscan: init at 0.8.12 (#37762) --- .../python-modules/hdbscan/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/hdbscan/default.nix diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix new file mode 100644 index 000000000000..3d57ff371666 --- /dev/null +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, cython +, numpy +, nose +, scipy +, scikitlearn +, fetchPypi +}: + +buildPythonPackage rec { + pname = "hdbscan"; + version = "0.8.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yxi34frg2jwyvjl942qy4gq5pbx8dq4pf4p28d1xah8njchfqir"; + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ cython numpy scipy scikitlearn ]; + + meta = with lib; { + description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; + homepage = http://github.com/scikit-learn-contrib/hdbscan; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93444be7302a..6635721ee958 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6342,6 +6342,8 @@ in { propagatedBuildInputs = with self; [ requests webob ]; }; + hdbscan = callPackage ../development/python-modules/hdbscan { }; + hmmlearn = callPackage ../development/python-modules/hmmlearn { }; hcs_utils = callPackage ../development/python-modules/hcs_utils { }; From 8a07916fa965d752d929890c4621823401862ab6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 20:30:51 +0000 Subject: [PATCH 376/491] hplip: 3.17.11 -> 3.18.3 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b18ae7762df2..91be6cf743a4 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -11,16 +11,16 @@ let name = "hplip-${version}"; - version = "3.17.11"; + version = "3.18.3"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g"; + sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "0vqhwqc33vxncdhbzdchbgrcrxvkwnp7rc2hkswwn9da112s0c9w"; + sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw"; }; hplipState = substituteAll { From 0be5637139970d5ae6aef1999769b600765a95f6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 14:27:26 -0500 Subject: [PATCH 377/491] netbsd.games: disable more games on darwin --- pkgs/os-specific/bsd/netbsd/default.nix | 33 +++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 343b61bab383..ecd09eaff807 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -381,19 +381,26 @@ in rec { # to build but need to look at how to implement stuff in # Linux. macOS is missing gettime. TODO try to get these # working. - substituteInPlace Makefile \ - ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \ - --replace atc "" \ - --replace boggle "" \ - --replace dm "" \ - --replace fortune "" \ - --replace hunt "" \ - --replace larn "" \ - --replace phantasia "" \ - --replace rogue "" \ - --replace sail "" \ - --replace trek "" \ - --replace dab "" + disableGame() { + substituteInPlace Makefile --replace $1 "" + } + + disableGame atc + disableGame boggle + disableGame dm + disableGame fortune + disableGame hunt + disableGame larn + disableGame phantasia + disableGame rogue + disableGame sail + disableGame trek + disableGame dab + ${lib.optionalString stdenv.isDarwin "disableGame adventure"} + ${lib.optionalString stdenv.isDarwin "disableGame factor"} + ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} + ${lib.optionalString stdenv.isDarwin "disableGame mille"} + substituteInPlace Makefile.inc \ --replace 2555 555 \ --replace 2550 550 From c2148482c2b4d479017d94c5e8b80bdc9bdb9a03 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 14:46:54 -0500 Subject: [PATCH 378/491] libressl: move netcat stuff to '.nc' output I still feel weird about doing this because it seems a little hacky but this was requested by @Mic92 and seems understandable to not want to mix up libressl outputs with netcat stuff. --- pkgs/development/libraries/libressl/default.nix | 11 ++++++++--- pkgs/top-level/aliases.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 8f028bcb5461..b65c813f230f 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib }: let @@ -15,11 +15,16 @@ let enableParallelBuilding = true; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" "nc" ]; + + postFixup = '' + moveToOutput "bin/nc" "$nc" + moveToOutput "share/man/man1/nc.1${lib.optionalString (!dontGzipMan) ".gz"}" "$nc" + ''; dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong - meta = with stdenv.lib; { + meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; platforms = platforms.all; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a7f59d1268fd..334905b79f2b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,7 +138,7 @@ mapAliases (rec { mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 ncat = nmap; # added 2016-01-26 - netcat-openbsd = libressl.bin; # added 2018-04-25 + netcat-openbsd = libressl.nc; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 From e8672c8b3751622c5d603bc7bb144377d1d3498c Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 29 Apr 2018 15:14:34 -0500 Subject: [PATCH 379/491] libressl: fix eval --- pkgs/development/libraries/libressl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index b65c813f230f..51162979e630 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -19,7 +19,7 @@ let postFixup = '' moveToOutput "bin/nc" "$nc" - moveToOutput "share/man/man1/nc.1${lib.optionalString (!dontGzipMan) ".gz"}" "$nc" + moveToOutput "share/man/man1/nc.1${lib.optionalString (dontGzipMan==null) ".gz"}" "$nc" ''; dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong From 146cb02542989d67f6bb11e1206562f44c0e1eec Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 29 Apr 2018 23:39:25 +0200 Subject: [PATCH 380/491] nixos/tests/hibernate: Fix netcat flags I'm not sure why 024b501907eafbd89624e465ff21afbc96e9fec6 used -q 0 because even netcat-openbsd has the -N flag which IMO is the better way to shutdown the socket on EOF. Our default netcat implementation has changed once again[1] in 3c3b82234a6faa5a4c07323d0066452055d1ea81 and we're now using LibreSSL's implementation, which doesn't have a -q flag. See https://github.com/NixOS/nixpkgs/pull/39634 for the pull request introducing the switch. [1]: https://github.com/NixOS/nixpkgs/pull/19982 Signed-off-by: aszlig Cc: @matthewbauer, @dtzWill, @Mic92 --- nixos/tests/hibernate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index a95235887e89..3ae2bdffed90 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -37,7 +37,7 @@ import ./make-test.nix (pkgs: { $machine->waitForShutdown; $machine->start; $probe->waitForUnit("network.target"); - $probe->waitUntilSucceeds("echo test | nc machine 4444 -q 0"); + $probe->waitUntilSucceeds("echo test | nc machine 4444 -N"); ''; }) From f12b93162a134cf9bfa4fcdaf10966922fbec6f7 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 29 Apr 2018 18:30:42 -0500 Subject: [PATCH 381/491] rl-1809: add netcat note --- nixos/doc/manual/release-notes/rl-1809.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 2e53f0563baf..62f1b769463b 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -68,6 +68,15 @@ following incompatible changes: points to the package which is bundled with the unfree libspotify package. + + + The netcat package is now taken directly from OpenBSD's + libressl, instead of relying on Debian's fork. The new + version should be very close to the old version, but there are some minor + differences. Importantly, flags like -b, -q, -C, and -Z are no longer + accepted by the nc command. + + From 62eb285a621e1b09ea82387c15a817cf07d61d9e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 28 Mar 2018 12:48:31 +0200 Subject: [PATCH 382/491] qpdfview: port to qt5 --- pkgs/applications/misc/qpdfview/default.nix | 24 ++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index e3e7ff950b0c..a4fd1d356746 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups +{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups , file, ghostscript }: let @@ -10,9 +10,9 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - qt4 poppler_qt4 djvulibre libspectre cups file ghostscript + qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { @@ -21,13 +21,17 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - configurePhase = '' - qmake *.pro - for i in *.pro; do - qmake "$i" -o "Makefile.$(basename "$i" .pro)" - done - sed -e "s@/usr/@$out/@g" -i Makefile* - ''; + qmakeFlags = [ + "*.pro" + "TARGET_INSTALL_PATH=${placeholder "out"}/bin" + "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview" + "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview" + "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1" + "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps" + "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications" + "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata" + ]; + meta = { inherit (s) version; description = "A tabbed document viewer"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c5..34e13559c649 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18213,7 +18213,7 @@ with pkgs; vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); - qpdfview = callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; From 8ce6587966040ab03a2f7d1d26223bed59c65cbe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:21:01 +0800 Subject: [PATCH 383/491] utox: 0.16.1 -> 0.17.0 --- .../instant-messengers/utox/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 9c208dd52a83..e139904fee53 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }: +{ stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig +, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }: stdenv.mkDerivation rec { name = "utox-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828"; + sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"; + fetchSubmodules = true; }; buildInputs = [ @@ -20,16 +22,20 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake git pkgconfig check + check cmake pkgconfig ]; cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + "-DENABLE_AUTOUPDATE=OFF" + ] ++ lib.optional (doCheck) "-DENABLE_TESTS=ON"; - doCheck = true; + doCheck = stdenv.isLinux; - checkTarget = "test"; + checkPhase = '' + runHook preCheck + ctest -VV + runHook postCheck + ''; meta = with stdenv.lib; { description = "Lightweight Tox client"; From 8811d1d384d38962927450cf8f69d675f72ee80a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:21:25 +0800 Subject: [PATCH 384/491] toxvpn: 2017-06-25 -> 2018-04-17 --- pkgs/tools/networking/toxvpn/default.nix | 19 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c7fa1c7a2719..ccb9f3bc0d6b 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,25 +1,22 @@ { stdenv, fetchFromGitHub, cmake, nlohmann_json, -libtoxcore, libsodium, systemd, libcap, zeromq }: + libtoxcore, libsodium, libcap, zeromq, + systemd ? null }: with stdenv.lib; -let - systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd; - if_systemd = optional (systemdOrNull != null); -in stdenv.mkDerivation rec { - name = "toxvpn-${version}"; - version = "2017-06-25"; +stdenv.mkDerivation rec { + name = "toxvpn-2018-04-17"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "7bd6f169d69c511affa8c9672e8f794e4e205a44"; - sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0"; + rev = "dc766f98888f500ea51f002f59007eac3f3a0a06"; + sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz"; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ if_systemd systemd - ++ optional (stdenv.system != "x86_64-darwin") libcap; + ++ optionals stdenv.isLinux [ libcap systemd ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9224ecbe66e..c60f99b82cb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5220,7 +5220,7 @@ with pkgs; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; - toxvpn = callPackage ../tools/networking/toxvpn { }; + toxvpn = callPackage ../tools/networking/toxvpn { libtoxcore = libtoxcore_0_1; }; tpmmanager = callPackage ../applications/misc/tpmmanager { }; From 841643796a8efc8c3412eb7488646094cb607ef7 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 29 Apr 2018 20:03:05 -0400 Subject: [PATCH 385/491] rclone: 1.40 -> 1.41 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index aa2a971b15f6..405ff2fde735 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.40"; + version = "1.41"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9"; + sha256 = "0kvqzrj7kbr9mhg023lkvk320qhkf4widcv6yph1cx701935brhr"; }; outputs = [ "bin" "out" "man" ]; From 47a738339553e5416e9edb4c5bc71c3497911fb1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 19:14:00 -0500 Subject: [PATCH 386/491] darling: fix src Darling has a case conflict which means that its src hash will be different between case sensitive and case insensitive file systems. This is not ideal and the only way around it is basically to remove the offending files from the output. I use fetchzip here to do that but I hope there is a better fix available eventually. --- pkgs/os-specific/darwin/darling/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index b9d806cded23..c1e29843147c 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -1,14 +1,19 @@ -{stdenv, lib, fetchFromGitHub, cmake, bison, flex}: +{stdenv, lib, fetchzip, cmake, bison, flex}: stdenv.mkDerivation rec { pname = "darling"; name = pname; - src = fetchFromGitHub { - repo = pname; - owner = "darlinghq"; - rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b"; - sha256 = "1sdl0ysa3yfdvkq0x7vkdl64g7mcfy3qx70saf1d8rnhycbxjgjg"; + src = fetchzip { + url = "https://github.com/darlinghq/darling/archive/d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b.tar.gz"; + sha256 = "11b51fw47nl505h63bgx5kqiyhf3glhp1q6jkpb6nqfislnzzkrf"; + postFetch = '' + # Get rid of case conflict + mkdir $out + cd $out + tar -xzf $downloadedFile --strip-components=1 + rm -r $out/src/libm + ''; }; # only packaging sandbox for now From 9e503e039b6adce89bc0b99cbf6e5b24d3b75118 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Apr 2018 02:22:54 +0200 Subject: [PATCH 387/491] qpdfview: remove placeholder usage --- pkgs/applications/misc/qpdfview/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index a4fd1d356746..f836ce5b8085 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -21,16 +21,11 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - qmakeFlags = [ - "*.pro" - "TARGET_INSTALL_PATH=${placeholder "out"}/bin" - "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview" - "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview" - "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1" - "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps" - "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications" - "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata" - ]; + + # TODO: revert this once placeholder is supported + preConfigure = '' + qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata" + ''; meta = { inherit (s) version; From 82080d77a0f135ddb6a980e110d7e67282bc8be3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 29 Apr 2018 20:32:41 -0400 Subject: [PATCH 388/491] wire-desktop: correct desktopItem --- .../networking/instant-messengers/wire-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 9e946152c192..f0123024fe2f 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -61,7 +61,7 @@ in }; desktopItem = makeDesktopItem { - name = "Wire"; + name = "wire-desktop"; exec = "wire-desktop %U"; icon = "wire-desktop"; comment = "Secure messenger for everyone"; From 1907120f23ada097ccf00ba8ac040097c911e9e6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 30 Apr 2018 00:21:36 +0200 Subject: [PATCH 389/491] nixos/tests/udisks2: Fix USB device hotplug The usb_add and usb_del monitor commands have been removed in QEMU version 2.12 (introduced in 3e3b39f173f9abc99da84084a1f4657c9de885bd). Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes: > The deprecated HMP commands "usb_add" and "usb_del" have been removed. > Use "device_add" and "device_del" as replacement instead. So we're doing exactly that and the udisks2 test now works again. Signed-off-by: aszlig Cc: @edolstra --- nixos/tests/udisks2.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 72d51c0051c0..70a999267a54 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -37,7 +37,8 @@ in $machine->fail("udisksctl info -b /dev/sda1"); # Attach a USB stick and wait for it to show up. - $machine->sendMonitorCommand("usb_add disk:$stick"); + $machine->sendMonitorCommand("drive_add 0 id=stick,if=none,file=$stick,format=raw"); + $machine->sendMonitorCommand("device_add usb-storage,id=stick,drive=stick"); $machine->waitUntilSucceeds("udisksctl info -b /dev/sda1"); $machine->succeed("udisksctl info -b /dev/sda1 | grep 'IdLabel:.*USBSTICK'"); @@ -52,7 +53,7 @@ in $machine->fail("[ -d /run/media/alice/USBSTICK ]"); # Remove the USB stick. - $machine->sendMonitorCommand("usb_del 0.3"); # FIXME + $machine->sendMonitorCommand("device_del stick"); $machine->waitUntilFails("udisksctl info -b /dev/sda1"); $machine->fail("[ -e /dev/sda ]"); ''; From f148c5c4a1ffa353836bfd18a94d457acf83bd36 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 30 Apr 2018 01:43:17 +0200 Subject: [PATCH 390/491] nixos/tests: Fix QEMU flags for SCSI disks The ability to specify "-drive if=scsi" has been removed in QEMU version 2.12 (introduced in 3e3b39f173f9abc99da84084a1f4657c9de885bd). Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes: > The deprecated way of configuring SCSI devices with "-drive if=scsi" > on x86 has been removed. Use an appropriate SCSI controller together > "-device scsi-hd" or "-device scsi-cd" and a corresponding "-blockdev" > parameter instead. So whenever the diskInterface is "scsi" we use the new way to specify the drive and fall back to the deprecated way for the time being. The reason why I'm not using the new way for "virtio" and "ide" as well is because there is no simple generic way anymore to specify these. This also turns the type of the virtualisation.qemu.diskInterface option to be an enum, so the user knows which values are allowed but we can also make sure the right value is provided to prevent typos. I've tested this against a few non-disk-related NixOS VM tests but also the installer.grub1 test (because it uses "ide" as its drive interface), the installer.simple test (just to be sure it still works with "virtio") and all the tests in nixos/tests/boot.nix. In order to be able to run the grub1 test I had to go back to 8b1cf100cd8badad6e1b6d4650b904b88aa870db (which is a known commit where that test still works) and apply the QEMU update and this very commit, because right now the test is broken. Apart from the tests here in nixpkgs, I also ran another[1] test in another repository which uses the "scsi" disk interface as well (in comparison to most of the installer tests, this one actually failed prior to this commit). All of them now succeed. [1]: https://github.com/openlab-aux/vuizvui/blob/9b5a119972e9c2d327500638d89063f4fce243ec/tests/system/kernel/bfq.nix Signed-off-by: aszlig Cc: @edostra, @grahamc, @dezgeg, @abbradar, @ts468 --- nixos/lib/test-driver/Machine.pm | 17 +++++++++++--- nixos/modules/virtualisation/qemu-vm.nix | 30 +++++++++++++++++------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 7e269b43e70f..b18f48464cee 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -33,9 +33,20 @@ sub new { $startCommand = "qemu-kvm -m 384 " . "-net nic,model=virtio \$QEMU_OPTS "; - my $iface = $args->{hdaInterface} || "virtio"; - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,werror=report " - if defined $args->{hda}; + + if (defined $args->{hda}) { + if ($args->{hdaInterface} eq "scsi") { + $startCommand .= "-drive id=hda,file=" + . Cwd::abs_path($args->{hda}) + . ",werror=report,if=none " + . "-device scsi-hd,drive=hda "; + } else { + $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) + . ",if=" . $args->{hdaInterface} + . ",werror=report "; + } + } + $startCommand .= "-cdrom $args->{cdrom} " if defined $args->{cdrom}; $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk " diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 3d4bd315f812..66ff43c8547d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -27,6 +27,21 @@ let kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; + # XXX: This is very ugly and in the future we really should use attribute + # sets to build ALL of the QEMU flags instead of this mixed mess of Nix + # expressions and shell script stuff. + mkDiskIfaceDriveFlag = idx: driveArgs: let + inherit (cfg.qemu) diskInterface; + # The drive identifier created by incrementing the index by one using the + # shell. + drvId = "drive$((${idx} + 1))"; + # NOTE: DO NOT shell escape, because this may contain shell variables. + commonArgs = "index=${idx},id=${drvId},${driveArgs}"; + isSCSI = diskInterface == "scsi"; + devArgs = "${diskInterface}-hd,drive=${drvId}"; + args = "-drive ${commonArgs},if=none -device lsi53c895a -device ${devArgs}"; + in if isSCSI then args else "-drive ${commonArgs},if=${diskInterface}"; + # Shell script to start the VM. startVM = '' @@ -68,7 +83,7 @@ let if ! test -e "empty$idx.qcow2"; then ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" fi - extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=${cfg.qemu.diskInterface},werror=report" + extraDisks="$extraDisks ${mkDiskIfaceDriveFlag "$idx" "file=$(pwd)/empty$idx.qcow2,werror=report"}" idx=$((idx + 1)) '')} @@ -83,14 +98,14 @@ let -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ ${if cfg.useBootLoader then '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ - -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \ + ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ + ${mkDiskIfaceDriveFlag "1" "file=$TMPDIR/disk.img,media=disk"} \ ${if cfg.useEFIBoot then '' -pflash $TMPDIR/bios.bin \ '' else '' ''} '' else '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ + ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \ @@ -338,11 +353,8 @@ in mkOption { default = "virtio"; example = "scsi"; - type = types.str; - description = '' - The interface used for the virtual hard disks - (virtio or scsi). - ''; + type = types.enum [ "virtio" "scsi" "ide" ]; + description = "The interface used for the virtual hard disks."; }; }; From cf194a93115ac1354f0e49f49c1f44aac74b3d6d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 29 Apr 2018 22:29:10 -0400 Subject: [PATCH 391/491] linux: 4.17-rc2 -> 4.17-rc3 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6370f82235a7..d02ab4157191 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc2"; - modDirVersion = "4.17.0-rc2"; + version = "4.17-rc3"; + modDirVersion = "4.17.0-rc3"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1z4kl25x8m498wicbzhx21kvksp63ab8l2s0nfxf7fwj7dd13cld"; + sha256 = "1divgjzmpl98b5j416vhkq53li0y9v5vvdwbgwpr2xznspzbkygq"; }; # Should the testing kernels ever be built on Hydra? From d0c8bf86e4bb6839b3567178bae2d0bba2ebb8ac Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 29 Apr 2018 23:19:19 -0400 Subject: [PATCH 392/491] dbeaver: 5.0.3 -> 5.0.4 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 002d8fc8f23b..edc1497294fc 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.0.3"; + version = "5.0.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0pk40jzmd23cv690a8wslxbb4xp4msq2zwh7xm0hvs64ykm9a581"; + sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3"; }; installPhase = '' From d207e043d3315330e5011be63783a335f645c9d0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 29 Apr 2018 22:46:16 -0400 Subject: [PATCH 393/491] asymptote: move Emacs Lisp files to $out/share/emacs/site-lisp/asymptote/ This way, emacs can find the 'asymptote' mode. --- pkgs/tools/graphics/asymptote/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 7337cd227a2e..01ddd6ba7fc5 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -51,7 +51,9 @@ stdenv.mkDerivation { rmdir $out/share/info/asymptote rm $out/share/info/dir - rm -rf "$out"/share/texmf + rm -rfv "$out"/share/texmf + mkdir -pv "$out"/share/emacs/site-lisp/${s.name} + mv -v "$out"/share/asymptote/*.el "$out"/share/emacs/site-lisp/${s.name} ''; enableParallelBuilding = true; From f3062702096f42c6a2349693bf776e17fb8dd4d9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 23:11:37 -0500 Subject: [PATCH 394/491] netbsd.games: cleanup This gets a few more games working. --- pkgs/os-specific/bsd/netbsd/default.nix | 73 ++++++++++++++++++++----- 1 file changed, 59 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index ecd09eaff807..4961ab6080a9 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,5 +1,5 @@ { stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils -, yacc, flex, libressl, bash }: +, yacc, flex, libressl, bash, more }: let fetchNetBSD = path: version: sha256: fetchcvs { @@ -42,6 +42,7 @@ let LIBCURSES = ""; LIBTERMINFO = ""; LIBM = ""; + LIBL = ""; "LIBDO.terminfo" = "_external"; "LIBDO.curses" = "_external"; _GCC_CRTBEGIN = ""; @@ -370,6 +371,14 @@ in rec { version = "7.1.2"; }; + dict = netBSDDerivation { + path = "share/dict"; + version = "7.1.2"; + sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; + preBuild = "mkdir -p $out/share/dict"; + makeFlags = [ "BINDIR=/share" ]; + }; + games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; @@ -377,6 +386,21 @@ in rec { patchPhase = '' sed -i '1i #include ' adventure/save.c + for f in $(find . -name pathnames.h); do + substituteInPlace $f \ + --replace /usr/share/games $out/share/games \ + --replace /usr/games $out/bin \ + --replace /usr/libexec $out/libexec \ + --replace /var/games $out/var/games \ + --replace /usr/bin/more ${more}/bin/more \ + --replace /usr/share/dict ${dict}/share/dict + done + substituteInPlace ching/ching/ching.sh \ + --replace /usr/share $out/share \ + --replace /usr/libexec $out/libexec + substituteInPlace hunt/huntd/driver.c \ + --replace "(void) setpgrp(getpid(), getpid());" "" + # Disable some games that don't build. They should be possible # to build but need to look at how to implement stuff in # Linux. macOS is missing gettime. TODO try to get these @@ -386,16 +410,10 @@ in rec { } disableGame atc - disableGame boggle disableGame dm - disableGame fortune - disableGame hunt - disableGame larn - disableGame phantasia - disableGame rogue - disableGame sail - disableGame trek disableGame dab + ${lib.optionalString stdenv.isDarwin "disableGame sail"} + ${lib.optionalString stdenv.isDarwin "disableGame trek"} ${lib.optionalString stdenv.isDarwin "disableGame adventure"} ${lib.optionalString stdenv.isDarwin "disableGame factor"} ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} @@ -405,6 +423,17 @@ in rec { --replace 2555 555 \ --replace 2550 550 ''; + + # HACK strfile needs to be installed first & in the path + preBuild = '' + pushd fortune/strfile + mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8 + make + make BINDIR=/bin install + popd + export PATH=$out/bin:$PATH + ''; + NIX_CFLAGS_COMPILE = [ "-D__noinline=" "-D__scanflike(a,b)=" @@ -412,24 +441,29 @@ in rec { "-DOXTABS=XTABS" "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" - (if hostPlatform.isMusl then "-include sys/ttydefaults.h -include sys/file.h" else "") + (lib.optionalString hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h") + "-DBE32TOH(x)=((void)0)" + "-DBE64TOH(x)=((void)0)" + "-D__c99inline=__inline" ]; + postBuild = '' mkdir -p $out/usr/games $out/usr/share/games/ching \ + $out/usr/share/games/fortune \ $out/usr/share/games/quiz.db \ + $out/usr/share/games/boggle \ $out/usr/libexec/ching $out/var/games/hackdir touch $out/var/games/hackdir/perm ''; + preFixup = '' mkdir -p $out/bin mv $out/games/* $out/bin rmdir $out/games ''; + buildInputs = [ compat libcurses libterminfo libressl ]; - extraPaths = [ - (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4") - who.src - ]; + extraPaths = [ dict.src who.src ]; }; # finger = netBSDDerivation { @@ -477,6 +511,17 @@ in rec { sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; MKPIC = if stdenv.isDarwin then "no" else "yes"; + patchPhase = '' + substituteInPlace term.c \ + --replace /usr/share $out/share + ''; + postBuild = '' + pushd $NETBSDSRCDIR/share/terminfo + mkdir -p $out/share/misc + make + make BINDIR=/share install + popd + ''; extraPaths = [ (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") ]; From 5f5257dbce61d8fd417b64b59ddaffc62c695f4f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 30 Apr 2018 13:31:09 +0800 Subject: [PATCH 395/491] go-ethereum: 1.8.3 -> 1.8.6 --- pkgs/applications/altcoins/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 65e1dbc9b198..a47b7fa3168f 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.3"; + version = "1.8.6"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1vdrf3fi4arr6aivyp5myj4jy7apqbiqa6brr3jplmc07q1yijnf"; + sha256 = "1n6f34r7zlc64l1q8xzcjk5sljdznjwp81d9naapprhpqb8g01gl"; }; meta = with stdenv.lib; { From 6a560f499c5a1038a573ea961ef1d1166e1b3677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 30 Apr 2018 07:43:57 +0100 Subject: [PATCH 396/491] gperftools: suppress compilation warning on macOS --- pkgs/development/libraries/gperftools/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 2a2710531e06..de71704cff85 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { substituteInPlace libtool --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isDarwin "-D_XOPEN_SOURCE"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ + "-D_XOPEN_SOURCE" "-Wno-aligned-allocation-unavailable" + ]; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools From 8ce6db16244b2fb312a2cfb7a8ba425dc3b4a18a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 16:11:37 +0800 Subject: [PATCH 397/491] grc: 1.11.1 -> 1.11.3 --- pkgs/tools/misc/grc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index c554c13bb4ab..451828b0f47b 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "grc-${version}"; - version = "1.11.1"; + version = "1.11.3"; src = fetchFromGitHub { owner = "garabik"; repo = "grc"; rev = "v${version}"; - sha256 = "10h65qmv2cymixzfsckfcn6f01xsjzfq1x303rv01nibniwbq5z9"; + sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; }; buildInputs = with python3Packages; [ wrapPython makeWrapper ]; From 6a32965e17910c18bd166a79502c0a3639854ea7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Apr 2018 22:09:25 +0200 Subject: [PATCH 398/491] notary: fix build The package is broken on master for some time now: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.notary.x86_64-linux/all The main reason for the breackage is that the `Makefile` script attempts to retrieve the latest git commit by using `git rev-parse` which breaks as `git` is not in the build environment. This could be fixed by using `?=` rather than `:=` for the `GITCOMMIT` variable in the `make` script to easily override `GITCOMMIT` in the `buildPhase`. See the Hydra logs for reference: https://nix-cache.s3.amazonaws.com/log/ib4qp8h4r8d830ra4fah38l7ybb82gp7-notary-0.6.0.drv Furthermore some refactoring was applied: * Activated the test suite for `cmd/notary` to confirm the basic functionality when building for NixOS. * Added {pre,post} hooks for `{build,install}Phase` * Added myself as maintainer to have more people available in case of further breakage. --- pkgs/tools/security/notary/default.nix | 34 ++++++++++++------- pkgs/tools/security/notary/no-git-usage.patch | 15 ++++++++ 2 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 pkgs/tools/security/notary/no-git-usage.patch diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 4a42c9162e1b..071bfdaea005 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -1,32 +1,42 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, git, libtool }: +{ stdenv, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { name = "notary-${version}"; - version = "0.6.0"; - gitcommit = "34f53ad"; + version = "0.6.1"; + gitcommit = "d6e1431f"; src = fetchFromGitHub { owner = "theupdateframework"; repo = "notary"; rev = "v${version}"; - sha256 = "0lg7ab2agkk3rnladcvpdzk8cnf3m49qfm4sanh7yjvlvlv1wm4a"; + sha256 = "1ak9dk6vjny5069hp3w36dbjawcnaq82l3i2qvf7mn7zfglbsnf9"; }; + patches = [ ./no-git-usage.patch ]; + buildInputs = [ libtool ]; + buildPhase = '' + runHook preBuild + cd go/src/github.com/theupdateframework/notary + make client GITCOMMIT=${gitcommit} + runHook postBuild + ''; goPackagePath = "github.com/theupdateframework/notary"; - buildPhase = '' - cd go/src/github.com/theupdateframework/notary - make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client + installPhase = '' + runHook preInstall + install -D bin/notary $bin/bin/notary + runHook postInstall ''; - installPhase = '' - install -D bin/notary $bin/bin/notary + doCheck = true; + checkPhase = '' + make test PKGS=github.com/theupdateframework/notary/cmd/notary ''; meta = with stdenv.lib; { - description = " Notary is a project that allows anyone to have trust over arbitrary collections of data"; + description = "Notary is a project that allows anyone to have trust over arbitrary collections of data"; longDescription = '' The Notary project comprises a server and a client for running and interacting with trusted collections. See the service architecture @@ -49,7 +59,7 @@ buildGoPackage rec { ''; license = licenses.asl20; homepage = https://github.com/theupdateframework/notary; - maintainers = with maintainers; [ vdemeester ]; - platforms = with platforms; unix; + maintainers = with maintainers; [ vdemeester ma27 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/notary/no-git-usage.patch b/pkgs/tools/security/notary/no-git-usage.patch new file mode 100644 index 000000000000..363eefe36921 --- /dev/null +++ b/pkgs/tools/security/notary/no-git-usage.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index ab794165..0cbd047f 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,8 +5,8 @@ PREFIX?=$(shell pwd) + # Add to compile time flags + NOTARY_PKG := github.com/theupdateframework/notary + NOTARY_VERSION := $(shell cat NOTARY_VERSION) +-GITCOMMIT := $(shell git rev-parse --short HEAD) +-GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no) ++GITCOMMIT ?= $(shell git rev-parse --short HEAD) ++GITUNTRACKEDCHANGES := + ifneq ($(GITUNTRACKEDCHANGES),) + GITCOMMIT := $(GITCOMMIT)-dirty + endif From 9786bd06a621dbb2c0cd7de696df5ed269e54ddd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 17:22:01 +0800 Subject: [PATCH 399/491] libqmatrixclient: 0.2 -> 0.2.1 --- .../libraries/libqmatrixclient/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f537013d2fec..7d8ec42700c5 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -1,40 +1,26 @@ { stdenv, fetchFromGitHub, cmake , qtbase }: -# This doesn't actually do anything really yet as it doesn't support dynamic building -# When it does, quaternion and tensor should use it - stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; - rev = "v${version}-q0.0.5"; - sha256 = "1m53yxsqjxv2jq0h1xipwsgaj5rca4fk4cl3azgvmf19l9yn00ck"; + rev = "v${version}"; + sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv"; }; buildInputs = [ qtbase ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - install -Dm644 -t $out/lib *.a - - runHook postInstall - ''; - meta = with stdenv.lib; { description= "A Qt5 library to write cross-platfrom clients for Matrix"; homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; - hydraPlatforms = [ ]; }; } From dbcdcb63d886b8ded089b06e7f727a2d16739664 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Apr 2018 17:22:20 +0800 Subject: [PATCH 400/491] quaternion: 0.0.5 -> 0.0.9 --- .../instant-messengers/quaternion/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 768ab24c2f39..6c716cc3e1c0 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,24 +2,21 @@ stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.5"; - - # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source + version = "0.0.9"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = "v${version}"; - sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; + sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408"; }; buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - # take the source from libqmatrixclient + # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet + # https://github.com/QMatrixClient/Quaternion/issues/239 postPatch = '' rm -rf lib ln -s ${libqmatrixclient.src} lib From d5eef36abb2914a98c25475409b71819d4c94162 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:12:37 -0400 Subject: [PATCH 401/491] linux: 4.4.129 -> 4.4.130 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index fe8633ed0da7..ccc8b4ba2dc2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.129"; + version = "4.4.130"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0aviyky8f73l6jpi1d4by947rj78d5vckxkyf9aj73bavaxc8rd1"; + sha256 = "1rad8fa25hzifpxqxsc7wzhcssbbv32rc03nvljygvlxcn8dz6xj"; }; } // (args.argsOverride or {})) From 24a7d14ab43d2366f917397e4a42715e1245fa10 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:00 -0400 Subject: [PATCH 402/491] linux: 4.9.96 -> 4.9.97 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 63fe3db3b577..cc4609676d4e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.96"; + version = "4.9.97"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zw7x86c8qa2kzkwlxlhqzsnddyp1ncw4ja660bqnzqrnmp5jvw2"; + sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4"; }; } // (args.argsOverride or {})) From 6cbded6551e4d6c8608814a6752774807d1cc67a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:17 -0400 Subject: [PATCH 403/491] linux: 4.14.37 -> 4.14.38 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d9aef3a21930..177a5c878f65 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.37"; + version = "4.14.38"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14lfj2vfxw36k8cbmzs280w4h81yz5xhlhq5550kww906vnyg5w1"; + sha256 = "00ibrl633d4cqnn4i0z7kj1ddj1243dh7ap783bwlicw9hkddwzg"; }; } // (args.argsOverride or {})) From cf994a3d3d14272f624e20d1c3c64f86a27904a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Apr 2018 07:13:32 -0400 Subject: [PATCH 404/491] linux: 4.16.5 -> 4.16.6 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 3da2cda30e22..46bdcff66a10 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.5"; + version = "4.16.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0f1a8ggjb2jxc8n3hvypc81xbwylwkqi0mnynd9q316ay152zb1r"; + sha256 = "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs"; }; } // (args.argsOverride or {})) From 2cc9da33af1db5750fdf41b8ed397ff48f318d28 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 30 Apr 2018 13:15:25 +0200 Subject: [PATCH 405/491] pcsc-scm-scl011: clean up unpack phase --- pkgs/tools/security/pcsc-scm-scl011/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index 88b5c147f303..1418a4ead580 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -17,10 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; unpackPhase = '' - echo ${stdenv.system} unzip $src tar xf "Linux Driver Ver${version}/sclgeneric_${version}_linux_${arch}bit.tar.gz" - cd sclgeneric_${version}_linux_${arch}bit; export sourceRoot=`pwd` + export sourceRoot=$(readlink -e sclgeneric_${version}_linux_${arch}bit) ''; # Add support for SCL011 nPA (subsidized model for German eID) From e12cc85b070ec62144c5bfc8036041fee4b3692e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Apr 2018 11:59:53 +0200 Subject: [PATCH 406/491] nixos/osquery: add test Some time ago I fixed the broken package `osquery` (see #39336). I had to test the package manually by starting the daemon locally, however this doesn't ensure that the module is still functional. In order to cover the package *and* the integration with the NixOS module I thought that adding a testcase might be the best idea. The current testcase does the following things: * Starts an `osqueryd` service in a test machine with customized logger path and PID file * Ensures that the `osqueryd.service` unit is running * Checks if the customized flags (`pidfile`, `logger_path`) are applied to `osquery`. * Performs a simple test query against the `etc_hosts` database to check if the basic funcitonality of `osquery` (storing system information into a database) works fine. --- nixos/release.nix | 1 + nixos/tests/osquery.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 nixos/tests/osquery.nix diff --git a/nixos/release.nix b/nixos/release.nix index 4994cd98302f..4ad947f11d10 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -307,6 +307,7 @@ in rec { tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; + tests.osquery = callTest tests/osquery.nix {}; tests.plasma5 = callTest tests/plasma5.nix {}; tests.plotinus = callTest tests/plotinus.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix new file mode 100644 index 000000000000..281dbcff6643 --- /dev/null +++ b/nixos/tests/osquery.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "osquery"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + machine = { + services.osquery.enable = true; + services.osquery.loggerPath = "/var/log/osquery/logs"; + services.osquery.pidfile = "/var/run/osqueryd.pid"; + }; + + testScript = '' + $machine->start; + $machine->waitForUnit("osqueryd.service"); + + $machine->succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | grep '127.0.0.1'"); + $machine->succeed( + "echo 'SELECT value FROM osquery_flags WHERE name = \"logger_path\";' | osqueryi | grep /var/log/osquery/logs" + ); + + $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /var/run/osqueryd.pid"); + ''; +}) From ccb7e5488e879de3645ca66081f3cb8a638783a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 30 Apr 2018 16:01:07 +0100 Subject: [PATCH 407/491] pdf-quench: no manual shebang patch --- pkgs/applications/misc/pdf-quench/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 5b80fb161224..291ab241b084 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -12,17 +12,17 @@ pythonPackages.buildPythonApplication rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ]; + buildInputs = with pkgs; [ + gtk3 + gobjectIntrospection + goocanvas2 + (poppler.override { introspectionSupport = true; }) + ]; propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; - dontBuild = true; + format = "other"; doCheck = false; - postPatch = '' - substituteInPlace src/pdf_quench.py \ - --replace /usr/bin/python "${pythonPackages.python}/bin/python" - ''; - installPhase = '' install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench ''; From 1478878caba8c9c73780d3615cd1dea6a1686593 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 30 Apr 2018 17:26:59 +0200 Subject: [PATCH 408/491] pdf-quench: use poppler_gi from top-level --- pkgs/applications/misc/pdf-quench/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 291ab241b084..c567a7903b81 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { gtk3 gobjectIntrospection goocanvas2 - (poppler.override { introspectionSupport = true; }) + poppler_gi ]; propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; From dc6cda78fb1aa77bdc2c80b6401821628aa64cae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 10:57:52 -0500 Subject: [PATCH 409/491] gllvm: 2018-02-09 -> 2018-04-28 (~= 1.0.2) --- pkgs/development/tools/gllvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 58ee7699b459..da8f90cd9406 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "gllvm-${version}"; - version = "2018-02-09"; + version = "2018-04-28"; # ~= 1.0.2, but no release tags yet goPackagePath = "github.com/SRI-CSL/gllvm"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "gllvm"; - rev = "ef83222afd22452dd1277329df227a326db9f84f"; - sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a"; + rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e"; + sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl"; }; meta = with stdenv.lib; { From 751aa3dff2ad43b1cc872f33b859c62cd671812e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 08:58:49 -0700 Subject: [PATCH 410/491] linuxPackages.wireguard: 0.0.20180413 -> 0.0.20180420 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireguard/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/62dbb660d0b10010e5638c9be376d68b --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index b88646424be5..6e3e444240ac 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180413"; + version = "0.0.20180420"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1"; + sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m"; }; meta = with stdenv.lib; { From 02cb787c0cf4d38c9eb64e7110201a19ab6469cd Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Mon, 30 Apr 2018 11:47:18 +0300 Subject: [PATCH 411/491] flow: 0.70.0 -> 0.71.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 042b338b2b14..31bc1848d580 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,14 +4,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.70.0"; + version = "0.71.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76"; + sha256 = "1z9qf3kahaincy3i3ynqx7gr1sf470ym8h690a0kc7ah5fwsyr5w"; }; installPhase = '' From 89001d8d158ca0040084811c6f517416ddc2c7d9 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 30 Apr 2018 12:18:14 -0400 Subject: [PATCH 412/491] hplipWithPlugin_3_16_11: Refer to correct base derivation This appears to be a cut-and-paste error. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06ee..cf2d9e9db3ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20632,7 +20632,7 @@ with pkgs; hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; - hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; }; + hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; hyperfine = callPackage ../tools/misc/hyperfine { }; From eaf71dd33e8ec5836193f27717139be44c0ada3d Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 30 Apr 2018 12:20:01 -0400 Subject: [PATCH 413/491] notmuch: 0.26.1 -> 0.26.2 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index d89219cce5f3..13add2690db3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26.1"; + version = "0.26.2"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"; + sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h"; }; nativeBuildInputs = [ pkgconfig ]; From 92f00a58533b7fd58b0ed6efbe86ccd387682b7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 09:39:09 -0700 Subject: [PATCH 414/491] 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 48c2428bbcdb..89dbeaab04ae 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 b405a6537c79a00f3d754dfd9b7a3b3ca467b4f0 Mon Sep 17 00:00:00 2001 From: Milo Date: Mon, 30 Apr 2018 13:03:05 -0400 Subject: [PATCH 415/491] nixos/bspwm: spawn bpswm process in the background and properly set waiPID (#39707) --- nixos/modules/services/x11/window-managers/bspwm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index 6783ac3479e6..23cd4f6529a6 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -59,7 +59,7 @@ in start = '' export _JAVA_AWT_WM_NONREPARENTING=1 SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} & - ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} + ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} & waitPID=$! ''; }; From dc2f012215f15dc05e447ce6611039fcaede3910 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 10:12:01 -0700 Subject: [PATCH 416/491] riot-web: 0.14.0 -> 0.14.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riot-web/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.14.1 with grep in /nix/store/77d4rg2yy4gj8m1mvrw6zqhdi7jv7cg8-riot-web-0.14.1 - directory tree listing: https://gist.github.com/4606f4af0dcfc7ef1ece43dfe4b38abe --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 0d3342e66687..ce558130a6ce 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi"; + sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf"; }; installPhase = '' From 078b764f38cb779e32f7be4f1e614157b72cac2d Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 30 Apr 2018 19:22:42 +0200 Subject: [PATCH 417/491] highlight: 3.42 -> 3.43 --- pkgs/tools/text/highlight/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 1fcfdd85e7ae..c2fe3fcd5761 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.42"; + version = "3.43"; src = fetchFromGitHub { owner = "andre-simon"; repo = "highlight"; - rev = "${version}"; - sha256 = "1fxx827igzqjn5rri57b8980hnd3ixz3j7smfxwi1ivfhlfznzgr"; + rev = "v${version}"; + sha256 = "126nsf4cjxflg2kiv72qf1xl5fsilk0jqcncs6qqgm72cpjfmlsy"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; From 1022dc54bab9fa076fe3033a0c1e3f7f9549345d Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 30 Apr 2018 13:28:46 -0400 Subject: [PATCH 418/491] strongswan: include curl plugin by default (#39506) This is necessary for OCSP and/or remote CRL verification of server certificates to work, which is a fairly common thing to need. --- pkgs/tools/networking/strongswan/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 042f8bea3d62..eb466745ef84 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -3,11 +3,15 @@ , gmp, python, iptables, ldns, unbound, openssl, pcsclite , openresolv , systemd, pam - -, enableTNC ? false, curl, trousers, sqlite, libxml2 +, curl +, enableTNC ? false, trousers, sqlite, libxml2 , enableNetworkManager ? false, networkmanager }: +# Note on curl support: If curl is built with gnutls as its backend, the +# strongswan curl plugin may break. +# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. + with stdenv.lib; stdenv.mkDerivation rec { @@ -23,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = - [ gmp python iptables ldns unbound openssl pcsclite ] - ++ optionals enableTNC [ curl trousers sqlite libxml2 ] + [ curl gmp python iptables ldns unbound openssl pcsclite ] + ++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals stdenv.isLinux [ systemd.dev pam ] ++ optionals enableNetworkManager [ networkmanager ]; @@ -61,12 +65,12 @@ stdenv.mkDerivation rec { "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth" "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" - "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] + "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" + "--enable-curl" ] ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ optional (stdenv.system == "i686-linux") "--enable-padlock" ++ optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" - "--enable-curl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" "--enable-tnc-imv" "--enable-imv-attestation" From 49ef9019f149f9051d4b1da4190f078c19980921 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 13:12:01 -0500 Subject: [PATCH 419/491] psstop: init at 1.3 --- pkgs/tools/system/psstop/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/system/psstop/default.nix diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix new file mode 100644 index 000000000000..178e08938fea --- /dev/null +++ b/pkgs/tools/system/psstop/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "psstop-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "clearlinux"; + repo = "psstop"; + rev = "v${version}"; + sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/clearlinux/psstop; + description = "Show processes' memory usage by looking into pss"; # upstream summary + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77b7a822c5c4..49160d59ac45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1358,6 +1358,8 @@ with pkgs; ps_mem = callPackage ../tools/system/ps_mem { }; + psstop = callPackage ../tools/system/psstop { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; socklog = callPackage ../tools/system/socklog { }; From a8f3b1ad752c6552245f42e7428319642d7ca627 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 13:27:36 -0500 Subject: [PATCH 420/491] openmw: update hash missed in update to 0.43.0 Fixes #39712 --- pkgs/games/openmw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index f64bbe4c1255..8080c9596388 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0lj8v81hk807dy0wcdhfp0iyn4l5yag53hx1a6xm44gh2dpyil43"; + sha256 = "1nybxwp77qswjayf0g9xayp4x1xxq799681rhjlggch127r07ifi"; }; enableParallelBuilding = true; From b45a5a1801d677d67b9e20a8b216719b914bc9ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 12:43:38 -0700 Subject: [PATCH 421/491] nextcloud: 13.0.1 -> 13.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nextcloud/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 13.0.2 with grep in /nix/store/370na6b77ds8vj2qjxij4id8r5ihjpiq-nextcloud-13.0.2 - directory tree listing: https://gist.github.com/bb7d1d9b3be5379cba2c2852ec4b8e56 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index e6baf9e64d8b..7513d3c71d2b 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "048x3x6d11m75ghxjcjzm8amjm6ljirv6djbl53awwp9f5532hsp"; + sha256 = "0zf4z4cn4wwsybxirvzyk7l6xjw9gkc60lzm8jqz9aak3a5gk5kk"; }; installPhase = '' From b0989d3c76439277198557375893c29d8b0bcf2f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 13:49:46 -0700 Subject: [PATCH 422/491] pam_u2f: 1.0.5 -> 1.0.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pam_u2f/versions. These checks were done: - built on NixOS - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg -h’ got 0 exit code - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg --help’ got 0 exit code - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg -V’ and found version 1.0.6 - ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg --version’ and found version 1.0.6 - found 1.0.6 with grep in /nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6 - directory tree listing: https://gist.github.com/7d4bb96a876d359bc67f88a024a674f8 --- pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 0f0b6ebb37a6..5cc235c3104a 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "0bbwy9k3002anhkv67zwck3dry7blqnnp291dc4qsjrca0blw217"; + sha256 = "0fpdb49596zywnbx1cfcx1k83rbs1ylhi1cnn25pq9d3b92hj50h"; }; nativeBuildInputs = [ pkgconfig ]; From 7ce53bee97d55dab2c3fe8ccdf06e6b3461432e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:42:45 -0700 Subject: [PATCH 423/491] mwic: 0.7.4 -> 0.7.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mwic/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.7.5 with grep in /nix/store/3r91cbyw9xi6iy67l5nalznb7rkq1idq-mwic-0.7.5 - directory tree listing: https://gist.github.com/0513e07e310449f5f9f06de443e90f43 --- pkgs/applications/misc/mwic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 02c18109abc2..67e6ed3fa9ce 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q"; + sha256 = "1b4fz9vs0aihg9nj9aj6d2jmykpa9nxi9rvz06v50wwk515plpmc"; }; makeFlags=["PREFIX=\${out}"]; From 1fe6cca2db75e24f3e23ab645baf4a349447a903 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:53:47 -0700 Subject: [PATCH 424/491] miniupnpd: 2.0.20180410 -> 2.0.20180422 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/miniupnpd/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/f8b4c06f4c61efa13671b5156550d7b5 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 129db56dc554..99e12084ccb5 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180410"; + name = "miniupnpd-2.0.20180422"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1w4crmsmrygagh0v9phx8aicbyh6nypfjh2fdmknijngvx05biaq"; + sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy"; name = "${name}.tar.gz"; }; From acdbf504e3f756de9964123b355a8c4f2d60e133 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 14:57:13 -0700 Subject: [PATCH 425/491] 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 6b206ea8761a..bace31a17bda 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 d50a31a7106bb6d38fb3f594652a862de8f71281 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:01:58 -0700 Subject: [PATCH 426/491] html-xml-utils: 7.6 -> 7.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/html-xml-utils/versions. These checks were done: - built on NixOS - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxaddid help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxaddid -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxcite -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract --help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxcopy -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxincl -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxpipe -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxremove help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxremove -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxselect help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxselect -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxtabletrans -v’ and found version 7.7 - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxuncdata --help’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxwls -h’ got 0 exit code - ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxref -v’ and found version 7.7 - found 7.7 with grep in /nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7 - directory tree listing: https://gist.github.com/f303211f05f8424805b5314ae0ff7c9e --- pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 987d192bafcd..f681ae62aeaa 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "html-xml-utils-${version}"; - version = "7.6"; + version = "7.7"; src = fetchurl { url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; - sha256 = "0l97ps089byy62838wf2jwvvc465iw29z9r5kwmwcq7f3bn11y3m"; + sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr"; }; buildInputs = [curl libiconv]; From eb8e6f1f014577295f1cf9e53ad89a25cdce9f92 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 30 Apr 2018 17:44:42 -0500 Subject: [PATCH 427/491] vit: enable on all Fixes #39762 --- pkgs/applications/misc/vit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 37d7aeb88e61..40a399247e90 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; maintainers = with pkgs.lib.maintainers; [ ]; - platforms = pkgs.lib.platforms.linux; + platforms = pkgs.lib.platforms.all; license = pkgs.lib.licenses.gpl3; }; } From 67b3dcde4c259897b1909dcef795309a33413deb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 15:58:28 -0700 Subject: [PATCH 428/491] 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 8df630d582cc..03f7b515747b 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 855e0463abe182e4cb481db8246ae5cd029c1298 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:43:54 -0500 Subject: [PATCH 429/491] tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux "platforms.gnu" has been linux-only since at least 17.03: $ nix eval -f channel:nixos-17.03 lib.platforms.gnu [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ] Unlike platforms.linux, platforms.gnu indicates "must use glibc" which for the most part is not intended. Replacing platforms.gnu with platforms.linux would be the same "today" but let's err on preserving existing behavior and be optimistic about platforms these packages work on. --- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/graphics/geeqie/default.nix | 2 +- pkgs/applications/graphics/ocrad/default.nix | 2 +- pkgs/applications/graphics/scantailor/advanced.nix | 2 +- .../networking/instant-messengers/bitlbee/default.nix | 2 +- .../networking/instant-messengers/telepathy/logger/default.nix | 2 +- .../networking/instant-messengers/telepathy/salut/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/development/guile-modules/guile-lib/default.nix | 2 +- pkgs/development/guile-modules/guile-ncurses/default.nix | 2 +- pkgs/development/libraries/libchamplain/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/vcdimager/default.nix | 2 +- pkgs/tools/graphics/logstalgia/default.nix | 2 +- pkgs/tools/misc/grub/pvgrub_image/default.nix | 2 +- pkgs/tools/misc/grub/trusted.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/tools/security/gnupg/1.nix | 2 +- pkgs/tools/text/numdiff/default.nix | 2 +- pkgs/tools/video/dvgrab/default.nix | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ee0ebf234ce5..3ffc5265f7a0 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://mpg321.sourceforge.net/; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index d034f5d64d93..a1ea88da84be 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; maintainers = with maintainers; [ jfrankenau pSub ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ac67759c258c..d88117916279 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index bea4fe9b2c6c..1fb8d572e95b 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index fa1c64ba0ad7..fa3c66e67b61 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 111970ab7112..f1b3c55d14c3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.gnu; # Arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index e060eaabf281..17cd20c09cbd 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; - platforms = platforms.gnu; # Random choice + platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index d18342177243..e15c3588c298 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ viric vrthra ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 95741e07600a..35eb4667bd6b 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -40,6 +40,6 @@ in stdenv.mkDerivation { homepage = "http://www.nongnu.org/guile-lib/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 152a34883045..8f6018582670 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -39,6 +39,6 @@ in stdenv.mkDerivation { homepage = "https://www.gnu.org/software/guile-ncurses/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 74e5bbc952ae..418e9cf0b573 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; maintainers = gnome3.maintainers; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 1be3a74fbff5..5790672d8e51 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://nongnu.org/libchop/; license = licenses.gpl3Plus; maintainers = with maintainers; [ viric ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 48ad33424f60..77956be3b12e 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = platforms.gnu; # random choice + platforms = platforms.gnu ++ platforms.linux; # random choice license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 0fa991638457..be4cf0f493b6 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { a Miscellaneous section. ''; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index ee6e5065f40b..df5e3f15e95a 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { Xen guests ''; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; }) diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index e57c98bf51b0..2bf7e3dcf43b 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; homepage = https://github.com/Sirrix-AG/TrustedGRUB2; license = licenses.gpl3Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 26bfd27bf9a6..4df7f80fff6c 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -116,6 +116,6 @@ in stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mailutils/; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index fa4555dcafb9..9a147caa7e21 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { other applications. A wealth of frontend applications and libraries are available. ''; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 96c91def9ac7..4741fecb90c1 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/numdiff/; license = licenses.gpl3Plus; maintainers = with maintainers; [ ndowens ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index cec4fc1ce8bf..752a6f314325 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://kinodv.org/; license = licenses.gpl2Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } From 4b7b083bcbfffe0cddc79eb618fbf316918dea6b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:47:47 -0500 Subject: [PATCH 430/491] treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux Include all linux platforms. --- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/editors/emacs-modes/calfw/default.nix | 2 +- pkgs/applications/editors/emacs-modes/jdee/default.nix | 2 +- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/panotools/default.nix | 2 +- pkgs/applications/graphics/qtpfsgui/default.nix | 2 +- pkgs/applications/graphics/scantailor/default.nix | 2 +- pkgs/applications/graphics/ufraw/default.nix | 2 +- pkgs/applications/graphics/viewnior/default.nix | 2 +- pkgs/applications/graphics/xfig/default.nix | 2 +- .../networking/instant-messengers/telepathy/gabble/default.nix | 2 +- .../networking/instant-messengers/telepathy/haze/default.nix | 2 +- .../networking/instant-messengers/telepathy/idle/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/git.nix | 2 +- pkgs/applications/networking/p2p/gnunet/svn.nix | 2 +- pkgs/applications/office/gnucash/2.6.nix | 2 +- pkgs/applications/office/gnucash/default.nix | 2 +- .../science/machine-learning/torch/torch-distro.nix | 2 +- pkgs/applications/science/misc/megam/default.nix | 2 +- pkgs/applications/science/misc/tulip/default.nix | 2 +- pkgs/applications/video/qstopmotion/default.nix | 2 +- pkgs/desktops/gnome-3/core/folks/default.nix | 2 +- pkgs/development/compilers/gprolog/default.nix | 2 +- pkgs/development/libraries/clutter-gst/default.nix | 2 +- pkgs/development/libraries/clutter-gtk/default.nix | 2 +- pkgs/development/libraries/libcanberra/default.nix | 2 +- pkgs/development/libraries/libgpod/default.nix | 2 +- pkgs/development/libraries/libxmi/default.nix | 2 +- pkgs/development/libraries/tokyo-tyrant/default.nix | 2 +- pkgs/development/tools/misc/complexity/default.nix | 2 +- pkgs/os-specific/gnu/mig/default.nix | 2 +- pkgs/servers/pies/default.nix | 2 +- pkgs/tools/X11/xnee/default.nix | 2 +- pkgs/tools/misc/picocom/default.nix | 2 +- pkgs/tools/misc/urjtag/default.nix | 2 +- pkgs/tools/networking/connect/default.nix | 2 +- pkgs/tools/networking/inetutils/default.nix | 2 +- pkgs/tools/networking/p2p/amule/default.nix | 2 +- pkgs/tools/networking/p2p/seeks/default.nix | 2 +- pkgs/tools/networking/telnet/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 2 +- pkgs/tools/system/freeipmi/default.nix | 2 +- pkgs/tools/text/namazu/default.nix | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index ac945bee7f74..efaef97257e0 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index c173684fab4c..091635feda6f 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index e47da7a41934..306fe66823c8 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -92,7 +92,7 @@ in license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; }; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 447e729d4f9b..d3d95e5886a5 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation { meta = common.meta // { maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index f491f5dc914a..01d086cc4ed4 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -196,7 +196,7 @@ rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; }; diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 9ca90d2f5df3..719aca5096a5 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "Free software suite for authoring and displaying virtual reality panoramas"; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index d3edc40cbea2..4be7d230b5f4 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index ec7af8829073..395179ff70ae 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index cb1c37aefebf..50cd9485a3e8 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # needs GTK+ + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # needs GTK+ }; } diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index c655cadef400..5afd7a0237d0 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index c70b1029b791..545675ab1545 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { meta = { description = "An interactive drawing tool for X11"; homepage = http://xfig.org; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 2d880bef753e..4fa4967c898e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index a1669183bb3b..89be42781a4c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = stdenv.lib.platforms.gnu; # Random choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 7894554eee4f..4607961cdf08 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "IRC connection manager for the Telepathy framework"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index 6a0063dfb871..9763c0ee97fa 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index 8c8d95169c87..688bb11acd03 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index c768f4c7fa34..4d85374ee9a6 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d17cd2a7ab75..252c6d878d0c 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index a4247eac627b..d8ce1d2c6280 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -9,7 +9,7 @@ let homepage = http://torch.ch; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; distro_src = src; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index a0ee505dc97f..8cd119c7b7b0 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = "non-commercial"; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 8560d900a4fa..7db2e6a12c20 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 412cc1ad2728..2454044bb48e 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 776f76642222..beb40209bc8c 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -45,6 +45,6 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = gnome3.maintainers; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 0e3eb88f537c..b12b055342ca 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 962ca9ff9b53..a06691d5c715 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -30,6 +30,6 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 71789b45a283..22f205cdcec0 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 1b2cf4084f93..54f2273c2fcf 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 60400712e30e..fbe421e9974e 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { homepage = http://gtkpod.sourceforge.net/; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 46d38b16ccf1..81c5b5e2891b 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index ccd619e8bc18..7bf08a3560ae 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 60a0370e86e2..41bfa520e62c 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/complexity/; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 34426b45d55e..2855f5b4240f 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; - # platforms = stdenv.lib.platforms.gnu; # really GNU/Hurd + # platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # really GNU/Hurd maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index c472f767d525..73af60e55c42 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/pies/; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 63abc31e0076..b31a512e84ab 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/xnee/; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 57be275d32af..bb66b97039da 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Minimal dumb-terminal emulation program"; homepage = https://github.com/npat-efault/picocom/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 99cd407a9ae4..25687a3dbe1e 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; homepage = http://urjtag.org/; license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 387987c588ad..f7a0c00fb481 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index c5ecb5eb6dad..04045615a9b4 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index c278cc989357..ac440fc6d338 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -65,7 +65,7 @@ mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index f11c0a63b07e..2a89e419b2e4 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index 3a5117653c83..c38f3c46fa46 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/pkgs/tools/networking/telnet/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { description = "A client and daemon for the Telnet protocol"; homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/; license = "BSD"; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index eb05c3748078..f9dced33ed46 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication { license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ fuuzetsu kierdavis ]; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index fd70dce4edf3..6996d66abe0c 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice updateWalker = true; inherit version; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 21548de5efbd..67a26cb41aa0 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://namazu.org/; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; broken = true; # File-MMagic is not compatible with our Perl version }; From 9bbac8b3bf8daa22d3b632eacd625328396243c0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:48:58 -0500 Subject: [PATCH 431/491] mtools: optimistically extend platforms (gnu + darwin) => unix --- pkgs/tools/filesystems/mtools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index ff311b9fae2f..e7a9963f6501 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; } From 9bde5abedd34add6fdc579635cd4d522cad1a299 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:51:17 -0500 Subject: [PATCH 432/491] more platforms.gnu -> gnu ++ linux changes, manually --- pkgs/development/compilers/mit-scheme/default.nix | 2 +- pkgs/servers/http/myserver/default.nix | 2 +- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 4670f39eac18..f254e91e5c65 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation { # Build fails on Cygwin and Darwin: # . - platforms = platforms.gnu ++ platforms.freebsd; + platforms = platforms.gnu ++ platforms.linux ++ platforms.freebsd; }; } diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 3e1c94e79b4b..fa3b57a0b22e 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; # libevent fails to build on Cygwin and Guile has troubles on Darwin. - platforms = lib.platforms.gnu; + platforms = lib.platforms.gnu ++ lib.platforms.linux; broken = true; # needs patch for gets() }; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 8c0c4a6c5664..c682100b4384 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -89,6 +89,6 @@ pythonPackages.buildPythonApplication rec { homepage = http://tahoe-lafs.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; - platforms = lib.platforms.gnu; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } From 52a9b6e896508e3794dff8b102da65e23596ed05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 16:18:09 -0700 Subject: [PATCH 433/491] 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 03da84f7c733..1a9951a33fd7 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 434/491] 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 17837c6c254e..9ae4ca0be03e 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 e9d67529f7c83530e6caf1cc2e807dd33994653a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 18:45:22 -0500 Subject: [PATCH 435/491] nss-mdns: fix build w/musl --- pkgs/tools/networking/nss-mdns/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index b3d4ec95e061..9f83949e8de0 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, fetchpatch }: stdenv.mkDerivation rec { name = "nss-mdns-0.10"; @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + ( + fetchpatch + { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; + sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; + } + ); + + meta = { description = "The mDNS Name Service Switch (NSS) plug-in"; longDescription = '' @@ -34,7 +44,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; maintainers = [ ]; }; From e6f9103afcab0b7bf2fd64c2f4de2950d97eb4b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 17:15:47 -0700 Subject: [PATCH 436/491] 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 dbe487368dc5..b2a224e10b11 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 437/491] 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 d1bf190be574..26703b8288e6 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 07c025424ee0685801ed76cc6b9bd243e435a6e7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 30 Apr 2018 20:52:09 -0400 Subject: [PATCH 438/491] xmlformat: init at 1.04 --- pkgs/tools/text/xml/xmlformat/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/text/xml/xmlformat/default.nix diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix new file mode 100644 index 000000000000..5982aa3828ef --- /dev/null +++ b/pkgs/tools/text/xml/xmlformat/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + name = "xmlformat-${version}"; + version = "1.04"; + + src = fetchurl { + url = "http://www.kitebird.com/software/xmlformat/xmlformat-${version}.tar.gz"; + sha256 = "1vwgzn4ha0az7dx0cyc6dx5nywwrx9gxhyh08mvdcq27wjbh79vi"; + }; + + buildInputs = [ perl ]; + buildPhase = '' + patchShebangs ./xmlformat.pl + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./xmlformat.pl $out/bin/xmlformat + cp ./LICENSE $out/ + ''; + + meta = { + description = "a configurable formatter (or 'pretty-printer') for XML documents"; + homepage = "http://www.kitebird.com/software/xmlformat/"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fea71173109..b20cf36a05fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5736,6 +5736,8 @@ with pkgs; xml2 = callPackage ../tools/text/xml/xml2 { }; + xmlformat = callPackage ../tools/text/xml/xmlformat { }; + xmlroff = callPackage ../tools/typesetting/xmlroff { }; xmloscopy = callPackage ../tools/text/xml/xmloscopy { }; From 1c86f0cc4683e055df981cded464464cb48e05aa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 19:59:33 -0500 Subject: [PATCH 439/491] netbsd: cleanup bootstrapping --- pkgs/os-specific/bsd/netbsd/default.nix | 242 +++++++++++++----------- 1 file changed, 133 insertions(+), 109 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 4961ab6080a9..aea0ddac3023 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -10,10 +10,11 @@ let }; netBSDDerivation = attrs: stdenv.mkDerivation ((rec { - name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + name = "bsd-${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; + setOutputFlags = false; nativeBuildInputs = [ makeMinimal mandoc groff install stat yacc flex tsort lorder ]; @@ -25,17 +26,24 @@ let DESTDIR = "$(out)"; TOOLDIR = "$(out)"; USETOOLS = "never"; - NOCLANGERROR="yes"; - NOGCCERROR="yes"; + NOCLANGERROR = "yes"; + NOGCCERROR = "yes"; LEX = "flex"; + MKUNPRIVED = "yes"; + INSTPRIV = '' ''${INSTPRIV.unpriv}''; + HOST_SH = "${bash}/bin/sh"; + OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; + PRESERVE = "-p"; + MACHINE_ARCH = hostPlatform.parsed.cpu.name; + MACHINE_CPU = hostPlatform.parsed.cpu.name; # libs will be provided by cc-wrapper - LIBCRT0=""; - LIBCRTI=""; - LIBCRTEND=""; - LIBCRTBEGIN=""; - LIBC=""; - LIBUTIL=""; + LIBCRT0 = ""; + LIBCRTI = ""; + LIBCRTEND = ""; + LIBCRTBEGIN = ""; + LIBC = ""; + LIBUTIL = ""; LIBSSL = ""; LIBCRYPTO = ""; LIBCRYPT = ""; @@ -43,8 +51,6 @@ let LIBTERMINFO = ""; LIBM = ""; LIBL = ""; - "LIBDO.terminfo" = "_external"; - "LIBDO.curses" = "_external"; _GCC_CRTBEGIN = ""; _GCC_CRTBEGINS = ""; _GCC_CRTEND = ""; @@ -54,10 +60,14 @@ let _GCC_CRTDIR = ""; _GCC_CRTN = ""; + "LIBDO.terminfo" = "_external"; + "LIBDO.curses" = "_external"; + # all dirs will be prefixed with DESTDIR BINDIR = "/bin"; LIBDIR = "/lib"; SHLIBDIR = "/lib"; + INCSDIR = "/include"; MANDIR = "/share/man"; INFODIR = "/share/info"; DOCDIR = "/share/doc"; @@ -65,22 +75,12 @@ let X11BINDIR = "/bin"; X11USRLIBDIR = "/lib"; X11MANDIR = "/share/man"; - SHLINKDIR = "/usr/libexec"; - - HOST_SH = "${bash}/bin/sh"; - - SHLIB_WARNTEXTREL = "no"; - SHLIB_MKMAP = "no"; - PRESERVE = "-p"; - OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - - MACHINE_ARCH = hostPlatform.parsed.cpu.name; - MACHINE_CPU = hostPlatform.parsed.cpu.name; # NetBSD makefiles should be able to detect this # but without they end up using gcc on Darwin stdenv preConfigure = '' export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} + # Parallel building. Needs the space. export makeFlags+=" -j $NIX_BUILD_CORES" ''; @@ -91,6 +91,7 @@ let sourceRoot=$PWD/$sourceRoot export NETBSDSRCDIR=$sourceRoot export BSDSRCDIR=$NETBSDSRCDIR + export _SRC_TOP_=$NETBSDSRCDIR chmod -R u+w $sourceRoot for path in $extraPaths; do cd $path @@ -109,15 +110,14 @@ let # will be removed in the postInstall. preInstall = '' mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR + $out$DOCDIR $out$LOCALEDIR $out$INCSDIR for i in 1 2 3 4 5 6 7 8 9; do mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ $out$DOCDIR/reference/ref$i done - mkdir -p $out/usr/include ''; - postInstall = '' + preFixup = '' # Remove lingering /usr references if [ -d $out/usr ]; then cd $out/usr @@ -125,6 +125,10 @@ let find . -type f -exec mv \{} $out/\{} \; fi + if [ -f $out/METALOG ]; then + rm $out/METALOG + fi + find $out -type d -empty -delete ''; @@ -135,7 +139,9 @@ let }; }) // attrs); - # BOOTSTRAPPING + ## + ## BOOTSTRAPPING + ## makeMinimal = netBSDDerivation rec { path = "tools/make"; sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb"; @@ -144,16 +150,26 @@ let buildInputs = []; nativeBuildInputs = []; - patchPhase = '' + postPatch = '' patchShebangs configure - ${make.patchPhase} + ${make.postPatch} + ''; + buildPhase = '' + runHook prePatch + + sh ./buildmake.sh + + runHook postPatch ''; - buildPhase = "sh ./buildmake.sh"; installPhase = '' + runHook preInstall + install -D nbmake $out/bin/nbmake ln -s $out/bin/nbmake $out/bin/make mkdir -p $out/share - cp -r ../../share/mk $out/share/mk + cp -r $NETBSDSRCDIR/share/mk $out/share/mk + + runHook postInstall ''; extraPaths = [ make.src ] ++ make.extraPaths; }; @@ -171,7 +187,8 @@ let # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = "INSTALL=${coreutils}/bin/install"; + makeFlags = [ "INSTALL=${coreutils}/bin/install" ]; + installFlags = []; RENAME = "-D"; postInstall = '' @@ -219,7 +236,17 @@ let extraPaths = [ mtree.src make.src ]; nativeBuildInputs = [ makeMinimal mandoc groff ]; buildInputs = [ compat fts ]; - RENAME = "-D"; + installPhase = '' + runHook preInstall + + install -D install.1 $out/share/man/man1/install.1 + install -D xinstall $out/bin/install + ln -s $out/bin/install $out/bin/xinstall + ln -s $out/bin/install $out/bin/binstall + + runHook postInstall + ''; + # INSTALL_FILE = "install -D"; }; fts = netBSDDerivation { @@ -240,10 +267,14 @@ let ar -rsc libfts.a lib/libc/gen/fts.o ''; installPhase = '' + runHook preInstall + install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 install -D include/fts.h $out/include/fts.h install -D lib/libc/include/namespace.h $out/include/namespace.h install -D libfts.a $out/lib/libfts.a + + runHook postInstall ''; setupHook = ./fts-setup-hook.sh; }; @@ -268,7 +299,9 @@ let sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = [ makeMinimal mandoc groff install ]; }; - # END BOOTSTRAPPING + ## + ## END BOOTSTRAPPING + ## libutil = netBSDDerivation { path = "lib/libutil"; @@ -292,44 +325,31 @@ let path = "usr.bin/make"; sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar"; version = "7.1.2"; - patchPhase = '' + postPatch = '' # make needs this to pick up our sys make files export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - # can't set owner or group in Nix build - # maybe there is a better way to trick it? substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-o ''${SCRIPTSOWN_''${.ALLSRC:T}:U''${SCRIPTSOWN}}' "" \ - --replace '-g ''${SCRIPTSGRP_''${.ALLSRC:T}:U''${SCRIPTSGRP}}' "" \ - --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \ - --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \ - --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \ - --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \ - --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.links.mk \ - --replace '-o ''${LINKSOWN_''${.ALLSRC:T}:U''${LINKSOWN}}' "" \ - --replace '-g ''${LINKSGRP_''${.ALLSRC:T}:U''${LINKSGRP}}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \ - --replace '-o ''${MANOWN} -g ''${MANGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \ - --replace '-o ''${FILESOWN_''${.ALLSRC:T}:U''${FILESOWN}}' "" \ - --replace '-g ''${FILESGRP_''${.ALLSRC:T}:U''${FILESGRP}}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.inc.mk \ - --replace '-o ''${BINOWN} -g ''${BINGRP}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \ - --replace '-o ''${LIBOWN} -g ''${LIBGRP}' "" + --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ --replace '-Wl,--whole-archive' "" \ - --replace '-Wl,--no-whole-archive' "" + --replace '-Wl,--no-whole-archive' "" \ + --replace '-Wl,--warn-shared-textrel' "" \ + --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" + ''; + preInstall = '' + mkdir -p $out$BINDIR $out$DOCDIR/reference/ref1/make \ + $out$MANDIR/man1 $out$MANDIR/html1 $out/share/mk ''; postInstall = '' - (cd $NETBSDSRCDIR/share/mk && make install) + (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) ''; extraPaths = [ (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa") @@ -346,17 +366,23 @@ let path = "usr.bin/who"; version = "7.1.2"; sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; - patchPhase = '' + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ + --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ + --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ + --replace "timespeccmp(&st.st_mtimespec, &utmpxtime, >)" "st.st_mtimespec.tv_sec == utmpxtime.tv_sec ? st.st_mtimespec.tv_nsec > utmpxtime.tv_nsec : st.st_mtimespec.tv_sec > utmpxtime.tv_sec" + '' + '' substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \ - --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ - --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" \ - --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" + --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" \ + --replace "timespecclear(&utmpxtime)" "utmpxtime.tv_sec = utmpxtime.tv_nsec = 0" ''; }; in rec { - inherit compat install netBSDDerivation fts; + inherit compat install netBSDDerivation fts make; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -375,23 +401,26 @@ in rec { path = "share/dict"; version = "7.1.2"; sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; - preBuild = "mkdir -p $out/share/dict"; makeFlags = [ "BINDIR=/share" ]; + preInstall = "mkdir -p $out/share/dict"; }; games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; version = "7.1.2"; - patchPhase = '' + makeFlags = [ "BINDIR=/bin" + "SCRIPTSDIR=/bin" + "FILESDIR=/share/games" ]; + postPatch = '' sed -i '1i #include ' adventure/save.c for f in $(find . -name pathnames.h); do substituteInPlace $f \ + --replace /usr/share/games/fortune $out/share/games \ --replace /usr/share/games $out/share/games \ --replace /usr/games $out/bin \ --replace /usr/libexec $out/libexec \ - --replace /var/games $out/var/games \ --replace /usr/bin/more ${more}/bin/more \ --replace /usr/share/dict ${dict}/share/dict done @@ -424,13 +453,11 @@ in rec { --replace 2550 550 ''; - # HACK strfile needs to be installed first & in the path + # HACK strfile needs to be installed first & in the path. The + # Makefile should do this for us but haven't gotten it to work preBuild = '' - pushd fortune/strfile mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8 - make - make BINDIR=/bin install - popd + (cd fortune/strfile && make && make BINDIR=/bin install) export PATH=$out/bin:$PATH ''; @@ -447,38 +474,37 @@ in rec { "-D__c99inline=__inline" ]; - postBuild = '' - mkdir -p $out/usr/games $out/usr/share/games/ching \ - $out/usr/share/games/fortune \ - $out/usr/share/games/quiz.db \ - $out/usr/share/games/boggle \ - $out/usr/libexec/ching $out/var/games/hackdir + preInstall = '' + mkdir -p $out/var/games/hackdir \ + $out/share/games \ + $out$DOCDIR/reference/ref6/rogue \ + $out$MANDIR/man6 $out$MANDIR/html6 touch $out/var/games/hackdir/perm ''; - preFixup = '' - mkdir -p $out/bin - mv $out/games/* $out/bin - rmdir $out/games - ''; - buildInputs = [ compat libcurses libterminfo libressl ]; extraPaths = [ dict.src who.src ]; }; - # finger = netBSDDerivation { - # path = "usr.bin/finger"; - # sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; - # version = "7.1.2"; - # extraPaths = [ who.src ]; - # NIX_CFLAGS_COMPILE = [ - # "-DSUPPORT_UTMP" - # "-USUPPORT_UTMPX" - # ]; - # patchPhase = '' - # ${who.patchPhase} - # ''; - # }; + finger = netBSDDerivation { + path = "usr.bin/finger"; + sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; + version = "7.1.2"; + NIX_CFLAGS_COMPILE = [ + (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP") + (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX") + ]; + postPatch = '' + NIX_CFLAGS_COMPILE+=" -I$NETBSDSRCDIR/include" + + substituteInPlace extern.h \ + --replace psort _psort + + ${who.postPatch} + ''; + extraPaths = [ who.src ] + ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "7.1.2" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px"); + }; fingerd = netBSDDerivation { path = "libexec/fingerd"; @@ -490,8 +516,8 @@ in rec { path = "lib/libedit"; buildInputs = [ libterminfo libcurses ]; propagatedBuildInputs = [ compat ]; - postBuild = "mkdir -p $out/usr/include/readline"; - patchPhase = '' + makeFlags = [ "INCSDIR=/include" ]; + postPatch = '' sed -i '1i #undef bool_t' el.h substituteInPlace config.h \ --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" @@ -511,16 +537,13 @@ in rec { sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; MKPIC = if stdenv.isDarwin then "no" else "yes"; - patchPhase = '' - substituteInPlace term.c \ - --replace /usr/share $out/share + makeFlags = [ "INCSDIR=/include" ]; + postPatch = '' + substituteInPlace term.c --replace /usr/share $out/share ''; - postBuild = '' - pushd $NETBSDSRCDIR/share/terminfo + postInstall = '' mkdir -p $out/share/misc - make - make BINDIR=/share install - popd + (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) ''; extraPaths = [ (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") @@ -532,6 +555,7 @@ in rec { version = "7.1.2"; sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; buildInputs = [ libterminfo ]; + makeFlags = [ "INCSDIR=/include" ]; NIX_CFLAGS_COMPILE = [ "-D__scanflike(a,b)=" "-D__va_list=va_list" @@ -540,7 +564,7 @@ in rec { propagatedBuildInputs = [ compat ]; MKDOC = "no"; # missing vfontedpr MKPIC = if stdenv.isDarwin then "no" else "yes"; - patchPhase = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' From 5c1b3d93bfc70d14fba94afb2e824ab88faa0aef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 02:43:01 +0000 Subject: [PATCH 440/491] netbsd.games: disable some broken linux games --- pkgs/os-specific/bsd/netbsd/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index aea0ddac3023..188d9709ee08 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -382,7 +382,7 @@ let }; in rec { - inherit compat install netBSDDerivation fts make; + inherit compat install netBSDDerivation fts; getent = netBSDDerivation { path = "usr.bin/getent"; @@ -441,16 +441,17 @@ in rec { disableGame atc disableGame dm disableGame dab - ${lib.optionalString stdenv.isDarwin "disableGame sail"} - ${lib.optionalString stdenv.isDarwin "disableGame trek"} + disableGame sail + disableGame trek + ${lib.optionalString stdenv.isLinux "disableGame boggle"} + ${lib.optionalString stdenv.isLinux "disableGame hunt"} + ${lib.optionalString stdenv.isLinux "disableGame larn"} + ${lib.optionalString stdenv.isLinux "disableGame phantasia"} + ${lib.optionalString stdenv.isLinux "disableGame rogue"} ${lib.optionalString stdenv.isDarwin "disableGame adventure"} ${lib.optionalString stdenv.isDarwin "disableGame factor"} ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} ${lib.optionalString stdenv.isDarwin "disableGame mille"} - - substituteInPlace Makefile.inc \ - --replace 2555 555 \ - --replace 2550 550 ''; # HACK strfile needs to be installed first & in the path. The From 8838533ec12db36483a6e3aee903075b62b14130 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:11 -0500 Subject: [PATCH 441/491] 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 0cb483027c19..b734eadae902 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 442/491] 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 04045615a9b4..c050758a8ee3 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 443/491] 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 751b78ab674b..764877a11cb3 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 444/491] 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 bd94c6786d77..888fa48eab9a 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 445/491] 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 4a7eb9376da7..dbd2814a6fb6 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 446/491] 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 cd0821ef9ef5..be8e9e210d15 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 447/491] 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 67bb5feff8c7..f3f7fe2aacba 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 448/491] 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 77956be3b12e..ddecf4a96a75 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 449/491] 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 d88117916279..2ff62cc9eef2 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 450/491] 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 c2adc58f9ce5..099e4428016e 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 633a1d9bd6e6..5c6a4bab9306 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 f95370e39e72..4bc0e93a3b46 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 01d086cc4ed4..5b21b349764b 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 22d659dd10e4..b8fc63c2c9ed 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 5f219dc4752c..50f575d15cec 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 36527cdbe7c3..662ca9761fb2 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 2b5554353270..1a7ba3cf93df 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 e3a917a12eb3..ff19a62ef306 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 c2e6528e637e..95e01e586ec2 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 b03673a00b66..b5bab3585c5f 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 421e0dbb8a39..aa17cf183e34 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 46c87b0b189e..986639c947b0 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 b54f6e8def33..fa964e86974b 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 fdd23d134599..8a316b60f025 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 1cb28118ccbe..749e4125a0b3 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 384178d2c8df..4a166242eb3a 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 c4332df5a3db..660cdfa6414b 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 272a9774a7f4..1e7720b0656a 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 75cf69035cbe..9c25757efb03 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 7bca8f21c6b9..889ef1347732 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 a8d2953cad00..fb2dad605252 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 4d754dc80866..a09a76707390 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 3766140eea1e..b5188cb66d29 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 ec4d19423e6d..9aac638d0a80 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 5fcd6b341653..e014276cd670 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 f8389786b9da..f42adffc5f42 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 58bc24e1ec64..12152e988669 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 cef48978b6d0..6f742bb64f79 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 16cb7af3d600..9dec1ecacae0 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 da54936092b3..24ed1dffd4d8 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 f95b5efe3d38..6a0bedeab260 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 c079d8272b12..4133478dbf98 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 a83ee771d699..1499e81b624e 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 c7267aca1071..902d7d7d1a1e 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 451bcae1efd1..ca078c16ab6b 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 b33034515fb6..3c6c5f3d2992 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 59d97a4a18b6..fcc6c1d86bdf 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 d96652e456df..358c53f453bb 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 8c12e4e30c3e..c3aa92bf4b01 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 3e1e3a882839..0994c649c83e 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 451/491] 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 ef805a31567a..149092c70d38 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 0c3efb9ba05828822ba61105aead64ee3d6dd12c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 01:13:44 -0400 Subject: [PATCH 452/491] openssl: Support iOS cross compilation (in theory) --- pkgs/development/libraries/openssl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5a9052222cb8..1eac225387d2 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -48,6 +48,8 @@ let then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}" else if hostPlatform.isLinux then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}" + else if hostPlatform.isiOS + then "./Configure ios${toString hostPlatform.parsed.cpu.bits}-cross" else throw "Not sure what configuration to use for ${hostPlatform.config}" ); From 9a845de873dfcc31f360a08f1b1f786c6f649c7d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 01:14:58 -0400 Subject: [PATCH 453/491] lib/systems: Update iOS examples The commented-out configs are @shlevy's old known-good ones. I changed them as needed to play nice with lib.systems.parse but did not test so leaving them as comments for now. --- lib/systems/examples.nix | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 848737700b0b..e229cccb365c 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -88,16 +88,36 @@ rec { # iphone64 = { - config = "aarch64-apple-darwin14"; - arch = "arm64"; - libc = "libSystem"; + config = "aarch64-apple-ios"; + # config = "aarch64-apple-darwin14"; + sdkVer = "10.2"; + useiOSPrebuilt = true; platform = {}; }; iphone32 = { - config = "arm-apple-darwin10"; - arch = "armv7-a"; - libc = "libSystem"; + config = "armv7-apple-ios"; + # config = "arm-apple-darwin10"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + platform = {}; + }; + + iphone64-simulator = { + config = "x86_64-apple-ios"; + # config = "x86_64-apple-darwin14"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + isiPhoneSimulator = true; + platform = {}; + }; + + iphone32-simulator = { + config = "i686-apple-ios"; + # config = "i386-apple-darwin11"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + isiPhoneSimulator = true; platform = {}; }; From 57a4db244995c9852cf5a202bd7540a5c1e7c410 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:45:05 -0500 Subject: [PATCH 454/491] 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 486a2e69d264..957a4cf64211 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 455/491] 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 c9887146989b..d6e70d16098b 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 456/491] 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 e2bac5d3884c..5d4e22fefae3 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 457/491] 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 5e12e90a3c3d..6b18694dc8d1 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 458/491] 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 8b035359730b..f3ea3b8954f5 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 459/491] 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 da65c2698228..cf1036283126 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 460/491] 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 03f7b515747b..3d49452cbe62 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 000000000000..9427d45487d4 --- /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 461/491] 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 75e78d8ac44f..9c24e77e0f78 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 2e6c95bfe3c1..c4dc8b5fc5b9 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 b1036e61f1bb..6797a71703b4 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 79bced9ad0ee..92c3c87774ab 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 5d39f9b3b0c8..1cc5dc368da3 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 3b53a2831e8c..9e9c3c7957aa 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 ca20e17dd50e..a44e81d3c19c 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 462/491] 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 59f7360df2ae..14c8f53a3944 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 463/491] 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 aec6f67a9191..14fd53b2f492 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 b0889e62f7c5..38f961c0467a 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 000000000000..895d02827f71 --- /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 4ad947f11d10..5b6640f1d3cc 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 000000000000..b024306cde56 --- /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 000000000000..fde6f3cbd19a --- /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 000000000000..0478b1c26351 --- /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 000000000000..366934829b86 --- /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 b20cf36a05fb..4f9644f9bd56 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 464/491] 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 6fd55c369d59..6f2fb68775df 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 465/491] 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 75385275ec84..630f5dd34471 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 466/491] 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 252c6d878d0c..d12b1327e8f7 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