From 4cd7b284e8b122bec155bc98454817b18ca9bea3 Mon Sep 17 00:00:00 2001 From: Lprndn Date: Wed, 1 Feb 2017 14:59:35 +0100 Subject: [PATCH 001/172] fontforge-gtk: Add support for libspiro. Add Spiro toolkit in fontforge-gtk for designing fonts. libspiro: Init at c26afeb. --- .../development/libraries/libspiro/default.nix | 18 ++++++++++++++++++ pkgs/tools/misc/fontforge/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libspiro/default.nix diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix new file mode 100644 index 000000000000..dcec6b058fc3 --- /dev/null +++ b/pkgs/development/libraries/libspiro/default.nix @@ -0,0 +1,18 @@ +{stdenv, pkgconfig, fetchurl}: + +stdenv.mkDerivation rec { + name = "libspiro-${version}"; + version = "0.5.20150702"; + src = fetchurl { + url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz"; + sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv"; + }; + + nativeBuildInputs = [pkgconfig]; + + meta = with stdenv.lib; { + description = "A library that simplifies the drawing of beautiful curves"; + homepage = "https://github.com/fontforge/libspiro"; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 2cccee0a4e3b..90d17ba52818 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, lib , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango +, withSpiro ? false, libspiro , withGTK ? false, gtk2 , withPython ? true , Carbon ? null, Cocoa ? null @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] + ++ lib.optionals withSpiro [libspiro] ++ lib.optionals withGTK [ gtk2 pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90e44c9819ac..f246df2874fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1738,6 +1738,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }); fontforge-gtk = callPackage ../tools/misc/fontforge { + withSpiro = true; withGTK = true; gtk2 = gtk2-x11; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -8495,6 +8496,8 @@ with pkgs; libsoup = callPackage ../development/libraries/libsoup { }; + libspiro = callPackage ../development/libraries/libspiro {}; + libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; From 8a534d53281c5aead91a67ca526d8cb7f27a14c5 Mon Sep 17 00:00:00 2001 From: Lprndn Date: Sun, 12 Feb 2017 16:32:14 +0100 Subject: [PATCH 002/172] pdf2htmlEX: Switch from fontforge-gtk to fontforge. --- pkgs/tools/typesetting/pdf2htmlEX/default.nix | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/tools/typesetting/pdf2htmlEX/default.nix diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix new file mode 100644 index 000000000000..299f075115ad --- /dev/null +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, poppler, xlibs, pcre, python, glib, fontforge, cairo, pango, openjdk8 +}: + +stdenv.mkDerivation rec { + name = "pdf2htmlEX-0.14.6"; + + src = fetchFromGitHub { + repo = "pdf2htmlEX"; + owner = "coolwanglu"; + rev = "v0.14.6"; + sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78"; + }; + + patches = [ ./add-glib-cmake.patch ]; + + cmakeFlags = [ "-DENABLE_SVG=ON" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + buildInputs = [ + xlibs.libpthreadstubs + xlibs.libXdmcp + pcre + python + glib + cairo + pango + (poppler.override { withData = true; }) + fontforge + openjdk8 + ]; + + meta = with stdenv.lib; { + description = "Render PDF files to beautiful HTML"; + homepage = "https://github.com/coolwanglu/pdf2htmlEX"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.taktoa ]; + platforms = with platforms; linux; + }; +} From b0115c2fac63d71eb83108106f2612bb47831497 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 16 Feb 2017 13:20:53 +0000 Subject: [PATCH 003/172] Logbook: 0.11.3 -> 1.0.0 --- 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 63fc33ed17eb..6ae7d0c63911 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28965,14 +28965,14 @@ EOF Logbook = buildPythonPackage rec { name = "Logbook-${version}"; - version = "0.11.3"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/L/Logbook/${name}.tar.gz"; - sha256 = "0bchn00jj0y4dmrmqsm29ffcx37g79jcxjihadmgz2aj0z6dbsrc"; + sha256 = "0whqbx5p0zkf7gmb5ssnsnhm4kn4drd4x7fbhdi8dnxklqajbnl7"; }; - buildInputs = [ self.pytest ]; + buildInputs = [ self.pytest ] ++ optionals (!isPy3k) [ self.mock ]; checkPhase = '' find tests -name \*.pyc -delete From 5e31a7cca61286f90571432f6775d6a908361699 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 16 Feb 2017 16:05:10 +0000 Subject: [PATCH 004/172] pytables: 3.2.2 -> 3.3.0 --- pkgs/development/python-modules/tables/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 88a39400c77c..e5de7c4e2a42 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, python, buildPythonPackage -, cython, bzip2, lzo, numpy, numexpr, hdf5 }: +, cython, bzip2, lzo, numpy, numexpr, hdf5, six }: buildPythonPackage rec { - version = "3.2.2"; + version = "3.3.0"; name = "tables-${version}"; src = fetchurl { url = "mirror://pypi/t/tables/${name}.tar.gz"; - sha256 = "3564b351a71ec1737b503b001eb7ceae1f65d5d6e3ffe1ea75aafba10f37fa84"; + sha256 = "0b4211s0zzdmh74k49ss0m9lc2ql2iazq2aa95ams6h45vqcr0w3"; }; buildInputs = [ hdf5 cython bzip2 lzo ]; - propagatedBuildInputs = [ numpy numexpr ]; + propagatedBuildInputs = [ numpy numexpr six ]; # The setup script complains about missing run-paths, but they are # actually set. From 90223a9bbd7f44153bb7e45f5fc757c86d67cdd9 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Fri, 17 Feb 2017 08:52:45 +0000 Subject: [PATCH 005/172] vega: add pytest as a build-input. It's unclear how this worked before but it clearly did because we have vega running in production. --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ae7d0c63911..1ca0a76d6bb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -456,6 +456,7 @@ in { sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm"; }; + buildInputs = [ self.pytest ]; propagatedBuildInputs = with self; [ jupyter_core pandas ]; meta = { From 5a9e14ee16374313bad0cbac4f3969d132ca2f19 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Fri, 17 Feb 2017 09:14:18 +0000 Subject: [PATCH 006/172] altair: 1.0.0 -> 1.2.0 Also disabling tests because the test runner picks up too much and then fails. --- pkgs/top-level/python-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ca0a76d6bb6..15c1b2bbb285 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -431,15 +431,19 @@ in { }; altair = buildPythonPackage rec { - name = "altair-1.0.0"; + name = "altair-1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/altair/${name}.tar.gz"; - sha256 = "024drhmiw8w3dl7dbal0pvnlfd3sv4n1rqywv2jb488b3fzm704r"; + sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n"; }; + buildInputs = [ self.pytest ]; + checkPhase = '' + export LANG=en_US.UTF-8 + py.test altair --doctest-modules + ''; propagatedBuildInputs = with self; [ vega pandas ipython traitlets ]; - meta = { description = "A declarative statistical visualization library for Python."; homepage = https://github.com/altair-viz/altair; From 88458c8697ce8c2d1c00a51a36093b02e88ec251 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 22 Mar 2017 20:29:40 +0100 Subject: [PATCH 007/172] clipster: 2017-02-17 -> 2017-02-27 --- pkgs/tools/misc/clipster/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 05cc33f8bce1..c65836c1ae0f 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { name = "clipster-unstable-${version}"; - version = "2017-02-17"; + version = "2017-02-27"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; - rev = "8c4732d7c26ddec6faac295d3ddb2278c6ed5647"; - sha256 = "00ki3srdjh96ghan1z4zd8w5cahgvnpa8hccnxmn0im1xrgpkh3b"; + rev = "dfa75b52ee3a41fff7534aca165dc0e6a24a3680"; + sha256 = "0d7ak6wpvvgz7cwvfzy2shkfiw6gr8l703xyjpiayjbnr2s79k5j"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck3 makeWrapper ]; + buildInputs = [ pythonEnv gtk3 libwnck3 ]; + + nativeBuildInputs = [ makeWrapper ]; installPhase = '' sed -i 's/python/python3/g' clipster From 6c9e6c218cbaab5f3e13ce6c56c39ad8a8662f92 Mon Sep 17 00:00:00 2001 From: ndowens Date: Fri, 24 Mar 2017 18:09:15 -0500 Subject: [PATCH 008/172] bluez-tools: 2015-09-10 -> 2016-12-12 --- pkgs/tools/bluetooth/bluez-tools/default.nix | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index 4640e3c4a615..47aaadc9ccf0 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -1,23 +1,25 @@ -{ stdenv, autoconf, automake, glib, pkgconfig, readline, fetchgit }: +{ stdenv, autoreconfHook, readline +, fetchFromGitHub, glib, pkgconfig }: stdenv.mkDerivation rec { - date = "2015-09-10"; + date = "2016-12-12"; name = "bluez-tools-${date}"; - rev = "193ad6bb3db"; + rev = "97efd29"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/khvzak/bluez-tools.git"; - sha256 = "0ylk10gfqlwmiz1k355axdhraixc9zym9f87xhag23934x64m8wa"; + owner = "khvzak"; + repo = "bluez-tools"; + sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6"; }; - preConfigure = '' - ./autogen.sh - ''; - buildInputs = [ stdenv autoconf automake glib pkgconfig readline ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + + buildInputs = [ readline glib ]; meta = with stdenv.lib; { description = "Command line bluetooth manager for Bluez5"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; maintainers = [ maintainers.dasuxullebt ]; platforms = platforms.unix; }; From b603a943e53d28496a79492124e8d5f467cae990 Mon Sep 17 00:00:00 2001 From: Jens Grunert Date: Tue, 28 Mar 2017 21:06:41 +0200 Subject: [PATCH 009/172] corebird: 1.3.3 -> 1.4.2 --- pkgs/applications/networking/corebird/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 07d89b53fa49..36b46030577b 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -3,24 +3,26 @@ , glib_networking }: stdenv.mkDerivation rec { - version = "1.3.3"; + version = "1.4.2"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "09k0jrhjqrmpvyz5pf1g7wkidflkhpvw5869a95vnhfxjd45kzs3"; + sha256 = "0s28q9c7p4p4jyhb1g6gdwdphlf6yhi6yg4yn8bkd0gmyf9acakb"; }; preConfigure = '' ./autogen.sh ''; + configureFlags = [ "--disable-spellcheck" ]; + nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf glib_networking + gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); meta = { From 4a12a681efbc1f9851170be60479b598e5d28768 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 18 Mar 2017 04:14:05 +0100 Subject: [PATCH 010/172] go builder: use removeReferencesTo --- pkgs/development/go-modules/generic/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 985b4c9b9db1..adac53f78282 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, govers, parallel, lib, fetchgit, fetchhg, rsync }: +{ go, govers, parallel, lib, fetchgit, fetchhg, rsync, removeReferencesTo }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -41,9 +41,7 @@ let removeReferences = [ ] ++ lib.optional (!allowGoReference) go; - removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: '' - | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ - ''); + removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; dep2src = goDep: { @@ -70,7 +68,7 @@ go.stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { inherit name; - nativeBuildInputs = [ go parallel ] + nativeBuildInputs = [ removeReferencesTo go parallel ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = [ go ] ++ buildInputs; @@ -186,11 +184,7 @@ go.stdenv.mkDerivation ( ''; preFixup = preFixup + '' - while read file; do - cat $file ${removeExpr removeReferences} > $file.tmp - mv $file.tmp $file - chmod +x $file - done < <(find $bin/bin -type f 2>/dev/null) + find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + ''; shellHook = '' From 04223369e37e1c7c59737d546741dee583534b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 30 Mar 2017 11:01:12 +0200 Subject: [PATCH 011/172] gspell: 1.0.3 -> 1.2.1 also enable vala bindings --- pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix index fbb95efb27ac..3024d3ed59ff 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig glib gtk3 enchant isocodes ]; + buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix index 248e39151524..850e13fb011e 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix @@ -1,10 +1,10 @@ fetchurl: rec { - major = "1.0"; - minor = "3"; + major = "1.2"; + minor = "1"; name = "gspell-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz"; - sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr"; + sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z"; }; } From ca87b3a130da099b207ef1b5d5ca72e824883533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 30 Mar 2017 11:01:50 +0200 Subject: [PATCH 012/172] corebird: fix spell check --- pkgs/applications/networking/corebird/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 36b46030577b..b4197a12db3f 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - configureFlags = [ "--disable-spellcheck" ]; - nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ From d023239bb7ab004f88418eb5c648f656d6a915b5 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 26 Mar 2017 19:16:12 -0500 Subject: [PATCH 013/172] hdparm: 9.48 -> 9.51 hdparm: Fixed mandir --- pkgs/os-specific/linux/hdparm/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 538d8d4ab837..ab40099fc2ce 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.48"; + name = "hdparm-9.51"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1vpvlkrksfwx8lxq1p1nk3ddyzgrwy3rgxpn9kslchdh3jkv95yf"; + sha256 = "14ax5lyzhigx58ing7adbfyzisv0fqajbmzphg149rnb3s4xiyhs"; + }; preBuild = '' makeFlagsArray=(sbindir=$out/sbin manprefix=$out) - ''; + ''; - meta = { + meta = with stdenv.lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; homepage = http://sourceforge.net/projects/hdparm/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = [ maintainers.fuuzetsu ]; }; + } From 560d4152effe9e72e31d8c5366001df7a53b0657 Mon Sep 17 00:00:00 2001 From: Volth Date: Fri, 31 Mar 2017 03:48:00 +0000 Subject: [PATCH 014/172] openvswitch: 2.5.0 -> 2.5.2 --- pkgs/os-specific/linux/openvswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index b1e24884557a..9abb20a1c6a8 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; let _kernel = kernel; in stdenv.mkDerivation rec { - version = "2.5.0"; + version = "2.5.2"; name = "openvswitch-${version}"; src = fetchurl { url = "http://openvswitch.org/releases/${name}.tar.gz"; - sha256 = "08bgsqjjn2q5hvxsjqs7n3jir7k7291wlj3blsqhacjhmpxm9nil"; + sha256 = "0ifx758zl97dpad9vpd5i5dqj6i03k632mvgxs82hqkcsb3r6y7q"; }; kernel = optional (_kernel != null) _kernel.dev; From 50f7a7ca2e2c35667591f2c16733bb09f7f786b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 31 Mar 2017 10:41:34 +0200 Subject: [PATCH 015/172] rtl8192su-firmware: init at unstable-2016-10-05 --- nixos/modules/hardware/all-firmware.nix | 1 + .../firmware/rtl8192su-firmware/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index fb8e1ccab667..bc82bfd066c3 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -26,6 +26,7 @@ with lib; firmwareLinuxNonfree intel2200BGFirmware rtl8723bs-firmware + rtl8192su-firmware ]; }; diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix new file mode 100644 index 000000000000..d8d4c37fd886 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub }: +with stdenv.lib; +stdenv.mkDerivation { + name = "rtl8192su-unstable-2016-10-05"; + + src = fetchFromGitHub { + owner = "chunkeey"; + repo = "rtl8192su"; + rev = "c00112c9a14133290fe30bd3b44e45196994cb1c"; + sha256 = "0j3c35paapq1icmxq0mg7pm2xa2m69q7bkfmwgq99d682yr2cb5l"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + for i in rtl8192sfw.bin \ + rtl8192sufw-ap.bin \ + rtl8192sufw-apple.bin \ + rtl8192sufw-windows.bin \ + rtl8712u-linux-firmware-bad.bin \ + rtl8712u-most-recent-v2.6.6-bad.bin \ + rtl8712u-most-recent-v2.6.6-bad.bin \ + rtl8712u-oldest-but-good.bin; + do + install -D -pm644 firmwares/$i $out/lib/firmware/rtlwifi/$i + done + ''; + + meta = with stdenv.lib; { + description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU"; + homepage = https://github.com/chunkeey/rtl8192su; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ mic92 ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a487579e41c3..14a6b54c3de6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -741,7 +741,7 @@ with pkgs; catclock = callPackage ../applications/misc/catclock { }; cde = callPackage ../tools/package-management/cde { }; - + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; @@ -12023,6 +12023,8 @@ with pkgs; rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; + rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { }; + rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; From e0f6bd6cfb4c5da3e9bce8c7280f743f721b109e Mon Sep 17 00:00:00 2001 From: laMudri Date: Fri, 31 Mar 2017 13:15:31 +0100 Subject: [PATCH 016/172] ibus-table: 1.9.14 -> 1.9.16 --- pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 8900ebc120cf..8c842dbc841e 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ibus-table-${version}"; - version = "1.9.14"; + version = "1.9.16"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "1mkx03iqrq5yq57y7hjqcmxfh41dsjykyyl70d41dflcgp5q2nhw"; + sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb"; }; postPatch = '' From 1afd3ceaaab5d11e17f47a473c6e6642aa074f18 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 31 Mar 2017 12:19:22 +0100 Subject: [PATCH 017/172] terraform: 0.9.1 -> 0.9.2 * makes the generic builder open for extension * upgrades terraform and set the 0_9 series by default --- .../networking/cluster/terraform/default.nix | 82 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 51 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ab0771656b59..42a8465bf8a3 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,43 +1,44 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchurl, fetchFromGitHub }: let - generic = { version, sha256 }: - buildGoPackage rec { - name = "terraform-${version}"; + goPackagePath = "github.com/hashicorp/terraform"; - goPackagePath = "github.com/hashicorp/terraform"; + generic = { version, sha256, ... }@attrs: + let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in + buildGoPackage ({ + name = "terraform-${version}"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform"; - rev = "v${version}"; - inherit sha256; - }; + inherit goPackagePath; - postInstall = '' - # remove all plugins, they are part of the main binary now - for i in $bin/bin/*; do - if [[ $(basename $i) != terraform ]]; then - rm "$i" - fi - done - ''; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "terraform"; + rev = "v${version}"; + inherit sha256; + }; - preCheck = '' - export HOME=$TMP - ''; + postInstall = '' + # remove all plugins, they are part of the main binary now + for i in $bin/bin/*; do + if [[ $(basename $i) != terraform ]]; then + rm "$i" + fi + done + ''; - doCheck = builtins.compareVersions version "0.9.0" >= 0; + preCheck = '' + export HOME=$TMP + ''; - meta = with stdenv.lib; { - description = "Tool for building, changing, and versioning infrastructure"; - homepage = https://www.terraform.io/; - license = licenses.mpl20; - maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ]; - }; - }; + meta = with stdenv.lib; { + description = "Tool for building, changing, and versioning infrastructure"; + homepage = https://www.terraform.io/; + license = licenses.mpl20; + maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ]; + }; + } // attrs'); -in rec { +in { terraform_0_8_5 = generic { version = "0.8.5"; sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; @@ -48,8 +49,21 @@ in rec { sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; }; - terraform_0_9_1 = generic { - version = "0.9.1"; - sha256 = "081p6dlvkg9mgaz49ichxzlk1ks0rxa7nvilaq8jj1gq3jvylqnh"; + terraform_0_9_2 = generic { + version = "0.9.2"; + sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl"; + + patches = [ + (fetchurl { + url = "https://github.com/hashicorp/terraform/pull/13237.patch"; + sha256 = "1f7hr1l5hck9mmqk01p6wxbfv9r3b0yi9ypz7bcmikp3bikza98x"; + }) + (fetchurl { + url = "https://github.com/hashicorp/terraform/pull/13248.patch"; + sha256 = "1qc57kjhlqg5339him9bg4izdphins2fjjhb4ffr7bv9lb5k0hkr"; + }) + ]; + + doCheck = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6471ca83ab..ae7f46acea84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18115,11 +18115,11 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_1; + terraform_0_9_2; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_1; - terraform = terraform_0_8; + terraform_0_9 = terraform_0_9_2; + terraform = terraform_0_9; terragrunt = callPackage ../applications/networking/cluster/terragrunt { terraform = terraform_0_8; From c9d02b7c573774d2ffd2add2192ec92d60a12396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20H=C3=B6ppner?= Date: Fri, 31 Mar 2017 20:19:55 +0200 Subject: [PATCH 018/172] vscode: Fix relocation errors LD_PRELOAD was inherited by spawned processes, and caused issues with systems that have older system packages while using fresh user packages. Links out the wrapper script instead of electron binary to expose CLI like on other systems Breaks anything that relies on vscode not detaching --- pkgs/applications/editors/vscode/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 3031fa1cb0c1..c46640602141 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -55,7 +55,7 @@ in '' else '' mkdir -p $out/lib/vscode $out/bin cp -r ./* $out/lib/vscode - ln -s $out/lib/vscode/code $out/bin + ln -s $out/lib/vscode/bin/code $out/bin mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications @@ -67,11 +67,8 @@ in postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \ + --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1:$out/lib/vscode" \ $out/lib/vscode/code - - wrapProgram $out/bin/code \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 ''; meta = with stdenv.lib; { From 117797367a0f16f62c10eb1f5d83040c58185a1d Mon Sep 17 00:00:00 2001 From: Jordan Woehr Date: Fri, 31 Mar 2017 12:39:12 -0600 Subject: [PATCH 019/172] ghcjs (head): Fix infinite recursion ... ... in hscolour when building packages. --- pkgs/development/compilers/ghcjs/head_stage2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix index d4247f51b3e3..5808891d4303 100644 --- a/pkgs/development/compilers/ghcjs/head_stage2.nix +++ b/pkgs/development/compilers/ghcjs/head_stage2.nix @@ -382,6 +382,7 @@ version = "1.24.0.0"; src = "${ghcjsBoot}/boot/cabal/Cabal"; doCheck = false; + hyperlinkSource = false; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix From 552045db8025a9269ae1d33294ebc3ebe5c56ea6 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Fri, 31 Mar 2017 20:51:32 +0200 Subject: [PATCH 020/172] skopeo: 0.1.16 -> 0.1.18 --- pkgs/development/tools/skopeo/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index e724d00e4d39..6a5faa68ced0 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,22 +1,29 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs }: + +with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.16"; + version = "0.1.18"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; - buildInputs = [ gpgme ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ]; src = fetchFromGitHub { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "11na7imx6yc1zijb010hx6fjh6v0m3wm5r4sa2nkclm5lkjq259b"; + sha256 = "13k29i5hx909hvddl2xkyw4qzxq2q20ay9bkal3xi063s6l0sh0z"; }; + preBuild = '' + export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" + export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" + ''; + meta = { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/projectatomic/skopeo"; From ecf5daa5d7db5eec7d26792cf07b3b532b589390 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 1 Apr 2017 01:37:40 +0000 Subject: [PATCH 021/172] subgit: 3.1.0 -> 3.2.4 --- .../git-and-tools/subgit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 0774bbc9a624..7b36a142d15d 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: -stdenv.mkDerivation { - name = "subgit-3.1.0"; +stdenv.mkDerivation rec { + name = "subgit-3.2.4"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ unzip makeWrapper ]; installPhase = '' mkdir $out; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://old.subgit.com/download/subgit-3.1.0.zip; - sha256 = "08qhpg6y2ziwplm0z1ghh1wfp607sw4hyb53a7qzfn759j5kcdrg"; + url = "http://subgit.com/download/${name}.zip"; + sha256 = "13r6hi2zk46bs3j17anfc85kszlwliv2yc16qx834b3v4w68hajw"; }; -} \ No newline at end of file +} From a3098900448544a084cb0ab0d83d9caadd19bbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sat, 1 Apr 2017 05:51:41 +0200 Subject: [PATCH 022/172] ipfs: 0.4.6 -> 0.4.8 --- pkgs/applications/networking/ipfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index a00aebef2969..2be39df61472 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.6"; - rev = "ed729423ce548785834cdcaa21aab11ebc3a1b1a"; + version = "0.4.8"; + rev = "8e7484ed794d1aecb3e773e9003ae64c7b78bb87"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "1wwzbps3ry3vlrr0iqhvxd44x0wi99dcp5hlxvh79dc0g9r7myfk"; + sha256 = "1h4n74n65z4sw3fqz8nfcrwisbvvwwfq69909w3kgrjsxs7505s5"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1b262k1lhb1g68l8hghly4pdrxx1c6wbv6ij6dg399zdwqzczl13"; + sha256 = "15jcg0wbm7g82fsmhc1vxrsszbxcghls3rsyv35n1hv5k5r5d5nh"; }; meta = with stdenv.lib; { From 033c5debbc2db8f934aad4bd2b35b899d839fb46 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 1 Apr 2017 07:39:13 +0200 Subject: [PATCH 023/172] utop: fix on OCaml 4.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don’t strip the binary The wrapper directly calls ocamlrun --- pkgs/development/tools/ocaml/utop/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 9b41a06c9355..31549729cfe7 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -25,14 +25,24 @@ stdenv.mkDerivation rec { make doc ''; + dontStrip = true; + postFixup = - let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; - in + let p = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; in '' - for prog in "$out"/bin/* + pushd $out/bin + for prog in * do - wrapProgram $prog --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH' + mv $prog .$prog-wrapped + cat > $prog < Date: Sat, 1 Apr 2017 11:50:13 +0200 Subject: [PATCH 024/172] oracle-instantclient: add optional odbc support --- .../oracle-instantclient/default.nix | 50 +++++++++++++------ 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index c29a5da9f21a..d0085752623d 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,29 +1,39 @@ -{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio }: +{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio +, odbcSupport ? false, unixODBC +}: -let requireSource = version: part: hash: (requireFile rec { - name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; - message = '' - This Nix expression requires that ${name} already - be part of the store. Download the file - manually at +assert odbcSupport -> unixODBC != null; - http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html +let optional = stdenv.lib.optional; + optionalString = stdenv.lib.optionalString; + requireSource = version: part: hash: (requireFile rec { + name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; + message = '' + This Nix expression requires that ${name} already + be part of the store. Download the file + manually at - and add it to the Nix store with the following command: + http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html - nix-prefetch-url file://${name} ${hash} --type sha256 -''; - url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"; - sha256 = hash; -}); in stdenv.mkDerivation rec { + and add it to the Nix store using either: + nix-store --add-fixed sha256 ${name} + or + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"; + sha256 = hash; + }); +in stdenv.mkDerivation rec { version = "12.1.0.2.0-1"; name = "oracle-instantclient-${version}"; srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed"); srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296"); srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam"); + srcOdbc = optionalString odbcSupport (requireSource version "odbc" "d3aa1a4957a2f15ced05921dab551ba823aa7925d8fcb58d5b3a7f624e4df063"); - buildInputs = [ glibc patchelf rpmextract ]; + buildInputs = [ glibc patchelf rpmextract ] ++ + optional odbcSupport unixODBC; buildCommand = '' mkdir -p "${name}" @@ -31,6 +41,9 @@ let requireSource = version: part: hash: (requireFile rec { ${rpmextract}/bin/rpmextract "${srcBase}" ${rpmextract}/bin/rpmextract "${srcDevel}" ${rpmextract}/bin/rpmextract "${srcSqlplus}" + ${optionalString odbcSupport '' + ${rpmextract}/bin/rpmextract "${srcOdbc}" + ''} mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"} mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/" @@ -46,6 +59,13 @@ let requireSource = version: part: hash: (requireFile rec { $lib done + for lib in $out/lib/libsqora*; do + test -f $lib || continue + chmod +x $lib + patchelf --force-rpath --set-rpath "$out/lib:${unixODBC}/lib" \ + $lib + done + for exe in $out/bin/sqlplus; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ From 86f4ded7898eee8ba3dd808d65095f5afacc1d29 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 1 Apr 2017 10:52:19 +0200 Subject: [PATCH 025/172] google-drive-ocamlfuse: add missing ocamlbuild dependency --- .../networking/google-drive-ocamlfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 64519ce17d5b..674cf60161db 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib -, ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: +, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas"; }; - buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; + buildInputs = [ zlib ocaml ocamlbuild ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; configurePhase = "ocaml setup.ml -configure --prefix \"$out\""; buildPhase = "ocaml setup.ml -build"; From e5d0593a4289abc33505f061239b32081a710e06 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 1 Apr 2017 10:53:47 +0200 Subject: [PATCH 026/172] ocamlPackages.core_extended: fix build on Linux --- .../development/ocaml-modules/janestreet/core-extended.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index df7f6903cd24..dc84ea34337e 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -13,6 +13,13 @@ buildOcamlJane rec { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane re2 textutils ]; + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + patch src/extended_unix_stubs.c < #define _LINUX_QUOTA_VERSION 2 +EOF + ''; + meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_extended; description = "Jane Street Capital's standard library overlay"; From fcb9f443750ce8c41a229818a2968d5dc4ec2e4d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 1 Apr 2017 10:54:30 +0200 Subject: [PATCH 027/172] ocamlPackages.{ocf,xtmpl}: fix for OCaml 4.04 --- pkgs/development/ocaml-modules/ocf/default.nix | 4 +++- pkgs/development/ocaml-modules/xtmpl/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 11be8a13a575..4da9fb45d332 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -18,11 +18,14 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + dontStrip = true; + patches = [(fetchpatch { url = "https://github.com/zoggy/ocf/commit/3a231c7a6c5e535a77c25e207af8952793436444.patch"; sha256 = "0nc8cggc5gxhch9amaz3s71lxs1xbgi7fs9p90cng04dsgr64xk5"; }) ]; + meta = with stdenv.lib; { description = "OCaml library to read and write configuration options in JSON syntax"; homepage = "https://zoggy.github.io/ocf/"; @@ -31,4 +34,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ regnat ]; }; } - diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index c3d7637e870d..86c9974c9316 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + dontStrip = true; + meta = with stdenv.lib; { description = "Xml template library for OCaml"; homepage = "https://zoggy.github.io/xtmpl/"; @@ -27,5 +29,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ regnat ]; }; } - - From ae034020aa18455d86202be50bff0939aebfb18c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 1 Apr 2017 12:54:24 +0100 Subject: [PATCH 028/172] fixup! terraform: 0.9.1 -> 0.9.2 use fetchpatch to improve patch download hash stability --- .../networking/cluster/terraform/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 42a8465bf8a3..93a9894ba6b8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchurl, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchpatch, fetchFromGitHub }: let goPackagePath = "github.com/hashicorp/terraform"; @@ -54,13 +54,13 @@ in { sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl"; patches = [ - (fetchurl { + (fetchpatch { url = "https://github.com/hashicorp/terraform/pull/13237.patch"; - sha256 = "1f7hr1l5hck9mmqk01p6wxbfv9r3b0yi9ypz7bcmikp3bikza98x"; + sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm"; }) - (fetchurl { + (fetchpatch { url = "https://github.com/hashicorp/terraform/pull/13248.patch"; - sha256 = "1qc57kjhlqg5339him9bg4izdphins2fjjhb4ffr7bv9lb5k0hkr"; + sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m"; }) ]; From d19384ca7e217dcd42eff673bafa07f9c6f183b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 1 Apr 2017 14:40:35 +0200 Subject: [PATCH 029/172] liferea: bugfix 1.12-rc2 -> 1.12-rc3 --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index b348010c61f1..93e10fbe5664 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12-rc2"; + version = "1.12-rc3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1q83s900skl0w9pb0afq8z387ynhl0rqn6fmps8wmncj0z1q07wb"; + sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; From ed41d50e9fe3d942cfde37e84de781c096309e5b Mon Sep 17 00:00:00 2001 From: Volth Date: Mon, 20 Mar 2017 23:24:54 +0000 Subject: [PATCH 030/172] kernel: fix 9p issues [tuomas: rename the patch from 9p-hacks to something slighly more meaningful] Signed-off-by: Tuomas Tynkkynen --- pkgs/os-specific/linux/kernel/p9-fixes.patch | 85 ++++++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 5 ++ pkgs/top-level/all-packages.nix | 6 ++ 3 files changed, 96 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/p9-fixes.patch diff --git a/pkgs/os-specific/linux/kernel/p9-fixes.patch b/pkgs/os-specific/linux/kernel/p9-fixes.patch new file mode 100644 index 000000000000..f6061b60667a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/p9-fixes.patch @@ -0,0 +1,85 @@ +diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c +--- a/fs/9p/vfs_inode.c ++++ b/fs/9p/vfs_inode.c +@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data) + + if (v9inode->qid.type != st->qid.type) + return 0; ++ ++ if (v9inode->qid.path != st->qid.path) ++ return 0; + return 1; + } + +diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c +--- a/fs/9p/vfs_inode_dotl.c ++++ b/fs/9p/vfs_inode_dotl.c +@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) + + if (v9inode->qid.type != st->qid.type) + return 0; ++ ++ if (v9inode->qid.path != st->qid.path) ++ return 0; + return 1; + } + +diff --git a/net/9p/client.c b/net/9p/client.c +index 3ce672af1596..f1c8ad373f90 100644 +--- a/net/9p/client.c ++++ b/net/9p/client.c +@@ -749,8 +749,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) + } + again: + /* Wait for the response */ +- err = wait_event_interruptible(*req->wq, +- req->status >= REQ_STATUS_RCVD); ++ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); + + /* + * Make sure our req is coherent with regard to updates in other +diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c +index f24b25c25106..f3a4efcf1456 100644 +--- a/net/9p/trans_virtio.c ++++ b/net/9p/trans_virtio.c +@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req) + if (err == -ENOSPC) { + chan->ring_bufs_avail = 0; + spin_unlock_irqrestore(&chan->lock, flags); +- err = wait_event_interruptible(*chan->vc_wq, +- chan->ring_bufs_avail); ++ err = wait_event_killable(*chan->vc_wq, ++ chan->ring_bufs_avail); + if (err == -ERESTARTSYS) + return err; + +@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, + * Other zc request to finish here + */ + if (atomic_read(&vp_pinned) >= chan->p9_max_pages) { +- err = wait_event_interruptible(vp_wq, ++ err = wait_event_killable(vp_wq, + (atomic_read(&vp_pinned) < chan->p9_max_pages)); + if (err == -ERESTARTSYS) + return err; +@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, + if (err == -ENOSPC) { + chan->ring_bufs_avail = 0; + spin_unlock_irqrestore(&chan->lock, flags); +- err = wait_event_interruptible(*chan->vc_wq, +- chan->ring_bufs_avail); ++ err = wait_event_killable(*chan->vc_wq, ++ chan->ring_bufs_avail); + if (err == -ERESTARTSYS) + goto err_out; + +@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, + virtqueue_kick(chan->vq); + spin_unlock_irqrestore(&chan->lock, flags); + p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n"); +- err = wait_event_interruptible(*req->wq, +- req->status >= REQ_STATUS_RCVD); ++ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); + /* + * Non kernel buffers are pinned, unpin them + */ diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5bb9d2d39ac2..d8676413e82e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -52,6 +52,11 @@ rec { patch = ./bridge-stp-helper.patch; }; + p9_fixes = + { name = "p9-fixes"; + patch = ./p9-fixes.patch; + }; + no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e403f303d126..a3ba43b95c3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11501,6 +11501,7 @@ with pkgs; linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.packet_fix_race_condition_CVE_2016_8655 kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 ] @@ -11521,6 +11522,7 @@ with pkgs; linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + p9_fixes lguest_entry-linkage packet_fix_race_condition_CVE_2016_8655 DCCP_double_free_vulnerability_CVE-2017-6074 @@ -11535,6 +11537,7 @@ with pkgs; linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.4" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11547,6 +11550,7 @@ with pkgs; linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking @@ -11563,6 +11567,7 @@ with pkgs; linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking @@ -11579,6 +11584,7 @@ with pkgs; linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From b78f16b33772722d19c9cbe4145953f9c4b76fc8 Mon Sep 17 00:00:00 2001 From: Volth Date: Mon, 20 Mar 2017 23:12:12 +0000 Subject: [PATCH 031/172] kernel: do not remove .o files on installPhase --- .../linux/kernel/manual-config.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index e07a89fc1e64..55162e54f4dc 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -146,17 +146,12 @@ let unlink $out/lib/modules/${modDirVersion}/build unlink $out/lib/modules/${modDirVersion}/source - mkdir -p $dev/lib/modules/${modDirVersion} - cd .. - mv $sourceRoot $dev/lib/modules/${modDirVersion}/source + mkdir -p $dev/lib/modules/${modDirVersion}/build + cp -dpR ../$sourceRoot $dev/lib/modules/${modDirVersion}/source cd $dev/lib/modules/${modDirVersion}/source - mv $buildRoot/.config $buildRoot/Module.symvers $TMPDIR - rm -fR $buildRoot - mkdir $buildRoot - mv $TMPDIR/.config $TMPDIR/Module.symvers $buildRoot - make modules_prepare $makeFlags "''${makeFlagsArray[@]}" - mv $buildRoot $dev/lib/modules/${modDirVersion}/build + cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build + make modules_prepare $makeFlags "''${makeFlagsArray[@]}" O=$dev/lib/modules/${modDirVersion}/build # !!! No documentation on how much of the source tree must be kept # If/when kernel builds fail due to missing files, you can add @@ -164,7 +159,7 @@ let # from drivers/ in the future; it adds 50M to keep all of its # headers on 3.10 though. - chmod +w -R ../source + chmod u+w -R ../source arch=`cd $dev/lib/modules/${modDirVersion}/build/arch; ls` # Remove unusued arches @@ -177,14 +172,14 @@ let rm -fR drivers # Keep all headers - find . -type f -name '*.h' -print0 | xargs -0 chmod -w + find . -type f -name '*.h' -print0 | xargs -0 chmod u-w # Keep root and arch-specific Makefiles - chmod -w Makefile - chmod -w arch/$arch/Makefile* + chmod u-w Makefile + chmod u-w arch/$arch/Makefile* # Keep whole scripts dir - chmod -w -R scripts + chmod u-w -R scripts # Delete everything not kept find . -type f -perm -u=w -print0 | xargs -0 rm From ee0f3e7ad9aa61f02283eb1c18f670703eea20ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 1 Apr 2017 14:42:21 +0200 Subject: [PATCH 032/172] acme: Use `chown -R` for challenges directory. Fixes #24529. Commit 75f131da02c00027b9a8240fb74d117cb0f9d9cf added `chown 'nginx:nginx' '/var/lib/acme'` to the pre-start script, but since it doesn't use `chown -R`, it is possible that there are older existing subdirs (like `acme-challenge`) that are owned to `root` from before that commit went it. --- nixos/modules/security/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 703d5ddbd0e2..ada198e0e586 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -178,7 +178,7 @@ in path = [ pkgs.simp_le ]; preStart = '' mkdir -p '${cfg.directory}' - chown '${data.user}:${data.group}' '${cfg.directory}' + chown -R '${data.user}:${data.group}' '${cfg.directory}' if [ ! -d '${cpath}' ]; then mkdir '${cpath}' fi From daab7c193f92151e0daae4c7fe927aa98bcb2b81 Mon Sep 17 00:00:00 2001 From: ndowens Date: Thu, 30 Mar 2017 18:09:45 -0500 Subject: [PATCH 033/172] i3lock-color: 2.7-2016-09-17 -> 2.8; Closes #24450 i3lock-color: Corrected software src Fixed version --- pkgs/applications/window-managers/i3/lock-color.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index dd781143d862..aa4001f62dea 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -2,17 +2,19 @@ , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - rev = "c8e1aece7301c3c6481bf2f695734f8d273f252e"; - version = "2.7-2016-09-17"; + version = "2.7-2017-04-01"; name = "i3lock-color-${version}"; + src = fetchFromGitHub { owner = "chrjguill"; repo = "i3lock-color"; - inherit rev; - sha256 = "07fpvwgdfxsnxnf63idrz3n1kbyayr53lsfns2q775q93cz1mfia"; + rev = "61f6428aedbe4829d3e0f51d137283c8aec1e206"; + sha256 = "0h4nzx46kcsp6b1i2lm9y4d1w1icrpvjl8g1h3wbpa5x4crh4703"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile ]; + makeFlags = "all"; preInstall = '' mkdir -p $out/share/man/man1 From 8c38250a3e4bc9dc62b710a263ea85dabf14d235 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 1 Apr 2017 14:34:17 +0100 Subject: [PATCH 034/172] treesheets: init at 2017-03-27 --- .../office/treesheets/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/office/treesheets/default.nix diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix new file mode 100644 index 000000000000..01c24838f616 --- /dev/null +++ b/pkgs/applications/office/treesheets/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, wxGTK, makeWrapper }: + +stdenv.mkDerivation rec { + name = "treesheets-${version}"; + version = "2017-03-27"; + + src = fetchFromGitHub { + owner = "aardappel"; + repo = "treesheets"; + rev = "1d1d6b214e3ae88445eb1ec0032d5fef14160f32"; + sha256 = "0np91c4skq3yxq76c4zi33w73qb1w2nrcin490kkvrxk53jspklb"; + }; + + buildInputs = [ wxGTK makeWrapper ]; + + preConfigure = "cd src"; + + postInstall = '' + mkdir "$out/share" -p + cp -av ../TS "$out/share/libexec" + + mkdir "$out/bin" -p + makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets" + + mkdir "$out/share/doc" -p + + for f in readme.html docs examples + do + mv -v "$out/share/libexec/$f" "$out/share/doc" + ln -sv "$out/share/doc/$f" "$out/share/libexec/$f" + done + + mkdir "$out/share/applications" -p + mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications" + substituteInPlace "$out/share/applications/treesheets.desktop" \ + --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg" + ''; + + meta = with stdenv.lib; { + description = "Free Form Data Organizer"; + + longDescription = '' + The ultimate replacement for spreadsheets, mind mappers, outliners, + PIMs, text editors and small databases. + + Suitable for any kind of data organization, such as Todo lists, + calendars, project management, brainstorming, organizing ideas, + planning, requirements gathering, presentation of information, etc. + ''; + + homepage = http://passwordsafe.sourceforge.net/; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.linux; + license = licenses.zlib; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3ba43b95c3b..853d37d3c9ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15724,6 +15724,8 @@ with pkgs; tree = callPackage ../tools/system/tree {}; + treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; }; + trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { }; tribler = callPackage ../applications/networking/p2p/tribler { }; From 498a2f5e61cca7a63e462b0ad32c5c00d62b6a56 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 1 Apr 2017 08:45:58 -0500 Subject: [PATCH 035/172] speedtest-cli: 1.0.2 -> 1.0.3 (#24535) --- pkgs/tools/networking/speedtest-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index ac23635441d4..3be1d194d82b 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "1p7lavw95w3as9b2b55i61mwxdr1b6jj40yly91f9j26ywr5dpkg"; + sha256 = "160m1liinbpbmjxi3cvdw5x3k9sb4j51ly92lynylpamcqcv8m83"; }; meta = with stdenv.lib; { From c4801f65f8b9958a4d2dda1c278e5e081986ab54 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 1 Apr 2017 15:21:54 +0100 Subject: [PATCH 036/172] treesheets: fix url --- pkgs/applications/office/treesheets/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 01c24838f616..d8e6cdd86ea9 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { planning, requirements gathering, presentation of information, etc. ''; - homepage = http://passwordsafe.sourceforge.net/; + homepage = http://strlen.com/treesheets/; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; license = licenses.zlib; From 03aff3d22f7c729ffaec228437d840ff0a75aa4c Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 1 Apr 2017 10:16:51 -0500 Subject: [PATCH 037/172] Small cosmetic change --- pkgs/tools/misc/clipster/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index c65836c1ae0f..547cc289c3cd 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); buildInputs = [ pythonEnv gtk3 libwnck3 ]; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -48,6 +47,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3; homepage = https://github.com/mrichar1/clipster; platforms = platforms.linux; - maintainers = [maintainers.magnetophon]; + maintainers = [ maintainers.magnetophon ]; }; } From 72070e6dfce2dfc4dcd1bd567eadc39878497db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Sat, 1 Apr 2017 15:32:25 +0200 Subject: [PATCH 038/172] doc: improve "getting the sources" chapter --- nixos/doc/manual/development/sources.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 0b2528e9a779..a2896cd7a135 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -8,7 +8,7 @@ By default, NixOS’s nixos-rebuild command uses the NixOS and Nixpkgs sources provided by the -nixos-unstable channel (kept in +nixos channel (kept in /nix/var/nix/profiles/per-user/root/channels/nixos). To modify NixOS, however, you should check out the latest sources from Git. This is as follows: @@ -41,7 +41,7 @@ branch based on your current NixOS version: $ nixos-version 17.09pre104379.6e0b727 (Hummingbird) -$ git checkout -b local e3938c8 +$ git checkout -b local 6e0b727 Or, to base your local branch on the latest version available in a @@ -87,7 +87,11 @@ $ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs You may want to delete the symlink ~/.nix-defexpr/channels_root to prevent root’s -NixOS channel from clashing with your own tree. +NixOS channel from clashing with your own tree (this may break the +command-not-found utility though). If you want to go back to the default +state, you may just remove the ~/.nix-defexpr +directory completely, log out and log in again and it should have been +recreated with a link to the root channels. - - - ${fcBool cfg.forceAutohint} - - - ''; @@ -453,15 +446,6 @@ in description = ''Use embedded bitmaps in fonts like Calibri.''; }; - forceAutohint = mkOption { - type = types.bool; - default = false; - description = '' - Force use of the TrueType Autohinter. Useful for debugging or - free-software purists. - ''; - }; - renderMonoTTFAsBitmap = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 54433e205973..4cf48e1e2cb5 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -202,5 +202,6 @@ with lib; (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] "Set the option `services.xserver.displayManager.sddm.package' instead.") + (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") ]; } From 03942659ca1189ba50f9f1b86bbe6d925eba237b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 3 Apr 2017 08:24:32 -0500 Subject: [PATCH 102/172] nixos/fontconfig: remove renderMonoTTFAsBitmap --- nixos/modules/config/fonts/fontconfig.nix | 13 ------------- nixos/modules/rename.nix | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index affb46c2ca03..1cf5cb6e0396 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -167,13 +167,6 @@ let cfg = config.fonts.fontconfig; - - - - ${fcBool cfg.renderMonoTTFAsBitmap} - - - ''; @@ -446,12 +439,6 @@ in description = ''Use embedded bitmaps in fonts like Calibri.''; }; - renderMonoTTFAsBitmap = mkOption { - type = types.bool; - default = false; - description = ''Render some monospace TTF fonts as bitmaps.''; - }; - }; }; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4cf48e1e2cb5..0174fe544e35 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -203,5 +203,6 @@ with lib; (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] "Set the option `services.xserver.displayManager.sddm.package' instead.") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") + (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") ]; } From c77a54d79fde2e79cb832f310ccfdd40bb8a36f0 Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Mon, 3 Apr 2017 13:58:02 +0000 Subject: [PATCH 103/172] pharo-vm: Disable "pic" hardening Compiling the Pharo VM with "pic" hardening causes segmentation faults on startup of pharo-launcher. Resolves NixOS/nixpkgs#24541. --- pkgs/development/pharo/vm/build-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 1eeb5dc31517..1f9e82f866ee 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mimeType = "application/x-pharo-image"; }; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" "pic" ]; # Building preConfigure = '' From 89bfa112cfd8a8b3da642169d33f1dfe3ea1e839 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 3 Apr 2017 08:48:50 -0500 Subject: [PATCH 104/172] fontconfig-penultimate: 0.2.1 -> 0.3.2 --- .../config/fonts/fontconfig-penultimate.nix | 221 +++++++++++++++++- nixos/modules/config/fonts/fontconfig.nix | 15 +- .../fonts/fontconfig-penultimate/default.nix | 4 +- 3 files changed, 228 insertions(+), 12 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 8e41d3421173..83d6532774e3 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -3,23 +3,236 @@ with lib; let - cfg = config.fonts.fontconfig.penultimate; + cfg = config.fonts.fontconfig; + fcBool = x: "" + (if x then "true" else "false") + ""; + + # back-supported fontconfig version and package + # version is used for font cache generation + supportVersion = "210"; + supportPkg = pkgs."fontconfig_${supportVersion}"; + + # latest fontconfig version and package + # version is used for configuration folder name, /etc/fonts/VERSION/ + # note: format differs from supportVersion and can not be used with makeCacheConf latestVersion = pkgs.fontconfig.configVersion; + latestPkg = pkgs.fontconfig; + + # supported version fonts.conf + supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; }; + + # configuration file to read fontconfig cache + # version dependent + # priority 0 + cacheConfSupport = makeCacheConf { version = supportVersion; }; + cacheConfLatest = makeCacheConf {}; + + # generate the font cache setting file for a fontconfig version + # use latest when no version is passed + makeCacheConf = { version ? null }: + let + fcPackage = if builtins.isNull version + then "fontconfig" + else "fontconfig_${version}"; + makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; + cache = makeCache pkgs."${fcPackage}"; + cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}"; + in + pkgs.writeText "fc-00-nixos-cache.conf" '' + + + + + ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} + + ${cache} + ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' + ${cache32} + ''} + + ''; # The configuration to be included in /etc/font/ - confPkg = pkgs.runCommand "font-penultimate-conf" {} '' + penultimateConf = pkgs.runCommand "font-penultimate-conf" {} '' support_folder=$out/etc/fonts/conf.d latest_folder=$out/etc/fonts/${latestVersion}/conf.d mkdir -p $support_folder mkdir -p $latest_folder - # fontconfig ultimate various configuration files + ln -s ${supportFontsConf} $support_folder/../fonts.conf + ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ + $latest_folder/../fonts.conf + + # fontconfig-penultimate various configuration files ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ $support_folder ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ $latest_folder + + ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf + ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf + + rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf + ln -s ${antialiasConf} $support_folder/10-antialias.conf + ln -s ${antialiasConf} $latest_folder/10-antialias.conf + + rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf + ln -s ${hintingConf} $support_folder/10-hinting.conf + ln -s ${hintingConf} $latest_folder/10-hinting.conf + + ${optionalString cfg.useEmbeddedBitmaps '' + rm $support_folder/10-no-embedded-bitmaps.conf + rm $latest_folder/10-no-embedded-bitmaps.conf + ''} + + rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf + ln -s ${subpixelConf} $support_folder/10-subpixel.conf + ln -s ${subpixelConf} $latest_folder/10-subpixel.conf + + ${optionalString (cfg.dpi != 0) '' + ln -s ${dpiConf} $support_folder/11-dpi.conf + ln -s ${dpiConf} $latest_folder/11-dpi.conf + ''} + + ${optionalString (!cfg.includeUserConf) '' + rm $support_folder/50-user.conf + rm $latest_folder/50-user.conf + ''} + + # 51-local.conf + rm $latest_folder/51-local.conf + substitute \ + ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \ + $latest_folder/51-local.conf \ + --replace local.conf /etc/fonts/${latestVersion}/local.conf + + ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf + ln -s ${defaultFontsConf} $latest_folder/52-default-fonts.conf + + ${optionalString cfg.allowBitmaps '' + rm $support_folder/53-no-bitmaps.conf + rm $latest_folder/53-no-bitmaps.conf + ''} + + ${optionalString (!cfg.allowType1) '' + ln -s ${rejectType1} $support_folder/53-no-type1.conf + ln -s ${rejectType1} $latest_folder/53-no-type1.conf + ''} + ''; + + hintingConf = pkgs.writeText "fc-10-hinting.conf" '' + + + + + + + + ${fcBool cfg.hinting.enable} + + + ${fcBool cfg.hinting.autohint} + + + hintslight + + + + + ''; + + antialiasConf = pkgs.writeText "fc-10-antialias.conf" '' + + + + + + + + ${fcBool cfg.antialias} + + + + + ''; + + subpixelConf = pkgs.writeText "fc-10-subpixel.conf" '' + + + + + + + + ${cfg.subpixel.rgba} + + + lcd${cfg.subpixel.lcdfilter} + + + + + ''; + + dpiConf = pkgs.writeText "fc-11-dpi.conf" '' + + + + + + + ${toString cfg.dpi} + + + + + ''; + + defaultFontsConf = + let genDefault = fonts: name: + optionalString (fonts != []) '' + + ${name} + + ${concatStringsSep "" + (map (font: '' + ${font} + '') fonts)} + + + ''; + in + pkgs.writeText "fc-52-nixos-default-fonts.conf" '' + + + + + + ${genDefault cfg.defaultFonts.sansSerif "sans-serif"} + + ${genDefault cfg.defaultFonts.serif "serif"} + + ${genDefault cfg.defaultFonts.monospace "monospace"} + + + ''; + + rejectType1 = pkgs.writeText "fc-53-no-type1.conf" '' + + + + + + + + + Type 1 + + + + + ''; in @@ -50,7 +263,7 @@ in config = mkIf (config.fonts.fontconfig.enable && cfg.enable) { - fonts.fontconfig.confPackages = [ confPkg ]; + fonts.fontconfig.confPackages = [ penultimateConf ]; }; diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1cf5cb6e0396..d44b583447a3 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -444,11 +444,14 @@ in }; }; - config = mkIf cfg.enable { - fonts.fontconfig.confPackages = [ confPkg ]; - - environment.systemPackages = [ pkgs.fontconfig ]; - environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; - }; + config = mkMerge [ + (mkIf cfg.enable { + environment.systemPackages = [ pkgs.fontconfig ]; + environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; + }) + (mkIf (cfg.enable && !cfg.penultimate.enable) { + fonts.fontconfig.confPackages = [ confPkg ]; + }) + ]; } diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix index f9d60d6600dc..a42e5d9109b6 100644 --- a/pkgs/data/fonts/fontconfig-penultimate/default.nix +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -let version = "0.2.1"; in +let version = "0.3.2"; in stdenv.mkDerivation { name = "fontconfig-penultimate-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "ttuegel"; repo = "fontconfig-penultimate"; rev = version; - sha256 = "14arpalmpn7ig2myxslk4jdg6lm0cnmwsxy7zl0j7yr417k1kprf"; + sha256 = "01cgqdmgpqahkg71lnvr3yzsmka9q1kgkbiz6w5ds1fhrpcswj7p"; }; installPhase = '' From 4736c19c657012b6f6ecd5567fa21c57e2977c92 Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Mon, 3 Apr 2017 14:26:33 +0000 Subject: [PATCH 105/172] pharo-launcher: Add test case & myself as maintainer --- pkgs/development/pharo/launcher/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 02004061b83a..911680b1eb8d 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -43,6 +43,19 @@ stdenv.mkDerivation rec { chmod +x $prefix/bin/${executable-name} ''; + doCheck = true; + + checkPhase = '' + # Launcher should be able to run for a few seconds without crashing. + (set +e + export HOME=. # Pharo will try to create files here + secs=5 + echo -n "Running headless Pharo for $secs seconds to check for a crash... " + timeout $secs \ + ${pharo-vm}/bin/pharo-vm-nox PharoLauncher.image --no-quit eval 'true' + test "$?" == 124 && echo "ok") + ''; + meta = { description = "Launcher for Pharo distributions"; longDescription = '' @@ -65,7 +78,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.lukego ]; platforms = pharo-vm.meta.platforms; }; } From ef4b73a0386a088ac77e1c3e0d0db2d6d770dd50 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Apr 2017 17:25:12 +0300 Subject: [PATCH 106/172] libappindicator: propagate dependencies --- pkgs/development/libraries/libappindicator/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index ff256fb73c84..0c1c51d6f47a 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -27,12 +27,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; + propagatedBuildInputs = + if gtkVersion == "2" + then [ gtk2 libdbusmenu-gtk2 ] + else [ gtk3 libdbusmenu-gtk3 ]; + buildInputs = [ glib dbus_glib python pygobject2 pygtk gobjectIntrospection vala_0_23 ] ++ (if gtkVersion == "2" - then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] - else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); + then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] + else [ libindicator-gtk3 ]); postPatch = '' substituteInPlace configure.ac \ From 74f7db075a89c92cf65c68a6e2bc64fd01d7da7f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Apr 2017 17:28:16 +0300 Subject: [PATCH 107/172] tdesktop: 1.0.2 -> 1.0.27 Use system Qt. --- .../telegram/tdesktop/default.nix | 162 ++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 56 insertions(+), 108 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 67d86571b885..d64b5be816aa 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,144 +1,92 @@ { stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake -, qtbase, qtimageformats, qtwayland -, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus -, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 -, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland -, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau - -, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon -, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11 -, inputproto, sqlite, dbus +, qtbase, qtimageformats, makeQtWrapper +, breakpad, gtk3, libappindicator-gtk3, dee +, ffmpeg, openalSoft, minizip }: -let - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; - packagedQt = "5.6.2"; - # Hacky: split "1.2.3-4" into "1.2.3" and "4" - systemQt = (builtins.parseDrvName qtbase.version).name; - qtLibs = [ qtbase qtimageformats qtwayland ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.0.2"; - qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; + version = "1.0.27"; - src = fetchFromGitHub { - owner = "telegramdesktop"; - repo = "tdesktop"; - rev = "v${version}"; - sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2"; + # Submodules + src = fetchgit { + url = "https://github.com/telegramdesktop/tdesktop"; + rev = "refs/tags/v${version}"; + sha256 = "05g88g6h2a7f9biliicg81fqssx0y3akd3y5r2q2b5h8q3igqrfc"; }; tgaur = fetchgit { - url = "https://aur.archlinux.org/telegram-desktop.git"; - rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69"; - sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8"; + url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; + rev = "b4d169076ed12ec01941a95499774d5caa6fc00e"; + sha256 = "0pmm6slabg9xazgs0ffnp8v0hx3vnpdfgymvapwqpm3h9mwk22x9"; }; buildInputs = [ - breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus - gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk - dee libdbusmenu-glib libva-full xcbutilrenderutil icu libproxy - libSM libICE - # Qt dependencies - libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon - libpng libjpeg freetype harfbuzz pcre16 xproto libX11 - inputproto sqlite dbus libwebp wayland libvdpau + gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip ]; - nativeBuildInputs = [ pkgconfig gyp cmake ]; + nativeBuildInputs = [ pkgconfig gyp cmake makeQtWrapper ]; - patches = [ "${tgaur}/aur-fixes.diff" ]; + patches = [ "${tgaur}/aur-build-fixes.patch" ]; enableParallelBuilding = true; - qtSrcs = builtins.map (x: x.src) qtLibs; - qtNames = builtins.map (x: (builtins.parseDrvName x.name).name) (lib.tail qtLibs); - qtPatches = qtbase.patches; + GYP_DEFINES = lib.concatStringsSep "," [ + "TDESKTOP_DISABLE_CRASH_REPORTS" + "TDESKTOP_DISABLE_AUTOUPDATE" + "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + ]; - buildCommand = '' - unpackPhase - cd "$sourceRoot" - - patchPhase - - sed -i Telegram/gyp/Telegram.gyp \ - -e 's,/usr/include/breakpad,${breakpad}/include/breakpad,g' + NIX_CFLAGS_COMPILE = [ + "-DTDESKTOP_DISABLE_AUTOUPDATE" + "-DTDESKTOP_DISABLE_CRASH_REPORTS" + "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + "-I${minizip}/include/minizip" + # See Telegram/gyp/qt.gypi + "-I${qtbase.dev}/mkspecs/linux-g++" + ] ++ lib.concatMap (x: [ + "-I${qtbase.dev}/include/${x}" + "-I${qtbase.dev}/include/${x}/${qtbase.version}" + "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}" + ]) [ "QtCore" "QtGui" ]; + CPPFLAGS = NIX_CFLAGS_COMPILE; + preConfigure = '' sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ + -e 's,appindicator-0.1,appindicator3-0.1,g' \ -e 's,-flto,,g' sed -i Telegram/gyp/qt.gypi \ - -e 's,${packagedQt},${systemQt},g' + -e "s,/usr/bin/moc,moc,g" + sed -i Telegram/gyp/qt_rcc.gypi \ + -e "s,/usr/bin/rcc,rcc,g" - gypFlagsArray=( - "-Dlinux_path_qt=$PWD/../qt" - "-Dlinux_lib_ssl=-lssl" - "-Dlinux_lib_crypto=-lcrypto" - "-Dlinux_lib_icu=-licuuc -licutu -licui18n" - ) + gyp \ + -Gconfig=Release \ + --depth=Telegram/gyp \ + --generator-output=../.. \ + -Goutput_dir=out \ + --format=cmake \ + Telegram/gyp/Telegram.gyp - export QMAKE=$PWD/../qt/bin/qmake - ( mkdir -p ../Libraries - cd ../Libraries - for i in $qtSrcs; do - tar -xaf $i - done - cd qtbase-* - # This patch is often outdated but the fixes doesn't feel very important - patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff || true - for i in $qtPatches; do - patch -p1 < $i - done - ${qtbase.postPatch} - cd .. + cd out/Release - export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \ - -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ - -system-xkbcommon-x11 -no-eglfs -no-gtkstyle -static -nomake examples -nomake tests \ - -no-directfb -system-proxies -openssl-linked -dbus-linked -system-sqlite -verbose \ - ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \ - -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2" - export dontAddPrefix=1 - export MAKEFLAGS=-j$NIX_BUILD_CORES + NUM=$((`wc -l < CMakeLists.txt` - 2)) + sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt - ( cd qtbase-* - configurePhase - buildPhase - make install - ) - for i in $qtNames; do - ( cd $i-* - $QMAKE - buildPhase - make install - ) - done - ) + export ASM=$(type -p gcc) + ''; - ( cd Telegram/gyp - gyp "''${gypFlagsArray[@]}" --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake - ) - - ( cd out/Release - export ASM=$(type -p gcc) - cmake . - # For some reason, it can't find stdafx.h -- we need to build dependencies till it fails and then retry. - buildPhase || true - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -include stdafx.h" - buildPhase - ) - - install -Dm755 out/Release/Telegram $out/bin/telegram-desktop + installPhase = '' + install -Dm755 Telegram $out/bin/telegram-desktop mkdir -p $out/share/applications $out/share/kde4/services sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol for icon_size in 16 32 48 64 128 256 512; do - install -Dm644 "Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" + install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" done - - fixupPhase + wrapQtProgram $out/bin/telegram-desktop ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f1287a35767..50aa1b0e8afb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15614,7 +15614,7 @@ with pkgs; taskserver = callPackage ../servers/misc/taskserver { }; - tdesktop = qt56.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { inherit (pythonPackages) gyp; }; From 94c2f3e772cccdc681be720ffe95fc0483d7f9cf Mon Sep 17 00:00:00 2001 From: ndowens Date: Mon, 3 Apr 2017 09:48:52 -0500 Subject: [PATCH 108/172] jp2a: 1.0.6 -> 1.0.7 (#24579) --- pkgs/applications/misc/jp2a/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index e552ac9777f2..138ee397d3fd 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, libjpeg }: +{ stdenv, fetchFromGitHub, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.0.7"; name = "jp2a-${version}"; - src = fetchurl { - url = "mirror://sourceforge/jp2a/${name}.tar.gz"; - sha256 = "076frk3pa16s4r1b10zgy81vdlz0385zh3ykbnkaij25jn5aqc09"; + src = fetchFromGitHub { + owner = "cslarsen"; + repo = "jp2a"; + rev = "v${version}"; + sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql"; }; makeFlags = "PREFIX=$(out)"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libjpeg ]; meta = with stdenv.lib; { From e6faf2a4e6c9d079e9c04dc88988479a73a54b34 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Apr 2017 16:55:05 +0200 Subject: [PATCH 109/172] create-amis.sh: Use pv-grub-hd0_1.05 --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 1e397b0f1761..ac43d7dc31a2 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -206,7 +206,7 @@ for type in $types; do # Register the AMI. if [ $type = pv ]; then - kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.04-$arch.gz" | jq -r .Images[0].ImageId) + kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.05-$arch.gz" | jq -r .Images[0].ImageId) if [ "$kernel" = null ]; then break; fi echo "using PV-GRUB kernel $kernel" extraFlags+=" --virtualization-type paravirtual --kernel $kernel" From fbe6d23624b0b62cb5754d37ab81007cd4c035ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Apr 2017 17:03:49 +0200 Subject: [PATCH 110/172] EC2: Disable PV support Unfortunately, somewhere between 16.09 and 17.03, paravirtualized instances stopped working. They hang at the pv-grub prompt ("grubdom>"). I tried reverting to a 4.4 kernel, reverting kernel compression from xz to bzip2 (even though pv-grub is supposed to support xz), and reverting the only change to initrd generation (5a8147479e794d5932273d01790c3602b8abeedc). Nothing worked so I'm giving up. --- nixos/maintainers/scripts/ec2/create-amis.sh | 13 ++++++------- nixos/modules/virtualisation/amazon-options.nix | 8 +++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index ac43d7dc31a2..24ced8da531a 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -3,21 +3,20 @@ # To start with do: nix-shell -p awscli --run "aws configure" - +set -e set -o pipefail -#set -x - -stateDir=${TMPDIR:-/tmp}/ec2-image -echo "keeping state in $stateDir" -mkdir -p $stateDir version=$(nix-instantiate --eval --strict '' -A lib.nixpkgsVersion | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" +stateDir=/var/tmp/ec2-image-$version +echo "keeping state in $stateDir" +mkdir -p $stateDir + rm -f ec2-amis.nix -types="hvm pv" +types="hvm" stores="ebs s3" regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 34a50dcab16f..cba77d3edd1d 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -12,5 +12,11 @@ }; }; - config = {}; + config = { + assertions = [ + { assertion = config.ec2.hvm; + message = "Paravirtualized EC2 instances are no longer supported."; + } + ]; + }; } From 8cc3db6b671854b4433adf741f9b06931b7be1ce Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Apr 2017 17:46:15 +0200 Subject: [PATCH 111/172] Add 17.03 AMIs --- nixos/modules/virtualisation/ec2-amis.nix | 32 ++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index d592a23c303f..745518f85972 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -193,5 +193,35 @@ let self = { "16.09".us-west-2.pv-ebs = "ami-6d4af60d"; "16.09".us-west-2.pv-s3 = "ami-de48f4be"; - latest = self."16.09"; + # 17.03.885.6024dd4067 + "17.03".ap-northeast-1.hvm-ebs = "ami-dbd0f7bc"; + "17.03".ap-northeast-1.hvm-s3 = "ami-7cdff81b"; + "17.03".ap-northeast-2.hvm-ebs = "ami-c59a48ab"; + "17.03".ap-northeast-2.hvm-s3 = "ami-0b944665"; + "17.03".ap-south-1.hvm-ebs = "ami-4f413220"; + "17.03".ap-south-1.hvm-s3 = "ami-864033e9"; + "17.03".ap-southeast-1.hvm-ebs = "ami-e08c3383"; + "17.03".ap-southeast-1.hvm-s3 = "ami-c28f30a1"; + "17.03".ap-southeast-2.hvm-ebs = "ami-fca9a69f"; + "17.03".ap-southeast-2.hvm-s3 = "ami-3daaa55e"; + "17.03".ca-central-1.hvm-ebs = "ami-9b00bdff"; + "17.03".ca-central-1.hvm-s3 = "ami-e800bd8c"; + "17.03".eu-central-1.hvm-ebs = "ami-5450803b"; + "17.03".eu-central-1.hvm-s3 = "ami-6e2efe01"; + "17.03".eu-west-1.hvm-ebs = "ami-10754c76"; + "17.03".eu-west-1.hvm-s3 = "ami-11734a77"; + "17.03".eu-west-2.hvm-ebs = "ami-ff1d099b"; + "17.03".eu-west-2.hvm-s3 = "ami-fe1d099a"; + "17.03".sa-east-1.hvm-ebs = "ami-d95d3eb5"; + "17.03".sa-east-1.hvm-s3 = "ami-fca2c190"; + "17.03".us-east-1.hvm-ebs = "ami-0940c61f"; + "17.03".us-east-1.hvm-s3 = "ami-674fc971"; + "17.03".us-east-2.hvm-ebs = "ami-afc2e6ca"; + "17.03".us-east-2.hvm-s3 = "ami-a1cde9c4"; + "17.03".us-west-1.hvm-ebs = "ami-587b2138"; + "17.03".us-west-1.hvm-s3 = "ami-70411b10"; + "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; + "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; + + latest = self."17.03"; }; in self From 1bf690c1bb7bfc167d6ad78102a625320691e1ac Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 3 Apr 2017 18:30:49 +0100 Subject: [PATCH 112/172] iosevka: 1.11.4 -> 1.12.1 (#24527) iosevka: 1.11.4 -> 1.12.1 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index c8ce86b818bc..ac7dcea31b13 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "iosevka-${version}"; - version = "1.11.4"; + version = "1.12.1"; buildInputs = [ unzip ]; src = fetchurl { - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/01-iosevka-${version}.zip"; - sha256 = "0mn9pqkambsal5cvz8hzlwx7qvcdfch8g1iy7mqhgghzflfhsy8x"; + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; + sha256 = "1rwg06fbizf2cmjwysx4ciz96nh80k48drsyr3rshppycajnaahj"; }; sourceRoot = "."; From 75319eb2035e7c9ec0a8f45ab816dd34689fd77a Mon Sep 17 00:00:00 2001 From: Lprndn Date: Mon, 3 Apr 2017 11:04:04 +0200 Subject: [PATCH 113/172] nomacs: 3.4 -> 3.6.1 fixes #24589 --- pkgs/applications/graphics/nomacs/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 0f0e0984a873..669e46c6a842 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,19 +18,19 @@ }: stdenv.mkDerivation rec { - version = "3.4"; + version = "3.6.1"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; - rev = "3.4"; - sha256 = "1l7q85dsiss0ix25niybj27zx1ssd439mwj449rxixa351cg1r2z"; + rev = version; + sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; }; name = "nomacs-${version}"; enableParallelBuilding = true; - sourceRoot = "${name}/ImageLounge"; + sourceRoot = "${name}-src/ImageLounge"; patches = [./fix-appdata-install.patch]; @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { quazip gsettings_desktop_schemas]; - cmakeFlags = ["-DENABLE_OPENCV=ON" "-DENABLE_RAW=ON" "-DENABLE_TIFF=ON" From bc45ee50c4f043bea57422e94a92e79fd07eb379 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 3 Apr 2017 15:23:18 -0400 Subject: [PATCH 114/172] ruby: 2.4.0 -> 2.4.1 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 8 ++++---- pkgs/development/interpreters/ruby/rvm-patchsets.nix | 6 +++--- pkgs/top-level/all-packages.nix | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 98be02da3b26..6818a7271558 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -212,11 +212,11 @@ in { }; }; - ruby_2_4_0 = generic { - version = rubyVersion "2" "4" "0" ""; + ruby_2_4_1 = generic { + version = rubyVersion "2" "4" "1" ""; sha256 = { - src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm"; - git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3"; + src = "0l0201fqwzwygnrgxay469gbb2w865bnqckq00x3prdmbh6y2c53"; + git = "1gjn31ymypzzcwkrjx62hqw59fywz1x3cyvmi1f2yb9bwb3659ss"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index f1b82210aec2..f8326ed325cc 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -39,9 +39,9 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.0" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.4.1" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 51db26b78236..c60d6e3728d0 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -1,8 +1,8 @@ { fetchFromGitHub }: fetchFromGitHub { - owner = "manveru"; + owner = "skaes"; repo = "rvm-patchsets"; - rev = "46e04f230ce91a786f5e583389443efec0ecd594"; - sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693"; + rev = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94"; + sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50aa1b0e8afb..19a0c5cef0f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -741,7 +741,7 @@ with pkgs; catclock = callPackage ../applications/misc/catclock { }; cde = callPackage ../tools/package-management/cde { }; - + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; @@ -5331,7 +5331,7 @@ with pkgs; jdk = jdk8; jre = jre8; jre_headless = jre8_headless; - + openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { }; oraclejdk = pkgs.jdkdistro true false; @@ -6084,7 +6084,7 @@ with pkgs; ruby_2_1_10 ruby_2_2_5 ruby_2_3_3 - ruby_2_4_0; + ruby_2_4_1; # Ruby aliases ruby = ruby_2_3; @@ -6092,7 +6092,7 @@ with pkgs; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; ruby_2_3 = ruby_2_3_3; - ruby_2_4 = ruby_2_4_0; + ruby_2_4 = ruby_2_4_1; scsh = callPackage ../development/interpreters/scsh { }; From 482566939edc8130b60fe32a66f47556ffc7bec8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 3 Apr 2017 15:28:38 -0400 Subject: [PATCH 115/172] ruby: 2.3.3 -> 2.3.4 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 7 +------ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 6818a7271558..906328eb458f 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -204,11 +204,11 @@ in { }; }; - ruby_2_3_3 = generic { - version = rubyVersion "2" "3" "3" ""; + ruby_2_3_4 = generic { + version = rubyVersion "2" "3" "4" ""; sha256 = { - src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514"; - git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; + src = "1hy0zr4vwkqcjbykh2hp0d6ifkrhgskaxlzy6878sc9kr4bqzqcq"; + git = "0jjhgdjv3aayxb0flxjiny7xfzh3ggrqcpvgjv2ydm25padfbqmp"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index f8326ed325cc..b67c102628a4 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -29,12 +29,7 @@ rec { "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.1" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; - "2.3.3" = ops useRailsExpress [ + "2.3.4" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19a0c5cef0f4..00fa8b5dbc03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6083,7 +6083,7 @@ with pkgs; ruby_2_0_0 ruby_2_1_10 ruby_2_2_5 - ruby_2_3_3 + ruby_2_3_4 ruby_2_4_1; # Ruby aliases @@ -6091,7 +6091,7 @@ with pkgs; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; - ruby_2_3 = ruby_2_3_3; + ruby_2_3 = ruby_2_3_4; ruby_2_4 = ruby_2_4_1; scsh = callPackage ../development/interpreters/scsh { }; From ec2c46923078ceda67f944ae09bcb4d435d45ce5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 3 Apr 2017 15:33:26 -0400 Subject: [PATCH 116/172] ruby: 2.2.5 -> 2.2.7 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 906328eb458f..52cae9bb64e6 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -196,11 +196,11 @@ in { }; }; - ruby_2_2_5 = generic { - version = rubyVersion "2" "2" "5" ""; + ruby_2_2_7 = generic { + version = rubyVersion "2" "2" "7" ""; sha256 = { - src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h"; - git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2"; + src = "199xz5bvmp26c7vyzw47cpxkd8jk826kc8nlpavqzj5vqp388h9p"; + git = "0i0nsm9ldjp39m9xq47v8w6wlg821ikczz530493cs150qkqa0a1"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index b67c102628a4..f6ecb7c8e285 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,10 +24,10 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.5" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.2.7" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; "2.3.4" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00fa8b5dbc03..272c31641f5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6082,7 +6082,7 @@ with pkgs; inherit (callPackage ../development/interpreters/ruby {}) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_5 + ruby_2_2_7 ruby_2_3_4 ruby_2_4_1; @@ -6090,7 +6090,7 @@ with pkgs; ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_5; + ruby_2_2 = ruby_2_2_7; ruby_2_3 = ruby_2_3_4; ruby_2_4 = ruby_2_4_1; From 3535a6bf3c25bf2893c070a8a0cb60445e02ea0e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 3 Apr 2017 15:40:26 -0400 Subject: [PATCH 117/172] ruby: 2.0.0-p647 -> 2.0.0-p648 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 52cae9bb64e6..a552b2719bb2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -181,10 +181,10 @@ let in { ruby_2_0_0 = generic { - version = rubyVersion "2" "0" "0" "p647"; + version = rubyVersion "2" "0" "0" "p648"; sha256 = { - src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8"; - git = "186pf4q9xymzn4zn1sjppl1skrl5f0159ixz5cz8g72dmmynq3g3"; + src = "1y3n4c6xw2wki7pyjpq5zpbgxnw5i3jc8mcpj6rk7hs995mvv446"; + git = "0ncjfq4hfqj9kcr8pbll6kypwnmcgs8w7l4466qqfyv7jj3yjd76"; }; }; From d5a623cb39ee33ddb9589abe6bc640315437258f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 3 Apr 2017 22:54:34 +0200 Subject: [PATCH 118/172] Update 17.03 release notes --- nixos/doc/manual/release-notes/rl-1703.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 639b23b229b6..28c573e6d231 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -501,6 +501,14 @@ following incompatible changes: necessary to pull in all of bind to use them. + + + + Per-user configuration was moved from ~/.nixpkgs to + ~/.config/nixpkgs. The former is still valid for + config.nix for backwards compatibility. + + From b03013cb326f3b6a274ad1d60e2c5f26b077a335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 4 Apr 2017 00:13:15 +0200 Subject: [PATCH 119/172] Fix consul version being "unknown-unknown". Fixes #24606. See https://github.com/hashicorp/consul/blob/v0.7.5/scripts/build.sh#L44 for how consul's build script does it. --- pkgs/servers/consul/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 41a0bea1cddb..cc566e712c29 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -17,6 +17,10 @@ buildGoPackage rec { # Keep consul.ui for backward compatability passthru.ui = consul-ui; + preBuild = '' + buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + ''; + meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = "https://www.consul.io/"; From 9497da7e2352d5d3133b16a7a7322702833211d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 4 Apr 2017 09:34:20 +0200 Subject: [PATCH 120/172] palemoon: switch to gcc-4.9 Upstream recommends that due to stability problems. I tested it builds and starts. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61e884366aa2..4a2db8227f4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14898,7 +14898,10 @@ with pkgs; osmo = callPackage ../applications/office/osmo { }; - palemoon = callPackage ../applications/networking/browsers/palemoon { }; + palemoon = callPackage ../applications/networking/browsers/palemoon { + # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146 + stdenv = overrideCC stdenv gcc49; + }; pamix = callPackage ../applications/audio/pamix { }; From d3fff80d00952dd5a187350c4e49d6971168521e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2017 11:00:38 +0200 Subject: [PATCH 121/172] exa: unstable-2016-04-20 -> unstable-2017-04-02 (unbrick) cc @ehegnes --- pkgs/tools/misc/exa/default.nix | 48 +++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index d26eb8f45aea..c49f11a72a9e 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,28 +1,55 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }: with rustPlatform; -buildRustPackage rec { - name = "exa-${version}"; - version = "2016-04-20"; +let + # check for updates + zoneinfo_compiled = fetchFromGitHub { + owner = "rust-datetime"; + repo = "zoneinfo-compiled"; + rev = "f56921ea5e9f7cf065b1480ff270a1757c1f742f"; + sha256 = "1xmw7c5f5n45lkxnyxp4llfv1bnqhc876w98165ccdbbiylfkw26"; + }; + cargoPatch = '' + # use non-git dependencies + patch -p1 < Date: Tue, 4 Apr 2017 12:03:21 +0200 Subject: [PATCH 122/172] Revert "EC2: Disable PV support" This reverts commit fbe6d23624b0b62cb5754d37ab81007cd4c035ab. this breaks every non-ec2 (non-hvm) system cc @edolstra --- nixos/maintainers/scripts/ec2/create-amis.sh | 13 +++++++------ nixos/modules/virtualisation/amazon-options.nix | 8 +------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 24ced8da531a..ac43d7dc31a2 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -3,20 +3,21 @@ # To start with do: nix-shell -p awscli --run "aws configure" -set -e + set -o pipefail +#set -x + +stateDir=${TMPDIR:-/tmp}/ec2-image +echo "keeping state in $stateDir" +mkdir -p $stateDir version=$(nix-instantiate --eval --strict '' -A lib.nixpkgsVersion | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" -stateDir=/var/tmp/ec2-image-$version -echo "keeping state in $stateDir" -mkdir -p $stateDir - rm -f ec2-amis.nix -types="hvm" +types="hvm pv" stores="ebs s3" regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index cba77d3edd1d..34a50dcab16f 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -12,11 +12,5 @@ }; }; - config = { - assertions = [ - { assertion = config.ec2.hvm; - message = "Paravirtualized EC2 instances are no longer supported."; - } - ]; - }; + config = {}; } From 7d211be459ae80fca55c7eb50d79b5c6a7f9a9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2017 11:38:05 +0200 Subject: [PATCH 123/172] rustPackages: build less verbose --- pkgs/top-level/rust-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index fea4e7c9160b..1bebf222ac5e 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -44,7 +44,7 @@ runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" { inherit src $git config --local user.email "example@example.com" $git config --local user.name "example" $git add . - $git commit -m 'Rust registry commit' + $git commit --quiet -m 'Rust registry commit' touch $out/touch . "$out/.cargo-index-lock" '' From bb1e6557da293d6a7c9f868cb850afdbe2ba09d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 30 Mar 2017 14:48:05 +0200 Subject: [PATCH 124/172] sysdig: 1.15.0 -> 1.15.1 --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index b23da5451d1c..185d54b420bb 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,7 +3,7 @@ let inherit (stdenv.lib) optional optionalString; baseName = "sysdig"; - version = "0.15.0"; + version = "0.15.1"; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2"; + sha256 = "0x1ssgrw8n563fk4vb9f2f27yjgv2c05xmpkc8p78l4hv8alwh2b"; }; buildInputs = [ From 279565c3d623e16aff3233c7489d22d655adf773 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Apr 2017 13:03:05 +0200 Subject: [PATCH 125/172] Revert "Revert "EC2: Disable PV support"" This reverts commit 71710fd099ce6c46b54f05c6cf769e73cf11d49f. --- nixos/maintainers/scripts/ec2/create-amis.sh | 13 ++++++------- nixos/modules/virtualisation/amazon-options.nix | 8 +++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index ac43d7dc31a2..24ced8da531a 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -3,21 +3,20 @@ # To start with do: nix-shell -p awscli --run "aws configure" - +set -e set -o pipefail -#set -x - -stateDir=${TMPDIR:-/tmp}/ec2-image -echo "keeping state in $stateDir" -mkdir -p $stateDir version=$(nix-instantiate --eval --strict '' -A lib.nixpkgsVersion | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" +stateDir=/var/tmp/ec2-image-$version +echo "keeping state in $stateDir" +mkdir -p $stateDir + rm -f ec2-amis.nix -types="hvm pv" +types="hvm" stores="ebs s3" regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 34a50dcab16f..cba77d3edd1d 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -12,5 +12,11 @@ }; }; - config = {}; + config = { + assertions = [ + { assertion = config.ec2.hvm; + message = "Paravirtualized EC2 instances are no longer supported."; + } + ]; + }; } From 35dbcbb2960cd5a310638183cf75a7874c57e373 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Apr 2017 13:07:15 +0200 Subject: [PATCH 126/172] Fix eval error due to config.ec2.hvm --- nixos/modules/virtualisation/amazon-image.nix | 6 ++++++ nixos/modules/virtualisation/amazon-options.nix | 10 +--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 80e481d79b9e..3e47710361a8 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -15,6 +15,12 @@ let cfg = config.ec2; in config = { + assertions = [ + { assertion = cfg.hvm; + message = "Paravirtualized EC2 instances are no longer supported."; + } + ]; + virtualisation.growPartition = cfg.hvm; fileSystems."/" = { diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index cba77d3edd1d..349fd3adfc96 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -3,7 +3,7 @@ options = { ec2 = { hvm = lib.mkOption { - default = false; + default = lib.versionAtLeast config.system.stateVersion "17.03"; internal = true; description = '' Whether the EC2 instance is a HVM instance. @@ -11,12 +11,4 @@ }; }; }; - - config = { - assertions = [ - { assertion = config.ec2.hvm; - message = "Paravirtualized EC2 instances are no longer supported."; - } - ]; - }; } From 3a9c217804688668404ebfe9a199e6e85297a3a7 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 4 Apr 2017 08:07:52 -0400 Subject: [PATCH 127/172] rtags: fix for clang/libc++ 4 This also fixes a missing header in the SDK that rtags needs to work properly. The underlying cause is that C++ headers got shuffled around a lot in libc++ 3.8 (I believe) and became more standards-compliant, which led to a lot of C-compatible passthrough header files being added to it like math.h, which defines some C++-compatible versions of standard functions like signbit, while #include_next'ing the system math.h. In this case, including the SDK was stuffing another math.h in front of the libc++ shim, which led to all sorts of mysterious failures. --- pkgs/development/tools/rtags/default.nix | 12 ++++-------- pkgs/os-specific/darwin/apple-sdk/default.nix | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 44f922906e89..4f396e26bf94 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -5,15 +5,11 @@ stdenv.mkDerivation rec { version = "2.8-p1"; buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] - ++ lib.optionals stdenv.isDarwin [ apple_sdk.sdk apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; preConfigure = '' export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \ - LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \ - - '' + lib.optionalString stdenv.isDarwin '' - export CXXFLAGS="-isysroot ${apple_sdk.sdk}/" \ - MACOSX_DEPLOYMENT_TARGET="10.9" + LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" ''; src = fetchgit { @@ -24,11 +20,11 @@ stdenv.mkDerivation rec { sha256 = "0g9sgc763c5d695hjffhis19sbaqk8z4884szljf7kbrjxl17y78"; }; + enableParallelBuilding = true; + meta = { description = "C/C++ client-server indexer based on clang"; - homepage = https://github.com/andersbakken/rtags; - license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.allBut [ "i686-linux" ]; }; diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 536e62f777e2..73126ce1f5c1 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -157,6 +157,7 @@ in rec { mkdir -p $out/include pushd $out/include >/dev/null ln -s "${sdk}/include/xpc" + ln -s "${sdk}/include/launch.h" popd >/dev/null ''; }; From 01dbf03628fbddff46b60354407d23497c25a566 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Apr 2017 14:18:49 +0200 Subject: [PATCH 128/172] network-link-*.service: Set stopIfChanged = false This reduces the time window during which IP addresses are gone during switch-to-configuration. A complication is that with stopIfChanged = true, preStop would try to delete the *new* IP addresses rather than the old one (since the preStop script now runs after the switch to the new configuration). So we now record the actually configured addresses in /run/nixos/network/addresses/. This is more robust in any case. Issue https://github.com/NixOS/nixops/issues/640. --- nixos/modules/security/polkit.nix | 2 +- .../tasks/network-interfaces-scripted.nix | 31 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 8d9d53480630..7e59408a5b0b 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -64,7 +64,7 @@ in systemd.packages = [ pkgs.polkit.out ]; systemd.services.polkit.restartTriggers = [ config.system.path ]; - systemd.services.polkit.unitConfig.X-StopIfChanged = false; + systemd.services.polkit.stopIfChanged = false; # The polkit daemon reads action/rule files environment.pathsToLink = [ "/share/polkit-1" ]; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index f30906b84a24..720891d518a7 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -159,35 +159,42 @@ let after = [ "network-pre.target" ] ++ (deviceDependency i.name); serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; + # Restart rather than stop+start this unit to prevent the + # network from dying during switch-to-configuration. + stopIfChanged = false; path = [ pkgs.iproute ]; script = '' + # FIXME: shouldn't this be done in network-link? echo "bringing up interface..." ip link set "${i.name}" up - restart_network_interfaces=false + state="/run/nixos/network/addresses/${i.name}" + + mkdir -p $(dirname "$state") + '' + flip concatMapStrings (ips) (ip: let address = "${ip.address}/${toString ip.prefixLength}"; in '' - echo "checking ip ${address}..." + echo "${address}" >> $state if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then - echo "added ip ${address}..." + echo "added ip ${address}" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then echo "failed to add ${address}" exit 1 fi ''); - preStop = flip concatMapStrings (ips) (ip: - let - address = "${ip.address}/${toString ip.prefixLength}"; - in - '' - echo -n "deleting ${address}..." - ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" - echo "" - ''); + preStop = '' + state="/run/nixos/network/addresses/${i.name}" + while read address; do + echo -n "deleting $address..." + ip addr del "$address" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" + echo "" + done < "$state" + rm -f "$state" + ''; }; createTunDevice = i: nameValuePair "${i.name}-netdev" From fccce068c397ff2e97a686babbb9604e4e88c20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2017 11:38:47 +0200 Subject: [PATCH 129/172] baobab: remove superflous gsettings_desktop_schemas --- .../gnome-3/3.22/core/baobab/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix index f7a0ff473cc1..15db270e80c5 100644 --- a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, vala_0_32, libgtop +{ stdenv, intltool, fetchurl, vala, libgtop , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 +, bash, wrapGAppsHook, itstool, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { @@ -10,17 +10,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - preFixup = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 + wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Baobab; From e0160f70daf9f8ec7a42166fb5e43e1e7d252c29 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Apr 2017 12:59:00 +0200 Subject: [PATCH 130/172] LTS Haskell 8.8 --- .../configuration-hackage2nix.yaml | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 91460eb4019c..fb9efff32243 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: default-package-overrides: - store < 0.4.1 # https://github.com/fpco/store/issues/104 - # LTS Haskell 8.6 + # LTS Haskell 8.8 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -371,7 +371,7 @@ default-package-overrides: - cmark ==0.5.5.1 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.16 + - cmdargs ==0.10.17 - code-builder ==0.1.3 - code-page ==0.1.3 - codo-notation ==0.5.2 @@ -666,6 +666,7 @@ default-package-overrides: - format-numbers ==0.1.0.0 - formatting ==6.2.4 - fortran-src ==0.1.0.4 + - foundation ==0.0.4 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 @@ -695,7 +696,7 @@ default-package-overrides: - getopt-generics ==0.13 - ghc-events ==0.4.4.0 - ghc-exactprint ==0.5.3.0 - - ghc-heap-view ==0.5.7 + - ghc-heap-view ==0.5.9 - ghc-mod ==5.7.0.0 - ghc-paths ==0.1.0.9 - ghc-prof ==1.3.0.2 @@ -708,7 +709,7 @@ default-package-overrides: - ghcjs-base-stub ==0.1.0.2 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 - - ghcjs-perch ==0.3.3.1 + - ghcjs-perch ==0.3.3.2 - gi-atk ==2.0.11 - gi-cairo ==1.0.11 - gi-gdk ==3.0.11 @@ -897,10 +898,10 @@ default-package-overrides: - hashable ==1.2.6.0 - hashable-time ==0.2 - hashmap ==1.3.2 - - hashtables ==1.2.1.0 + - hashtables ==1.2.1.1 - haskeline ==0.7.3.1 - - haskell-gi ==0.20 - - haskell-gi-base ==0.20 + - haskell-gi ==0.20.1 + - haskell-gi-base ==0.20.1 - haskell-import-graph ==1.0.1 - haskell-lexer ==1.0.1 - haskell-names ==0.8.0 @@ -957,6 +958,7 @@ default-package-overrides: - hfsevents ==0.1.6 - hid ==0.2.2 - hidapi ==0.1.4 + - hidden-char ==0.1.0.0 - hierarchical-clustering ==0.4.6 - highjson ==0.4.0.0 - highjson-swagger ==0.4.0.0 @@ -1097,7 +1099,8 @@ default-package-overrides: - hyphenation ==0.6 - ical ==0.0.1 - iconv ==0.4.1.3 - - identicon ==0.2.0 + - identicon ==0.2.1 + - idris ==1.0 - ieee754 ==0.8.0 - if ==0.1.0.0 - IfElse ==0.85 @@ -1224,6 +1227,7 @@ default-package-overrides: - leveldb-haskell ==0.6.4 - lexer-applicative ==2.1.0.1 - lhs2tex ==1.19 + - libffi ==0.1 - libgit ==0.3.1 - libinfluxdb ==0.0.4 - libmpd ==0.9.0.6 @@ -1291,7 +1295,7 @@ default-package-overrides: - median-stream ==0.7.0.0 - mega-sdist ==0.3.0.2 - megaparsec ==5.2.0 - - memory ==0.14.2 + - memory ==0.14.3 - MemoTrie ==0.6.7 - mersenne-random ==1.0.0.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1327,7 +1331,7 @@ default-package-overrides: - monad-extras ==0.6.0 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - - monad-logger ==0.3.21 + - monad-logger ==0.3.22 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.3.0 @@ -1371,7 +1375,7 @@ default-package-overrides: - multistate ==0.7.1.1 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.2.4 - - mustache ==2.1.2 + - mustache ==2.1.3 - mutable-containers ==0.3.3 - mwc-probability ==1.3.0 - mwc-random ==0.13.5.0 @@ -1567,6 +1571,7 @@ default-package-overrides: - prelude-safeenum ==0.1.1.2 - preprocessor-tools ==1.0.1 - presburger ==1.3.1 + - present ==4.1.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - pretty-show ==1.6.12 @@ -1587,7 +1592,7 @@ default-package-overrides: - prometheus-metrics-ghc ==0.1.0.1 - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - - protobuf-simple ==0.1.0.2 + - protobuf-simple ==0.1.0.3 - protocol-buffers ==2.4.0 - protocol-buffers-descriptor ==2.4.0 - protolude ==0.1.10 @@ -1725,7 +1730,7 @@ default-package-overrides: - scalpel ==0.5.0 - scalpel-core ==0.5.0 - scanner ==0.2 - - scientific ==0.3.4.10 + - scientific ==0.3.4.11 - scotty ==0.11.0 - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 @@ -1867,7 +1872,7 @@ default-package-overrides: - storable-record ==0.0.3.1 - store-core ==0.4 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.4.1 + - stratosphere ==0.4.2 - streaming ==0.1.4.5 - streaming-bytestring ==0.1.4.6 - streaming-commons ==0.1.17 @@ -1935,11 +1940,11 @@ default-package-overrides: - tasty-program ==1.0.5 - tasty-quickcheck ==0.8.4 - tasty-rerun ==1.1.6 - - tasty-silver ==3.1.9 + - tasty-silver ==3.1.10 - tasty-smallcheck ==0.8.1 - tasty-stats ==0.2.0.2 - tasty-tap ==0.0.4 - - tasty-th ==0.1.4 + - tasty-th ==0.1.5 - Taxonomy ==1.0.2 - TCache ==0.12.1 - tce-conf ==1.3 @@ -2054,7 +2059,7 @@ default-package-overrides: - uglymemo ==0.1.0.1 - unbound ==0.5.1 - unbound-generics ==0.3.1 - - unbounded-delays ==0.1.0.9 + - unbounded-delays ==0.1.0.10 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - unicode-show ==0.1.0.2 @@ -2138,7 +2143,7 @@ default-package-overrides: - wai-middleware-consul ==0.1.0.2 - wai-middleware-content-type ==0.5.0.1 - wai-middleware-crowd ==0.1.4.2 - - wai-middleware-metrics ==0.2.3 + - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.1.0.1 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.1.0 @@ -2168,7 +2173,7 @@ default-package-overrides: - webdriver-angular ==0.1.11 - webkitgtk3 ==0.14.2.1 - webkitgtk3-javascriptcore ==0.14.2.1 - - webpage ==0.0.4 + - webpage ==0.0.5 - webrtc-vad ==0.1.0.3 - websockets ==0.10.0.0 - websockets-snap ==0.10.2.0 @@ -2203,7 +2208,7 @@ default-package-overrides: - writer-cps-full ==0.1.0.0 - writer-cps-lens ==0.1.0.1 - writer-cps-morph ==0.1.0.2 - - writer-cps-mtl ==0.1.1.2 + - writer-cps-mtl ==0.1.1.3 - writer-cps-transformers ==0.1.1.2 - wuss ==1.1.3 - X11 ==1.8 @@ -2281,7 +2286,7 @@ default-package-overrides: - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.9 + - zip ==0.1.10 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 From 4f62f342f6e7a505e659d86792d7e7ad2d8d6b89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Apr 2017 12:56:25 +0200 Subject: [PATCH 131/172] hackage2nix: disable Hydra builds for accelerate-* packages with unfree license --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fb9efff32243..2e0b75ce56fe 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2414,12 +2414,14 @@ dont-distribute-packages: shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ] # these packages depend on software with an unfree license + accelerate-bignum: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cufft: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-llvm-ptx: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-yices: [ i686-linux, x86_64-linux, x86_64-darwin ] ccelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] From b232d2f4e4cf1ebb1f3dc5d58cf11a7d6c71d9a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Mar 2017 09:44:31 +0200 Subject: [PATCH 132/172] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.1.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f68bd6983705d5dbc2ad701dd90f45539cd0cef4. --- .../haskell-modules/hackage-packages.nix | 1685 +++++++++++++---- 1 file changed, 1360 insertions(+), 325 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e709108e9d86..509f6449e02b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1807,6 +1807,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Blogdown" = callPackage + ({ mkDerivation, base, containers, MissingH, parsec }: + mkDerivation { + pname = "Blogdown"; + version = "0.1.0"; + sha256 = "e4485ea5f4b61b5887b930e23f7a3d0a1ed0068070c18aceff511ab980bd5532"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers MissingH parsec ]; + executableHaskellDepends = [ base containers MissingH parsec ]; + testHaskellDepends = [ base containers MissingH parsec ]; + description = "A markdown-like markup language designed for blog posts"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "BluePrintCSS" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -3859,9 +3874,10 @@ self: { ({ mkDerivation, base, constraints, mtl, random }: mkDerivation { pname = "DeepDarkFantasy"; - version = "0.2017.3.28"; - sha256 = "e9dd1618c3e002cbf4fc6da18ad06202488b673b5d9e3ee5569830c5fc512f2d"; + version = "0.2017.4.1"; + sha256 = "01342b63961fc2916edebb8b4bc9bd63a1719608ac4c42f5cd700a7ef471dd77"; libraryHaskellDepends = [ base constraints mtl random ]; + testHaskellDepends = [ base constraints mtl random ]; description = "A DSL for creating neural network"; license = stdenv.lib.licenses.asl20; }) {}; @@ -9883,6 +9899,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_1_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "1.0.0"; + sha256 = "2ece595b6a29a58074e6459ab03f32aae2a90b475ce3d629ccdf71844f599da4"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/MichelBoucey/IPv6Addr"; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -18056,14 +18092,14 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_5_3_0" = callPackage + "Win32_2_5_4_1" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 , msimg32, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.5.3.0"; - sha256 = "fd66d7feafc7863cbd0726c8dbf605a007804e009fe4e5b5ebdf4f4727257c31"; + version = "2.5.4.1"; + sha256 = "cc183e9e545ad04fe8e509eb9447e9d11b160b2027482230cee8cdc141fd3d64"; libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm @@ -19138,6 +19174,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate_1_0_0_0" = callPackage + ({ mkDerivation, base, base-orphans, containers, deepseq, directory + , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables + , mtl, pretty, template-haskell, time, transformers, unique, unix + , unordered-containers + }: + mkDerivation { + pname = "accelerate"; + version = "1.0.0.0"; + sha256 = "26bd346b77852ebaeef32e18907272e7b0cc54b033a2fcc7f24ee1afa0e8f112"; + libraryHaskellDepends = [ + base base-orphans containers deepseq directory exceptions fclabels + filepath ghc-prim hashable hashtables mtl pretty template-haskell + time transformers unique unix unordered-containers + ]; + homepage = "https://github.com/AccelerateHS/accelerate/"; + description = "An embedded language for accelerated array processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-arithmetic" = callPackage ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck , utility-ht @@ -19158,6 +19215,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-bignum" = callPackage + ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion + , ghc-prim, llvm-hs-pure, mwc-random, tasty, tasty-quickcheck + , template-haskell, vector, vector-th-unbox, wide-word + }: + mkDerivation { + pname = "accelerate-bignum"; + version = "0.1.0.0"; + sha256 = "7c18c467d646ed30131ad197144c4f7fa6ce3e821d41c6db3dba4361f04e30a5"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx + base criterion mwc-random vector vector-th-unbox wide-word + ]; + homepage = "https://github.com/tmcdonell/accelerate-bignum"; + description = "Fixed-length large integer arithmetic for Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-cublas" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda , accelerate-io, accelerate-utility, base, cublas, cuda, random @@ -19185,18 +19270,20 @@ self: { "accelerate-cuda" = callPackage ({ mkDerivation, accelerate, array, base, binary, bytestring - , cryptohash, cuda, directory, fclabels, filepath, hashable - , hashtables, language-c-quote, mainland-pretty, mtl, old-time - , pretty, process, SafeSemaphore, srcloc, template-haskell, text - , transformers, unix, unordered-containers + , containers, cryptohash, cuda, directory, fclabels, filepath + , hashable, hashtables, language-c-quote, mainland-pretty, mtl + , old-time, pretty, process, SafeSemaphore, srcloc + , template-haskell, text, transformers, unix, unordered-containers }: mkDerivation { pname = "accelerate-cuda"; - version = "0.16.0.0"; - sha256 = "a5856713e24d2441823f3e53b7edaff3808b9757c687ca0c9fcf014a8001f7e5"; + version = "0.17.0.0"; + sha256 = "8bf1a11683db753961ce138aae1726f51aa93ff1bd29e9d30c0e53b60ad5b682"; + revision = "3"; + editedCabalFile = "7593f53c4d1e4851e226fef9f51b60b9addfc1cf7ed5f0f67eb2d3728e7f8013"; libraryHaskellDepends = [ - accelerate array base binary bytestring cryptohash cuda directory - fclabels filepath hashable hashtables language-c-quote + accelerate array base binary bytestring containers cryptohash cuda + directory fclabels filepath hashable hashtables language-c-quote mainland-pretty mtl old-time pretty process SafeSemaphore srcloc template-haskell text transformers unix unordered-containers ]; @@ -19227,37 +19314,37 @@ self: { }) {}; "accelerate-examples" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, accelerate-fft - , accelerate-io, ansi-wl-pprint, array, attoparsec, base, binary - , bmp, bytestring, bytestring-lexing, cereal, containers, criterion - , directory, ekg, fclabels, filepath, gloss, gloss-accelerate - , gloss-raster-accelerate, gloss-rendering, HUnit, mwc-random - , normaldistribution, primitive, QuickCheck, random, repa, repa-io - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-algorithms + ({ mkDerivation, accelerate, accelerate-fft, accelerate-io + , ansi-wl-pprint, array, base, binary, bmp, bytestring + , bytestring-lexing, cereal, colour-accelerate, containers + , criterion, directory, fclabels, filepath, gloss, gloss-accelerate + , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate + , linear, linear-accelerate, matrix-market-attoparsec, mwc-random + , normaldistribution, pipes, QuickCheck, random, repa, repa-io + , scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "0.15.1.0"; - sha256 = "2191601709da693aedb29f570e44b899b5132d2bc05fe618bc93608a43fec4a2"; - revision = "2"; - editedCabalFile = "bcebd104b948308a60f7f5ff63cdacb7e4b07d84be73fe3a83c5ef641a2b41f4"; + version = "1.0.0.0"; + sha256 = "a659dc486da23d220aeefac958008ae9c0a214570008bfa6eaccb6fc02ac05e9"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - accelerate accelerate-cuda ansi-wl-pprint base containers criterion - directory ekg fclabels HUnit mwc-random QuickCheck test-framework + accelerate ansi-wl-pprint base containers criterion directory + fclabels HUnit linear mwc-random QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; executableHaskellDepends = [ - accelerate accelerate-cuda accelerate-fft accelerate-io array - attoparsec base binary bmp bytestring bytestring-lexing cereal - containers criterion directory fclabels filepath gloss - gloss-accelerate gloss-raster-accelerate gloss-rendering HUnit - mwc-random normaldistribution primitive QuickCheck random repa - repa-io test-framework test-framework-hunit - test-framework-quickcheck2 vector vector-algorithms + accelerate accelerate-fft accelerate-io array base binary bmp + bytestring bytestring-lexing cereal colour-accelerate containers + criterion directory fclabels filepath gloss gloss-accelerate + gloss-raster-accelerate gloss-rendering HUnit lens-accelerate + linear-accelerate matrix-market-attoparsec mwc-random + normaldistribution pipes QuickCheck random repa repa-io scientific + test-framework test-framework-hunit test-framework-quickcheck2 + vector vector-algorithms ]; homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; @@ -19266,16 +19353,12 @@ self: { }) {}; "accelerate-fft" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, base, cuda, cufft }: + ({ mkDerivation, accelerate, base, bytestring }: mkDerivation { pname = "accelerate-fft"; - version = "0.15.1.0"; - sha256 = "fd2648931ce4607aba4ad527691a4bba0f043ea4182a160aa8f024152101a702"; - revision = "1"; - editedCabalFile = "c283fc3767bf4281da75b958ae0c8a404ba0e26f7c7b746158355e6824e2d22d"; - libraryHaskellDepends = [ - accelerate accelerate-cuda base cuda cufft - ]; + version = "1.0.0.0"; + sha256 = "784a486d36ac3af714952744f5f592242f11f477bdf8b336356857d593a584e3"; + libraryHaskellDepends = [ accelerate base bytestring ]; homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = stdenv.lib.licenses.bsd3; @@ -19352,8 +19435,8 @@ self: { }: mkDerivation { pname = "accelerate-io"; - version = "0.15.1.0"; - sha256 = "d531fc6c950a6fcf0bdd72c65438c27fbffe2f3043444128979490d53fc7677c"; + version = "1.0.0.0"; + sha256 = "d12b3b85b488a860bee0c4d54c98d22a327e3264f5e8d328109035162cc8b640"; libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; @@ -19363,6 +19446,67 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-llvm" = callPackage + ({ mkDerivation, abstract-deque, accelerate, base, chaselev-deque + , containers, data-default-class, dlist, exceptions, fclabels + , llvm-hs, llvm-hs-pure, mtl, mwc-random, unordered-containers + , vector + }: + mkDerivation { + pname = "accelerate-llvm"; + version = "1.0.0.0"; + sha256 = "b0ead40df7ff37ffd97374c5320c099cc85399af74e12b375dec46c172988ccf"; + revision = "6"; + editedCabalFile = "f9176273927c5a66cbd32d5039bd4d01ef33783fb5a8e7b24ec6f64da09e1ae6"; + libraryHaskellDepends = [ + abstract-deque accelerate base chaselev-deque containers + data-default-class dlist exceptions fclabels llvm-hs llvm-hs-pure + mtl mwc-random unordered-containers vector + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "accelerate-llvm-native" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, containers + , directory, dlist, fclabels, libffi, llvm-hs, llvm-hs-pure, mtl + , time + }: + mkDerivation { + pname = "accelerate-llvm-native"; + version = "1.0.0.0"; + sha256 = "2dca18b74e9eddb031d85bbf23a20dcdd0ee96a8b47b44ea2028e75fbabb0855"; + revision = "1"; + editedCabalFile = "6cc24adf5c991e7776a8ad0393bc7899caee5e431c8d90bccaf1f8610ae0811d"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base containers directory dlist fclabels + libffi llvm-hs llvm-hs-pure mtl time + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "accelerate-llvm-ptx" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , containers, cuda, directory, dlist, fclabels, filepath, hashable + , llvm-hs, llvm-hs-pure, mtl, pretty, time, unordered-containers + }: + mkDerivation { + pname = "accelerate-llvm-ptx"; + version = "1.0.0.0"; + sha256 = "4fae1fb91339ce1e989f9fc8063869e68eb3cf152d972ec1913d6f5f37d12d0e"; + revision = "1"; + editedCabalFile = "c9e468c5a8c75f231122ba116ae645734f13051ef0163fef2a47bd2ea0278592"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring containers cuda + directory dlist fclabels filepath hashable llvm-hs llvm-hs-pure mtl + pretty time unordered-containers + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-random" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -20473,6 +20617,8 @@ self: { pname = "aeson"; version = "1.0.2.1"; sha256 = "e0a66fba0a9996063d0e241b0b868c6271b6aeb457821a78bfcaac5d84c89066"; + revision = "1"; + editedCabalFile = "cf848d5d07a3e6962d7a274d452c772bc1c413a0f9f2d5f112fdde4556a7d7f1"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -20505,6 +20651,8 @@ self: { pname = "aeson"; version = "1.1.1.0"; sha256 = "083791ed61fd5d2ce613ba9d54dd37e598a376fab63c9df0abfaa69e802272d6"; + revision = "1"; + editedCabalFile = "fac1956736821af59480cc0adaa84f6c35f6a7678d4256a818f0a5d84a23aef1"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -27955,8 +28103,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5"; - revision = "7"; - editedCabalFile = "fb4e416f91c130daa956139b2d2cac7c92735879c699802e7f2acb0115eb671f"; + revision = "8"; + editedCabalFile = "02e4d9421b93aa3fe30c3b676ae1e7c5dca3a7b7d4c710b4f1a0925a071dca6c"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -27973,7 +28121,7 @@ self: { aeson base criterion mtl network-uri resource-pool rethinkdb-client-driver text ]; - description = "empty"; + description = "Server-side implementation of the Avers storage model"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -27986,6 +28134,8 @@ self: { pname = "avers-api"; version = "0.0.18.0"; sha256 = "b1ba2ad32420636bf298efa7d4ff42fda9501672306f04b11c91aee1fe7805c5"; + revision = "1"; + editedCabalFile = "1b4647c9b83c58c85eda00a185f366602084de4e1a75f47ad02fcb1789ecda7e"; libraryHaskellDepends = [ aeson avers base bytestring cookie http-api-data servant text time vector @@ -28004,6 +28154,8 @@ self: { pname = "avers-api-docs"; version = "0.0.18.0"; sha256 = "38a9f290cfd92ee922253337b30297dd5d3fa0db28c5aad5a0e6d01a205efca1"; + revision = "1"; + editedCabalFile = "23afde7dedb160851c8cb51c7d778d52bac33b38b01189d91d71a5d0db0b4512"; libraryHaskellDepends = [ aeson avers avers-api base cookie lens servant servant-swagger swagger2 text unordered-containers @@ -28025,6 +28177,8 @@ self: { pname = "avers-server"; version = "0.0.18.0"; sha256 = "44ea17fd5f2351ae0c63d630f3c4a4879541f47b63b57bd447683d4644901cf7"; + revision = "1"; + editedCabalFile = "e685f7dcb5c8a80b047f6974e51cc2edab7e0a98b260587a7c82627fb858f559"; libraryHaskellDepends = [ aeson avers avers-api base base64-bytestring bytestring bytestring-conversion containers cookie cryptonite either @@ -28713,8 +28867,8 @@ self: { }: mkDerivation { pname = "azubi"; - version = "0.2.0.1"; - sha256 = "9c772283727f23f433bb3617917ad7318c179a7e34b9bc890ab42ca20e9bd651"; + version = "0.2.0.2"; + sha256 = "5b5901feb57f59e518e53cc8d29863650c5bf34d83224aafc10895e5f8915602"; libraryHaskellDepends = [ base Diff directory filepath options process unix ]; @@ -30653,7 +30807,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary_0_8_4_1" = callPackage + "binary_0_8_5_1" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal , containers, criterion, deepseq, directory, filepath, HUnit, mtl , QuickCheck, random, tar, test-framework @@ -30661,35 +30815,8 @@ self: { }: mkDerivation { pname = "binary"; - version = "0.8.4.1"; - sha256 = "8d13c700fe96c84644a2af37003f488668fe9cd1f8e5b316fc929de26ce7e7ba"; - revision = "1"; - editedCabalFile = "56a00340fec65458e3c7cfe1d63651db09dd8d6ac925f843aefd2e98f4adbd50"; - libraryHaskellDepends = [ array base bytestring containers ]; - testHaskellDepends = [ - array base bytestring Cabal containers directory filepath HUnit - QuickCheck random test-framework test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - array attoparsec base bytestring Cabal cereal containers criterion - deepseq directory filepath mtl tar unordered-containers zlib - ]; - homepage = "https://github.com/kolmodin/binary"; - description = "Binary serialisation for Haskell values using lazy ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "binary_0_9_0_0" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal - , containers, criterion, deepseq, directory, filepath, HUnit, mtl - , QuickCheck, random, tar, test-framework - , test-framework-quickcheck2, unordered-containers, zlib - }: - mkDerivation { - pname = "binary"; - version = "0.9.0.0"; - sha256 = "881dc60e21685846e1f2e8e02e60b30db96da3763492c7f1009aaf7ab9768dea"; + version = "0.8.5.1"; + sha256 = "deb91a69662288f38bb62e04f2cedf8ef60d84437a194c778dacf6c31dfe0596"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -33876,8 +34003,8 @@ self: { }: mkDerivation { pname = "board-games"; - version = "0.1.0.5"; - sha256 = "b03ba53621f7ebd508d1f910f71492252a7181cc3485ecf7ae874eb634bd5d5e"; + version = "0.1.0.6"; + sha256 = "173e6eba0eddd3807d610c305f37f049fe5d2346e0772e186b3c2aced4043e63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33943,8 +34070,8 @@ self: { }: mkDerivation { pname = "bolt"; - version = "0.3.0.1"; - sha256 = "dd7f157db6fe2c6cac86a19803ac56ed132d8aa27f602a98e3506d2765b23ff9"; + version = "0.3.1.0"; + sha256 = "b08cbc39c38084e540c30052ac03fc764871650444024008f67d407002f57764"; libraryHaskellDepends = [ base bifunctors bytestring cereal containers hashable network network-uri scientific text transformers unordered-containers @@ -35912,6 +36039,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "c-mosquitto" = callPackage + ({ mkDerivation, base, bytestring, containers, inline-c, mosquitto + , options, primitive + }: + mkDerivation { + pname = "c-mosquitto"; + version = "0.1.0.0"; + sha256 = "f5ebcc828368ab3e76f45e64fc0266d8483f28f42cbcda911a22d6021204cd3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers inline-c primitive + ]; + librarySystemDepends = [ mosquitto ]; + executableHaskellDepends = [ base options ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/tolysz/c-mosquitto#readme"; + description = "Simpe mosquito MQTT binding able to work with the Amazons IoT"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) mosquitto;}; + "c-storable-deriving" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -36629,8 +36777,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.1.0.0"; - sha256 = "14181990a168231a74b5f277e33f55c3dce8b58e0cb9f7bd828cb06d82326eae"; + version = "0.1.1.0"; + sha256 = "aa33d57eb818ca5da4c1ebf96f12e6751c216b279ee6bffdaee09bfd9cf6ea69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38225,10 +38373,8 @@ self: { ({ mkDerivation, base, split }: mkDerivation { pname = "casing"; - version = "0.1.2.0"; - sha256 = "82fa20ff56d52349a9d0ee0c095f1aad384c8d5046a3563b956c4add841465a7"; - revision = "1"; - editedCabalFile = "fe967eec15b788744d08ffa34b33baa7e765764dcf2feb642c5985ca543dd804"; + version = "0.1.2.1"; + sha256 = "a8bff2e6ed42915a472fa6f62873d78f21c2d31390845a8d3b5ea2638101a638"; libraryHaskellDepends = [ base split ]; description = "Convert between various source code casing conventions"; license = stdenv.lib.licenses.mit; @@ -39498,8 +39644,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "charsetdetect"; - version = "1.0"; - sha256 = "f7d8e6a38572ed4e0789279ff9726a7a2b192e3f8c099cc54484c47acd1660f0"; + version = "1.1.0.2"; + sha256 = "5e8339ec02f13265016489141b69af373564edc7581ef46f8ae405b8a919d5e6"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://www.github.com/batterseapower/charsetdetect"; description = "Character set detection using Mozilla's Universal Character Set Detector"; @@ -39590,8 +39736,8 @@ self: { }: mkDerivation { pname = "chatter"; - version = "0.9.0.0"; - sha256 = "edf8212aeb172c7ba63be8d72eded4f7ca3eb0c29fbf78b134d7a9e64f989f5a"; + version = "0.9.1.0"; + sha256 = "c0bf8a15a71e935a83ae3b723a63ab81b13d59a1de1f9cd44c0a77e6a15852e0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41738,6 +41884,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cloudi" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , network, time, unix, zlib + }: + mkDerivation { + pname = "cloudi"; + version = "1.7.0"; + sha256 = "66d372c0fe9a19f465f6b40d43864e9a43195c5de99ab560f0b5bbb6f3978648"; + libraryHaskellDepends = [ + array base binary bytestring containers network time unix zlib + ]; + homepage = "https://github.com/CloudI/cloudi_api_haskell"; + description = "Haskell CloudI API"; + license = stdenv.lib.licenses.bsdOriginal; + }) {}; + "cloudyfs" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , datetime, filepath, HFuse, HTTP, regex-base, regex-tdfa, tagsoup @@ -42028,6 +42190,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmdargs_0_10_17" = callPackage + ({ mkDerivation, base, filepath, process, template-haskell + , transformers + }: + mkDerivation { + pname = "cmdargs"; + version = "0.10.17"; + sha256 = "3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath process template-haskell transformers + ]; + homepage = "https://github.com/ndmitchell/cmdargs#readme"; + description = "Command line argument processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmdargs-browser" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , http-types, process, text, transformers, wai, wai-handler-launch @@ -42760,6 +42941,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colour-accelerate" = callPackage + ({ mkDerivation, accelerate, base }: + mkDerivation { + pname = "colour-accelerate"; + version = "0.1.0.0"; + sha256 = "3292dae683026ae6890908a70363d80500f56c0f539c8571672e667623b08cb2"; + libraryHaskellDepends = [ accelerate base ]; + homepage = "https://github.com/tmcdonell/colour-accelerate"; + description = "Working with colours in Accelerate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "colour-space" = callPackage ({ mkDerivation, base, colour, constrained-categories, JuicyPixels , linear, linearmap-category, manifolds, semigroups, vector-space @@ -43429,10 +43622,10 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "complex-generic"; - version = "0.1.1"; - sha256 = "9422670fd08f3daaae823466398a9d4b9b2d8b4b9d568380833c5c391e679896"; + version = "0.1.1.1"; + sha256 = "1f535c9ab52930cfae7665b659713214af81ab6ffdfddb42c540bad8522a8b0f"; libraryHaskellDepends = [ base template-haskell ]; - homepage = "https://gitorious.org/complex-generic"; + homepage = "https://code.mathr.co.uk/complex-generic"; description = "complex numbers with non-mandatory RealFloat"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -45055,17 +45248,24 @@ self: { }) {}; "constrained-monads" = callPackage - ({ mkDerivation, base, containers, doctest, QuickCheck - , transformers + ({ mkDerivation, base, containers, criterion, deepseq, doctest + , free, nat-sized-numbers, QuickCheck, smallcheck, transformers + , vector }: mkDerivation { pname = "constrained-monads"; - version = "0.4.0.0"; - sha256 = "335432d74b02ada378b2815a57ba9b840fe24474e2d5c25fa2aac32c3a431cc1"; - libraryHaskellDepends = [ base containers transformers ]; + version = "0.5.0.0"; + sha256 = "8e618d145ec4d38c41446b56fdc4264d789bf3f9bc03e1db64827086ecdb07c0"; + libraryHaskellDepends = [ + base containers deepseq free transformers + ]; testHaskellDepends = [ base containers doctest QuickCheck transformers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq nat-sized-numbers QuickCheck + smallcheck transformers vector + ]; homepage = "https://github.com/oisdk/constrained-monads#readme"; description = "Typeclasses and instances for monads with constraints"; license = stdenv.lib.licenses.mit; @@ -45256,15 +45456,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_10_1" = callPackage + "containers_0_5_10_2" = callPackage ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq , ghc-prim, HUnit, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.10.1"; - sha256 = "fa74241147e58084fe2520a376349df114b8280ddcd9062ae351fed20946d347"; + version = "0.5.10.2"; + sha256 = "a04efef290be272cdeca1c36f9cff17271ccd8d2b484ebf152bb496fb5328c23"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -48575,6 +48775,8 @@ self: { pname = "cublas"; version = "0.2.1.0"; sha256 = "3c6031d2f7332a6a2357a1ec9adc4ba1404c5c05cb5a42193847ceac7652a80b"; + revision = "1"; + editedCabalFile = "2784c7237bd25f49735d8779ea8d3a57514b2418bfdeb2697bdd06e688acd9d7"; libraryHaskellDepends = [ base cuda filepath language-c storable-complex template-haskell ]; @@ -56769,6 +56971,18 @@ self: { license = "GPL"; }) {}; + "doublify-toolkit" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "doublify-toolkit"; + version = "0.0.1"; + sha256 = "dba394c7bf1d64898679a3b8108245abcf053fee439b8e4066ce2135f8592b52"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/doublifyapis/toolkit-haskell"; + description = "Doublify API toolkit for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "dove" = callPackage ({ mkDerivation, acl2, base }: mkDerivation { @@ -61152,6 +61366,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ether_0_4_1_0" = callPackage + ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl + , QuickCheck, tasty, tasty-quickcheck, template-haskell + , transformers, transformers-base, transformers-lift + }: + mkDerivation { + pname = "ether"; + version = "0.4.1.0"; + sha256 = "4790c6a8d2f81fcda1dd037bd89e4183d215417f0f3228b6f3dee5a2be139d30"; + libraryHaskellDepends = [ + base exceptions mmorph monad-control mtl template-haskell + transformers transformers-base transformers-lift + ]; + testHaskellDepends = [ + base mtl QuickCheck tasty tasty-quickcheck transformers + ]; + homepage = "https://int-index.github.io/ether/"; + description = "Monad transformers and classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ethereum-client-haskell" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, data-default @@ -61935,8 +62171,8 @@ self: { }: mkDerivation { pname = "exinst"; - version = "0.3.0.1"; - sha256 = "7a7351355ac5bf1f0bf1fb1028993399f7f644b661579a62bbc88853a55c796b"; + version = "0.4"; + sha256 = "49f2465086a7e0411d9bdfe5957e54e7bd85d873dc7e75d3447c7b2edf98ee58"; libraryHaskellDepends = [ aeson base binary bytes cereal constraints deepseq hashable profunctors QuickCheck singletons @@ -61947,7 +62183,7 @@ self: { tasty-quickcheck ]; homepage = "https://github.com/k0001/exinst"; - description = "Recover instances for your existential types"; + description = "Recover type indexes and instances for your existentialized types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -62944,8 +63180,8 @@ self: { }: mkDerivation { pname = "fast-tagsoup"; - version = "1.0.12"; - sha256 = "6447078da5a85c62528edab1a266ae8709811ba1d113f6dee1ec249e75e3904a"; + version = "1.0.13"; + sha256 = "250658a41dae37448ce938ef05f9eaa1d9083b4b6030de03df074d3e546a0986"; libraryHaskellDepends = [ base bytestring containers tagsoup text text-icu ]; @@ -66638,10 +66874,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.4"; - sha256 = "a86d2383d2be673593c4862ce082bb2662ce1e2f32d5187f351d47105b95921b"; - revision = "3"; - editedCabalFile = "bd8219e3179c900cc49b70d006c8844fcda618f33867d2e8b5679fed9afd360b"; + version = "0.0.5"; + sha256 = "d2822ebd4159ef2786909dee674397d675dcb710ee2b48a693d69a1ece30cf55"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -70325,6 +70559,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-heap-view_0_5_9" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-heap-view"; + version = "0.5.9"; + sha256 = "c631a30ed4dc3d6b53ffe1dbed7d2dc5799a362e6e490a7760ff2fd2b0df32af"; + libraryHaskellDepends = [ + base binary bytestring containers ghc template-haskell transformers + ]; + testHaskellDepends = [ base deepseq ]; + description = "Extract the heap representation of Haskell values and thunks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-imported-from" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils @@ -70593,14 +70844,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-prof_1_4_0" = callPackage + "ghc-prof_1_4_0_1" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, scientific, tasty, tasty-hunit, temporary, text, time }: mkDerivation { pname = "ghc-prof"; - version = "1.4.0"; - sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253"; + version = "1.4.0.1"; + sha256 = "af2e4919097e4bed023aefd9b10fb70ded3ea369e7457324e7ad7d2b96d809e0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71159,6 +71410,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-perch_0_3_3_2" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "ghcjs-perch"; + version = "0.3.3.2"; + sha256 = "a7cee1699b51af9e0aa62dec2ab4a04f68250106da02c77bed19dd69fae5e6d9"; + libraryHaskellDepends = [ base transformers ]; + description = "GHCJS version of Perch library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-promise" = callPackage ({ mkDerivation, base, ghcjs-base, protolude }: mkDerivation { @@ -71697,6 +71960,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libnotify;}; + "gi-ostree" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, ostree, text + , transformers + }: + mkDerivation { + pname = "gi-ostree"; + version = "1.0.1"; + sha256 = "de10141aad3fe918b337743231d86f2dd70e876e6e49de8f4d36ef700d241299"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ ostree ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "OSTree bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) ostree;}; + "gi-pango" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text @@ -72515,8 +72799,8 @@ self: { }: mkDerivation { pname = "gitHUD"; - version = "1.3.6"; - sha256 = "a522924926b65d19601726fb5fde020c0523f0b30c95d6bb1e0ba0d751da8a49"; + version = "1.3.7"; + sha256 = "dc38431b13d2dc4625987131c1389ed4ab67154990035c0c66f30d90d1a344af"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process text unix ]; @@ -73693,10 +73977,8 @@ self: { ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { pname = "gloss-accelerate"; - version = "1.9.0.0"; - sha256 = "3bf746a687ed23fbb19d6ac358cad52dfeb06301315ac4e69d221c6a5139798f"; - revision = "1"; - editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff"; + version = "0.2.0.0"; + sha256 = "5039b74bac0851ceaa7b971a5a50f1533c5e7d99594bc8030ee01c473f5875ae"; libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -73814,15 +74096,15 @@ self: { }) {}; "gloss-raster-accelerate" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, base, gloss + ({ mkDerivation, accelerate, base, colour-accelerate, gloss , gloss-accelerate }: mkDerivation { pname = "gloss-raster-accelerate"; - version = "1.9.0.0"; - sha256 = "288e1937da8a28e947bafd55624bffb469c84ef031b23b895589deac205ef24d"; + version = "0.2.0.0"; + sha256 = "d88c6dd639b86a451e77b5eae86fec785b476dd337bb189b82981bf33fe580fa"; libraryHaskellDepends = [ - accelerate accelerate-cuda base gloss gloss-accelerate + accelerate base colour-accelerate gloss gloss-accelerate ]; description = "Parallel rendering of raster images using Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -77092,8 +77374,8 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.2.0.0"; - sha256 = "73a2560c6fb927d689e826cbd4ec1aba6a9f35bb3ba0b66b0d693614bfc492b3"; + version = "0.3.0.0"; + sha256 = "11b543397fd2a414371b0ba795ae4f49ab29db318d1f154df1d4f6c9cebe39b2"; libraryHaskellDepends = [ aeson base google-static-maps http-client servant servant-client text @@ -77171,17 +77453,20 @@ self: { }) {}; "google-static-maps" = callPackage - ({ mkDerivation, aeson, base, bytedump, double-conversion - , http-client, JuicyPixels, network-uri, servant, servant-client - , servant-JuicyPixels, text + ({ mkDerivation, aeson, base, base64-bytestring, bytedump + , bytestring, cryptonite, double-conversion, http-client + , JuicyPixels, memory, MissingH, network-uri, servant + , servant-client, servant-JuicyPixels, text, utf8-string }: mkDerivation { pname = "google-static-maps"; - version = "0.3.0.0"; - sha256 = "4344c0b1470dd2025bae93a0a9e29c43826c00a16b618513515d696eab96c196"; + version = "0.4.0.0"; + sha256 = "015e9f538cac89c82eda25732905eefc7c31bda40d068da5e13b8d3402b03464"; libraryHaskellDepends = [ - aeson base bytedump double-conversion http-client JuicyPixels + aeson base base64-bytestring bytedump bytestring cryptonite + double-conversion http-client JuicyPixels memory MissingH network-uri servant servant-client servant-JuicyPixels text + utf8-string ]; homepage = "https://github.com/mpilgrem/google-static-maps#readme"; description = "Bindings to the Google Static Maps API"; @@ -82006,23 +82291,16 @@ self: { }) {}; "halma" = callPackage - ({ mkDerivation, async, base, containers, data-default - , diagrams-cairo, diagrams-gtk, diagrams-lib, grid, gtk, HUnit, mtl - , mvc, pipes, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, timeit + ({ mkDerivation, aeson, base, containers, data-default + , diagrams-lib, grid, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "halma"; - version = "0.2.0.1"; - sha256 = "4c1b2990d2cbe3b46f5895cf9db75aaabbdf3a9e31df09d3c9fc5528a36c6011"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "ce4af6881502d16e55be04ff055c79898885aed2e657c981633b3a14584cd542"; libraryHaskellDepends = [ - base containers data-default diagrams-lib grid - ]; - executableHaskellDepends = [ - async base data-default diagrams-cairo diagrams-gtk diagrams-lib - gtk mtl mvc pipes timeit + aeson base containers data-default diagrams-lib grid ]; testHaskellDepends = [ base containers grid HUnit QuickCheck test-framework @@ -82034,6 +82312,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "halma-gui" = callPackage + ({ mkDerivation, async, base, data-default, diagrams-cairo + , diagrams-gtk, diagrams-lib, gtk, halma, mtl, mvc, pipes, timeit + }: + mkDerivation { + pname = "halma-gui"; + version = "0.1.1.0"; + sha256 = "28c092d95859946c408bfec96a4794923802c8644b987d3fb7477504cb898861"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base data-default diagrams-cairo diagrams-gtk diagrams-lib + gtk halma mtl mvc pipes timeit + ]; + homepage = "https://github.com/timjb/halma"; + description = "GTK application for playing Halma"; + license = stdenv.lib.licenses.mit; + }) {}; + + "halma-telegram-bot" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , data-default, diagrams-cairo, diagrams-lib, directory, exceptions + , filepath, halma, http-client, http-client-tls, megaparsec, mtl + , optparse-applicative, semigroups, servant-client, telegram-api + , temporary, text, transformers, vector + }: + mkDerivation { + pname = "halma-telegram-bot"; + version = "0.1.0.0"; + sha256 = "0b7e311a1d86c7ccb8df208f985914e07c2f5df7f80ebcdbedd658cfb7afdcfa"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default + diagrams-cairo diagrams-lib directory exceptions filepath halma + http-client http-client-tls megaparsec mtl optparse-applicative + semigroups servant-client telegram-api temporary text transformers + vector + ]; + homepage = "https://github.com/timjb/halma"; + description = "Telegram bot for playing Halma"; + license = stdenv.lib.licenses.mit; + }) {}; + "haltavista" = callPackage ({ mkDerivation, base, hint, process }: mkDerivation { @@ -84613,14 +84935,14 @@ self: { "haskell-igraph" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs - , colour, data-default-class, hashable, hxt, igraph, primitive - , random, split, tasty, tasty-golden, tasty-hunit - , unordered-containers + , colour, 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.2.2"; - sha256 = "33673e6369f2b83c9103367af9b4050c3a6ed71ebbb3033a601a1e4c65f57a7d"; + version = "0.3.0"; + sha256 = "fb02f544b8ff98893bae89c72323dbb5ff49357e7c7b65f45eb11d26168517b4"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing colour data-default-class hashable hxt primitive split unordered-containers @@ -84628,7 +84950,7 @@ self: { librarySystemDepends = [ igraph ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base random tasty tasty-golden tasty-hunit + base data-ordlist matrices random tasty tasty-golden tasty-hunit ]; description = "Imcomplete igraph bindings"; license = stdenv.lib.licenses.mit; @@ -85171,8 +85493,8 @@ self: { ({ mkDerivation, base, doctest, lens, semigroups, text, time }: mkDerivation { pname = "haskell-time-range"; - version = "0.2.0.0"; - sha256 = "73c6258304465cd4e243287e7012a9630a6835025104414105c29c9e9f5503c7"; + version = "0.2.0.1"; + sha256 = "249315cc1167c23e9e50bdc61b5b2ddb062603616df0b2e575a6235516320ef6"; libraryHaskellDepends = [ base lens semigroups text time ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/mankyKitty/haskell-time-range#readme"; @@ -85222,6 +85544,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-ast_0_6_0_0" = callPackage + ({ mkDerivation, base, ghc, mtl, references, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "0.6.0.0"; + sha256 = "bb3669b5fb70875551a29efd781e58408c26107eb26f1a4b41d8123a9f7dd6a6"; + libraryHaskellDepends = [ + base ghc mtl references template-haskell uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -85295,6 +85634,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-backend-ghc_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "0.6.0.0"; + sha256 = "1bc88d278a314207ebe47cc8a85cebf6b6cd6d835f858e45be2d0cc663a40d96"; + libraryHaskellDepends = [ + base bytestring containers ghc haskell-tools-ast mtl references + safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, haskell-tools-ast @@ -85325,6 +85683,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-cli_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , directory, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl + , process, references, split, strict, tasty, tasty-hunit, time + }: + mkDerivation { + pname = "haskell-tools-cli"; + version = "0.6.0.0"; + sha256 = "fe6da0d9a8cfd42ff74579bbfe7d727a64f4e3b8b99770920877a0ddcee6d786"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath ghc ghc-paths haskell-tools-ast + haskell-tools-prettyprint haskell-tools-refactor mtl references + split strict + ]; + executableHaskellDepends = [ base directory process split ]; + testHaskellDepends = [ + base bytestring directory filepath knob tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion directory filepath knob split time + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Command-line frontend for Haskell-tools Refact"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -85353,6 +85741,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-daemon_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, Diff + , directory, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl + , network, process, references, split, strict, tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "0.6.0.0"; + sha256 = "25500cc2877eb692cb70905b8f52fc4934ead7030d1acad4165a663dc59e7545"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers Diff directory filepath ghc + ghc-paths haskell-tools-ast haskell-tools-prettyprint + haskell-tools-refactor mtl network process references split strict + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc HUnit network process + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools refactor that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-debug" = callPackage ({ mkDerivation, base, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -85375,6 +85791,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-debug_0_6_0_0" = callPackage + ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, references, template-haskell + }: + mkDerivation { + pname = "haskell-tools-debug"; + version = "0.6.0.0"; + sha256 = "e7c1d57bf0399e5421cff93a7873eb762fc428d0165a18512ef6a755b40f3a80"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-prettyprint + haskell-tools-refactor references template-haskell + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -85406,6 +85845,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-demo_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, http-types, HUnit, mtl, network + , references, tasty, tasty-hunit, transformers, wai, wai-websockets + , warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "0.6.0.0"; + sha256 = "d914bcd4e1e5eb9bee7dcb309847a075ee218c995bc1614bdf0f1ef7a10a1547"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor http-types mtl + references transformers wai wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-prettyprint" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, uniplate @@ -85423,6 +85893,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-prettyprint_0_6_0_0" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "0.6.0.0"; + sha256 = "3940d50675b96c29a45a8682effb22a65bf49711dc44deaafcf46272d1c821f8"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -85454,6 +85942,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-refactor_0_6_0_0" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "0.6.0.0"; + sha256 = "1a339d0571d78a94099cd442bf0865cb30df3b7054e7c75d7a5a20effbf94087"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-rewrite" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references @@ -85477,6 +85996,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-rewrite_0_6_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "0.6.0.0"; + sha256 = "3a328de2b8df98fdb7e10308daf31b3ca8be401ad8df3b26887f2035642705f7"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -90210,15 +90752,15 @@ self: { }) {}; "hgis" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, cairo - , Chart, Chart-cairo, Chart-diagrams, colour, composition + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart + , Chart-cairo, Chart-diagrams, colour, composition , data-binary-ieee754, data-default, directory, filepath, hspec , lens, monad-loops, optparse-applicative, transformers }: mkDerivation { pname = "hgis"; - version = "0.1.3.1"; - sha256 = "1616cb332092457e7649ea02687cfc7a5a7d777ac426207870a4df2afc32d6ab"; + version = "0.1.3.2"; + sha256 = "6fa441ccf23a2a867d24a3a229add55ce15d9ef95811e04f96e6882713824f0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90227,14 +90769,13 @@ self: { directory filepath lens monad-loops optparse-applicative transformers ]; - libraryPkgconfigDepends = [ cairo ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/vmchale/hgis#readme"; description = "Package and command-line for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo;}; + }) {}; "hgithub" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring @@ -90488,6 +91029,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {systemd = null;}; + "hidden-char" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "hidden-char"; + version = "0.1.0.0"; + sha256 = "805d8e7f4919f2b32374cf0074c3987831464a359be3b72f6b38509b58d7c9b7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/rcook/hidden-char#readme"; + description = "Provides getHiddenChar function"; + license = stdenv.lib.licenses.mit; + }) {}; + "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: mkDerivation { @@ -91804,49 +92358,47 @@ self: { "hledger" = callPackage ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers , criterion, csv, data-default, directory, file-embed, filepath - , hashable, haskeline, hledger-lib, html, HUnit, megaparsec, mtl - , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa - , safe, shakespeare, split, tabular, temporary, terminfo - , test-framework, test-framework-hunit, text, time, timeit - , transformers, unordered-containers, utf8-string, wizards + , hashable, haskeline, here, hledger-lib, html, HUnit, megaparsec + , mtl, mtl-compat, old-time, parsec, pretty-show, process + , regex-tdfa, safe, shakespeare, split, tabular, temporary + , terminfo, test-framework, test-framework-hunit, text, time + , timeit, transformers, unordered-containers, utf8-string, wizards }: mkDerivation { pname = "hledger"; - version = "1.1"; - sha256 = "b254b2a3918e047ca031f6dfafc42dd5fcb4b859157fae2d019dcd95262408e5"; - revision = "1"; - editedCabalFile = "d33edead74698ee1e7f3e5f167bfd8e32664d520df69092f5ac48f0816939aaf"; + version = "1.2"; + sha256 = "06f4bae5a49916e0291b1b6d6c2017794c98f14bb22ffa20c49e9650278247a2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath hashable haskeline hledger-lib HUnit - megaparsec mtl mtl-compat old-time pretty-show process regex-tdfa - safe shakespeare split tabular temporary terminfo text time - transformers unordered-containers utf8-string wizards + directory file-embed filepath hashable haskeline here hledger-lib + HUnit megaparsec mtl mtl-compat old-time pretty-show process + regex-tdfa safe shakespeare split tabular temporary terminfo text + time transformers unordered-containers utf8-string wizards ]; executableHaskellDepends = [ base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath haskeline hledger-lib HUnit mtl + directory file-embed filepath haskeline here hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time unordered-containers utf8-string wizards ]; testHaskellDepends = [ base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath haskeline hledger-lib HUnit mtl + directory file-embed filepath haskeline here hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework test-framework-hunit text time unordered-containers utf8-string wizards ]; benchmarkHaskellDepends = [ - base base-compat criterion directory file-embed filepath + base base-compat criterion directory file-embed filepath here hledger-lib html pretty-show process tabular temporary time timeit ]; homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -91858,8 +92410,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.1"; - sha256 = "182b8bdaf2b4b7d621a8570f0fa81a34de4f34f1a41f8dca6d60c05dd5701b1c"; + version = "1.2"; + sha256 = "98d3590c8ba7ea11f1d374b6dc0e26642b0d20ce091b83918d42118fd381425d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91869,7 +92421,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -91916,8 +92468,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.2"; - sha256 = "7ec0817c2c9c20c05c6496eca6264124139e7575e452ada5b1fd225c97533083"; + version = "1.2.1"; + sha256 = "bc2636fbdce63f62b29ef9cba4e876469b4a040b0b10d2d4575927ef186a591e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91979,35 +92531,31 @@ self: { ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring , cmdargs, containers, csv, data-default, Decimal, deepseq , directory, doctest, filepath, Glob, hashtables, HUnit, megaparsec - , mtl, mtl-compat, old-time, parsec, parsers, pretty-show - , regex-tdfa, safe, semigroups, split, system-filepath - , test-framework, test-framework-hunit, text, time, transformers - , trifecta, uglymemo, utf8-string + , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe + , semigroups, split, test-framework, test-framework-hunit, text + , time, transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.1"; - sha256 = "4142142fb92e6c1affc1420e3478449cf0d9d696ab05cc801338a562a5560556"; - revision = "1"; - editedCabalFile = "cf72c68e9c71bc059e7ea98e764837e649ec9ecda073ac936e5fb71e06115724"; + version = "1.2"; + sha256 = "2c7fd837b2a9596b4d6bd3e5f5b60918c697ebb411942f973b6bd4587042d797"; libraryHaskellDepends = [ array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory filepath hashtables - HUnit megaparsec mtl mtl-compat old-time parsec parsers pretty-show - regex-tdfa safe semigroups split system-filepath text time - transformers trifecta uglymemo utf8-string + HUnit megaparsec mtl mtl-compat old-time parsec pretty-show + regex-tdfa safe semigroups split text time transformers uglymemo + utf8-string ]; testHaskellDepends = [ array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory doctest filepath Glob - hashtables HUnit megaparsec mtl mtl-compat old-time parsec parsers - pretty-show regex-tdfa safe split system-filepath test-framework - test-framework-hunit text time transformers trifecta uglymemo - utf8-string + hashtables HUnit megaparsec mtl mtl-compat old-time parsec + pretty-show regex-tdfa safe split test-framework + test-framework-hunit text time transformers uglymemo utf8-string ]; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {}; "hledger-ui" = callPackage @@ -92019,10 +92567,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.1.2"; - sha256 = "5cc85502297f3ccf31990ebbe60178ee9f90ea434e86756f39e2848f0ae788d1"; - revision = "2"; - editedCabalFile = "b8f09f1a5411bec106f6f507a5d71eea67685f6271c716e390b4f6513c7acddd"; + version = "1.2"; + sha256 = "61e2aa3496a7f2898de3e487d9ee90d045e1c8851e74b3995ce37f332784b00a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92033,7 +92579,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -92067,10 +92613,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.1"; - sha256 = "da0c0c1096497737540efdc85cbb95cd01cbd48410491d8b2c26529b4151a2ca"; - revision = "1"; - editedCabalFile = "fbc15617f161701111b55e6d19f2fa0b4bac297c0db23194ca5c5d9d87a8301d"; + version = "1.2"; + sha256 = "a3a14ae8d0548aeb239768639afbfc0631aed4ff620720c28448d88d20eac5e6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92099,7 +92643,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -97405,8 +97949,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.0"; - sha256 = "a9b1e3ce4e7ad04634a4eec62249f877d8a2203bdd38192dee9a57714c779fe1"; + version = "0.3.1"; + sha256 = "80cdbdec7f99957514f76faa858a0fd7b3c7e7c8539afd141983d6af6a32e728"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -97581,8 +98125,8 @@ self: { ({ mkDerivation, base, hspec-expectations, transformers }: mkDerivation { pname = "hspec-expectations-lifted"; - version = "0.8.2"; - sha256 = "2b629013b07f69b2dbbe1462f067f097a9f28beae2eb222b1255ff45327cecef"; + version = "0.10.0"; + sha256 = "22cdf1509b396fea2f53a0bb88dec3552f540d58cc60962a82970264c1e73828"; libraryHaskellDepends = [ base hspec-expectations transformers ]; description = "A version of hspec-expectations generalized to MonadIO"; license = stdenv.lib.licenses.mit; @@ -102995,8 +103539,8 @@ self: { }: mkDerivation { pname = "idris"; - version = "0.99.2"; - sha256 = "c3ff38dfeecab2edb7afee907ccbc9b3f348c658ceff686d0617aa3b661d8c3a"; + version = "1.0"; + sha256 = "b06852c83e307c9398fa33e031ca1fbe3c4f927496e7f5b00f13b4ed19f82beb"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -106073,6 +106617,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip6addr_0_5_3" = callPackage + ({ mkDerivation, base, cmdargs, IPv6Addr, text }: + mkDerivation { + pname = "ip6addr"; + version = "0.5.3"; + sha256 = "1ff90994e691785a6eb4bc080d71556761f0ef6f91f0a3a1452c58a8b06e03c6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base cmdargs IPv6Addr text ]; + homepage = "https://github.com/MichelBoucey/ip6addr"; + description = "Commandline tool to generate IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ipatch" = callPackage ({ mkDerivation, base, bytestring, darcs, directory, filepath , hashed-storage, process, unix @@ -111985,15 +112544,17 @@ self: { }) {}; "lambdatex" = callPackage - ({ mkDerivation, async, base, containers, directory, HaTeX, hspec - , mtl, QuickCheck, quickcheck-text, text, transformers + ({ mkDerivation, async, base, containers, directory, filepath + , HaTeX, hspec, mtl, QuickCheck, quickcheck-text, text + , transformers }: mkDerivation { pname = "lambdatex"; - version = "0.1.1.0"; - sha256 = "ab86128908697c0f595076b36769e26365d927ade325879d9b350deb489c0164"; + version = "0.2.0.0"; + sha256 = "64d89ff1a397e7cc1390f5c0c49fd83e358b9fa12ca78325ff63a2cc44ddcea9"; libraryHaskellDepends = [ - async base containers directory HaTeX mtl text transformers + async base containers directory filepath HaTeX mtl text + transformers ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-text text @@ -112127,8 +112688,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.6.2"; - sha256 = "63b3201611262cf8aad5b836b2bbe673a6b718bd1a05d16289e3adc790b08ce8"; + version = "0.7.0"; + sha256 = "9debcc259bba8c09490965d6886db1b5495193aae633e624542e8e7f9f2df970"; libraryHaskellDepends = [ base parsec pretty transformers ]; testHaskellDepends = [ base parsec process QuickCheck tasty tasty-expected-failure @@ -114004,6 +114565,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-accelerate" = callPackage + ({ mkDerivation, accelerate, base, lens }: + mkDerivation { + pname = "lens-accelerate"; + version = "0.1.0.0"; + sha256 = "e4a736962342c116960425a32a17f4eaccc03bf583c09d2a619779deee5c9548"; + libraryHaskellDepends = [ accelerate base lens ]; + homepage = "https://github.com/tmcdonell/lens-accelerate"; + description = "Instances to mix lens with accelerate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-action" = callPackage ({ mkDerivation, base, comonad, contravariant, directory, doctest , filepath, lens, mtl, profunctors, semigroupoids, semigroups @@ -114314,6 +114887,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lentil_1_0_9_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip + , filepath, hspec, natural-sort, optparse-applicative, parsec + , pipes, regex-tdfa, semigroups, terminal-progress-bar, text + , transformers + }: + mkDerivation { + pname = "lentil"; + version = "1.0.9.0"; + sha256 = "4403da26f4c6bef7848a20587422103e1e84cd446fc428dfe6370b875c78cf93"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath natural-sort + optparse-applicative parsec pipes regex-tdfa semigroups + terminal-progress-bar text transformers + ]; + testHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath hspec + natural-sort optparse-applicative parsec pipes regex-tdfa + semigroups terminal-progress-bar text transformers + ]; + homepage = "http://www.ariis.it/static/articles/lentil/page.html"; + description = "frugal issue tracker"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lenz" = callPackage ({ mkDerivation, base, base-unicode-symbols, transformers }: mkDerivation { @@ -115755,6 +116356,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear-accelerate_0_3" = callPackage + ({ mkDerivation, accelerate, base, Cabal, distributive, filepath + , lens, linear + }: + mkDerivation { + pname = "linear-accelerate"; + version = "0.3"; + sha256 = "3aef0c04059e3b650573929aabbf782cc712b2926d76a2a3ed7e37079bdb42a9"; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + accelerate base distributive lens linear + ]; + homepage = "http://github.com/ekmett/linear-accelerate/"; + description = "Lifting linear vector spaces into Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-algebra-cblas" = callPackage ({ mkDerivation, base, ieee754, QuickCheck, storable-complex , test-framework, test-framework-quickcheck2, vector @@ -116059,8 +116678,8 @@ self: { }: mkDerivation { pname = "linode"; - version = "0.2.0.0"; - sha256 = "3a5c1d507121a40848217ad8e092c3347c1c26a1ada09ccfa1450b30d22d59fa"; + version = "0.3.0.0"; + sha256 = "7c5c35938d19cd8577bd40c8c574a27011b3c0b30da45920129187d4d204139e"; libraryHaskellDepends = [ aeson async base binary bytestring containers errors lens process retry safe text transformers wreq @@ -117148,8 +117767,8 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "4.0.0.0"; - sha256 = "9f67758f1a0f73d9f1182251f0ded41cf9bd82382aa7b767d0b7ed6ee46c93b5"; + version = "4.0.1.0"; + sha256 = "48f5a375514269fae1fa8723c80500de845e0798a55fc36074e22bc2e7daa82d"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array base bytestring containers llvm-hs-pure mtl parsec @@ -119666,19 +120285,19 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, criterion, hspec - , hspec-megaparsec, lens, megaparsec, mtl, mwc-random - , optparse-applicative, text, tibetan-utils + ({ mkDerivation, ansi-wl-pprint, base, composition, containers + , criterion, directory, hspec, hspec-megaparsec, lens, megaparsec + , mtl, mwc-random, optparse-applicative, text, tibetan-utils }: mkDerivation { pname = "madlang"; - version = "2.0.1.1"; - sha256 = "f58b9a47a8f213c030ffbee9c8b2ed71443b32b832eaa761fd06ac3c37a0dccb"; + version = "2.1.0.1"; + sha256 = "5fe47345bdeb09d6c5947df21afb3c58cda051e136e0b30696a8c02da48b18a9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base containers lens megaparsec mtl mwc-random - optparse-applicative text tibetan-utils + ansi-wl-pprint base composition containers directory lens + megaparsec mtl mwc-random optparse-applicative text tibetan-utils ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -119732,10 +120351,10 @@ self: { }: mkDerivation { pname = "magicbane"; - version = "0.1.0"; - sha256 = "8449c50e3abe937f235ce806c0f8dd193b2172949e7a2111f5b7d78b4aa38d94"; - revision = "1"; - editedCabalFile = "0da48eedc8e65efecfd5b41191ec1f27c198c35334af15baea2febf759659656"; + version = "0.1.1"; + sha256 = "a4022e70c5d97717127fe947e1d03a8648616ed84cb99fd6ab4775d83a014dc6"; + revision = "3"; + editedCabalFile = "707d4c38ae27930b18c675893fef20afab379474dc22783bc4e70842cc7f4d62"; libraryHaskellDepends = [ aeson aeson-qq attoparsec base classy-prelude conduit conduit-combinators data-default data-has either ekg-core ekg-wai @@ -122283,6 +122902,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memorable-bits" = callPackage + ({ mkDerivation, base, binary, bits, bytes, bytestring, criterion + , cryptonite, data-dword, doctest, hashable, HUnit, memory, mtl + , network-ip, optparse-applicative, random, split, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "memorable-bits"; + version = "0.1.0.0"; + sha256 = "7ac3591f17c1a32c9d74f10cb610979729a1201e6f617604300152d2410cbd4b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bits bytes bytestring cryptonite data-dword hashable + memory mtl network-ip random split + ]; + executableHaskellDepends = [ + base bytestring cryptonite optparse-applicative + ]; + testHaskellDepends = [ + base doctest HUnit tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; + description = "Generate human memorable strings from binary data"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "memory" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty , tasty-hunit, tasty-quickcheck @@ -127487,6 +128134,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mushu" = callPackage + ({ mkDerivation, base, brick, bytestring, classy-prelude + , connection, containers, data-default, directory, filepath, fuzzy + , hscurses, htoml, libmpd, list-t, microlens, microlens-platform + , microlens-th, mtl, network, pretty, process, safe-exceptions + , template-haskell, text, text-zipper, time, transformers + , unordered-containers, vector, vty + }: + mkDerivation { + pname = "mushu"; + version = "0.1.1"; + sha256 = "9b0a749a3f81d3101df1295ff0a2509604f5142d51e1daa97fab692c4b8b35f2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick bytestring classy-prelude connection containers + data-default directory filepath fuzzy hscurses htoml libmpd list-t + microlens microlens-platform microlens-th mtl network pretty + process safe-exceptions template-haskell text text-zipper time + transformers unordered-containers vector vty + ]; + testHaskellDepends = [ base classy-prelude ]; + homepage = "https://github.com/elaye/mushu#README.md"; + description = "Minimalist MPD client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "music-articulation" = callPackage ({ mkDerivation, average, base, semigroups }: mkDerivation { @@ -127808,6 +128482,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mustache_2_1_3" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, either, filepath, hspec, lens + , mtl, parsec, process, scientific, tar, template-haskell + , temporary, text, th-lift, unordered-containers, vector, wreq + , yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.1.3"; + sha256 = "6bf426f9633aeff26bc78a5219b4ff93a785614adfc35f59933368ece71781b4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory either filepath mtl + parsec scientific template-haskell text th-lift + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + homepage = "https://github.com/JustusAdam/mustache"; + description = "A mustache template parser library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -127984,6 +128689,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random-accelerate" = callPackage + ({ mkDerivation, accelerate, base, mwc-random }: + mkDerivation { + pname = "mwc-random-accelerate"; + version = "0.1.0.0"; + sha256 = "30fad33d12b130457a6dcb8bedc885700e6ac0eea9b0f25fe6e5fe34968932e3"; + libraryHaskellDepends = [ accelerate base mwc-random ]; + description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mwc-random-monad" = callPackage ({ mkDerivation, base, monad-primitive, mwc-random, primitive , transformers, vector @@ -131507,8 +132223,8 @@ self: { ({ mkDerivation, base, checkers, QuickCheck }: mkDerivation { pname = "non-empty-zipper"; - version = "0.1.0.5"; - sha256 = "196e30fd12ce74458a62b8b61ea7c1f6cec4d5999f465d2ccb11b394c3ed77b4"; + version = "0.1.0.7"; + sha256 = "6b840c98fbe045bf3a2d4b5606ef8deb6668f6dbdaf872473273f129fda081fe"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base checkers QuickCheck ]; description = "The Zipper for NonEmpty"; @@ -132250,6 +132966,49 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "numhask" = callPackage + ({ mkDerivation, adjunctions, base, distributive, doctest, HUnit + , protolude, QuickCheck, singletons, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "numhask"; + version = "0.0.2"; + sha256 = "567762fe357d2114176425b115fa89b304ab9a41ca564b4b599bbc00384246b2"; + libraryHaskellDepends = [ + adjunctions base distributive protolude QuickCheck singletons + vector + ]; + testHaskellDepends = [ + base doctest HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask"; + description = "A numeric prelude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "numhask-range" = callPackage + ({ mkDerivation, base, containers, foldl, formatting, HUnit, lens + , linear, numhask, protolude, QuickCheck, smallcheck, tasty + , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "numhask-range"; + version = "0.0.1"; + sha256 = "52a73be1f8d653bb4ef0e54da3ec6a923494944e88ccbd86f2f9b7ea39c44f05"; + libraryHaskellDepends = [ + base containers foldl formatting lens linear numhask protolude + QuickCheck + ]; + testHaskellDepends = [ + base HUnit numhask protolude QuickCheck smallcheck tasty + tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/tonyday567/numhask-range"; + description = "see readme.md"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nums" = callPackage ({ mkDerivation }: mkDerivation { @@ -133015,15 +133774,16 @@ self: { }) {}; "ombra" = callPackage - ({ mkDerivation, base, gl, hashable, hashtables, transformers - , unordered-containers, vect + ({ mkDerivation, base, Boolean, gl, hashable, hashtables + , transformers, unordered-containers, vector-space }: mkDerivation { pname = "ombra"; - version = "0.2.2.0"; - sha256 = "006dde6ad3c4273078f7129a67380b1002b2fb6f2f92f253695e846a23181d60"; + version = "0.3.0.0"; + sha256 = "99516f07fdc85967a562668f136a2899fda28ea6fe3be27e09bc06a2aca654ad"; libraryHaskellDepends = [ - base gl hashable hashtables transformers unordered-containers vect + base Boolean gl hashable hashtables transformers + unordered-containers vector-space ]; homepage = "https://github.com/ziocroc/Ombra"; description = "Render engine"; @@ -138525,6 +139285,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-control, monad-logger, mysql-haskell, network + , persistent, persistent-template, resource-pool, resourcet, text + , time, transformers + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.2.1.0"; + sha256 = "bb7281fda0ff259d7d8738d541619fad2aadbc74245db72853d8fc6d669278cb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-control + monad-logger mysql-haskell network persistent resource-pool + resourcet text time transformers + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -139169,8 +139954,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.12.0"; - sha256 = "db6c64e67759c9133f12a70fa82df22c8f7d4ba4450b5317aa57f35a177976fb"; + version = "0.0.13.0"; + sha256 = "72d782287fccefaab02a524a8fc64affbee3692b56889dd07ed64427a1c453f7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -139525,6 +140310,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pictikz" = callPackage + ({ mkDerivation, base, matrix, transformers, xml }: + mkDerivation { + pname = "pictikz"; + version = "1.0.0.1"; + sha256 = "69e1e3e93db18c36ee716ebb57e3dbb35c3894724ad36793abf80e7d5cd8f3b8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base matrix transformers xml ]; + description = "Converts a svg image to tikz code"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "pid1" = callPackage ({ mkDerivation, base, process, unix }: mkDerivation { @@ -142023,12 +142821,16 @@ self: { }) {}; "pong-server" = callPackage - ({ mkDerivation, base, data-default, hspec, network, QuickCheck }: + ({ mkDerivation, base, bytestring, classy-prelude, exceptions + , hspec, http-types, network, QuickCheck + }: mkDerivation { pname = "pong-server"; - version = "0.0.2.1"; - sha256 = "145242c8ad672f358eb83f503ba5f92478040d943236b25010d343085f42779a"; - libraryHaskellDepends = [ base data-default network ]; + version = "0.0.3.0"; + sha256 = "dd84310b20b09d2667dcc1af7b6ecab2a47f19986395049eeebb7ddc86b8c326"; + libraryHaskellDepends = [ + base bytestring classy-prelude exceptions http-types network + ]; testHaskellDepends = [ base hspec network QuickCheck ]; homepage = "http://github.com/RobertFischer/pong-server#readme"; description = "A simple embedded pingable server that runs in the background"; @@ -145405,6 +146207,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protobuf-simple_0_1_0_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, directory, filepath, hspec, mtl, parsec + , QuickCheck, quickcheck-instances, split, text + }: + mkDerivation { + pname = "protobuf-simple"; + version = "0.1.0.3"; + sha256 = "55e8221677f8808539b3fc3644d4b3118afe6fb7bd9ff0be4e58783e38773f6d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 mtl text + ]; + executableHaskellDepends = [ + base containers directory filepath mtl parsec split text + ]; + testHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 filepath + hspec parsec QuickCheck quickcheck-instances split text + ]; + homepage = "https://github.com/sru-systems/protobuf-simple"; + description = "Simple Protocol Buffers library (proto2)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string @@ -146200,8 +147029,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.11.1"; - sha256 = "359894f7b8d6ba28e3150fbba3988a14aedf68d55b1eb7d6b69111a4a119ec86"; + version = "0.11.2"; + sha256 = "bf4c3c0cb3103cf4cfc2029bfbb0509ad61fa9ef07896818b522527891878144"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146216,19 +147045,29 @@ self: { unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat blaze-html - boxes bytestring containers directory file-embed filepath gitrev - Glob haskeline http-types monad-logger mtl network - optparse-applicative parsec process protolude sourcemap split stm - text time transformers transformers-compat utf8-string wai - wai-websockets warp websockets + aeson aeson-better-errors ansi-terminal ansi-wl-pprint base + base-compat blaze-html bower-json boxes bytestring cheapskate clock + containers data-ordlist deepseq directory dlist edit-distance + file-embed filepath fsnotify gitrev Glob haskeline http-client + http-types language-javascript lens lifted-base monad-control + monad-logger mtl network optparse-applicative parallel parsec + pattern-arrows pipes pipes-http process protolude regex-tdfa safe + scientific semigroups sourcemap spdx split stm syb text time + transformers transformers-base transformers-compat + unordered-containers utf8-string vector wai wai-websockets warp + websockets ]; testHaskellDepends = [ - aeson aeson-better-errors base base-compat bower-json boxes - bytestring containers directory filepath Glob haskeline hspec - hspec-discover HUnit lens monad-logger mtl optparse-applicative - parsec process protolude silently stm text time transformers - transformers-compat utf8-string vector + aeson aeson-better-errors ansi-terminal base base-compat blaze-html + bower-json boxes bytestring cheapskate clock containers + data-ordlist deepseq directory dlist edit-distance filepath + fsnotify Glob haskeline hspec hspec-discover http-client http-types + HUnit language-javascript lens lifted-base monad-control + monad-logger mtl parallel parsec pattern-arrows pipes pipes-http + process protolude regex-tdfa safe scientific semigroups silently + sourcemap spdx split stm syb text time transformers + transformers-base transformers-compat unordered-containers + utf8-string vector ]; doCheck = false; homepage = "http://www.purescript.org/"; @@ -148113,8 +148952,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.6"; - sha256 = "cc03e011817649426e527cb35f31b2daf7c2f8ab90c281d308dadddfd80f8500"; + version = "0.7"; + sha256 = "f8bafb43deaf0d656a8c170cb56861948af90d1c72cd99a2c9540c1eb6f1bc23"; libraryHaskellDepends = [ base containers parsec ]; testHaskellDepends = [ base Cabal containers hspec parsec QuickCheck @@ -151200,20 +152039,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "regex_0_10_0_3" = callPackage + "regex_0_13_0_0" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers - , hashable, regex-base, regex-tdfa, regex-tdfa-text - , template-haskell, text, time, time-locale-compat, transformers - , unordered-containers + , hashable, regex-base, regex-pcre-builtin, regex-tdfa + , regex-tdfa-text, template-haskell, text, time, time-locale-compat + , transformers, unordered-containers }: mkDerivation { pname = "regex"; - version = "0.10.0.3"; - sha256 = "304230caeb624689d05e41350bfbfa02d3a49f4087088c3017eb35ce6832ba3a"; + version = "0.13.0.0"; + sha256 = "78b7d83fb33c5e3cf45a66743db0dfe4ed4dfea77736d09c0830bd5e287b76bd"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable regex-base - regex-tdfa regex-tdfa-text template-haskell text time - time-locale-compat transformers unordered-containers + regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text + time time-locale-compat transformers unordered-containers ]; homepage = "http://regex.uk"; description = "Toolkit for regex-base"; @@ -151358,31 +152197,31 @@ self: { "regex-examples" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers - , directory, hashable, heredoc, http-conduit, regex, regex-base - , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, regex-with-pcre - , shelly, smallcheck, tasty, tasty-hunit, tasty-smallcheck - , template-haskell, text, time, time-locale-compat, transformers - , unordered-containers + , directory, filepath, hashable, heredoc, http-conduit, regex + , regex-base, regex-pcre-builtin, regex-tdfa, regex-tdfa-text + , regex-with-pcre, shelly, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, template-haskell, text, time + , time-locale-compat, transformers, unordered-containers }: mkDerivation { pname = "regex-examples"; - version = "0.10.0.3"; - sha256 = "88a3ead02eed5054aaa19c09671b24e5ba0e3892f2e64e8bec5ba948d428bb54"; + version = "0.13.0.0"; + sha256 = "b0dc80f421768ea9a272aeccc60722da9fbadc19feaf3bb2232446d82b7ec4f8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base base-compat bytestring containers directory hashable - heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text regex-with-pcre shelly smallcheck tasty tasty-hunit - tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers + array base base-compat bytestring containers directory filepath + hashable heredoc http-conduit regex regex-base regex-pcre-builtin + regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty + tasty-hunit tasty-smallcheck template-haskell text time + time-locale-compat transformers unordered-containers ]; testHaskellDepends = [ - array base base-compat bytestring containers directory hashable - heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text regex-with-pcre shelly smallcheck tasty tasty-hunit - tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers + array base base-compat bytestring containers directory filepath + hashable heredoc http-conduit regex regex-base regex-pcre-builtin + regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty + tasty-hunit tasty-smallcheck template-haskell text time + time-locale-compat transformers unordered-containers ]; homepage = "http://regex.uk"; description = "Tutorial, tests and example programs for regex"; @@ -151645,8 +152484,8 @@ self: { }: mkDerivation { pname = "regex-with-pcre"; - version = "0.10.0.3"; - sha256 = "0fed51f7ee7d142b090c1f71a38c99fa51aa7cf74ec05bfea55fdb4a6feb10da"; + version = "0.13.0.0"; + sha256 = "5a39c51ac8d8e20b1a2c5b363e6e8087ca1480e771ad7a6c2853a60738fc9983"; libraryHaskellDepends = [ base base-compat bytestring containers regex regex-base regex-pcre-builtin regex-tdfa template-haskell transformers @@ -152117,6 +152956,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_8_3_6" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, quickcheck-simple, sql-words + , template-haskell, text, th-reify-compat, time, time-locale-compat + , transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.8.3.6"; + sha256 = "227d39084a0d27fdb135b4e4ee48a0fbcbd9c3e99d69ba8429c2187be6fdf94b"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + sql-words template-haskell text th-reify-compat time + time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers 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, relational-query @@ -155431,8 +156294,8 @@ self: { }: mkDerivation { pname = "ruby-marshal"; - version = "0.1.1"; - sha256 = "d61ceb301b82e439b064eb4b1b84b1bb21c4ac9dc0239a0dc8d361cfe1b1800e"; + version = "0.1.2"; + sha256 = "37bc92262a7b0be2a608566f3523b37ac2e017611ff591d3f722d588f509408f"; libraryHaskellDepends = [ base bytestring cereal containers mtl string-conv vector ]; @@ -160205,6 +161068,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-options" = callPackage + ({ mkDerivation, base, bytestring, http-types, servant-foreign + , servant-server, text, wai + }: + mkDerivation { + pname = "servant-options"; + version = "0.1.0.0"; + sha256 = "5cfe2e60ec6267c80dfd2c5ccfb2ce8d9d13b2bcaf646ee80de6bc32c8f49fb3"; + libraryHaskellDepends = [ + base bytestring http-types servant-foreign servant-server text wai + ]; + homepage = "https://github.com/sordina/servant-options"; + description = "Provide responses to OPTIONS requests for Servant applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -161579,6 +162458,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-path" = callPackage + ({ mkDerivation, base, path, path-io, shake }: + mkDerivation { + pname = "shake-path"; + version = "0.0.0.0"; + sha256 = "eb6290368e92a637a5a3651c084790bc84e8cd614707e6227dde6b98ea761a33"; + libraryHaskellDepends = [ base path path-io shake ]; + homepage = "http://cs-syd.eu"; + description = "path alternatives to shake functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "shake-persist" = callPackage ({ mkDerivation, base, binary, directory, shake, template-haskell }: @@ -162160,8 +163051,8 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.2.1"; - sha256 = "3984671ee884f828df248aa5d9033ece376ecb30cb0f689a4a4aa10a93d697f8"; + version = "0.3.2"; + sha256 = "74c76ed29a086f3d8c2d4a017c358cf78505e0b862da6d931f2202b52b51301f"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob text unordered-containers @@ -164044,7 +164935,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "skylighting_0_3_1" = callPackage + "skylighting_0_3_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html , bytestring, case-insensitive, containers, criterion, Diff , directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -164053,8 +164944,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.3.1"; - sha256 = "d93ee3b15d74ab66fd729c4b56741c052fe331b4cfc78bad2a433827417d4f74"; + version = "0.3.2"; + sha256 = "fe48ff596d3971cbb285a1ce677d1527285845feaed16d46fcb49b8ad50767bc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167393,8 +168284,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.2.3"; - sha256 = "d7db98c9cf05b393469f843535e3255d6f16ab3cc82244ccdb77c25a36e9a127"; + version = "0.2.4"; + sha256 = "7cafbb4269289cadef7562059b3d6bbce09e933cc41369c68e7f991f8a7d1e14"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base cmdargs containers leancheck ]; benchmarkHaskellDepends = [ base cmdargs containers leancheck ]; @@ -168591,6 +169482,8 @@ self: { pname = "stable-memo"; version = "0.3.1"; sha256 = "fd8ddc1d5a6200b8cfb192195d0f078545d85088bd6f04aa3f76b310063a65e7"; + revision = "1"; + editedCabalFile = "3246671703f40d04d1f1f0087cfce88a8ba97b5b9c3774188915b9bd2e339ff2"; libraryHaskellDepends = [ base ghc-prim hashtables ]; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; @@ -170423,7 +171316,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "store_0_4_1" = callPackage + "store_0_4_2" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bytestring, cereal, cereal-vector, conduit , containers, contravariant, criterion, cryptohash, deepseq @@ -170437,8 +171330,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.4.1"; - sha256 = "aee7f803b9338569b089d01c3ab3ec1384d9ae55d1ebb6c867faefb34656bdb2"; + version = "0.4.2"; + sha256 = "584fd61fd788772398a233fce40f8956b6eb7cd6b8e86f35a30b44c849a7076b"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bytestring conduit containers contravariant cryptohash deepseq directory filepath free @@ -175289,6 +176182,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-silver_3_1_10" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit + , temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.1.10"; + sha256 = "8e886d93bff49da4221b917162613e00f83902af4a2ea014ab4bdcd9029d6efb"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + homepage = "https://github.com/phile314/tasty-silver"; + description = "A fancy test runner, including support for golden tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, async, base, smallcheck, tagged, tasty }: mkDerivation { @@ -175347,6 +176265,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-th_0_1_5" = callPackage + ({ mkDerivation, base, haskell-src-exts, tasty, template-haskell }: + mkDerivation { + pname = "tasty-th"; + version = "0.1.5"; + sha256 = "6452b3b65a2d59e469df598aa808084020095b4be54c64ff669802148845d372"; + libraryHaskellDepends = [ + base haskell-src-exts tasty template-haskell + ]; + homepage = "http://github.com/bennofs/tasty-th"; + description = "Automatic tasty test case discovery using TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tateti-tateti" = callPackage ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }: mkDerivation { @@ -176184,6 +177117,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "termcolor" = callPackage + ({ mkDerivation, base, cli }: + mkDerivation { + pname = "termcolor"; + version = "0.2.0.0"; + sha256 = "b09d399a733d867cb05dc51de4ee31d5db73cd453099e342973da91c30f21a90"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base cli ]; + homepage = "https://github.com/mdibaiee/termcolor#readme"; + description = "Composable terminal colors"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "terminal-progress-bar" = callPackage ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework , test-framework-hunit @@ -180086,8 +181034,8 @@ self: { ({ mkDerivation, base, containers, HUnit, network-uri, text }: mkDerivation { pname = "tld"; - version = "0.3.0.0"; - sha256 = "feb269cd135796d7a378a01150ca89fdea380e4e7fa67b031b299fcd16acac5e"; + version = "0.3.0.1"; + sha256 = "aa433c4fe7bfd06937bb68602a2c95272e221bb65272bd11cbd0bb241567df65"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; @@ -180282,17 +181230,17 @@ self: { }) {}; "toboggan" = callPackage - ({ mkDerivation, base, clit, directory, madlang, optparse-generic - , text + ({ mkDerivation, base, directory, madlang, optparse-generic, text + , tweet-hs }: mkDerivation { pname = "toboggan"; - version = "0.1.0.0"; - sha256 = "72281351961f1d55149379c273b72e4e4d7a5134c432351044a17317152f3a67"; + version = "0.1.0.1"; + sha256 = "3eca9e54376ea057907a57205231f654916e3f7f845f0aaeb83a43b81fc408a6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base clit directory madlang optparse-generic text + base directory madlang optparse-generic text tweet-hs ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/toboggan#readme"; @@ -181209,14 +182157,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "transient_0_5_3" = callPackage + "transient_0_5_4" = callPackage ({ mkDerivation, base, bytestring, containers, directory, mtl , random, stm, time, transformers }: mkDerivation { pname = "transient"; - version = "0.5.3"; - sha256 = "e3b4ae35933e4452745f257f2043356b00611b0772d73085d9af75e1bdd28d3e"; + version = "0.5.4"; + sha256 = "653065cb45b443606e30b4295d73885bd73795c7b254f26b65d9a15bf610855e"; libraryHaskellDepends = [ base bytestring containers directory mtl random stm time transformers @@ -181835,13 +182783,16 @@ self: { }) {}; "tslogger" = callPackage - ({ mkDerivation, async, base, containers, random }: + ({ mkDerivation, async, base, bytestring, containers, random, text + }: mkDerivation { pname = "tslogger"; - version = "0.1.0.0"; - sha256 = "b41d3612219cc49b7e61531587ca33e582ec11f76e24254154f44fd515a5cbf7"; - libraryHaskellDepends = [ async base containers random ]; - description = "Thread-safe logging"; + version = "0.2.1.0"; + sha256 = "f8f15b288db3071e017afbb6b0326109e074bee9e6adc468da70b2d8bbfc9eac"; + libraryHaskellDepends = [ + async base bytestring containers random text + ]; + description = "Thread-safe logging, with additional interleaving fuzz-testing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -183826,6 +184777,23 @@ self: { license = "GPL"; }) {}; + "tyro" = callPackage + ({ mkDerivation, aeson, base, HUnit, protolude, singletons + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "tyro"; + version = "0.1.1.1"; + sha256 = "b225ec138b2f98c9b478143a8f10bcd48ad944e3bd9813a2227068a23ec70cce"; + libraryHaskellDepends = [ aeson base protolude singletons text ]; + testHaskellDepends = [ + aeson base HUnit protolude test-framework test-framework-hunit text + ]; + homepage = "https://github.com/rlupton20/tyro#readme"; + description = "Type derived JSON parsing using Aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tz" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell @@ -189780,6 +190748,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-metrics_0_2_4" = callPackage + ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types + , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-metrics"; + version = "0.2.4"; + sha256 = "e73685a748f0ba6d16956b500cdc23f3802f794f5259a3d6b8a5b885e928ec74"; + libraryHaskellDepends = [ base ekg-core http-types text time wai ]; + testHaskellDepends = [ + base bytestring ekg-core http-types QuickCheck scotty tasty + tasty-hunit tasty-quickcheck text time transformers wai wai-extra + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ekg-core http-types scotty text time wai + wai-extra + ]; + homepage = "https://github.com/Helkafen/wai-middleware-metrics"; + description = "A WAI middleware to collect EKG request metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-preprocessor" = callPackage ({ mkDerivation, base, Cabal, directory, mtl, split, text, wai , wai-middleware-static, warp @@ -190813,8 +191805,8 @@ self: { }: mkDerivation { pname = "web-output"; - version = "0.3.0.0"; - sha256 = "db201c91c1c96db59670142d1ca1e63d31cbc0bdf495538994eab1b585894ead"; + version = "0.4.0.0"; + sha256 = "700bf50355a9232cb76af526c03d44d964a6829b01c66d909006db5c7e7d3404"; libraryHaskellDepends = [ base directory filepath open-browser temporary text ]; @@ -191424,6 +192416,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webpage_0_0_5" = callPackage + ({ mkDerivation, base, blaze-html, data-default, lucid, text }: + mkDerivation { + pname = "webpage"; + version = "0.0.5"; + sha256 = "213e92ff931d7f58becb532a70cb958a691b216fa85c43f950b429ffad3d1aad"; + libraryHaskellDepends = [ + base blaze-html data-default lucid text + ]; + description = "Organized and simple web page scaffold for blaze and lucid"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webrtc-vad" = callPackage ({ mkDerivation, base, primitive, vector }: mkDerivation { @@ -192489,20 +193495,20 @@ self: { ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-swf, base, bytestring, conduit, conduit-combinators , conduit-extra, directory, exceptions, filemanip, filepath - , lifted-async, monad-control, optparse-applicative + , http-types, lifted-async, monad-control, optparse-applicative , optparse-generic, preamble, process, resourcet, shakers, text , time, uuid, yaml }: mkDerivation { pname = "wolf"; - version = "0.3.8"; - sha256 = "af9021f6b883cd9f90d984e6e66535f17738d0064fa96bd0f39938eeb863dd4b"; + version = "0.3.10"; + sha256 = "37a02e1b60d7f7779dd94a3facbb54eadbecb0729e639ec30f7c7cd98fe5baae"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-swf base bytestring conduit conduit-combinators conduit-extra directory - exceptions filemanip filepath lifted-async monad-control + exceptions filemanip filepath http-types lifted-async monad-control optparse-applicative preamble process resourcet text time uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; @@ -199014,6 +200020,8 @@ self: { pname = "zifter"; version = "0.0.1.1"; sha256 = "ea8c1a721789144ae7207474a91f0471d17c42aa5a8e6962eca93c41b189de45"; + revision = "1"; + editedCabalFile = "38d76a58f2a44cbef3d535592d54e082011fb7ee539c1a659d4a58d5bbc961a1"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions filepath optparse-applicative path path-io process safe stm validity @@ -199083,6 +200091,8 @@ self: { pname = "zifter-hlint"; version = "0.0.0.0"; sha256 = "d7588cfa7dc22acc664a1438881abca0b38789e787e1014d4a9a0a320b35772f"; + revision = "1"; + editedCabalFile = "9b56b30b5d88ccb8613851ec14d630dd4d5ec5dbcb6b6f104f5b8d475afc9523"; libraryHaskellDepends = [ base filepath hlint path path-io safe zifter ]; @@ -199173,6 +200183,31 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "zip_0_1_10" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, exceptions + , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck + , resourcet, text, time, transformers + }: + mkDerivation { + pname = "zip"; + version = "0.1.10"; + sha256 = "8ec11736f49ffc9b07fa51910d7e06791358e02ba4073e5ad6346b7d3172530d"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest exceptions filepath mtl path + path-io plan-b resourcet text time transformers + ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions filepath hspec path + path-io QuickCheck text time transformers + ]; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty From 046c5c57d0f2260b5961b28f62ab0722225a385f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Apr 2017 12:55:56 +0200 Subject: [PATCH 133/172] haskell-binary: update 0.8.x branch to latest version --- pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 03a905ea3d11..6be7ae16572a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -41,7 +41,7 @@ self: super: { unix = null; # These packages are core libraries in GHC 7.10.x, but not here. - binary = self.binary_0_8_4_1; + binary = self.binary_0_8_5_1; deepseq = self.deepseq_1_3_0_1; haskeline = self.haskeline_0_7_3_1; hoopl = self.hoopl_3_10_2_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index ee6e59c65ef3..18ebe5c8e1ad 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -42,7 +42,7 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_1; process = self.process_1_2_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 4c2fb69ec806..111852ab34b9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -41,10 +41,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 27fed51e6fc8..10e1410ff598 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -40,10 +40,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; From fa365c2b9d085d8b913f561f1db559cab7d1a028 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Apr 2017 14:44:40 +0200 Subject: [PATCH 134/172] haskell-language-nix: fix build with GHC 7.6.3 --- .../haskell-modules/configuration-ghc-7.6.x.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 10e1410ff598..4ef1aa562118 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -39,9 +39,6 @@ self: super: { transformers = self.transformers_0_4_3_0; xhtml = self.xhtml_3000_2_1; - # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; }; - # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); @@ -101,6 +98,12 @@ self: super: { lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend super.distributive self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; + void = addBuildDepends super.void (with self; [hashable semigroups]); + + # Need a newer version of Cabal to interpret their build instructions. + cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0; + extra = addSetupDepend super.extra self.Cabal_1_24_2_0; + hlint = addSetupDepend super.hlint self.Cabal_1_24_2_0; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; From f0ba178a3c13d851270db44a1ac741bcd7fab14e Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 4 Apr 2017 16:36:46 +0200 Subject: [PATCH 135/172] zerotierone: 1.1.14 -> 1.2.2 (#24614) --- pkgs/tools/networking/zerotierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 76385312385b..0202541da400 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.1.14"; + version = "1.2.2"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "1brlyqk2p5h9sws15nbkmm4qhx911aib1v7crmcm2rhwsad0c1nj"; + sha256 = "058sy6yrprd23iyx7fxnwyvnp1xxsd55yapjv5m2n7dcb7l4005h"; }; preConfigure = '' From e410c78cd5f2d770f6be8b68e410e566d61f75e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Apr 2017 15:48:55 +0200 Subject: [PATCH 136/172] gnupg: Give the 1compat package a higher priority This resolves collision warnings with the regular gnupg packages. --- pkgs/tools/security/gnupg/1compat.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index c4cc68dcca38..da700fe9f227 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { meta = gnupg.meta // { description = gnupg.meta.description + " with symbolic links for gpg and gpgv"; + priority = -1; }; } From de51ad6cd1a1443d66263420c49c334cad0eeb71 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Apr 2017 16:29:24 +0200 Subject: [PATCH 137/172] Don't restart systemd-fsck@ units Restarting them is useless since the filesystem is already checked. Worse, restarting them causes the filesystem to be unmounted. Also remove an override for systemd-rkill@.service which no longer exists. --- nixos/modules/system/boot/systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index bff6739db616..32e18ff0052d 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -829,7 +829,7 @@ in # Some overrides to upstream units. systemd.services."systemd-backlight@".restartIfChanged = false; - systemd.services."systemd-rfkill@".restartIfChanged = false; + systemd.services."systemd-fsck@".restartIfChanged = false; systemd.services."user@".restartIfChanged = false; systemd.services.systemd-journal-flush.restartIfChanged = false; systemd.services.systemd-random-seed.restartIfChanged = false; From 9fc14f23b8cc5a4868bb3f78630f0aeb453883ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2017 16:49:18 +0200 Subject: [PATCH 138/172] gnome-keyring: use wrapGAppsHook --- .../gnome-3/3.22/core/gnome-keyring/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix index 3ea108808f50..df47c1a477b9 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper +, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook , docbook_xsl_ns, docbook_xsl, gnome3 }: stdenv.mkDerivation rec { @@ -7,25 +7,18 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit makeWrapper + pango gcr gdk_pixbuf atk p11_kit ]; propagatedBuildInputs = [ glib libtasn1 libxslt ]; - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; + nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ]; configureFlags = [ "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; - preFixup = '' - wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; From 43c0530ca6017dea25e0676cbcf4059dbb7e5d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2017 13:37:55 +0200 Subject: [PATCH 139/172] libproxy: fix compilation also use webkit backend (webkitgtk is also a more common gnome/gtk) Changelog: https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/NEWS?h=1.6.2 --- pkgs/development/libraries/libproxy/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 97929d29b377..163357a0c0f8 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, spidermonkey_1_8_5 }: +, dbus, networkmanager, webkitgtk214x, pcre, python2 }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -16,7 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager spidermonkey_1_8_5 ]; + buildInputs = [ dbus networkmanager webkitgtk214x pcre ]; + + cmakeFlags = [ + "-DWITH_WEBKIT3=ON" + "-DWITH_MOZJS=OFF" + "-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}" + ]; meta = with stdenv.lib; { platforms = platforms.linux; From 6bb303cd856e9cef499b8738931099476f698e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2017 14:16:59 +0200 Subject: [PATCH 140/172] network-manager: 1.4.4 -> 1.6.4 --- .../networking/network-manager/PppdPath.patch | 8 ++--- .../networking/network-manager/default.nix | 36 +++++++++++++------ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch index 98c1308e4dbf..4850d93716de 100644 --- a/pkgs/tools/networking/network-manager/PppdPath.patch +++ b/pkgs/tools/networking/network-manager/PppdPath.patch @@ -1,8 +1,6 @@ -diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c -index 89a7add..ae99eb4 100644 ---- a/src/ppp-manager/nm-ppp-manager.c -+++ b/src/ppp-manager/nm-ppp-manager.c -@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self, +--- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c 2017-02-15 13:10:27.000000000 +0100 ++++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c 2017-04-03 11:45:39.891653216 +0200 +@@ -724,7 +724,7 @@ g_return_val_if_fail (setting != NULL, NULL); diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index cac37bce280f..fd470143a3c5 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,25 +2,34 @@ , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, coreutils, file, inetutils, kmod }: +, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt +, python3Packages, docbook_xsl, fetchpatch }: stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; - major = "1.4"; - version = "${major}.4"; + major = "1.6"; + version = "${major}.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"; + sha256 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"; }; outputs = [ "out" "dev" ]; + postPatch = '' + patchShebangs ./tools + ''; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file - substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping + substituteInPlace src/devices/nm-device.c \ + --replace /usr/bin/ping ${inetutils}/bin/ping \ + --replace /usr/bin/ping6 ${inetutils}/bin/ping + substituteInPlace src/devices/nm-arping-manager.c \ + --replace '("arping", NULL, NULL);' '("arping", "${inetutils}/bin/arping", NULL);' substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} @@ -58,14 +67,21 @@ stdenv.mkDerivation rec { "--with-libsoup=yes" ]; - patches = [ ./PppdPath.patch ]; + patches = [ + ./PppdPath.patch + (fetchpatch { + sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6"; + name = "null-dereference.patch"; + url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch"; + }) + ]; buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp - bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; + bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; - propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; + propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ]; preInstall = '' installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) @@ -78,7 +94,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' # rename to network-manager to be in style - mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service + mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. From 7903ccbdf803bcca53fb4c695d11c32bd435ca4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2017 14:18:00 +0200 Subject: [PATCH 141/172] network-manager-applet: 1.4.4 -> 1.4.6 --- .../networking/network-manager-applet/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d2240984d9f6..c596ea63f4d3 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, librsvg , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook }: +, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; + name = "${pname}-${major}.${minor}"; pname = "network-manager-applet"; - version = networkmanager.version; + major = "1.4"; + minor = "6"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; - sha256 = "09ijxicsqf39y6h8kwbfjyljfbqkkx4vrpyfn6gfg1h9mvp4cf39"; + url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; + sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh"; }; configureFlags = [ "--sysconfdir=/etc" ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring - modemmanager jansson librsvg glib_networking gnome3.dconf + modemmanager jansson librsvg glib_networking gnome3.dconf webkitgtk ]; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; From b552de752500c6e9e84f71bb5f65a8e44c68ab94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2017 14:46:17 +0200 Subject: [PATCH 142/172] network-manager_l2tp: set 1.2.4 explicity --- pkgs/tools/networking/network-manager/l2tp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 591994ddccf6..6a4f31e5e19f 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-l2tp"; - version = networkmanager.version; + version = "1.2.4"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; - rev = "c0cedda5e2a0ded695b497c361eaf577068520cb"; - sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2"; + rev = "${version}"; + sha256 = "1mvn0z1vl4j9drl3dsw2dv0pppqvj29d2m07487dzzi8cbxrqj36"; }; buildInputs = [ networkmanager ppp libsecret ] From 9904019841b66a11d1dce48a54c15539f0731614 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Apr 2017 11:29:40 -0400 Subject: [PATCH 143/172] nix-plugins: Bump, unbreak --- .../libraries/nix-plugins/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 8a5d54952606..647f30f98280 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, nix }: - +{ stdenv, fetchFromGitHub, nix }: +let version = "2.0.2"; in stdenv.mkDerivation { - name = "nix-plugins-1.0.0"; + name = "nix-plugins-${version}"; - src = fetchgit { - url = git://github.com/shlevy/nix-plugins.git; - rev = "refs/tags/1.0.0"; - sha256 = "1w7l4mdwgf5w1g48mbng4lcg2nihixvp835mg2j7gghnya309fxl"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-plugins"; + rev = version; + sha256 = "02bi0p9qjpyxzbr0ki9q774lwdjwcpipkzx84xx9q1ywwafjhr7b"; }; buildInputs = [ nix ]; - buildFlags = [ "NIX_INCLUDE=${nix}/include" ]; + buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -20,6 +21,5 @@ stdenv.mkDerivation { homepage = https://github.com/shlevy/nix-plugins; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 182f9b196ff4..e83ef1781b89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9131,9 +9131,7 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { - nix = pkgs.nixUnstable; - }; + nix-plugins = callPackage ../development/libraries/nix-plugins {}; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; From ef2c8f98ec1ce78ca7e128fc9089285eebb115b1 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Tue, 4 Apr 2017 18:36:23 +0300 Subject: [PATCH 144/172] Fix schema, maintainers are usually an array --- pkgs/applications/networking/droopy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 8be5ee3c775a..93ff39bde64f 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Mini Web server that let others upload files to your computer"; homepage = http://stackp.online.fr/droopy; license = licenses.bsd3; - maintainers = maintainers.profpatsch; + maintainers = [ maintainers.profpatsch ]; }; } From 938cf02a206e10a6ee83223e88db07414c7122a5 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Tue, 4 Apr 2017 18:48:00 +0300 Subject: [PATCH 145/172] flam3: wrap maintainers attribute in a list (#24629) --- pkgs/tools/graphics/flam3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index f4e0faffb0e1..e3c9cbf2e69f 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cosmic recursive fractal flames"; homepage = http://flam3.com/; - maintainers = maintainers.nand0p; + maintainers = [ maintainers.nand0p ]; platforms = platforms.linux; license = licenses.cc-by-nc-sa-20; }; From 1ce34c54588b7567eb680073ab9da1a3adc7aa87 Mon Sep 17 00:00:00 2001 From: Pierre Radermecker Date: Tue, 4 Apr 2017 17:56:42 +0200 Subject: [PATCH 146/172] albert: 0.10.0 -> 0.10.2 --- pkgs/applications/misc/albert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 2bbac699a3e3..4a42c55c2493 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "albert-${version}"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "1r8m0b6lqljy314ilpi58sdpqyb9rr502nzx3pgmx2g2xz4izsfj"; + sha256 = "0plb8c7js91bpf7qgq1snhry8x4zixyy34lq42nhsglab2kaq4ns"; }; nativeBuildInputs = [ cmake makeQtWrapper ]; From e84d5b23e13b76aa377e8408ad1bb2709d5421be Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Apr 2017 18:15:40 +0200 Subject: [PATCH 147/172] Allow systemd-fsck@.service to find fsck.* Fixes "fsck.ext4 doesn't exist, not checking file system on ...". --- nixos/modules/system/boot/systemd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 32e18ff0052d..f798862513cb 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -830,6 +830,7 @@ in # Some overrides to upstream units. systemd.services."systemd-backlight@".restartIfChanged = false; systemd.services."systemd-fsck@".restartIfChanged = false; + systemd.services."systemd-fsck@".path = [ config.system.path ]; systemd.services."user@".restartIfChanged = false; systemd.services.systemd-journal-flush.restartIfChanged = false; systemd.services.systemd-random-seed.restartIfChanged = false; From 527512e5549c237010be421b14535c95f4f907ba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 4 Apr 2017 19:21:27 +0300 Subject: [PATCH 148/172] qutebrowser: add withWebEngineDefault flag Allows to set QtWebEngine backend by default. --- .../networking/browsers/qutebrowser/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a07fc04b02ea..eb26811cfb81 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook +{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook , qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav -, qtwebkit-plugins }: +, qtwebkit-plugins +, withWebEngineDefault ? false +}: let pdfjs = stdenv.mkDerivation rec { @@ -73,7 +75,8 @@ in buildPythonApplication rec { postFixup = '' mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath - makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser + makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser \ + ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''} sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped ''; From 7171d16fd40ed53b29ef11125f23f0f68f672f51 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 25 Jan 2017 02:08:03 -0500 Subject: [PATCH 149/172] bap: init at 1.2.0 --- .../development/ocaml-modules/bap/default.nix | 62 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/ocaml-modules/bap/default.nix diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix new file mode 100644 index 000000000000..25564a0a3009 --- /dev/null +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -0,0 +1,62 @@ +{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}: + +buildOcaml rec { + name = "bap"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap"; + rev = "v${version}"; + sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw"; + }; + + sigs = fetchurl { + url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; + sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn"; + }; + + createFindlibDestdir = true; + + setupHook = writeText "setupHook.sh" '' + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/" + ''; + + nativeBuildInputs = [ which makeWrapper ]; + + buildInputs = [ ocaml_oasis + llvm_38 + utop ]; + + propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi + piqi-ocaml uuidm frontc ounit ]; + + installPhase = '' + export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR; + export PATH=$PATH:$out/bin + export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH:$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/ + mkdir -p $out/lib/bap + make install + rm $out/bin/baptop + makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\"" + wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH + ln -s $sigs $out/share/bap/sigs.zip + ''; + + disableIda = "--disable-ida --disable-fsi-benchmark"; + + doCheck = true; + + checkTarget = "check test"; + + configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; + + BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; + + meta = with stdenv.lib; { + description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; + homepage = https://github.com/BinaryAnalysisPlatform/bap/; + maintainers = [ maintainers.maurer ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 232f13318651..cf2b676a5d4f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -51,6 +51,8 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; + bap = callPackage ../development/ocaml-modules/bap { }; + bitstring = callPackage ../development/ocaml-modules/bitstring { }; bolt = callPackage ../development/ocaml-modules/bolt { }; From d022b4419cc2f4528203b8840ee2f9481344e55e Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 25 Jan 2017 02:14:40 -0500 Subject: [PATCH 150/172] bap-python: init at 1.1.0 --- .../python-modules/bap/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/bap/default.nix diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix new file mode 100644 index 000000000000..9362729af447 --- /dev/null +++ b/pkgs/development/python-modules/bap/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: + +buildPythonPackage rec { + name = "bap"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap-python"; + rev = "v${version}"; + sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3"; + }; + + propagatedBuildInputs = [bap requests]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; + homepage = https://github.com/BinaryAnalysisPlatform/bap/; + maintainers = [ maintainers.maurer ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5bb2b28d0019..22a3f56a6d46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -175,6 +175,10 @@ in { # packages defined elsewhere + bap = callPackage ../development/python-modules/bap { + bap = pkgs.ocamlPackages_4_02.bap; + }; + blivet = callPackage ../development/python-modules/blivet { }; breathe = callPackage ../development/python-modules/breathe { }; From e010c25ba41a09787168afd4c343ad49a8515f56 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 25 Jan 2017 02:18:06 -0500 Subject: [PATCH 151/172] libbap: init at master-2017-02-08 --- pkgs/development/libraries/libbap/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/libbap/default.nix diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix new file mode 100644 index 000000000000..83bd81456c07 --- /dev/null +++ b/pkgs/development/libraries/libbap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, + which }: + +stdenv.mkDerivation rec { + name = "libbap-${version}"; + version = "master-2017-02-08"; + + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap-bindings"; + rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108"; + sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb"; + }; + + nativeBuildInputs = [ autoreconfHook which ]; + buildInputs = [ ocaml bap findlib ctypes ]; + + preInstall = '' + mkdir -p $out/lib + mkdir -p $out/include + ''; + + meta = { + homepage = http://github.com/binaryanalysisplatform/bap-bindings; + description = "A C library for interacting with BAP"; + maintainers = [ stdenv.lib.maintainers.maurer ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fb20dab34d7..665e78c004c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8079,6 +8079,10 @@ with pkgs; libb2 = callPackage ../development/libraries/libb2 { }; + libbap = callPackage ../development/libraries/libbap { + inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; + }; + libbluedevil = callPackage ../development/libraries/libbluedevil { }; libbdplus = callPackage ../development/libraries/libbdplus { }; From aefb9671bf2e95b056570d4388c7a61a0749a602 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Apr 2017 08:03:55 -0400 Subject: [PATCH 152/172] docker: 17.03.0 -> 17.03.1 --- .../virtualization/docker/default.nix | 236 ++++++++++-------- pkgs/top-level/all-packages.nix | 8 +- 2 files changed, 134 insertions(+), 110 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index b8667997b16e..0fafb7fe3172 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -6,134 +6,154 @@ }: # https://github.com/docker/docker/blob/master/project/PACKAGERS.md +# https://github.com/docker/docker/blob/TAG/hack/dockerfile/binaries-commits with lib; -stdenv.mkDerivation rec { - name = "docker-${version}"; - version = "17.03.0-ce"; - rev = "60ccb22"; # should match the version commit +rec { + dockerGen = { + version, rev, sha256 + , runcRev, runcSha256 + , containerdRev, containerdSha256 + , tiniRev, tiniSha256 + } : stdenv.mkDerivation rec { + inherit version rev; - src = fetchFromGitHub { - owner = "docker"; - repo = "docker"; - rev = "v${version}"; - sha256 = "0ml9aan8x4w8kfz7dm9vvl8b1a0vq09si9b7z50xz84040cjhnr9"; - }; + name = "docker-${version}"; - docker-runc = runc.overrideAttrs (oldAttrs: rec { - name = "docker-runc"; src = fetchFromGitHub { owner = "docker"; - repo = "runc"; - rev = "a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70"; - sha256 = "0n7vr47fhpyxx5vdnp453qp4cq50w4hwgq3ldyj5878d91iir7l1"; - }; - # docker/runc already include these patches / are not applicable - patches = []; - }); - docker-containerd = containerd.overrideAttrs (oldAttrs: rec { - name = "docker-containerd"; - src = fetchFromGitHub { - owner = "docker"; - repo = "containerd"; - rev = "977c511eda0925a723debdc94d09459af49d082a"; - sha256 = "0hmcj8i70vv3a3bbdawrgi84a442m09x5mpc7fgn8dd3v031lcbc"; - }; - }); - docker-tini = tini.overrideAttrs (oldAttrs: rec { - name = "docker-init"; - src = fetchFromGitHub { - owner = "krallin"; - repo = "tini"; - rev = "949e6facb77383876aeff8a6944dde66b3089574"; - sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + repo = "docker"; + rev = "v${version}"; + sha256 = sha256; }; - # Do not remove static from make files as we want a static binary - patchPhase = '' + docker-runc = runc.overrideAttrs (oldAttrs: rec { + name = "docker-runc"; + src = fetchFromGitHub { + owner = "docker"; + repo = "runc"; + rev = runcRev; + sha256 = runcSha256; + }; + # docker/runc already include these patches / are not applicable + patches = []; + }); + docker-containerd = containerd.overrideAttrs (oldAttrs: rec { + name = "docker-containerd"; + src = fetchFromGitHub { + owner = "docker"; + repo = "containerd"; + rev = containerdRev; + sha256 = containerdSha256; + }; + }); + docker-tini = tini.overrideAttrs (oldAttrs: rec { + name = "docker-init"; + src = fetchFromGitHub { + owner = "krallin"; + repo = "tini"; + rev = tiniRev; + sha256 = tiniSha256; + }; + + # Do not remove static from make files as we want a static binary + patchPhase = '' + ''; + + NIX_CFLAGS_COMPILE = [ + "-DMINIMAL=ON" + ]; + }); + + buildInputs = [ + makeWrapper removeReferencesTo pkgconfig go-md2man go + sqlite devicemapper btrfs-progs systemd + ]; + + dontStrip = true; + + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] + ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" + ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; + + # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd + postPatch = '' + substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd + substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd ''; - NIX_CFLAGS_COMPILE = [ - "-DMINIMAL=ON" - ]; - }); + buildPhase = '' + patchShebangs . + export AUTO_GOPATH=1 + export DOCKER_GITCOMMIT="${rev}" + ./hack/make.sh dynbinary + ''; - buildInputs = [ - makeWrapper removeReferencesTo pkgconfig go-md2man go - sqlite devicemapper btrfs-progs systemd - ]; + outputs = ["out" "man"]; - dontStrip = true; + extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; - DOCKER_BUILDTAGS = [] - ++ optional (systemd != null) [ "journald" ] - ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; + installPhase = '' + install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker + install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + makeWrapper $out/libexec/docker/docker $out/bin/docker \ + --prefix PATH : "$out/libexec/docker:$extraPath" + makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ + --prefix PATH : "$out/libexec/docker:$extraPath" - # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd - postPatch = '' - substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd - substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd - ''; + # docker uses containerd now + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy + ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init - buildPhase = '' - patchShebangs . - export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" - ./hack/make.sh dynbinary - ''; + # systemd + install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service - outputs = ["out" "man"]; + # completion + install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker + install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish + install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker - extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; - - installPhase = '' - install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker - install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "$out/libexec/docker:$extraPath" - makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ - --prefix PATH : "$out/libexec/docker:$extraPath" - - # docker uses containerd now - ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim - ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc - ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy - ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init - - # systemd - install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service - - # completion - install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker - install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish - install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker - - # Include contributed man pages - man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + # Include contributed man pages + man/md2man-all.sh -q + manRoot="$man/share/man" + mkdir -p "$manRoot" + for manDir in man/man?; do + manBase="$(basename "$manDir")" # "man1" + for manFile in "$manDir"/*; do + manName="$(basename "$manFile")" # "docker-build.1" + mkdir -p "$manRoot/$manBase" + gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + done done - done - ''; + ''; - preFixup = '' - find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' + - ''; + preFixup = '' + find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' + + ''; - meta = { - homepage = http://www.docker.com/; - description = "An open source project to pack, ship and run any application as a lightweight container"; - license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook ]; - platforms = platforms.linux; + meta = { + homepage = http://www.docker.com/; + description = "An open source project to pack, ship and run any application as a lightweight container"; + license = licenses.asl20; + maintainers = with maintainers; [ offline tailhook ]; + platforms = platforms.linux; + }; + }; + + docker_17_03 = dockerGen rec { + version = "17.03.1-ce"; + rev = "c6d412e"; # git commit + sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7"; + runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe"; + runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m"; + containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc"; + containerdSha256 = "06f2gsx4w9z4wwjhrpafmz6c829wi8p7crj6sya6x9ii50bkn8p6"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f83222222637..6760a85952b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5332,7 +5332,7 @@ with pkgs; jdk = jdk8; jre = jre8; jre_headless = jre8_headless; - + openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { }; oraclejdk = pkgs.jdkdistro true false; @@ -13198,7 +13198,11 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - docker = callPackage ../applications/virtualization/docker { }; + inherit (callPackage ../applications/virtualization/docker { }) + docker_17_03; + + docker = docker_17_03; + docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; From a1e6176cbf3b38cf2ecc8f1543d6c562f509a144 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 4 Apr 2017 17:14:32 +0200 Subject: [PATCH 153/172] modules/searx: fix configFile type --- nixos/modules/services/networking/searx.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 3520c6d3f7da..e0eef9ed96f6 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -18,17 +18,12 @@ in services.searx = { - enable = mkOption { - type = types.bool; - default = false; - description = " - Whether to enable the Searx server. See https://github.com/asciimoo/searx - "; - }; + enable = mkEnableOption + "the searx server. See https://github.com/asciimoo/searx"; configFile = mkOption { - type = types.path; - default = ""; + type = types.nullOr types.path; + default = null; description = " The path of the Searx server configuration file. If no file is specified, a default file is used (default config file has @@ -72,7 +67,7 @@ in User = "searx"; ExecStart = "${cfg.package}/bin/searx-run"; }; - } // (optionalAttrs (configFile != "") { + } // (optionalAttrs (configFile != null) { environment.SEARX_SETTINGS_PATH = configFile; }); From f24c89a4d64dab1a52f7004bf17afb9a6dbd05c9 Mon Sep 17 00:00:00 2001 From: NWDD Date: Tue, 4 Apr 2017 21:10:53 +0200 Subject: [PATCH 154/172] gitkraken: 2.2.1 -> 2.3.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 023343f59cbe..076a78bd5b6e 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0ld5wdnrz4qpjl9af8hwmzli3201rfsh73lyy2zp8c98749a2zqn"; + sha256 = "ddb9eec34232e830646633c43bc9adc61afa0eee79500af29918b62780093b2a"; }; libPath = makeLibraryPath [ From 3f023c8989ffea5c378e251c176571ef6481af4b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Apr 2017 15:11:42 -0400 Subject: [PATCH 155/172] nix-plugins: 2.0.2 -> 2.0.3 Fixes darwin build --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 647f30f98280..6b61dbf75187 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix }: -let version = "2.0.2"; in +let version = "2.0.3"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "02bi0p9qjpyxzbr0ki9q774lwdjwcpipkzx84xx9q1ywwafjhr7b"; + sha256 = "033w4m9ah127sfls7zqzpp2b1wdzsvzzk3bnkv6jyi31bws7hadp"; }; buildInputs = [ nix ]; From 9b1a70f1ac59a0dea562ebf39907042c53e488ae Mon Sep 17 00:00:00 2001 From: George Whewell Date: Sat, 1 Apr 2017 22:11:11 +0100 Subject: [PATCH 156/172] mtools: fix build on darwin --- pkgs/tools/filesystems/mtools/UNUSED-darwin.patch | 11 +++++++++++ pkgs/tools/filesystems/mtools/default.nix | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/filesystems/mtools/UNUSED-darwin.patch diff --git a/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch b/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch new file mode 100644 index 000000000000..46b790afd30a --- /dev/null +++ b/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch @@ -0,0 +1,11 @@ +--- mtools/sysincludes.h.orig 2017-04-01 20:59:46.083196540 +0100 ++++ mtools/sysincludes.h 2017-04-01 20:59:12.855030456 +0100 +@@ -103,7 +103,7 @@ + # define PACKED __attribute__ ((packed)) + # if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3 + /* gcc 2.6.3 doesn't have "unused" */ /* mool */ +-# define UNUSED(x) x __attribute__ ((unused));x ++# define UNUSED(x) x + # define UNUSEDP __attribute__ ((unused)) + # else + # define UNUSED(x) x diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 6b9631bfccfe..ff311b9fae2f 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -8,12 +8,19 @@ stdenv.mkDerivation rec { sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar"; }; + # Prevents errors such as "mainloop.c:89:15: error: expected ')'" + # Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html + patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + + # fails to find X on darwin + configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x"; + doCheck = true; meta = { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin; maintainers = [ ]; }; } From 7acd1e7f68bb6c7d3032fa287c46c238806ac163 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Apr 2017 20:56:27 -0400 Subject: [PATCH 157/172] sway: 0.11 -> 0.12.2 --- pkgs/applications/window-managers/sway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 79077b477b44..64899e555c7d 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.11"; + version = "0.12.2"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -13,7 +13,7 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv"; + sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; From 89188e2972315e8fd555417dadf8a5646e92d81d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Apr 2017 21:01:27 -0400 Subject: [PATCH 158/172] docker-distribution: 2.5.1 -> 2.6.0 --- .../virtualization/docker-distribution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix index 4850d7d9f5f5..c3c0de149668 100644 --- a/pkgs/applications/virtualization/docker-distribution/default.nix +++ b/pkgs/applications/virtualization/docker-distribution/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "distribution-${version}"; - version = "2.5.1"; + version = "2.6.0"; rev = "v${version}"; goPackagePath = "github.com/docker/distribution"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "docker"; repo = "distribution"; inherit rev; - sha256 = "08nxcsl9bc3k9gav2mkqccm5byrlfcgy6qaqaywiyza0b0cn4kdc"; + sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"; }; meta = with stdenv.lib; { From b4b95c6686205c9589c160616a0adbf7fb81fb4f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Apr 2017 21:04:39 -0400 Subject: [PATCH 159/172] nano: 2.7.5 -> 2.8.0 --- pkgs/applications/editors/nano/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index b1f581dc8417..3d089c1cec19 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,18 +20,18 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.7.5"; - + version = "2.8.0"; + src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1r37gqx7hppqbgsbclchiis8wzzpb9srm3q3dlvlii2gpkk28kd6"; + sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; - + outputs = [ "out" "info" ]; - + configureFlags = '' --sysconfdir=/etc ${optionalString (!enableNls) "--disable-nls"} From fe319f8ebdbb14aea31e24e1f946278fad990b5e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Apr 2017 22:35:35 -0400 Subject: [PATCH 160/172] nix-plugins: 2.0.3 -> 2.0.6. Fixes incompatibility between build-time and link-time nix version --- pkgs/development/libraries/nix-plugins/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 6b61dbf75187..c808ca616b18 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, nix }: -let version = "2.0.3"; in +{ stdenv, fetchFromGitHub, nix, boehmgc }: +let version = "2.0.6"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,12 +7,10 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "033w4m9ah127sfls7zqzpp2b1wdzsvzzk3bnkv6jyi31bws7hadp"; + sha256 = "0gbajaxg7awk1fhicsnmvhrmd47wc7i38lz4baxks17sgx76amqr"; }; - buildInputs = [ nix ]; - - buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" ]; + buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ]; installFlags = [ "PREFIX=$(out)" ]; From f038db24a601c5ec497fb8a70b577bd3a8093ae9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Apr 2017 22:50:00 -0400 Subject: [PATCH 161/172] nix-plugins: 2.0.6 -> 2.0.7. Fixes warning on nix 1.12 --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index c808ca616b18..2dcc7e9a53dd 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix, boehmgc }: -let version = "2.0.6"; in +let version = "2.0.7"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "0gbajaxg7awk1fhicsnmvhrmd47wc7i38lz4baxks17sgx76amqr"; + sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs"; }; buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ]; From 0d8b5be67d30478c0790c8facf0198c730c9a1b2 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Tue, 4 Apr 2017 22:50:59 -0400 Subject: [PATCH 162/172] xpra: 0.17.6 -> 2.0.1 Requires build against newer ffmpeg (3.2.x instead of 3.1.x) because of new symbols: FF_PROFILE_H264_MULTIVIEW_HIGH FF_PROFILE_H264_STEREO_HIGH --- pkgs/tools/X11/xpra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 943707c0c5ee..15feb30743b2 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf -, ffmpeg, x264, libvpx, libwebp +, ffmpeg_3_2, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudioLight, gobjectIntrospection , pam }: @@ -11,11 +11,11 @@ with lib; let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { - name = "xpra-0.17.6"; + name = "xpra-2.0.1"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj"; + sha256 = "11y2icy24mc337gvppp0ankyl3wxrprlifm7spixvsndyz056mb8"; }; buildInputs = [ @@ -28,7 +28,7 @@ in buildPythonApplication rec { pango cairo gdk_pixbuf atk gtk2 glib - ffmpeg libvpx x264 libwebp + ffmpeg_3_2 libvpx x264 libwebp gobjectIntrospection gst_all_1.gstreamer From 5ffece7de1b75d2e059412ec417eebf01bb3bb6c Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Wed, 5 Apr 2017 15:37:47 +0800 Subject: [PATCH 163/172] llvm-hs: Point llvm-hs to llvm_4 --- pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 017f2ea7637a..f03fc73387f3 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -239,6 +239,8 @@ self: super: builtins.intersectAttrs super { } ); + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_4; }; + # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; From f911770acfaa6fd5a18e5236335ec7e2d3f34793 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Apr 2017 08:17:49 -0400 Subject: [PATCH 164/172] sway: Add xwayland build input --- pkgs/applications/window-managers/sway/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 64899e555c7d..f392945b36dd 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, pango, libinput , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap +, xwayland }: let @@ -18,7 +19,7 @@ in nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; - buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; From 637770f699c47ef9f25f4b4c1f2785be5b71d805 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 5 Apr 2017 15:24:05 +0200 Subject: [PATCH 165/172] gnupg21: 2.1.19 -> 2.1.20 See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00002.html for release information --- pkgs/tools/security/gnupg/21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 72786247af41..230ace078234 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.19"; + version = "2.1.20"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26"; + sha256 = "03cnd6gz8f4lf69inskssw57idrswcdimhccdyglmrlv6rlrmkr4"; }; buildInputs = [ From 12839e45997486bab15aa24717618f3607168f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Apr 2017 15:48:23 +0200 Subject: [PATCH 166/172] knot-resolver: maintenance 1.2.4 -> 1.2.5 --- pkgs/servers/dns/knot-resolver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index bc9e35f88c4b..b916207e01fd 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "630b2ad0bfdcf59164957a377adef8b1fddc37a58a7e1d10e76a1b497a30f036"; + sha256 = "9a50e32b90219a3e0b863d13f7a54f6064410371feff5f226439a0f9bff5edd1"; }; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ knot-dns luajit libuv gnutls ] ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin - ## optional dependencies + ## optional dependencies; TODO: libedit, dnstap? ++ optional doInstallCheck cmocka ++ optional stdenv.isLinux systemd # socket activation ++ [ From 44168b4b22a8c3a60ac4782c90052b497c4dee40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Apr 2017 16:07:17 +0200 Subject: [PATCH 167/172] knot-resolver: update the source hash Just nitpick changes in the tarball, minutes after the release. --- pkgs/servers/dns/knot-resolver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index b916207e01fd..c58b66d42f27 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "9a50e32b90219a3e0b863d13f7a54f6064410371feff5f226439a0f9bff5edd1"; + sha256 = "30e24f9681e40c79a0aadbbfd78aaa72534dd3bca3347de89dfeae055b2c99e4"; }; outputs = [ "out" "dev" ]; From 6b5e5de0ef2a040cab9af7388487b16030b877db Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 5 Apr 2017 03:00:21 +0200 Subject: [PATCH 168/172] rss2email: init at 3.9 --- .../feedreaders/rss2email/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/feedreaders/rss2email/default.nix diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix new file mode 100644 index 000000000000..6b92db9efa55 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -0,0 +1,29 @@ +{ pythonPackages, fetchurl, lib }: + +with pythonPackages; + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "rss2email"; + version = "3.9"; + + propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; + + src = fetchurl { + url = "mirror://pypi/r/rss2email/${name}.tar.gz"; + sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; + }; + + postInstall = '' + install -Dm 644 r2e.1 $out/share/man/man1/r2e.1 + # an alias for better finding the manpage + ln -s -T r2e.1 $out/share/man/man1/rss2email.1 + ''; + + meta = with lib; { + description = "A tool that converts RSS/Atom newsfeeds to email."; + homepage = "https://pypi.python.org/pypi/rss2email"; + license = licenses.gpl2; + maintainers = with maintainers; [ jb55 profpatsch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67ca563cdacd..24745919f54b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3797,6 +3797,10 @@ with pkgs; rrdtool = callPackage ../tools/misc/rrdtool { }; + rss2email = callPackage ../applications/networking/feedreaders/rss2email { + pythonPackages = python3Packages; + }; + rsstail = callPackage ../applications/networking/feedreaders/rsstail { }; rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; From 55d1237c6bae4e7a32805f2bcf8c723475a0b282 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Wed, 5 Apr 2017 11:18:12 -0500 Subject: [PATCH 169/172] transcrypt: 1.0.1 -> 1.0.2 --- .../version-management/git-and-tools/transcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 36d81ae9c441..6238cf9c9754 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "transcrypt-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "12n8714my9i93lysqa3dj1z5xgi10iv5y1mnsqki9zn5av3lgqkq"; + sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc"; }; buildInputs = [ git makeWrapper openssl ]; From a6420e13a2ed7a6dfe4463db5d92cd45b2bfa6a9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 4 Apr 2017 21:19:38 +0200 Subject: [PATCH 170/172] luksroot: Wait for the header (device) to appear The LUKS header can be on another device (e.g. a USB stick). In my case it can take up to two seconds until the partition on my USB stick is available (i.e. the decryption fails without this patch). This will also remove some redundancy by providing the shell function `wait_target` and slightly improve the output (one "." per second and a success/failure indication after 10 seconds instead of always printing "ok"). --- nixos/modules/system/boot/luksroot.nix | 51 +++++++++++++++----------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 8978b73749b7..6e867b674398 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -6,29 +6,38 @@ let luks = config.boot.initrd.luks; openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: assert name' == name; '' - # Wait for luksRoot to appear, e.g. if on a usb drive. - # XXX: copied and adapted from stage-1-init.sh - should be - # available as a function. - if ! test -e ${device}; then - echo -n "waiting 10 seconds for device ${device} to appear..." - for try in $(seq 10); do - sleep 1 - if test -e ${device}; then break; fi - echo -n . - done - echo "ok" - fi + + # Wait for a target (e.g. device, keyFile, header, ...) to appear. + wait_target() { + local name="$1" + local target="$2" + + if [ ! -e $target ]; then + echo -n "Waiting 10 seconds for $name $target to appear" + local success=false; + for try in $(seq 10); do + echo -n "." + sleep 1 + if [ -e $target ]; then success=true break; fi + done + if [ $success = true ]; then + echo " - success"; + else + echo " - failure"; + fi + fi + } + + # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g. + # if on a USB drive. + wait_target "device" ${device} ${optionalString (keyFile != null) '' - if ! test -e ${keyFile}; then - echo -n "waiting 10 seconds for key file ${keyFile} to appear..." - for try in $(seq 10); do - sleep 1 - if test -e ${keyFile}; then break; fi - echo -n . - done - echo "ok" - fi + wait_target "key file" ${keyFile} + ''} + + ${optionalString (header != null) '' + wait_target "header" ${header} ''} open_normally() { From 471626e6fba855dae35df7b79787a0da04d408b8 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 5 Apr 2017 20:40:14 +0200 Subject: [PATCH 171/172] scalafmt: 0.6.6 -> 0.6.7 Updates scalafmt to 0.6.7 --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 2c763072c294..b0d02cb8233a 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.6.6"; + version = "0.6.7"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "143g288m6xr93pavbym2y6f8gvihsf53fnzjra6ln1s39n9h205n"; + sha256 = "122x4a5x8024s7qqqs7vx8kz1x18q2l6alcvpzvsqkc304ybhfmh"; }; unpackPhase = "tar xvzf $src"; From f1480038a4675f467b8d977e99cf57c28e08d0a5 Mon Sep 17 00:00:00 2001 From: Matthias Herrmann Date: Wed, 5 Apr 2017 20:20:01 +0200 Subject: [PATCH 172/172] urbanterror: 4.3.1 -> 4.3.2 --- pkgs/games/urbanterror/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 50b127fa9dc2..bc293a881079 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.3.1"; + version = "4.3.2"; srcs = [ (fetchurl { - url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror431_full.zip"; - sha256 = "1dfnyb2grf2fxxphwj7p2ff721j2l0gwrj76jzympr32sim5a6cw"; + url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror432_full.zip"; + sha256 = "192jwdyfy18cg413ysaklqc8yzmdnshljqc6dnr0xkd6dxbf3pkl"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.3.1.zip"; - sha256 = "1rbiqa1ki73649np3af96cilavkgv66a0b6p0a5x26cxvpgg128k"; + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.zip"; + sha256 = "0m376hdkk8vjnbdy8zakjazyag6jiw4n8zy4lxhv2ndn9mii8lcx"; }) ]; buildInputs = [ unzip SDL mesa openal curl libXxf86vm ]; - sourceRoot = "ioq3-for-UrbanTerror-4-release-4.3.1"; + sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' echo "USE_OPENAL = 1" > Makefile.local