From dce2c258ac33ee1cd3b3e852b36e1d8fa11f33a1 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Sun, 23 Apr 2017 09:45:21 -0400 Subject: [PATCH 01/57] dockerTools: optionally preserve directory symlinks In some cases, this seems to save a lot (>40%) of space. --- pkgs/build-support/docker/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 7f63664dadd0..8230eb69c29c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -233,6 +233,10 @@ rec { baseJson, # Files to add to the layer. contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # Additional commands to run on the layer before it is tar'd up. extraCommands ? "" }: @@ -247,7 +251,7 @@ rec { echo "Adding contents..." for item in $contents; do echo "Adding $item" - rsync -ak --chown=0:0 $item/ layer/ + rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ done else echo "No contents to add to layer." @@ -286,6 +290,10 @@ rec { runAsRoot, # Files to add to the layer. If null, an empty layer will be created. contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # JSON containing configuration and metadata for this layer. baseJson, # Existing image onto which to append the new layer. @@ -310,7 +318,7 @@ rec { echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." - rsync -ak --chown=0:0 $item/ layer/ + rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ done ''; @@ -372,6 +380,10 @@ rec { fromImageTag ? null, # Files to put on the image (a nix store path or list of paths). contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # Docker config; e.g. what command to run on the container. config ? null, # Optional bash script to run on the files prior to fixturizing the layer. @@ -397,11 +409,12 @@ rec { if runAsRoot == null then mkPureLayer { name = baseName; - inherit baseJson contents extraCommands; + inherit baseJson contents keepContentsDirlinks extraCommands; } else mkRootLayer { name = baseName; inherit baseJson fromImage fromImageName fromImageTag - contents runAsRoot diskSize extraCommands; + contents keepContentsDirlinks runAsRoot diskSize + extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { buildInputs = [ jshon pigz coreutils findutils ]; From cbe48055929d008c3978a443b19e58975ddd7431 Mon Sep 17 00:00:00 2001 From: Xander Remon van der Goot Date: Mon, 11 Dec 2017 14:05:47 +0100 Subject: [PATCH 02/57] hl1110 : init at 3.0.1-1 This commit adds a cups driver for the Brother HL1110 printer. --- pkgs/misc/cups/drivers/hl1110/default.nix | 73 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/misc/cups/drivers/hl1110/default.nix diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix new file mode 100644 index 000000000000..6f27985bdbfc --- /dev/null +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -0,0 +1,73 @@ +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, patchelf}: + +let + version = "3.0.1-1"; +cupsdeb = fetchurl { + url = "http://download.brother.com/welcome/dlf100421/hl1110cupswrapper-${version}.i386.deb"; + sha256 = "a87880f4ece764a724411b5b24d15d1b912f6ffc6ecbfd9fac4cd5eda13d2eb7"; +}; +srcdir = "hl1110cupswrapper-GPL_src-${version}"; +cupssrc = fetchurl { + url = "http://download.brother.com/welcome/dlf100422/${srcdir}.tar.gz"; + sha256 = "be1dce6a4608cb253b0b382db30bf5885da46b010e8eb595b15c435e2487761c"; +}; +lprdeb = fetchurl { + url = "http://download.brother.com/welcome/dlf100419/hl1110lpr-${version}.i386.deb"; + sha256 = "5af241782a0d500d7f47e06ea43d61127f4019b5b1c6e68b4c1cb4521a742c22"; +}; + in +stdenv.mkDerivation { + name = "cups-brother-hl1110"; + + srcs = [ lprdeb cupssrc cupsdeb ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + unpackPhase = '' + tar -xvf ${cupssrc} + ''; + buildPhase = '' + gcc -Wall ${srcdir}/brcupsconfig/brcupsconfig.c -o brcupsconfig4 + ''; + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ + --replace /opt "$out/opt" \ + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1110/lpd/psconvert2 + + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/brprintconflsr3 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/rawtobr3 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter + + wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + wrapProgram $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 $out/lib/cups/filter/brother_lpdwrapper_HL1110 + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brother-HL1110-cups-en.ppd $out/lib/cups/filter/brother-HL1110-cups-en.ppd + cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 + + wrapProgram $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother HL1110 printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4463b5b77d4e..3c1885f91056 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19453,6 +19453,8 @@ with pkgs; cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; + cups-brother-hl1110 = callPackage_i686 ../misc/cups/drivers/hl1110 { }; + # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { }; From 22de8e19178b0cf5a53d6b02e895b8ac517396d4 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 15 Jan 2018 22:38:55 -0500 Subject: [PATCH 03/57] hll2390dw-cups: init at 4.0.0-1 --- .../cups/drivers/hll2390dw-cups/default.nix | 71 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/misc/cups/drivers/hll2390dw-cups/default.nix diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix new file mode 100644 index 000000000000..cda4ed6304d2 --- /dev/null +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, makeWrapper +, cups +, dpkg +, a2ps, ghostscript, gnugrep, gnused, coreutils, file, perl, which +}: + +stdenv.mkDerivation rec { + name = "hll2390dw-cups-${version}"; + version = "4.0.0-1"; + + src = fetchurl { + # The i386 part is a lie. There are x86, x86_64 and armv7l drivers. + # Though this builds only supports x86_64 for now. + url = "http://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; + sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + + unpackPhase = "true"; + + installPhase = '' + dpkg-deb -x $src $out + + substituteInPlace $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ + --replace /opt "$out/opt" \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HLL2390DW\"; #" + + # FIXME : Allow i686 and armv7l variations to be setup instead. + _PLAT=x86_64 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 $out/opt/brother/Printers/HLL2390DW/lpd/brprintconflsr3 + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 $out/opt/brother/Printers/HLL2390DW/lpd/rawtobr3 + + for f in \ + $out/opt/brother/Printers/HLL2390DW/cupswrapper/lpdwrapper \ + $out/opt/brother/Printers/HLL2390DW/cupswrapper/paperconfigml2 \ + ; do + #substituteInPlace $f \ + wrapProgram $f \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused + ]} + done + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter $out/lib/cups/filter/brother_lpdwrapper_HLL2390DW + + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/ + + wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + ''; + + meta = with stdenv.lib; { + homepage = http://www.brother.com/; + description = "Brother HL-L2390DW combined print driver"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128; + maintainers = [ maintainers.samueldr ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fd87d2a4521..623508bce617 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19765,6 +19765,8 @@ with pkgs; canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; + hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { }; + mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; mfcj470dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj470dwlpr { }; From f2622e6aff3ff69557bd238ed6b0e9c941068884 Mon Sep 17 00:00:00 2001 From: Benjamin Mellor Date: Sat, 27 Jan 2018 17:30:16 +1100 Subject: [PATCH 04/57] mono{48,50,54}: make sure configureFlags are used in configurePhase When copying generic-nix to generic-cmake.nix, an explicit configurePhase was added, but it doesn't use the existing configureFlags. Fixing this allowed removing the postBuild fixup of the path to libgdiplus.so, since the --with-libgdiplus option already handles that. --- pkgs/development/compilers/mono/generic-cmake.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 7621bd56d47b..929d00491382 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 dontDisableStatic = true; - # In fact I think this line does not help at all to what I - # wanted to achieve: have mono to find libgdiplus automatically configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { configurePhase = '' patchShebangs ./ - ./autogen.sh --prefix $out + ./autogen.sh --prefix $out $configureFlags ''; # Attempt to fix this error when running "mcs --version": @@ -58,13 +56,13 @@ stdenv.mkDerivation rec { substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" ''; - # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps + # Fix mono DLLMap so it can find libX11 to run winforms apps + # libgdiplus is correctly handled by the --with-libgdiplus configure flag # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive # http://www.mono-project.com/Config_DllMap postBuild = '' find . -name 'config' -type f | xargs \ - sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ - -e 's#[^"]*libgdiplus[^"]*"#${libgdiplus}/lib/libgdiplus.so"#' \ + sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" ''; # Without this, any Mono application attempting to open an SSL connection will throw with From a842f0e90577d2e715e5a55e3079698946b3f2b9 Mon Sep 17 00:00:00 2001 From: Alain Lehmann Date: Sun, 11 Feb 2018 14:15:28 +0100 Subject: [PATCH 05/57] graph-tool: 2.16 -> 2.26 - add ncurses: configure links against ncurses and fails otherwise configure: error: Could not link test program to Python. https://travis-ci.org/NixOS/nixpkgs/builds/48759067 The given hint (Maybe the main Python library has been installed in some non-standard library path) is misleading. The config.log reveals that the failure is due to missing ncurses link option - with-boost-libdir is need to find Boost::IOStreams/regex/etc. - expat/cgal are detected in /usr/lib when not specified explicitly - boost > boost159 is needed to have -lboost_python3 (and -lboost_python) - set pythonModule = Python; => inorder to be used in python.buildEnv { extraLibs = [..]; } tested on MacOSX and in a linux Docker container with: > nix-shell -I nixpkgs=. -p python2.pkgs.graph-tool > nix-shell -I nixpkgs=. -p python3.pkgs.graph-tool --- .../development/python-modules/graph-tool/2.x.x.nix | 13 +++++++++---- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 99fe4b73cb98..b3ed1a8b6ec8 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, -gobjectIntrospection, pygobject3, gtk3, matplotlib }: +gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses }: stdenv.mkDerivation rec { - version = "2.16"; + version = "2.26"; name = "${python.libPrefix}-graph-tool-${version}"; + pythonModule = python; + meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; homepage = http://graph-tool.skewed.de/; @@ -16,16 +18,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p"; + sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz"; }; configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" + "--with-boost-libdir=${boost}/lib" + "--with-expat=${expat}" + "--with-cgal=${cgal}" "--enable-openmp" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ boost diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 515759d3e470..64a12ea69dd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7970,9 +7970,7 @@ in { }; }; - # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067 - graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet" - else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; grappelli_safe = buildPythonPackage rec { version = "0.3.13"; From 83dc28cae2982f6aaa507192a19aff3ef0ff2074 Mon Sep 17 00:00:00 2001 From: Alain Lehmann Date: Mon, 12 Feb 2018 21:33:14 +0100 Subject: [PATCH 06/57] graph-tool: use buildPythonPackage with format = "other"; --- pkgs/development/python-modules/graph-tool/2.x.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index b3ed1a8b6ec8..0b89303dd5ab 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, -gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses }: +gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, +buildPythonPackage }: -stdenv.mkDerivation rec { +buildPythonPackage rec { + format = "other"; version = "2.26"; name = "${python.libPrefix}-graph-tool-${version}"; - pythonModule = python; - meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; homepage = http://graph-tool.skewed.de/; From d8a4e098f6af2934f6d3c575a8c10d95059a3c58 Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 18 Feb 2018 15:58:13 +0100 Subject: [PATCH 07/57] firehol: 3.1.5: search for config files in /etc/firehol to fix error when running firehol command, see issue #35114 --- pkgs/applications/networking/firehol/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index cf41ca1b0b3b..2435b2dcc98d 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -52,6 +52,17 @@ stdenv.mkDerivation rec { AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ '') + + # put firehol config files in /etc/firehol (not $out/etc/firehol) + # to avoid error on startup, see #35114 + (pkgs.writeText "firehol-sysconfdir.patch" + '' + --- a/sbin/install.config.in.in + +++ b/sbin/install.config.in.in + @@ -4 +4 @@ + -SYSCONFDIR="@sysconfdir_POST@" + +SYSCONFDIR="/etc" + '') ]; nativeBuildInputs = [ autoconf automake ]; From dce83f0b7971714737a3e67a63537ebdc960125f Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 18 Feb 2018 16:12:06 +0100 Subject: [PATCH 08/57] firehol: 3.1.5: fix uname command path quoting bug Missing quotes of $UNAME_CMD in the firehol bash script result in an error if the path to uname contains a dash, as in /nix/store/...-coreutils-.../bin/uname. Might be considered an upstream bug but only appears in this special case, unlikely to occur in other distros. --- .../networking/firehol/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 2435b2dcc98d..6c0d43b1c129 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -63,6 +63,24 @@ stdenv.mkDerivation rec { -SYSCONFDIR="@sysconfdir_POST@" +SYSCONFDIR="/etc" '') + + # we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname + # will be interpreted as IFS -> error. this might be considered an upstream bug + # but only appears when there are dashes in the command path + (pkgs.writeText "firehol-uname-command.patch" + '' + --- a/sbin/firehol + +++ b/sbin/firehol + @@ -10295,7 +10295,7 @@ + kmaj=$1 + kmin=$2 + + - set -- $($UNAME_CMD -r) + + set -- $("$UNAME_CMD" -r) + eval $kmaj=\$1 $kmin=\$2 + } + kernel_maj_min KERNELMAJ KERNELMIN + '') ]; nativeBuildInputs = [ autoconf automake ]; From 3c801e92a2b38c97ba999db363f40624199ba65a Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Sat, 24 Feb 2018 16:47:18 +0100 Subject: [PATCH 09/57] kodi: add IPTV Simple addon --- pkgs/applications/video/kodi/plugins.nix | 26 +++++++++++++++++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6bcba1e927f9..01e134afee6f 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,5 +1,5 @@ { stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip -, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun }: +, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }: with (callPackage ./commons.nix {}); @@ -314,4 +314,28 @@ rec { extraBuildInputs = [ jsoncpp libhdhomerun ]; }; + + pvr-iptvsimple = mkKodiABIPlugin rec { + + plugin = "pvr-iptvsimple"; + namespace = "pvr.iptvsimple"; + version = "2.4.14"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.iptvsimple"; + rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8"; + sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kodi-pvr/pvr.iptvsimple; + description = "Kodi's IPTV Simple client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; + + extraBuildInputs = [ zlib ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 140da3dd2f2b..0bef781b9605 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18124,6 +18124,7 @@ with pkgs; ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun + ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple ); }; From 24246f2d891d3cb208477b129884ce09ad1697a0 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 6 Mar 2018 00:29:14 +0100 Subject: [PATCH 10/57] i3-wk-switch: init at 2017-08-21 --- lib/maintainers-list.nix | 5 +++ .../window-managers/i3/wk-switch.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/window-managers/i3/wk-switch.nix diff --git a/lib/maintainers-list.nix b/lib/maintainers-list.nix index 608c36e91d2a..23afd6b9a7cc 100644 --- a/lib/maintainers-list.nix +++ b/lib/maintainers-list.nix @@ -3363,6 +3363,11 @@ github = "symphorien"; name = "Guillaume Girol"; }; + synthetica = { + email = "nix@hilhorst.be"; + github = "Synthetica9"; + name = "Patrick Hilhorst"; + }; szczyp = { email = "qb@szczyp.com"; github = "szczyp"; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix new file mode 100644 index 000000000000..04c99d500a1d --- /dev/null +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +let + pkgName = "i3-wk-switch"; +in +python2Packages.buildPythonApplication rec { + name = "${pkgName}-${version}"; + version = "2017-08-21"; + + # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb + src = fetchFromGitHub { + owner = "tmfink"; + repo = pkgName; + rev = "484f840"; + sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb"; + }; + + propagatedBuildInputs = with python2Packages; [ i3-py ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p "$out/bin" + cp i3-wk-switch.py "$out/bin/i3-wk-switch" + ''; + + meta = with stdenv.lib; { + description = "XMonad-like workspace switching for i3"; + maintainers = with maintainers; [ synthetica ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + homepage = https://travisf.net/i3-wk-switcher; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42e0e6daba6b..ace01666eb4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10433,7 +10433,7 @@ with pkgs; ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them - # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, + # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, # or other runtime dispatcher libGL = mesa_noglu; @@ -15968,6 +15968,8 @@ with pkgs; i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { }; + i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + i810switch = callPackage ../os-specific/linux/i810switch { }; icewm = callPackage ../applications/window-managers/icewm {}; From f3c5939ac90c551cecc768d091417a8adbc7ccb8 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 6 Mar 2018 01:00:44 +0100 Subject: [PATCH 11/57] fix license --- pkgs/applications/window-managers/i3/wk-switch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index 04c99d500a1d..577a86b05623 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -29,7 +29,7 @@ python2Packages.buildPythonApplication rec { description = "XMonad-like workspace switching for i3"; maintainers = with maintainers; [ synthetica ]; platforms = platforms.linux; - license = licenses.gpl3Plus; + license = licenses.mit; homepage = https://travisf.net/i3-wk-switcher; }; } From eba94285a365a089d6f9aa7d67a45a27b620dd5f Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 6 Mar 2018 11:39:49 +0100 Subject: [PATCH 12/57] Following @teto's suggestion with regards to pname --- pkgs/applications/window-managers/i3/wk-switch.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index 577a86b05623..39bd62cd5aa9 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -1,16 +1,13 @@ { stdenv, fetchFromGitHub, python2Packages }: -let - pkgName = "i3-wk-switch"; -in python2Packages.buildPythonApplication rec { - name = "${pkgName}-${version}"; + pname = "i3-wk-switch"; version = "2017-08-21"; # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb src = fetchFromGitHub { owner = "tmfink"; - repo = pkgName; + repo = pname; rev = "484f840"; sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb"; }; From b91fc28db0ee9204b404e611a965ea52360e9467 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 7 Mar 2018 00:40:27 +0100 Subject: [PATCH 13/57] firehol: build firehol command by default fixes #35139 --- pkgs/applications/networking/firehol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 6c0d43b1c129..5bb7159149c4 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -2,8 +2,8 @@ , autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, utillinux, whois -# Just install FireQOS without FireHOL -, onlyQOS ? true +# If true, just install FireQOS without FireHOL +, onlyQOS ? false }: stdenv.mkDerivation rec { From 0a9319a4b065c9e85fbeee3cb82812a3afa4171a Mon Sep 17 00:00:00 2001 From: rittelle <33598633+rittelle@users.noreply.github.com> Date: Wed, 7 Mar 2018 17:32:10 +0100 Subject: [PATCH 14/57] kdebugsettings: init --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kdebugsettings.nix | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/applications/kde/kdebugsettings.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 134ec56788e8..1e9b6bf785e7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2955,6 +2955,11 @@ github = "risicle"; name = "Robert Scott"; }; + rittelle = { + email = "rittelle@posteo.de"; + github = "rittelle"; + name = "Lennart Rittel"; + }; rlupton20 = { email = "richard.lupton@gmail.com"; github = "rlupton20"; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8fd65770afd5..b90eca239421 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -93,6 +93,7 @@ let kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdav = callPackage ./kdav.nix {}; + kdebugsettings = callPackage ./kdebugsettings.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix new file mode 100644 index 000000000000..a58e1b25a2ee --- /dev/null +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + gettext, + kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, + python +}: + +mkDerivation { + name = "kdebugsettings"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.rittelle ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python + ]; + propagatedUserEnvPkgs = [ ]; +} From be8c9afa788e08aaa6027292dc751c75fee37f57 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 25 Feb 2018 12:14:10 +0100 Subject: [PATCH 15/57] ldc: 1.7.0 -> 1.8.0 --- pkgs/development/compilers/ldc/default.nix | 26 ++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index bdb74680b134..1fd839180c56 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage , bootstrapVersion ? false -, version ? "1.7.0" -, ldcSha256 ? "1g8qvmlzvsp030z2rw6lis4kclsd9mlmnbim5kas0k1yr9063m3w" +, version ? "1.8.0" +, ldcSha256 ? "0zswjlibj8zcdj06nn09jjhbd99chsa5f4kps8xifzgrpgsa28g4" }: let @@ -29,16 +29,12 @@ let sha256 = ldcSha256; }; - sourceRoot = "."; - postUnpack = '' - cd ldc-${version}-src/ - patchShebangs . # Remove cppa test for now because it doesn't work. - rm tests/d2/dmd-testsuite/runnable/cppa.d - rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp '' + stdenv.lib.optionalString (bootstrapVersion) '' @@ -55,12 +51,15 @@ let # #============================== #Test failed: expected rc == 0, exited with rc == 1 - rm tests/d2/dmd-testsuite/runnable/variadic.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/variadic.d '' + stdenv.lib.optionalString (!bootstrapVersion) '' # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org - rm -r tests/dynamiccompile + rm -r ldc-${version}-src/tests/dynamiccompile + + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall ''; ROOT_HOME_DIR = "$(echo ~root)"; @@ -190,8 +189,6 @@ let src = ldcBuild.src; - sourceRoot = "."; - postUnpack = ldcBuild.postUnpack; postPatch = ldcBuild.postPatch; @@ -212,7 +209,7 @@ let "-DLDC_WITH_LLD=OFF" # Xcode 9.0.1 fixes that bug according to ldc release notes "-DRT_ARCHIVE_WITH_LDC=OFF" - "-DD_COMPILER=${ldcBuild}/bin/ldmd2" + "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" ) ''; @@ -223,7 +220,7 @@ let buildCmd = if bootstrapVersion then "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" else - "make -j$NIX_BUILD_CORES DMD=${ldcBuild}/bin/ldc2 druntime-test-runner druntime-test-runner-debug phobos2-test-runner phobos2-test-runner-debug"; + "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; testCmd = if bootstrapVersion then "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" @@ -232,6 +229,7 @@ let buildPhase = '' ${buildCmd} + ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 ${testCmd} ''; From 17e8da6b71ac02066e6136b40b18ac1868241cac Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Wed, 7 Mar 2018 23:41:33 -0500 Subject: [PATCH 16/57] libetpan: 1.6 -> 1.8 --- pkgs/development/libraries/libetpan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 063633619431..b09c2dd0f47e 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,6 +1,6 @@ { autoconf, automake, fetchgit, libtool, stdenv, openssl }: -let version = "1.6"; in +let version = "1.8"; in stdenv.mkDerivation { name = "libetpan-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/dinhviethoa/libetpan"; rev = "refs/tags/" + version; - sha256 = "13hv49271rr9yj7ifxqqmc0jfy1f26llivhp22s5wigick7qjxky"; + sha256 = "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk"; }; buildInputs = [ autoconf automake libtool openssl ]; From 44882a9b976557b6a42eb5ee975387937a4ab9a9 Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Thu, 8 Mar 2018 00:30:33 -0500 Subject: [PATCH 17/57] mailcore2: 0.5.1 -> 0.6.2 --- pkgs/development/libraries/mailcore2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 0a64c7c0429a..3828ebcb7a70 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "mailcore2-${version}"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "MailCore"; repo = "mailcore2"; rev = version; - sha256 = "1k0l59cdk8np4pff1my07dp7ivf3nchlhcpvm9xizp0my9rqgbxb"; + sha256 = "1d0wmnkk9vnjqc28i79z3fwaaycdbprfspagik4mzdkgval5r5pm"; }; nativeBuildInputs = [ pkgconfig ]; From e1edb55792c6c63836402249596becd4469190a0 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Fri, 9 Mar 2018 11:53:12 +0000 Subject: [PATCH 18/57] pythonPackages.periodictable: init at 1.5.0 This package is a required dependency of SasView, which will be added in a later commit. --- maintainers/maintainer-list.nix | 5 +++++ pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 134ec56788e8..de7b638fe24a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3015,6 +3015,11 @@ github = "rongcuid"; name = "Rongcui Dong"; }; + rprospero = { + email = "rprospero+nix@gmail.com"; + github = "rprospero"; + name = "Adam Washington"; + }; rszibele = { email = "richard@szibele.com"; github = "rszibele"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76fbeb202dc1..cc525cb1c9f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12276,6 +12276,26 @@ in { }; }; + periodictable = buildPythonPackage rec{ + name = "${pname}-${version}"; + pname = "periodictable"; + version = "1.5.0"; + + propagatedBuildInputs = with self; [numpy pyparsing]; + + src = fetchPypi { + inherit pname version; + sha256 = "1cjk6aqcz41nxm4fpriz01vqdafd6g57cjk0wh1iklk5cx6c085h"; + }; + + meta = { + homepage = http://www.reflectometry.org/danse/software.html; + description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; + license = licenses.publicDomain; + maintainers = with maintainers; [ rprospero ]; + }; + }; + pg8000 = buildPythonPackage rec { name = "pg8000-1.10.1"; From db2e6b6e9a98b7432e29d57dbd3340124a0dc9bd Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Fri, 9 Mar 2018 11:54:42 +0000 Subject: [PATCH 19/57] pythonPackages.unittest-xml-reporting: init at 2.1.1 This package is used by Sasview, which will be added in a later commit. --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc525cb1c9f8..298c8145b0ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17349,6 +17349,29 @@ in { }; }; + unittest-xml-reporting = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "unittest-xml-reporting"; + version = "2.1.1"; + + propagatedBuildInputs = with self; [six]; + + # The tarball from Pypi doesn't actually contain the unit tests + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwkqx5gfphkymp3xwqvlb94ng22gpbqh36vbbnsrpk1a0mammm6"; + }; + meta = with stdenv.lib; { + homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; + description = "A unittest runner that can save test results to XML files"; + license = licenses.bsd2; + maintainers = with maintainers; [ rprospero ]; + }; + }; + + uritemplate_py = buildPythonPackage rec { name = "uritemplate.py-${version}"; version = "0.3.0"; From 242e37800b2968380212211af62b1c18e2ad74c2 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Fri, 9 Mar 2018 11:57:28 +0000 Subject: [PATCH 20/57] pythonPackage.bumps: init at 0.7.6 This package is required by SasView, which will be added in a later commit. --- .../python-modules/bumps/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/bumps/default.nix diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix new file mode 100644 index 000000000000..f7ba5f3626c1 --- /dev/null +++ b/pkgs/development/python-modules/bumps/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, six}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "bumps"; + version = "0.7.6"; + + propagatedBuildInputs = [six]; + + # Bumps does not provide its own tests.py, so the test + # always fails + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "1ahzw8ls9wsz2ks668s15zskyykib52fhi07mg50hp7lw9avqb5k"; + }; + + meta = with stdenv.lib; { + homepage = http://www.reflectometry.org/danse/software.html; + description = "Data fitting with bayesian uncertainty analysis"; + maintainers = with maintainers; [ rprospero ]; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 298c8145b0ee..8759680e5e7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1321,6 +1321,8 @@ in { enablePython = true; }); + bumps = callPackage ../development/python-modules/bumps {}; + buttersink = buildPythonPackage rec { name = "buttersink-0.6.8"; From f3045a5af01057bc8e8beccef73fbbd8e7755fa4 Mon Sep 17 00:00:00 2001 From: Marko Poikonen Date: Fri, 3 Nov 2017 22:22:17 +0100 Subject: [PATCH 21/57] photoflow: init at unstable-2018-03-06 --- maintainers/maintainer-list.nix | 5 ++ .../graphics/photoflow/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 62 insertions(+) create mode 100644 pkgs/applications/graphics/photoflow/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 12cbb38a24ff..d379b6ededda 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2421,6 +2421,11 @@ github = "mt-caret"; name = "Masayuki Takeda"; }; + MtP = { + email = "marko.nixos@poikonen.de"; + github = "MtP76"; + name = "Marko Poikonen"; + }; mtreskin = { email = "zerthurd@gmail.com"; github = "Zert"; diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix new file mode 100644 index 000000000000..ffef558e84dd --- /dev/null +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: + +stdenv.mkDerivation { + name = "photoflow-unstable-2018-03-06"; + + src = fetchFromGitHub { + owner = "aferrero2707"; + repo = "PhotoFlow"; + rev = "f9bbea183fa02412d1d17075955d2284eeaf8174"; + sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf"; + }; + + nativeBuildInputs = [ + gettext + glib + libxml2 + pkgconfig + swig + automake + gobjectIntrospection + cmake + ninja + ]; + + buildInputs = [ + libtiff + libjpeg + fftw + exiv2 + lensfun + gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 + # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 + libraw + lcms2 + libexif + vips + expat + pcre + pugixml + ]; + + cmakeFlags = [ + "-DBUNDLED_EXIV2=OFF" + "-DBUNDLED_LENSFUN=OFF" + "-DBUNDLED_GEXIV2=OFF" + ]; + + meta = with stdenv.lib; { + description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; + homepage = https://aferrero2707.github.io/PhotoFlow/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.MtP ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 173b02fab245..109fe01f2667 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16967,6 +16967,8 @@ with pkgs; photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; + photoflow = callPackage ../applications/graphics/photoflow { }; + phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; phrasendrescher = callPackage ../tools/security/phrasendrescher { }; From 27f14b5e7d06aa89a2c6533d62257b6db75bd0c3 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Fri, 9 Mar 2018 12:00:24 +0000 Subject: [PATCH 22/57] pythonPackages.sasmodels: init at 0.96 Sasmodels provides a library of small angle scattering calculations that are needed by Sasview, which will be added in my next commit. --- .../python-modules/sasmodels/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/sasmodels/default.nix diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix new file mode 100644 index 000000000000..1360864cf03c --- /dev/null +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -0,0 +1,23 @@ +{lib, fetchgit, licenses, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}: + +buildPythonPackage rec { + name = "sasmodels-${version}"; + version = "0.96"; + + propagatedBuildInputs = [docutils matplotlib numpy pytest scipy]; + + preCheck = ''export HOME=$(mktemp -d)''; + + src = fetchgit { + url = "https://github.com/SasView/sasmodels.git"; + rev = "v${version}"; + sha256 = "11qaaqdc23qzb75zs48fkypksmcb332vl0pkjqr5bijxxymgm7nw"; + }; + + meta = { + description = "Library of small angle scattering models"; + homepage = http://sasview.org; + license = licenses.bsd3; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8759680e5e7a..4c4452e04e76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15321,6 +15321,10 @@ in { sampledata = callPackage ../development/python-modules/sampledata { }; + sasmodels = callPackage ../development/python-modules/sasmodels { + inherit licenses; + }; + scapy = callPackage ../development/python-modules/scapy { }; scipy = callPackage ../development/python-modules/scipy { }; From 73ed353d271f2f49dc258aa906a7e58321d196a2 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Fri, 9 Mar 2018 12:08:34 +0000 Subject: [PATCH 23/57] sasview: init at 4.1.2 Sasview is a data fitting and analysis package for small angle scattering data. More information can be found at https://www.sasview.org. There is some unfortunate cruft to this commit. SasView uses the xhtml2pdf python package, which has a specific version of html5lib as a dependency. This module manually loads that version into sasview. I haven't made xhtml2pdf available as its own package due to these circumstances. --- .../science/misc/sasview/default.nix | 51 +++++++++++++++++++ .../science/misc/sasview/local_config.patch | 10 ++++ .../science/misc/sasview/myHtml5.nix | 20 ++++++++ .../science/misc/sasview/pyparsing-fix.patch | 8 +++ .../science/misc/sasview/xhtml2pdf.nix | 15 ++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 106 insertions(+) create mode 100644 pkgs/applications/science/misc/sasview/default.nix create mode 100644 pkgs/applications/science/misc/sasview/local_config.patch create mode 100644 pkgs/applications/science/misc/sasview/myHtml5.nix create mode 100644 pkgs/applications/science/misc/sasview/pyparsing-fix.patch create mode 100644 pkgs/applications/science/misc/sasview/xhtml2pdf.nix diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix new file mode 100644 index 000000000000..45bdeef92bcb --- /dev/null +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -0,0 +1,51 @@ +{lib, fetchgit, gcc, python}: + +let + html5 = import ./myHtml5.nix {inherit python;}; + xhtml2pdf = import ./xhtml2pdf.nix {inherit python html5;}; +in + +python.pkgs.buildPythonApplication rec { + name = "sasview-${version}"; + version = "4.1.2"; + + propagatedBuildInputs = with python.pkgs; [ + bumps + gcc + h5py + html5 + libxslt + lxml + matplotlib + numpy + pyparsing + periodictable + pillow + pylint + pyopencl + pytest + reportlab + sasmodels + scipy + six + sphinx + unittest-xml-reporting + wxPython + xhtml2pdf]; + + src = fetchgit { + url = "https://github.com/SasView/sasview.git"; + rev = "v${version}"; + sha256 ="05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx"; + }; + + patches = [./pyparsing-fix.patch ./local_config.patch]; + sandbox = true; + + meta = { + homepage = https://www.sasview.org; + description = "Fitting and data analysis for small angle scattering data"; + maintainers = with lib.maintainers; [ rprospero ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/applications/science/misc/sasview/local_config.patch b/pkgs/applications/science/misc/sasview/local_config.patch new file mode 100644 index 000000000000..91972a913bc4 --- /dev/null +++ b/pkgs/applications/science/misc/sasview/local_config.patch @@ -0,0 +1,10 @@ +--- a/src/sas/_config.py ++++ b/src/sas/_config.py +@@ -70,2 +70,2 @@ +- logger.critical("Error loading %s: %s", path, exc) +- sys.exit() ++ import sas.sasview.local_config ++ return sas.sasview.local_config +-- +2.15.0 + diff --git a/pkgs/applications/science/misc/sasview/myHtml5.nix b/pkgs/applications/science/misc/sasview/myHtml5.nix new file mode 100644 index 000000000000..17e6a6d52e2f --- /dev/null +++ b/pkgs/applications/science/misc/sasview/myHtml5.nix @@ -0,0 +1,20 @@ +{python}: + +python.pkgs.buildPythonPackage (rec{ + buildInputs = with python.pkgs; [ flake8 pytest pytest-expect mock ]; + propagatedBuildInputs = with python.pkgs; [ + six webencodings + ]; + + checkPhase = '' + py.test + ''; + pname = "html5lib"; + name = "html5lib-${version}"; + version = "1.0b10"; + src = python.pkgs.fetchPypi { + pname = "html5lib"; + inherit version; + sha256 = "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd"; + }; +}) diff --git a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch new file mode 100644 index 000000000000..7729292cb344 --- /dev/null +++ b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch @@ -0,0 +1,8 @@ +--- a/setup.py ++++ b/setup.py +@@ -5,1 +5,1 @@ +- 'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing<2.0.0', ++ 'bumps>=0.7.5.9', 'periodictable>=1.5.0', +-- +2.15.0 + diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix new file mode 100644 index 000000000000..9f2b8e01a27d --- /dev/null +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -0,0 +1,15 @@ +{python, html5}: + +python.pkgs.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "xhtml2pdf"; + version = "0.2.1"; + + buildInputs = [html5]; + propagatedBuildInputs = with python.pkgs; [httplib2 pillow pypdf2 reportlab html5]; + + src = python.pkgs.fetchPypi { + inherit pname version; + sha256 = "1n9r8zdk9gc2x539fq60bhszmd421ipj8g78zmsn3njvma1az9k1"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b83424eabbad..ce5fb12c38f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4633,6 +4633,8 @@ with pkgs; samplicator = callPackage ../tools/networking/samplicator { }; + sasview = callPackage ../applications/science/misc/sasview {}; + scanbd = callPackage ../tools/graphics/scanbd { }; screen = callPackage ../tools/misc/screen { From 5b1cd5d27b1e3e3271a09836e06d9d79d6886978 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sun, 11 Mar 2018 19:05:41 +0100 Subject: [PATCH 24/57] f3: 6.0-2016.11.16-unstable -> 7.0 --- pkgs/tools/filesystems/f3/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index 4af076e8f2cd..61c6ab253cce 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,27 +1,26 @@ { stdenv, fetchFromGitHub , parted, udev }: -let - version = "6.0-2016.11.16-unstable"; -in + stdenv.mkDerivation rec { - name = "f3-${version}"; + name = "${pname}-${version}"; + pname = "f3"; + version = "7.0"; enableParallelBuilding = true; src = fetchFromGitHub { owner = "AltraMayor"; - repo = "f3"; - rev = "eabf001f69a788e64912bc9e812c118a324077d5"; - sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm"; + repo = pname; + rev = "v${version}"; + sha256 = "195j2zd747ffbsl8p5rf7dyn1j5n05zfqy1s9fm4y6lz8yc1nr17"; }; buildInputs = [ parted udev ]; patchPhase = "sed -i 's/-oroot -groot//' Makefile"; - buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2 - "all" # f3read, f3write + buildFlags = [ "all" # f3read, f3write "extra" # f3brew, f3fix, f3probe ]; From 6ab10aba30043ddeaf10b8e3f49f625f08e16a0b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 14 Mar 2018 20:24:09 -0700 Subject: [PATCH 25/57] live555: 2018.02.12 -> 2018.02.28 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2018.02.28 with grep in /nix/store/gfv4ai63b95lkydlxj9579driy60h4v6-live555-2018.02.28 - found 2018.02.28 in filename of file in /nix/store/gfv4ai63b95lkydlxj9579driy60h4v6-live555-2018.02.28 --- pkgs/development/libraries/live555/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 5d63dd770664..1479f7b6153b 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -2,14 +2,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD let - version = "2018.02.12"; + version = "2018.02.28"; in stdenv.mkDerivation { name = "live555-${version}"; src = fetchurl { # the upstream doesn't provide a stable URL url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"; - sha256 = "08860q07hfiln44d6qaasmfalf4hb9na5jsfd4yps6jn4r54xxwx"; + sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d"; }; postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles" From f447438038219c5de853d74ce99b43cd67a9ac62 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 14 Mar 2018 21:40:24 -0700 Subject: [PATCH 26/57] mcelog: 154 -> 156 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/3zc741ihwv728148wk2m7a61hj9rrp5c-mcelog-156/bin/mcelog --help` got 0 exit code - ran `/nix/store/3zc741ihwv728148wk2m7a61hj9rrp5c-mcelog-156/bin/mcelog --version` and found version 156 - ran `/nix/store/3zc741ihwv728148wk2m7a61hj9rrp5c-mcelog-156/bin/mcelog --help` and found version 156 - found 156 with grep in /nix/store/3zc741ihwv728148wk2m7a61hj9rrp5c-mcelog-156 - found 156 in filename of file in /nix/store/3zc741ihwv728148wk2m7a61hj9rrp5c-mcelog-156 --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index ac176c7d3b36..30c2b05b8e1e 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "154"; + version = "156"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0vq7r3zknr62rmi9g0zd7mmxframm79vmrdw029pc7z6wrlv40cy"; + sha256 = "0mv4sxcysl3m9wqybg6b363mawr9amzhc9v53775p4p2a47z774r"; }; postPatch = '' From 738bcfdef8bb3bf4c4135375de8efaabe63f6eb4 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 12 Jan 2018 10:23:05 -0800 Subject: [PATCH 27/57] config.hardware.onlykey configuration option By default, OnlyKey device (https://crp.to/p/) won't work on Linux (and, therefore, NixOS). This is unintuitive and requires one to search for a solution in the documentation. This change allows one to enable OnlyKey device support directly from their NixOS configuration. --- nixos/modules/hardware/onlykey.nix | 33 +++++++++++++++++++++++++++++ nixos/modules/hardware/onlykey.udev | 4 ++++ nixos/modules/module-list.nix | 1 + 3 files changed, 38 insertions(+) create mode 100644 nixos/modules/hardware/onlykey.nix create mode 100644 nixos/modules/hardware/onlykey.udev diff --git a/nixos/modules/hardware/onlykey.nix b/nixos/modules/hardware/onlykey.nix new file mode 100644 index 000000000000..b6820fe01911 --- /dev/null +++ b/nixos/modules/hardware/onlykey.nix @@ -0,0 +1,33 @@ +{ config, lib, ... }: + +with lib; + +{ + + ####### interface + + options = { + + hardware.onlykey = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable OnlyKey device (https://crp.to/p/) support. + ''; + }; + }; + + }; + + ## As per OnlyKey's documentation piece (hhttps://docs.google.com/document/d/1Go_Rs218fKUx-j_JKhddbSVTqY6P0vQO831t2MKCJC8), + ## it is important to add udev rule for OnlyKey for it to work on Linux + + ####### implementation + + config = mkIf config.hardware.onlykey.enable { + services.udev.extraRules = builtin.readFile ./onlykey.udev; + }; + + +} diff --git a/nixos/modules/hardware/onlykey.udev b/nixos/modules/hardware/onlykey.udev new file mode 100644 index 000000000000..6583530e5684 --- /dev/null +++ b/nixos/modules/hardware/onlykey.udev @@ -0,0 +1,4 @@ +ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" +ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP+="plugdev" +KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP+="plugdev" diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 74ed92de0c09..64a109f50e37 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -41,6 +41,7 @@ ./hardware/pcmcia.nix ./hardware/raid/hpsa.nix ./hardware/usb-wwan.nix + ./hardware/onlykey.nix ./hardware/video/amdgpu.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix From b07bc129cb8e467c311bf2ef42038202d2b2c2db Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Mon, 12 Mar 2018 09:12:45 +0100 Subject: [PATCH 28/57] p4v: init at 2017.3.1601999 --- maintainers/maintainer-list.nix | 5 ++ .../version-management/p4v/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 55 insertions(+) create mode 100644 pkgs/applications/version-management/p4v/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4aee16313aa4..ef8b969910c6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2516,6 +2516,11 @@ github = "ninjatrappeur"; name = "Félix Baylac-Jacqué"; }; + nioncode = { + email = "nioncode+github@gmail.com"; + github = "nioncode"; + name = "Nicolas Schneider"; + }; nipav = { email = "niko.pavlinek@gmail.com"; github = "nipav"; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix new file mode 100644 index 000000000000..f86362c94d5b --- /dev/null +++ b/pkgs/applications/version-management/p4v/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, makeWrapper }: + +stdenv.mkDerivation rec { + name = "p4v-${version}"; + version = "2017.3.1601999"; + + src = fetchurl { + url = "http://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; + sha256 = "f317607f1bc8877db01ff020b8b0857c2d0f8600474d152749264aea0be66b21"; + }; + + dontBuild = true; + nativeBuildInputs = [makeWrapper]; + + ldLibraryPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + qtbase + qtmultimedia + qtscript + qtsensors + qtwebkit + openssl + ]; + + installPhase = '' + mkdir $out + cp -r bin $out + mkdir -p $out/lib/p4v + cp -r lib/p4v/P4VResources $out/lib/p4v + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/p4merge.bin + + for f in $out/bin/*.bin ; do + wrapProgram $f \ + --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ + --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb \ + --suffix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix} + done + ''; + + meta = { + description = "Perforce Visual Client"; + homepage = http://www.perforce.com; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.nioncode ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1914ec7a090..5e0d22a1292e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16736,6 +16736,8 @@ with pkgs; ostinato = callPackage ../applications/networking/ostinato { }; + p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; + panamax_api = callPackage ../applications/networking/cluster/panamax/api { }; panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { }; From 7d767d3ac3c3821cf7e1b799a88477b7c59557e8 Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Sun, 18 Mar 2018 15:06:51 +0100 Subject: [PATCH 29/57] p4v: patch the interpreter for all binaries, not just p4merge.bin --- pkgs/applications/version-management/p4v/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index f86362c94d5b..85eb3a2ab4fe 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/p4v cp -r lib/p4v/P4VResources $out/lib/p4v - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/p4merge.bin - for f in $out/bin/*.bin ; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f + wrapProgram $f \ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb \ From be40a8b2f61d48688e8401a7593e656028122511 Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Sun, 18 Mar 2018 15:08:26 +0100 Subject: [PATCH 30/57] p4v: use https links --- pkgs/applications/version-management/p4v/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 85eb3a2ab4fe..27e029d39d1e 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2017.3.1601999"; src = fetchurl { - url = "http://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; + url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; sha256 = "f317607f1bc8877db01ff020b8b0857c2d0f8600474d152749264aea0be66b21"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; - homepage = http://www.perforce.com; + homepage = https://www.perforce.com; license = stdenv.lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.nioncode ]; From 609374523c7dbb6c4a6d6834ade1a8ff90b1c354 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Wed, 21 Mar 2018 13:32:30 +0000 Subject: [PATCH 31/57] Remove explicit licenses import from python package sasmodels The licenses variable was being required by sasmoels, but licenses was already a child of the lib parameter and was redundant. --- pkgs/development/python-modules/sasmodels/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 1360864cf03c..06e9adf197a9 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -1,4 +1,4 @@ -{lib, fetchgit, licenses, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}: +{lib, fetchgit, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}: buildPythonPackage rec { name = "sasmodels-${version}"; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Library of small angle scattering models"; homepage = http://sasview.org; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ rprospero ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c4452e04e76..4acbdade3b65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15321,9 +15321,7 @@ in { sampledata = callPackage ../development/python-modules/sampledata { }; - sasmodels = callPackage ../development/python-modules/sasmodels { - inherit licenses; - }; + sasmodels = callPackage ../development/python-modules/sasmodels { }; scapy = callPackage ../development/python-modules/scapy { }; From 01c1385deca520ead374afcbc7591aed9e4e6ce8 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Wed, 21 Mar 2018 13:46:17 +0000 Subject: [PATCH 32/57] Make xhtml2pdf its own package in python-packages xhtml2pdf now uses the main package html5lib with just an override to pull the correct version number. --- .../science/misc/sasview/default.nix | 6 ---- .../science/misc/sasview/myHtml5.nix | 20 ----------- .../science/misc/sasview/xhtml2pdf.nix | 15 --------- .../python-modules/xhtml2pdf/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 5 files changed, 35 insertions(+), 41 deletions(-) delete mode 100644 pkgs/applications/science/misc/sasview/myHtml5.nix delete mode 100644 pkgs/applications/science/misc/sasview/xhtml2pdf.nix create mode 100644 pkgs/development/python-modules/xhtml2pdf/default.nix diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index 45bdeef92bcb..d45eae1ac1f5 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -1,10 +1,5 @@ {lib, fetchgit, gcc, python}: -let - html5 = import ./myHtml5.nix {inherit python;}; - xhtml2pdf = import ./xhtml2pdf.nix {inherit python html5;}; -in - python.pkgs.buildPythonApplication rec { name = "sasview-${version}"; version = "4.1.2"; @@ -13,7 +8,6 @@ python.pkgs.buildPythonApplication rec { bumps gcc h5py - html5 libxslt lxml matplotlib diff --git a/pkgs/applications/science/misc/sasview/myHtml5.nix b/pkgs/applications/science/misc/sasview/myHtml5.nix deleted file mode 100644 index 17e6a6d52e2f..000000000000 --- a/pkgs/applications/science/misc/sasview/myHtml5.nix +++ /dev/null @@ -1,20 +0,0 @@ -{python}: - -python.pkgs.buildPythonPackage (rec{ - buildInputs = with python.pkgs; [ flake8 pytest pytest-expect mock ]; - propagatedBuildInputs = with python.pkgs; [ - six webencodings - ]; - - checkPhase = '' - py.test - ''; - pname = "html5lib"; - name = "html5lib-${version}"; - version = "1.0b10"; - src = python.pkgs.fetchPypi { - pname = "html5lib"; - inherit version; - sha256 = "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd"; - }; -}) diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix deleted file mode 100644 index 9f2b8e01a27d..000000000000 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ /dev/null @@ -1,15 +0,0 @@ -{python, html5}: - -python.pkgs.buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "xhtml2pdf"; - version = "0.2.1"; - - buildInputs = [html5]; - propagatedBuildInputs = with python.pkgs; [httplib2 pillow pypdf2 reportlab html5]; - - src = python.pkgs.fetchPypi { - inherit pname version; - sha256 = "1n9r8zdk9gc2x539fq60bhszmd421ipj8g78zmsn3njvma1az9k1"; - }; -} diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix new file mode 100644 index 000000000000..2d1112fe02e4 --- /dev/null +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -0,0 +1,33 @@ +{lib, fetchPypi, buildPythonPackage, html5lib, httplib2, nose, pillow, pypdf2, reportlab}: + +let + #xhtml2pdf specifically requires version "1.0b10" of html5lib + html5 = html5lib.overrideAttrs( oldAttrs: rec{ + version = "1.0b10"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd"; + }; + }); +in + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "xhtml2pdf"; + version = "0.2.1"; + + buildInputs = [html5]; + propagatedBuildInputs = [httplib2 nose pillow pypdf2 reportlab html5]; + + src = fetchPypi { + inherit pname version; + sha256 = "1n9r8zdk9gc2x539fq60bhszmd421ipj8g78zmsn3njvma1az9k1"; + }; + + meta = { + description = "A pdf converter for the ReportLab Toolkit"; + homepage = https://github.com/xhtml2pdf/xhtml2pdf; + license = lib.licenses.asl2; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4acbdade3b65..ba9e1ab88a14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17902,6 +17902,8 @@ EOF propagatedBuildInputs = with self; [ eventlib application ]; }; + xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf {}; + xlib = buildPythonPackage (rec { name = "xlib-${version}"; version = "0.17"; From 068d792fedbfb6f14b9f7bb52179a392e6886e52 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Wed, 21 Mar 2018 14:43:47 +0000 Subject: [PATCH 33/57] Fix typo in license for xhtml2pdf python package --- pkgs/development/python-modules/xhtml2pdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 2d1112fe02e4..51b00390dc27 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "A pdf converter for the ReportLab Toolkit"; homepage = https://github.com/xhtml2pdf/xhtml2pdf; - license = lib.licenses.asl2; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rprospero ]; }; } From 00823f016dbdcf0c813344d45ba0cb681321c5d3 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Thu, 22 Mar 2018 00:58:16 -0700 Subject: [PATCH 34/57] opendylan: 2013.1 -> 2016.1pre --- pkgs/development/compilers/opendylan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 773ab9f473f1..95f4dc5b215f 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -2,18 +2,18 @@ {stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { - name = "opendylan-2013.2"; + name = "opendylan-2016.1pre"; src = fetchgit { url = https://github.com/dylan-lang/opendylan; - rev = "ce9b14dab6cb9ffedc69fae8c6df524c0c79abd3"; - sha256 = "17jvhv0y63fj25ma05k70b7phcwgjyna5qkrirk48z3xapb8bknd"; + rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; + sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; fetchSubmodules = true; }; buildInputs = (if stdenv.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper - ] ; + ]; preConfigure = if stdenv.system == "i686-linux" then '' mkdir -p $TMPDIR/mps From 392def733b61855e667c7ce7a777a6bdc397ef44 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Thu, 22 Mar 2018 17:44:27 +0000 Subject: [PATCH 35/57] Remove lint from Sasview package --- .../science/misc/sasview/default.nix | 23 +++++++-- .../science/misc/sasview/xhtml2pdf.nix} | 1 - .../python-modules/bumps/default.nix | 1 - .../python-modules/periodictable/default.nix | 20 ++++++++ .../python-modules/sasmodels/default.nix | 5 +- .../unittest-xml-reporting/default.nix | 23 +++++++++ pkgs/top-level/python-packages.nix | 47 ++----------------- 7 files changed, 68 insertions(+), 52 deletions(-) rename pkgs/{development/python-modules/xhtml2pdf/default.nix => applications/science/misc/sasview/xhtml2pdf.nix} (96%) create mode 100644 pkgs/development/python-modules/periodictable/default.nix create mode 100644 pkgs/development/python-modules/unittest-xml-reporting/default.nix diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index d45eae1ac1f5..d0a4f74924c5 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -1,9 +1,27 @@ {lib, fetchgit, gcc, python}: +let + xhtml2pdf = import ./xhtml2pdf.nix { inherit lib; + fetchPypi = python.pkgs.fetchPypi; + buildPythonPackage = python.pkgs.buildPythonPackage; + html5lib = python.pkgs.html5lib; + httplib2 = python.pkgs.httplib2; + nose = python.pkgs.nose; + pillow = python.pkgs.pillow; + pypdf2 = python.pkgs.pypdf2; + reportlab = python.pkgs.reportlab; +}; + +in + python.pkgs.buildPythonApplication rec { - name = "sasview-${version}"; + pname = "sasview"; version = "4.1.2"; + buildInputs = with python.pkgs; [ + pytest + unittest-xml-reporting]; + propagatedBuildInputs = with python.pkgs; [ bumps gcc @@ -17,13 +35,11 @@ python.pkgs.buildPythonApplication rec { pillow pylint pyopencl - pytest reportlab sasmodels scipy six sphinx - unittest-xml-reporting wxPython xhtml2pdf]; @@ -34,7 +50,6 @@ python.pkgs.buildPythonApplication rec { }; patches = [./pyparsing-fix.patch ./local_config.patch]; - sandbox = true; meta = { homepage = https://www.sasview.org; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix similarity index 96% rename from pkgs/development/python-modules/xhtml2pdf/default.nix rename to pkgs/applications/science/misc/sasview/xhtml2pdf.nix index 51b00390dc27..0b3d438843da 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -12,7 +12,6 @@ let in buildPythonPackage rec { - name = "${pname}-${version}"; pname = "xhtml2pdf"; version = "0.2.1"; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index f7ba5f3626c1..51d3d9e6833e 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, six}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "bumps"; version = "0.7.6"; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix new file mode 100644 index 000000000000..e77c281e2c49 --- /dev/null +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -0,0 +1,20 @@ +{lib, fetchPypi, buildPythonPackage, numpy, pyparsing}: + +buildPythonPackage rec{ + pname = "periodictable"; + version = "1.5.0"; + + propagatedBuildInputs = [numpy pyparsing]; + + src = fetchPypi { + inherit pname version; + sha256 = "1cjk6aqcz41nxm4fpriz01vqdafd6g57cjk0wh1iklk5cx6c085h"; + }; + + meta = { + homepage = http://www.reflectometry.org/danse/software.html; + description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 06e9adf197a9..d33de9c2a73a 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -1,10 +1,11 @@ {lib, fetchgit, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}: buildPythonPackage rec { - name = "sasmodels-${version}"; + pname = "sasmodels"; version = "0.96"; - propagatedBuildInputs = [docutils matplotlib numpy pytest scipy]; + buildInputs = [pytest]; + propagatedBuildInputs = [docutils matplotlib numpy scipy]; preCheck = ''export HOME=$(mktemp -d)''; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix new file mode 100644 index 000000000000..129ad0ded6c7 --- /dev/null +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -0,0 +1,23 @@ +{lib, fetchPypi, buildPythonPackage, six}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "unittest-xml-reporting"; + version = "2.1.1"; + + propagatedBuildInputs = [six]; + + # The tarball from Pypi doesn't actually contain the unit tests + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwkqx5gfphkymp3xwqvlb94ng22gpbqh36vbbnsrpk1a0mammm6"; + }; + meta = with lib; { + homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; + description = "A unittest runner that can save test results to XML files"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba9e1ab88a14..e2cd2743d523 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12278,25 +12278,7 @@ in { }; }; - periodictable = buildPythonPackage rec{ - name = "${pname}-${version}"; - pname = "periodictable"; - version = "1.5.0"; - - propagatedBuildInputs = with self; [numpy pyparsing]; - - src = fetchPypi { - inherit pname version; - sha256 = "1cjk6aqcz41nxm4fpriz01vqdafd6g57cjk0wh1iklk5cx6c085h"; - }; - - meta = { - homepage = http://www.reflectometry.org/danse/software.html; - description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; - license = licenses.publicDomain; - maintainers = with maintainers; [ rprospero ]; - }; - }; + periodictable = callPackage ../development/python-modules/periodictable { }; pg8000 = buildPythonPackage rec { name = "pg8000-1.10.1"; @@ -17353,30 +17335,9 @@ in { }; }; - unittest-xml-reporting = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "unittest-xml-reporting"; - version = "2.1.1"; + unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; - propagatedBuildInputs = with self; [six]; - - # The tarball from Pypi doesn't actually contain the unit tests - doCheck = false; - - src = fetchPypi { - inherit pname version; - sha256 = "1jwkqx5gfphkymp3xwqvlb94ng22gpbqh36vbbnsrpk1a0mammm6"; - }; - meta = with stdenv.lib; { - homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; - description = "A unittest runner that can save test results to XML files"; - license = licenses.bsd2; - maintainers = with maintainers; [ rprospero ]; - }; - }; - - - uritemplate_py = buildPythonPackage rec { + uritemplate_py = buildPythonPackage rec { name = "uritemplate.py-${version}"; version = "0.3.0"; @@ -17902,8 +17863,6 @@ EOF propagatedBuildInputs = with self; [ eventlib application ]; }; - xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf {}; - xlib = buildPythonPackage (rec { name = "xlib-${version}"; version = "0.17"; From 60720eb2c0e63f55734c844a08632c5da548d333 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 29 Mar 2018 00:25:11 +0200 Subject: [PATCH 36/57] krakenx: init at 0.0.1 --- pkgs/tools/system/krakenx/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/krakenx/default.nix diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix new file mode 100644 index 000000000000..db0987d70739 --- /dev/null +++ b/pkgs/tools/system/krakenx/default.nix @@ -0,0 +1,23 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "krakenx"; + version = "0.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1vxyindph81srya0pfmb3n64n8h7ghp38ak86vc2zc5nyirf5zq8"; + }; + + propagatedBuildInputs = lib.singleton python3Packages.pyusb; + + doCheck = false; # there are no tests + + meta = with lib; { + description = "Python script to control NZXT cooler Kraken X52/X62"; + homepage = https://github.com/KsenijaS/krakenx; + license = licenses.gpl2; + maintainers = [ maintainers.willibutz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60e5bc59188b..3c870d028ec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3160,6 +3160,8 @@ with pkgs; kore = callPackage ../development/web/kore { }; + krakenx = callPackage ../tools/system/krakenx { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; From 2d01bb7f6a5ab80fa7e7f03559e082ba42140db6 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sun, 8 Apr 2018 22:36:47 +1000 Subject: [PATCH 37/57] haskellPackages.blank-canvas: disable tests The tests require a browser and possibly some manual intervention. See https://github.com/ku-fpg/blank-canvas/issues/73 --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6fb55d326b11..33f82e93a862 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -498,4 +498,7 @@ self: super: builtins.intersectAttrs super { LDAP = dontCheck (overrideCabal super.LDAP (drv: { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; })); + + # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 + blank-canvas = dontCheck super.blank-canvas; } From c2ce7070b17a425dd9ae6552afa27510d5b50d36 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Mon, 9 Apr 2018 07:27:03 +1000 Subject: [PATCH 38/57] Whitespace lint --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 33f82e93a862..f336e8126f0e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -203,7 +203,7 @@ self: super: builtins.intersectAttrs super { # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; - # Needs access to locale data, but looks for it in the wrong place. + # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; # Expect to find sendmail(1) in $PATH. From 2e0dfb49f7a973e8701e00c88c4e97340fa6c623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 9 Apr 2018 14:28:52 +0100 Subject: [PATCH 39/57] xalanc: /usr -> / --- pkgs/development/libraries/xalanc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 28575f4c5d5e..aeb741dbae7b 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -13,12 +13,11 @@ in stdenv.mkDerivation rec { sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg"; }; - # TODO: should we really be putting outputs in $out/usr? I'd expect -P$out below configurePhase = '' export XALANCROOT=`pwd`/c cd `pwd`/c - mkdir -p $out/usr - ./runConfigure -p ${platform} -c cc -x c++ -P$out/usr + mkdir -p $out + ./runConfigure -p ${platform} -c cc -x c++ -P$out ''; buildInputs = [ xercesc getopt ]; From ed453ccb9c572fffe2b0f22e6bcca2aa3899051c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 9 Apr 2018 14:44:47 +0100 Subject: [PATCH 40/57] CODEOWNERS: add Mic92/LnL7 for rustc Mic92: linux-x86_64, linux-aarch64 LnL7: for macOS-x86_64 --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 01a24d64988c..4e508d739e6a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -64,6 +64,9 @@ /pkgs/development/interpreters/ruby @zimbatm /pkgs/development/ruby-modules @zimbatm +# Rust +/pkgs/development/compilers/rust @Mic92 @LnL7 + # Darwin-related /pkgs/stdenv/darwin @NixOS/darwin-maintainers /pkgs/os-specific/darwin @NixOS/darwin-maintainers From c7acd932548d1da20c7b912562200edf68aa4600 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 30 Mar 2018 14:21:15 +0200 Subject: [PATCH 41/57] tachyon: Add support for jpeg, png, more platforms --- .../development/libraries/tachyon/default.nix | 53 +++++++++++++++-- .../libraries/tachyon/make-archs.patch | 37 ++++++++++++ .../libraries/tachyon/no-absolute-paths.patch | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 144 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/tachyon/make-archs.patch create mode 100644 pkgs/development/libraries/tachyon/no-absolute-paths.patch diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index e4a24279c9b4..53e48eb89317 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,4 +1,17 @@ -{stdenv, fetchurl}: +{ stdenv +, fetchurl +, fetchpatch +, Carbon ? null +, libjpeg ? null +, libpng ? null +, withJpegSupport ? true # support jpeg output +, withPngSupport ? true # support png output +}: + +assert withJpegSupport -> libjpeg != null; +assert withPngSupport -> libpng != null; +assert stdenv.isDarwin -> Carbon != null; + stdenv.mkDerivation rec { name = "tachyon-${version}"; version = "0.99b2"; @@ -6,12 +19,39 @@ stdenv.mkDerivation rec { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz"; sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; }; - buildInputs = []; - preBuild = "cd unix"; - arch = if stdenv.system == "x86_64-linux" then "linux-64-thr" else - if stdenv.system == "i686-linux" then "linux-thr" else + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + Carbon + ] ++ stdenv.lib.optionals withJpegSupport [ + libjpeg + ] ++ stdenv.lib.optionals withPngSupport [ + libpng + ]; + preBuild = '' + cd unix + '' + stdenv.lib.optionalString withJpegSupport '' + export USEJPEG=" -DUSEJPEG" + export JPEGLIB=" -ljpeg" + '' + stdenv.lib.optionalString withPngSupport '' + export USEPNG=" -DUSEPNG" + export PNGLIB=" -lpng -lz" + ''; + arch = if stdenv.system == "x86_64-linux" then "linux-64-thr" else + if stdenv.system == "i686-linux" then "linux-thr" else + if stdenv.system == "aarch64-linux" then "linux-arm-thr" else + if stdenv.system == "x86_64-darwin" then "macosx-thr" else + if stdenv.system == "i686-darwin" then "macosx-64-thr" else + if stdenv.system == "i686-cygwin" then "win32" else + if stdenv.system == "x86_64-freebsd" then "bsd" else + if stdenv.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; makeFlags = "${arch}"; + patches = [ + # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) + ./no-absolute-paths.patch + # Include new targets (like arm) + ./make-archs.patch + ]; + installPhase = '' cd ../compile/${arch} mkdir -p "$out"/{bin,lib,include,share/doc/tachyon,share/tachyon} @@ -26,7 +66,8 @@ stdenv.mkDerivation rec { description = ''A Parallel / Multiprocessor Ray Tracing System''; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + # darwin fails due to missing Carbon.h, even though Carbon is a build input + platforms = with stdenv.lib.platforms; linux ++ cygwin; homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; }; } diff --git a/pkgs/development/libraries/tachyon/make-archs.patch b/pkgs/development/libraries/tachyon/make-archs.patch new file mode 100644 index 000000000000..cf83f8c8c31c --- /dev/null +++ b/pkgs/development/libraries/tachyon/make-archs.patch @@ -0,0 +1,37 @@ +diff --git a/unix/Make-arch b/unix/Make-arch +index 08afb85..dbeb691 100644 +--- a/unix/Make-arch ++++ b/unix/Make-arch +@@ -920,6 +920,15 @@ macosx: + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB)" + ++macosx-64: ++ $(MAKE) all \ ++ "ARCH = macosx" \ ++ "CFLAGS = -Os -m64 -ffast-math -DBsd $(MISCFLAGS)" \ ++ "ARFLAGS = r" \ ++ "STRIP = strip" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(MISCLIB)" ++ + macosx-thr: + $(MAKE) all \ + "ARCH = macosx-thr" \ +@@ -1209,6 +1218,16 @@ linux-thr: + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" + ++# Linux Arm using gcc, with threads ++linux-arm-thr: ++ $(MAKE) all \ ++ "ARCH = linux-arm-thr" \ ++ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ ++ "ARFLAGS = r" \ ++ "STRIP = strip" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" ++ + # Linux x86 using gcc, threads, and OpenGL + linux-thr-ogl: + $(MAKE) all \ diff --git a/pkgs/development/libraries/tachyon/no-absolute-paths.patch b/pkgs/development/libraries/tachyon/no-absolute-paths.patch new file mode 100644 index 000000000000..faa3810fb5c6 --- /dev/null +++ b/pkgs/development/libraries/tachyon/no-absolute-paths.patch @@ -0,0 +1,57 @@ +diff --git a/unix/Make-config b/unix/Make-config +index ee4f388..c1d51d4 100644 +--- a/unix/Make-config ++++ b/unix/Make-config +@@ -18,7 +18,7 @@ + # Bourne Shell Configuration: + # set SHELL=/bin/sh or wherever your bourne shell is + ########################################################################## +-SHELL=/bin/sh ++# SHELL=/bin/sh + + + +@@ -30,7 +30,7 @@ SHELL=/bin/sh + + # The following line should be set to -Ixxx where xxx is your X11 include path + # Sun puts X11 in /usr/openwin/xxx +-X11INC= -I/usr/openwin/include ++# X11INC= -I/usr/openwin/include + + # Others typically use /usr/X11 or /usr/X11R6 + #X11INC= -I/usr/X11 +@@ -57,7 +57,7 @@ X11LIB= -lX11 + ########################################################################## + + # Standard MPICH installation location +-MPIDIR=/usr/local/mpi ++# MPIDIR=/usr/local/mpi + + # UMR CS Dept + #MPIDIR=/software/all/mpi +@@ -108,9 +108,9 @@ MBOX= + # http://www.ijg.org/files/ + ########################################################################## + # Uncomment the following lines to disable JPEG support +-USEJPEG= +-JPEGINC= +-JPEGLIB= ++# USEJPEG= ++# JPEGINC= ++# JPEGLIB= + + # Uncomment the following lines to enable JPEG support + #USEJPEG= -DUSEJPEG +@@ -128,9 +128,9 @@ JPEGLIB= + # http://www.libpng.org/ + ########################################################################## + # Uncomment the following lines to disable PNG support +-USEPNG= +-PNGINC= +-PNGLIB= ++# USEPNG= ++# PNGINC= ++# PNGLIB= + + # Uncomment the following lines to enable PNG support + #USEPNG= -DUSEPNG diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0296324ba6cf..80d479fab2ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11569,7 +11569,9 @@ with pkgs; t1lib = callPackage ../development/libraries/t1lib { }; - tachyon = callPackage ../development/libraries/tachyon {}; + tachyon = callPackage ../development/libraries/tachyon { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; taglib = callPackage ../development/libraries/taglib { }; taglib_1_9 = callPackage ../development/libraries/taglib/1.9.nix { }; From e0fc3b5fa1702d37f38766073fa80f1789d11e4f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 7 Apr 2018 20:11:56 +0200 Subject: [PATCH 42/57] openzwave: Init at 2018-04-04 --- .../libraries/openzwave/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/libraries/openzwave/default.nix diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix new file mode 100644 index 000000000000..63c51996b227 --- /dev/null +++ b/pkgs/development/libraries/openzwave/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub +, doxygen, fontconfig, graphviz-nox, libxml2, pkgconfig, which +, systemd }: + +let + version = "2018-04-04"; + +in stdenv.mkDerivation rec { + name = "openzwave-${version}"; + + src = fetchFromGitHub { + owner = "OpenZWave"; + repo = "open-zwave"; + rev = "ab5fe966fee882bb9e8d78a91db892a60a1863d9"; + sha256 = "0yby8ygzjn5zp5vhysxaadbzysqanwd2zakz379299qs454pr2h9"; + }; + + nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ]; + + buildInputs = [ systemd ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + DESTDIR=$out PREFIX= pkgconfigdir=lib/pkgconfig make install $installFlags + + runHook postInstall + ''; + + FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"; + FONTCONFIG_PATH="${fontconfig.out}/etc/fonts/"; + + postPatch = '' + substituteInPlace cpp/src/Options.cpp \ + --replace /etc/openzwave $out/etc/openzwave + ''; + + fixupPhase = '' + substituteInPlace $out/lib/pkgconfig/libopenzwave.pc \ + --replace prefix= prefix=$out \ + --replace dir= dir=$out + + substituteInPlace $out/bin/ozw_config \ + --replace pcfile=${pkgconfig} pcfile=$out + ''; + + meta = with stdenv.lib; { + description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; + homepage = http://www.openzwave.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1480b906403b..3195410c3c11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20532,6 +20532,8 @@ with pkgs; moltengamepad = callPackage ../misc/drivers/moltengamepad { }; + openzwave = callPackage ../development/libraries/openzwave { }; + mongoc = callPackage ../development/libraries/mongoc { }; mupen64plus = callPackage ../misc/emulators/mupen64plus { }; From f1f3ece81edab4c652dc38195b3941ca65cf1503 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 7 Apr 2018 23:33:10 +0200 Subject: [PATCH 43/57] python36Packages.python_openzwave: init at 0.4.4 --- .../python_openzwave/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/python_openzwave/default.nix diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix new file mode 100644 index 000000000000..d5cf709104fc --- /dev/null +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, pkgconfig +, systemd, libyaml, openzwave, cython +, six, pydispatcher, urwid }: + +buildPythonPackage rec { + pname = "python_openzwave"; + version = "0.4.4"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "17wdgwg212agj1gxb2kih4cvhjb5bprir4x446s8qwx0mz03azk2"; + extension = "zip"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ systemd libyaml openzwave cython ]; + propagatedBuildInputs = [ six urwid pydispatcher ]; + + # primary location for the .xml files is in /etc/openzwave so we override the + # /usr/local/etc lookup instead as that allows us to dump new .xml files into + # /etc/openzwave if needed + postPatch = '' + substituteInPlace src-lib/libopenzwave/libopenzwave.pyx \ + --replace /usr/local/etc/openzwave ${openzwave}/etc/openzwave + ''; + + # no tests available + doCheck = false; + + meta = with stdenv.lib; { + description = "Python wrapper for the OpenZWave C++ library"; + homepage = https://github.com/OpenZWave/python-openzwave; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu ]; + inherit (openzwave.meta) platforms; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5211a1a3143..2c941134e94a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8935,6 +8935,8 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { }; + python-Levenshtein = buildPythonPackage rec { name = "python-Levenshtein-${version}"; version = "0.12.0"; From 51d1aad9f3a10ccbabdb013f3c9f067bca4f23d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Apr 2018 11:59:07 +0200 Subject: [PATCH 44/57] home-assistant: treat "-" and "_" equally in parse-requirements.py --- pkgs/servers/home-assistant/component-packages.nix | 8 ++++---- pkgs/servers/home-assistant/parse-requirements.py | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5372b577e335..852b210ba159 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -112,8 +112,8 @@ "hue" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ ]; "ihc" = ps: with ps; [ ]; - "image_processing.dlib_face_detect" = ps: with ps; [ ]; - "image_processing.dlib_face_identify" = ps: with ps; [ ]; + "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; + "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ]; "image_processing.opencv" = ps: with ps; [ numpy ]; "influxdb" = ps: with ps; [ influxdb ]; "insteon_local" = ps: with ps; [ ]; @@ -172,7 +172,7 @@ "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; "media_player.frontier_silicon" = ps: with ps; [ ]; - "media_player.gpmdp" = ps: with ps; [ ]; + "media_player.gpmdp" = ps: with ps; [ websocket_client ]; "media_player.gstreamer" = ps: with ps; [ ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.lg_netcast" = ps: with ps; [ ]; @@ -447,6 +447,6 @@ "zeroconf" = ps: with ps; [ zeroconf ]; "zha" = ps: with ps; [ ]; "zigbee" = ps: with ps; [ ]; - "zwave" = ps: with ps; [ pydispatcher ]; + "zwave" = ps: with ps; [ pydispatcher python_openzwave ]; }; } diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 87ef65482ab6..46e7acee1782 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ setuptools ])" +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ ])" # # This script downloads https://github.com/home-assistant/home-assistant/blob/master/requirements_all.txt. # This file contains lines of the form @@ -20,7 +20,6 @@ import os import sys import json import re -from pkg_resources import Requirement, RequirementParseError GENERAL_PREFIX = '# homeassistant.' COMPONENT_PREFIX = GENERAL_PREFIX + 'components.' @@ -64,9 +63,11 @@ def name_to_attr_path(req): names = [req] # E.g. python-mpd2 is actually called python3.6-mpd2 # instead of python-3.6-python-mpd2 inside Nixpkgs - if req.startswith('python-'): + if req.startswith('python-') or req.startswith('python_'): names.append(req[len('python-'):]) for name in names: + # treat "-" and "_" equally + name = re.sub('[-_]', '[-_]', name) pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I) for attr_path, package in packages.items(): if pattern.match(package['name']): @@ -86,7 +87,7 @@ for component, reqs in OrderedDict(sorted(requirements.items())).items(): attr_paths = [] for req in reqs: try: - name = Requirement.parse(req).project_name + name = req.split('==')[0] attr_path = name_to_attr_path(name) if attr_path is not None: # Add attribute path without "python3Packages." prefix From a292149c8beaea603051febd20428860ad73f0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Apr 2018 13:21:52 +0200 Subject: [PATCH 45/57] home-assistant: treat extraComponents with multiple requirements correctly --- pkgs/servers/home-assistant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 75f8b309a406..944edc35176c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -45,7 +45,7 @@ let getPackages = component: builtins.getAttr component componentPackages.components; - componentBuildInputs = map (component: getPackages component py.pkgs) extraComponents; + componentBuildInputs = lib.concatMap (component: getPackages component py.pkgs) extraComponents; # Ensure that we are using a consistent package set extraBuildInputs = extraPackages py.pkgs; From 2206adb4cda8fbd25ca56312ae75c6012fec111a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Apr 2018 16:45:11 +0200 Subject: [PATCH 46/57] multi-ghc-travis: update to latest git version --- .../tools/haskell/multi-ghc-travis/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 7efe556ebde0..781d3b096cfb 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -1,17 +1,16 @@ -{ mkDerivation, base, bytestring, Cabal, containers, deepseq, Diff -, directory, filepath, ShellCheck, stdenv, tasty, tasty-golden -, transformers, fetchFromGitHub +{ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers +, deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty +, tasty-golden, transformers, fetchFromGitHub }: mkDerivation { - pname = "make-travis-yml"; + pname = "haskell-ci"; version = "0"; src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "7ca5d751c35c6dc43392397b4641c4611ed55121"; - sha256 = "04f9jcxqv1mn0rw31x23ns6xdhgqjv55blsksadwr25qn2521zxb"; + rev = "848c2fe5c7d0d95b20312e86b360d5db8c95db75"; + sha256 = "1n4y6j564sxxry19xs4x0ds7fg8h1q0svw9q45477czx82qzavym"; }; - jailbreak = true; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20,8 +19,8 @@ mkDerivation { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Diff directory filepath tasty tasty-golden - transformers + ansi-terminal base bytestring Diff directory filepath tasty + tasty-golden transformers ]; homepage = "https://github.com/haskell-CI/haskell-ci"; description = "Script generator for Travis-CI"; From 9d53bc38c15d1a5037b4ff9a6eed93ffd14233b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Apr 2018 16:47:03 +0200 Subject: [PATCH 47/57] zsh: 5.4.2 -> 5.5 --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 43b766fdaf2e..c68a1bb2784d 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre }: let - version = "5.4.2"; + version = "5.5"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "1703g6vfz2vpb866wgl71nvg0ynjq0zvrjwkqbv7v6q3606jbmn3"; + sha256 = "1k56ancx1xxniih8i1gmfhhmmk965jk8wfjdfkynnxfi4pkqy2gc"; }; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm"; + sha256 = "0nf1cwjgdncz9bln1fdz7m6rlgf8qjy2v01871ifhak78njhcmnh"; }; buildInputs = [ ncurses pcre ]; From 760602f093efc3292e5590a3af8d8cde9f7e03e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 9 Apr 2018 17:44:36 +0200 Subject: [PATCH 48/57] abcmidi: 2018.03.21 -> 2018.04.01 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index ab06a3b6983e..6d8376b60357 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.03.21"; + version = "2018.04.01"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0h34bjs5p3vkabg6c1dpwrwfxypki0xyd0m6jf4ys7xbs9qnal6l"; + sha256 = "1ffr358q663qgcjzg2l50isp8hybxp60r99xma2qhhy7lvyv57x4"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 7b4ed22b540184bb9cf7a2d38f8a04ee361e3689 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 9 Apr 2018 18:49:50 +0200 Subject: [PATCH 49/57] testssl: 2.9.5-3 -> 2.9.5-4 Changelog: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-4 Also improved the expression to be more readable. --- pkgs/applications/networking/testssl/default.nix | 12 ++++++------ pkgs/applications/networking/testssl/testssl.patch | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 24ffe61b5abf..97c05dfafdbe 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgs }: let - version = "2.9.5-3"; + version = "2.9.5-4"; pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; @@ -12,16 +12,16 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "07vlmf3gn2xa4wam2sql6c1s1hvj5adzd6l1fl12lq066v0k7r7n"; + sha256 = "0pfp7r4jhvkh06vawqlvq7vp4imwp6dpq6jx8m0k3j85ywwp45pd"; }; patches = [ ./testssl.patch ]; postPatch = '' - sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ - -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ - -e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \ - testssl.sh + substituteInPlace testssl.sh \ + --replace /bin/pwd ${pwdBinPath} \ + --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \ + --replace @@openssl-path@@ ${opensslBinPath} ''; installPhase = '' diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch index d5269c737084..ffc9e4b1c163 100644 --- a/pkgs/applications/networking/testssl/testssl.patch +++ b/pkgs/applications/networking/testssl/testssl.patch @@ -4,7 +4,7 @@ # following variables make use of $ENV, e.g. OPENSSL= ./testssl.sh # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help declare -x OPENSSL OPENSSL_TIMEOUT -+OPENSSL=${OPENSSL:-""} ++OPENSSL=${OPENSSL:-"@@openssl-path@@"} FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output From c8a19931239710e9aab4267f0641b35fdad15285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 9 Apr 2018 19:02:47 +0200 Subject: [PATCH 50/57] ghostwriter: 1.5.0 -> 1.6.1 --- pkgs/applications/editors/ghostwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 491fc0ca2a8d..aeae711c1c0f 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ghostwriter"; - version = "1.5.0"; + version = "1.6.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = "v${version}"; - sha256 = "0ixw2w2526836lwj4pc0vp7prp1gls7iq37v8m9ql1508b33b9pq"; + sha256 = "1ihdr4xk0j83q83xknbikxb7yf9qhlkgvc89w33lhj090cv376gd"; }; nativeBuildInputs = [ qmake pkgconfig ]; From a2cd83828094db21e725046d6b1046aeb94fad33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 9 Apr 2018 18:19:10 +0100 Subject: [PATCH 51/57] vimPlugins.UltiSnips: add old alias back --- pkgs/misc/vim-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a14a32bc0264..c2d608a7f4ff 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -142,7 +142,7 @@ rec { tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = tslime-vim; unite = unite-vim; - Ultisnips = ultisnips; + UltiSnips = ultisnips; vim-grepper = vim-grepper-git; vim-test = vim-test-git; vimproc = vimproc-vim; From 849a68597082c2a5adf83d5e122c9689f81d1cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 9 Apr 2018 18:32:19 +0100 Subject: [PATCH 52/57] vimPlugins.colors-solarized: add old alias back --- pkgs/misc/vim-plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index c2d608a7f4ff..3e8c6e9b257e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -59,6 +59,7 @@ rec { coffeeScript = coffee-script; # backwards compat, added 2014-10-18 Solarized = vim-colors-solarized; solarized = vim-colors-solarized; + colors-solarized = vim-colors-solarized; caw = caw-vim; colorsamplerpack = Colour_Sampler_Pack; Colour_Sampler_Pack = Colour-Sampler-Pack; From 1abd2359637ac1331f7ac311327e08b962c28649 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 9 Apr 2018 22:01:50 +0300 Subject: [PATCH 53/57] rustc: Disable failing test on aarch64 https://hydra.nixos.org/build/72562211/nixlog/1 https://github.com/rust-lang/rust/issues/49807 --- pkgs/development/compilers/rust/rustc.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 92b149865fa2..d7705aa89e8b 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -102,8 +102,10 @@ stdenv.mkDerivation { # Useful debugging parameter # export VERBOSE=1 - '' - + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.isAarch64 '' + # https://github.com/rust-lang/rust/issues/49807 + rm -vr src/test/debuginfo/by-value-self-argument-in-trait-impl.rs + '' + optionalString stdenv.isDarwin '' # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* From 9726417975acc8f38cb8d0f237ad945f80bde92f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 9 Apr 2018 22:43:25 +0200 Subject: [PATCH 54/57] androidStudioPackages.{dev,canary}: 3.2.0.8 -> 3.2.0.9 --- pkgs/applications/editors/android-studio/common.nix | 6 ++++-- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f963fe378d51..a165fad370ec 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -5,10 +5,13 @@ , fetchurl , findutils , file +, fontsConf , git , glxinfo , gnugrep +, gnused , gnutar +, gtk2, gnome_vfs, glib, GConf , gzip , fontconfig , freetype @@ -29,8 +32,6 @@ , writeTextFile , xkeyboard_config , zlib -, gtk2, gnome_vfs, glib, GConf -, fontsConf }: let @@ -57,6 +58,7 @@ let findutils gnugrep which + gnused # For Android emulator file diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 72794df5fdef..d7baa7f7c71c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; latestVersion = { - version = "3.2.0.8"; # "Android Studio 3.2 Canary 9" - build = "173.4688006"; - sha256Hash = "13kln5s45qzdi54gca0bvdiwl2mi6lg8zgp7f36a24zbmvdmnslv"; + version = "3.2.0.9"; # "Android Studio 3.2 Canary 10" + build = "181.4705630"; + sha256Hash = "07xf00f0wvrk576iaqn7qpcpgar432n6q3jlgpslhm4m1cww3sww"; }; in rec { # Old alias From 83229813b3a6aad729408a1f211d39b1b7acf614 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 9 Apr 2018 17:05:25 -0400 Subject: [PATCH 55/57] sbt: 1.1.3 -> 1.1.4 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index eedea46f076a..04102e7e8f86 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "1pqw70qghzp6k0wal9nzqrd6wis0ha23i06s04l6wrf6kkc77ski"; + sha256 = "0hc361gb71psadx9gj78j0j60fw4sljjk8sl45hw6yzx3hmmkg9g"; }; patchPhase = '' From 487be791d783c706369a1a0740e03a0bb60d8f1f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 9 Apr 2018 22:24:01 +0300 Subject: [PATCH 56/57] nixos/make-ext4-fs: Use closureInfo exportReferencesGraph is deprecated and doesn't have the generated initial Nix database contain the SHA256 of the contents of the store paths, which breaks various things under Nix 2.0. --- nixos/lib/make-ext4-fs.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 21c69ed560a3..986d80ff1b99 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -7,23 +7,22 @@ , volumeLabel }: +let + sdClosureInfo = pkgs.closureInfo { rootPaths = storePaths; }; +in + pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; - # For obtaining the closure of `storePaths'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) storePaths; - buildCommand = '' # Add the closures of the top-level store objects. - storePaths=$(perl ${pkgs.pathsFromGraph} closure-*) + storePaths=$(cat ${sdClosureInfo}/store-paths) - # Also include a manifest of the closures in a format suitable - # for nix-store --load-db. - printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > nix-path-registration + # Also include a manifest of the closures in a format suitable for nix-store --load-db. + cp ${sdClosureInfo}/registration nix-path-registration # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. From ad229677a3a6ac43bd1e6a25e1bec4fe8df5d9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Apr 2018 06:37:35 +0100 Subject: [PATCH 57/57] linuxPackages.{zfs,spl}{Stable,Unstable}: 0.7.7 -> 0.7.8; 2018-04-04 -> 2018-04-10 --- pkgs/os-specific/linux/spl/default.nix | 15 +- .../linux/spl/install_prefix-0.7.8.patch | 174 ++++++++++++++++++ .../linux/spl/install_prefix.patch | 12 -- pkgs/os-specific/linux/zfs/default.nix | 10 +- 4 files changed, 188 insertions(+), 23 deletions(-) create mode 100644 pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index e7139d17ace6..2550e6d28f6c 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -11,6 +11,7 @@ let , sha256 , rev ? "spl-${version}" , broken ? false + , patches ? [] } @ args : stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; @@ -20,7 +21,7 @@ let inherit rev sha256; }; - patches = [ ./install_prefix.patch ]; + inherit patches; nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; @@ -61,14 +62,16 @@ in assert kernel != null; { splStable = common { - version = "0.7.7"; - sha256 = "0mq7827x4173wdbpj361gvxvk8j9r96363gka75smzsc31i2wa5x"; + version = "0.7.8"; + sha256 = "0ypyy7ij280n7rly6ifrvna9k55gxwdx9a7lalf4r1ka714379fi"; + patches = [ ./install_prefix-0.7.8.patch ]; }; splUnstable = common { - version = "2018-03-09"; - rev = "43983eb2024ec6b3280e6e06a6fb621ee3bb2a41"; - sha256 = "00h7z30hzxd09cfa44w7yv7zympvdwzdximfgjvpa1layzppjpsh"; + version = "2018-04-10"; + rev = "9125f8f5bdb36bfbd2d816d30b6b29b9f89ae3d8"; + sha256 = "00zrbca906rzjd62m4khiw3sdv8x18dapcmvkyaawripwvzc4iri"; + patches = [ ./install_prefix.patch ]; }; splLegacyCrypto = common { diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch new file mode 100644 index 000000000000..dc91392bd2fe --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch @@ -0,0 +1,174 @@ +diff --git a/Makefile.am b/Makefile.am +index 4977448..ac17217 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,10 +12,10 @@ endif + if CONFIG_KERNEL + SUBDIRS += module + +-extradir = @prefix@/src/spl-$(VERSION) ++extradir = @prefix@/libexec/spl + extra_HEADERS = spl.release.in spl_config.h.in + +-kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) ++kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) + endif + +diff --git a/include/Makefile.am b/include/Makefile.am +index 3200222..4a47aaa 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -13,6 +13,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include ++kerneldir = @prefix@/libexec/spl/include + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am +index e0da4b3..d6d7af0 100644 +--- a/include/fs/Makefile.am ++++ b/include/fs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/fs ++kerneldir = @prefix@/libexec/spl/include/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am +index 712e94e..4af9fb7 100644 +--- a/include/linux/Makefile.am ++++ b/include/linux/Makefile.am +@@ -18,6 +18,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/linux ++kerneldir = @prefix@/libexec/spl/include/linux + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am +index cfc8246..4fbd33d 100644 +--- a/include/rpc/Makefile.am ++++ b/include/rpc/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc ++kerneldir = @prefix@/libexec/spl/include/rpc + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am +index 10e7093..febecdf 100644 +--- a/include/sharefs/Makefile.am ++++ b/include/sharefs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs ++kerneldir = @prefix@/libexec/spl/include/sharefs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am +index 73c4a84..31a9f50 100644 +--- a/include/sys/Makefile.am ++++ b/include/sys/Makefile.am +@@ -107,7 +107,7 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys ++kerneldir = @prefix@/libexec/spl/include/sys + kernel_HEADERS = $(KERNEL_H) + endif + +diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am +index 2821cbe..a84ce8e 100644 +--- a/include/sys/fm/Makefile.am ++++ b/include/sys/fm/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm ++kerneldir = @prefix@/libexec/spl/include/sys/fm + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am +index 581083e..0c35fb7 100644 +--- a/include/sys/fs/Makefile.am ++++ b/include/sys/fs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs ++kerneldir = @prefix@/libexec/spl/include/sys/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am +index 63d9af3..de1aa18 100644 +--- a/include/sys/sysevent/Makefile.am ++++ b/include/sys/sysevent/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent ++kerneldir = @prefix@/libexec/spl/include/sys/sysevent + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/util/Makefile.am b/include/util/Makefile.am +index e2bf09f..3f5d6ce 100644 +--- a/include/util/Makefile.am ++++ b/include/util/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/util ++kerneldir = @prefix@/libexec/spl/include/util + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am +index 7faab0a..8148b3d 100644 +--- a/include/vm/Makefile.am ++++ b/include/vm/Makefile.am +@@ -10,6 +10,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/vm ++kerneldir = @prefix@/libexec/spl/include/vm + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/module/Makefile.in b/module/Makefile.in +index d4e62e1..73fa01c 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -21,15 +21,15 @@ clean: + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ +- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ ++ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ + KERNELRELEASE=@LINUX_VERSION@ + @# Remove extraneous build products when packaging +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ +- if [ -n "$(DESTDIR)" ]; then \ ++ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ ++ if [ -n "@prefix@" ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ ++ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index dc91392bd2fe..114ca1231470 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -112,18 +112,6 @@ index 581083e..0c35fb7 100644 +kerneldir = @prefix@/libexec/spl/include/sys/fs kernel_HEADERS = $(KERNEL_H) endif -diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am -index 63d9af3..de1aa18 100644 ---- a/include/sys/sysevent/Makefile.am -+++ b/include/sys/sysevent/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -+kerneldir = @prefix@/libexec/spl/include/sys/sysevent - kernel_HEADERS = $(KERNEL_H) - endif diff --git a/include/util/Makefile.am b/include/util/Makefile.am index e2bf09f..3f5d6ce 100644 --- a/include/util/Makefile.am diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 788c596c03a1..50ceea19877c 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -147,9 +147,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.7"; + version = "0.7.8"; - sha256 = "0lrzy27sh1cinkf04ki2vfjrgpgbiza2s59i2by45qdd8kmkcc5r"; + sha256 = "0m7j5cpz81lqcfbh4w3wvqjjka07wickl27klgy1zplv6vr0baix"; extraPatches = [ (fetchpatch { @@ -166,10 +166,10 @@ in { incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-04-04"; + version = "2018-04-10"; - rev = "1724eb62debfaa48f5861660615d49a994945d94"; - sha256 = "1adnmpn7b8zi5rq9r71flwx237vbysss1wywbck8407mcnrfaxzf"; + rev = "74df0c5e251a920a1966a011c16f960cd7ba562e"; + sha256 = "1x3mipj3ryznnd7kx84r3n607hv6jqs66mb61g3zcdmvk6al4yq4"; isUnstable = true; extraPatches = [