From daefc5d9e2382382d55a095a7f435297484a4385 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Thu, 15 Sep 2016 11:39:29 +0300 Subject: [PATCH 01/48] fribidi: 0.19.6 -> 0.19.7 --- pkgs/development/libraries/fribidi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 35d67b63309..bdfbb97f021 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "fribidi-${version}"; - version = "0.19.6"; + version = "0.19.7"; src = fetchurl { url = "http://fribidi.org/download/${name}.tar.bz2"; - sha256 = "0zg1hpaml34ny74fif97j7ngrshlkl3wk3nja3gmlzl17i1bga6b"; + sha256 = "13jsb5qadlhsaxkbrb49nqslmbh904vvzhsm5mm2ghmv29i2l8h8"; }; hardeningDisable = [ "format" ]; + outputs = [ "out" "devdoc" ]; + meta = with stdenv.lib; { homepage = http://fribidi.org/; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; From b019424e5da3eb499d0f910e6bf677a53ba37846 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 16 Sep 2016 01:08:36 +0200 Subject: [PATCH 02/48] systemtap: init at 51b7ca master needs to be tracked in order to support recent kernels --- .../tools/profiling/systemtap/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/tools/profiling/systemtap/default.nix diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix new file mode 100644 index 00000000000..615ad346479 --- /dev/null +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -0,0 +1,56 @@ +{ fetchurl, linuxPackages, makeWrapper, runCommand, fetchgit +, elfutils, pkgconfig, gettext, stow, gnumake }: +let + ## fetchgit info + url = git://sourceware.org/git/systemtap.git; + rev = "51b7cae3023adf137081059c7cc44a13f652ba4c"; + sha256 = "18m3lf11r99f4yr1m172548lghc0i22zqbys1fwlwakbczz0a2lz"; + + inherit (linuxPackages) kernel; + version = kernel.stdenv.lib.substring 0 6 rev; + + ## stap binaries + stapBuild = kernel.stdenv.mkDerivation { + name = "systemtap-${version}"; + src = fetchgit { inherit url rev sha256; }; + buildInputs = [ elfutils pkgconfig gettext ]; + enableParallelBuilding = true; + }; + + ## a kernel build dir as expected by systemtap + kernelBuildDir = runCommand "kbuild-${kernel.version}-merged" { + buildInputs = [ stow ]; + } '' + mkdir -p $out + stowFrom () { + D="$(dirname $1)" + P="$(basename $1)" + shift + stow -d $D -t $out -v "$@" -S $P + } + stowFrom ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build --ignore=source + ln -s ${kernel.dev}/vmlinux $out/vmlinux + ln -s ${kernel}/System.map $out/System.map + ln -s ${kernel.dev}/lib/modules/${kernel.modDirVersion}/source $out/source + ''; + +in runCommand "systemtap-${kernel.version}-${version}" { + inherit stapBuild kernelBuildDir; + buildInputs = [ makeWrapper ]; + meta = with kernel.stdenv.lib; { + homepage = https://sourceware.org/systemtap/; + repositories.git = git://sourceware.org/git/systemtap.git; + description = "SystemTap provides a simple command line interface and scripting language for writing instrumentation for a live running kernel plus user-space applications."; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} '' + mkdir -p $out/bin + for bin in $stapBuild/bin/*; do # hello emacs */ + ln -s $bin $out/bin/$(basename $bin) + done + rm $out/bin/stap + makeWrapper $stapBuild/bin/stap $out/bin/stap \ + --add-flags "-r $kernelBuildDir" \ + --prefix PATH : ${kernel.stdenv.cc.cc}/bin:${elfutils}/bin:${gnumake}/bin +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b77bcb54f7a..5c9f8de15dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14963,6 +14963,8 @@ in # linux only by now synergy = callPackage ../applications/misc/synergy { }; + systemtap = callPackage ../development/tools/profiling/systemtap { }; + tabbed = callPackage ../applications/window-managers/tabbed { # if you prefer a custom config, write the config.h in tabbed.config.h # and enable From 59ccacbcd3adb5193329f412334b0017accb9d39 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 16 Sep 2016 22:09:39 +0200 Subject: [PATCH 03/48] systemtap: clean up as per feedback - shorter description - move systemtap into linuxPackages this is only necessary for the wrapper systemtap also has a dyninsn backend to instrument userspace apps we could experiment with other platforms, using this - get rid of stow build dependency - update version - minor cleanup steps --- .../tools/profiling/systemtap/default.nix | 50 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 615ad346479..b7872780245 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,16 +1,17 @@ -{ fetchurl, linuxPackages, makeWrapper, runCommand, fetchgit -, elfutils, pkgconfig, gettext, stow, gnumake }: +{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper +, elfutils, kernel, gnumake }: let ## fetchgit info url = git://sourceware.org/git/systemtap.git; - rev = "51b7cae3023adf137081059c7cc44a13f652ba4c"; - sha256 = "18m3lf11r99f4yr1m172548lghc0i22zqbys1fwlwakbczz0a2lz"; + rev = "a10bdceb7c9a7dc52c759288dd2e555afcc5184a"; + sha256 = "1kllzfnh4ksis0673rma5psglahl6rvy0xs5v05qkqn6kl7irmg1"; + version = "2016-09-16"; - inherit (linuxPackages) kernel; - version = kernel.stdenv.lib.substring 0 6 rev; + inherit (kernel) stdenv; + inherit (stdenv) lib; ## stap binaries - stapBuild = kernel.stdenv.mkDerivation { + stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; buildInputs = [ elfutils pkgconfig gettext ]; @@ -18,39 +19,34 @@ let }; ## a kernel build dir as expected by systemtap - kernelBuildDir = runCommand "kbuild-${kernel.version}-merged" { - buildInputs = [ stow ]; - } '' + kernelBuildDir = runCommand "kbuild-${kernel.version}-merged" { } '' mkdir -p $out - stowFrom () { - D="$(dirname $1)" - P="$(basename $1)" - shift - stow -d $D -t $out -v "$@" -S $P - } - stowFrom ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build --ignore=source - ln -s ${kernel.dev}/vmlinux $out/vmlinux - ln -s ${kernel}/System.map $out/System.map - ln -s ${kernel.dev}/lib/modules/${kernel.modDirVersion}/source $out/source + for f in \ + ${kernel}/System.map \ + ${kernel.dev}/vmlinux \ + ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build/{*,.*} + do + ln -s $(readlink -f $f) $out + done ''; in runCommand "systemtap-${kernel.version}-${version}" { inherit stapBuild kernelBuildDir; buildInputs = [ makeWrapper ]; - meta = with kernel.stdenv.lib; { + meta = { homepage = https://sourceware.org/systemtap/; - repositories.git = git://sourceware.org/git/systemtap.git; - description = "SystemTap provides a simple command line interface and scripting language for writing instrumentation for a live running kernel plus user-space applications."; - license = licenses.gpl2; - platforms = platforms.linux; + repositories.git = url; + description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } '' mkdir -p $out/bin for bin in $stapBuild/bin/*; do # hello emacs */ - ln -s $bin $out/bin/$(basename $bin) + ln -s $bin $out/bin done rm $out/bin/stap makeWrapper $stapBuild/bin/stap $out/bin/stap \ --add-flags "-r $kernelBuildDir" \ - --prefix PATH : ${kernel.stdenv.cc.cc}/bin:${elfutils}/bin:${gnumake}/bin + --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc elfutils gnumake ]} '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c9f8de15dc..dff536aa7f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11397,6 +11397,8 @@ in sysdig = callPackage ../os-specific/linux/sysdig {}; + systemtap = callPackage ../development/tools/profiling/systemtap { }; + tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; v86d = callPackage ../os-specific/linux/v86d { }; @@ -14963,8 +14965,6 @@ in # linux only by now synergy = callPackage ../applications/misc/synergy { }; - systemtap = callPackage ../development/tools/profiling/systemtap { }; - tabbed = callPackage ../applications/window-managers/tabbed { # if you prefer a custom config, write the config.h in tabbed.config.h # and enable From 0230d923f13d8d716f8e57c6882c80815b4ce790 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 26 Sep 2016 16:07:14 +0800 Subject: [PATCH 04/48] syncthing: 0.14.6 -> 0.14.7 --- pkgs/applications/networking/syncthing/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 99a9e7462c2..82e0cce47d6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.14.6"; + version = "0.14.7"; name = "syncthing-${version}"; src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing"; - rev = "v${version}"; - sha256 = "1w8a46c6r3rddfl9xbx7j2mavai4dm9h8flpm4qr0bsd6whf60hz"; + owner = "syncthing"; + repo = "syncthing"; + rev = "v${version}"; + sha256 = "1mcn2vmv3hvp0ni9jxbjj3qp0l6ls07qmq33amhvjhpfafqzn279"; }; buildInputs = [ go ]; From 0de0d23246e82b0a0785483460cb5747fa08727b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 25 Sep 2016 21:38:07 +0200 Subject: [PATCH 05/48] python-PyICU: init at 1.9.3 --- pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56540965a07..33d63cd24bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19515,6 +19515,33 @@ in modules // { }; }; + PyICU = buildPythonPackage rec { + name = "PyICU-1.9.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/P/PyICU/${name}.tar.gz"; + sha256 = "0hps2314w7ddiwhqgw249m3hgqnny7qn542vz26jxr5k5hhrcyhs"; + }; + + buildInputs = [ pkgs.icu ]; + + patches = [ + # Fixes a bug in the test suite. + (pkgs.fetchpatch { + url = "https://github.com/ovalhub/pyicu/commit/6ab20d48d85638acb3a811c8676f713bd26f0df9.patch"; + sha256 = "0z4585r6bi0xxvrr93n450ka43vixx9zd063qna078vck0i3bkjg"; + }) + ]; + + meta = { + homepage = https://pypi.python.org/pypi/PyICU/; + description = "Python extension wrapping the ICU C++ API"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + pyinotify = buildPythonPackage rec { name = "pyinotify"; version = "0.9.6"; From 87ffa1cea0ed77fb50751ff4579fc78a3e8ce0aa Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Tue, 27 Sep 2016 21:35:41 -0500 Subject: [PATCH 06/48] lastpass-cli: 0.9.0 -> 1.0.0 --- pkgs/tools/security/lastpass-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index bfd1343f5e5..88b7316e9d8 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "1iaz36bcyss2kahhlm92l7yh26rxvs12wnkkh1289yarl5wi0yld"; + sha256 = "0hidx2qfr52bwjb6as4fbfa34jqh3zwvrcx590vbsji3bq4g7avb"; }; buildInputs = [ From 7ab671c209fa94772e8ae636b5ca34d83ebc177a Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 28 Sep 2016 03:00:01 -0400 Subject: [PATCH 07/48] libui: darwin compatibility --- pkgs/development/libraries/libui/default.nix | 28 +++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 50c42f4f10b..4db64186850 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchgit, cmake, pkgconfig, gtk3 }: +{ stdenv, fetchgit, cmake, pkgconfig, gtk3, darwin }: let shortName = "libui"; version = "3.1a"; + backend = if stdenv.isDarwin then "darwin" else "unix"; in stdenv.mkDerivation rec { name = "${shortName}-${version}"; @@ -12,27 +13,42 @@ in sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; }; - buildInputs = [ cmake pkgconfig gtk3 ]; + buildInputs = [ cmake pkgconfig ] ++ + (if stdenv.isDarwin then [darwin.apple_sdk.frameworks.Cocoa] else [gtk3]); + + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt + ''; + cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_SYSROOT=" + "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + ]; installPhase = '' mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig - + '' + stdenv.lib.optionalString stdenv.isLinux '' mv ./out/${shortName}.so.0 $out/lib/ ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so - + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mv ./out/${shortName}.A.dylib $out/lib/ + ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib + '' + '' cp $src/ui.h $out/include - cp $src/ui_unix.h $out/include + cp $src/ui_${backend}.h $out/include cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc substituteInPlace $out/lib/pkgconfig/${shortName}.pc \ --subst-var-by out $out \ --subst-var-by version "${version}" ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib + ''; meta = { homepage = https://github.com/andlabs/libui; description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 16547d49da77e4645d922172332f7a53cbb8aa36 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 28 Sep 2016 12:33:46 +0200 Subject: [PATCH 08/48] wol: init at 0.7.1 wol, unlike wakelan, supports wake-on-lan passwords --- pkgs/tools/networking/wol/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/wol/default.nix diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/tools/networking/wol/default.nix new file mode 100644 index 00000000000..5349abec161 --- /dev/null +++ b/pkgs/tools/networking/wol/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "wol-${version}"; + version = "0.7.1"; + proj = "wake-on-lan"; + + enableParallelBuilding = true; + + src = fetchurl { + url = "mirror://sourceforge/${proj}/${name}.tar.gz"; + sha256 = "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270"; + }; + + meta = { + description = "Implements Wake On LAN functionality in a small program"; + homepage = https://sourceforge.net/projects/wake-on-lan/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccfccbadea6..f43e63136ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4175,6 +4175,8 @@ in wml = callPackage ../development/web/wml { }; + wol = callPackage ../tools/networking/wol { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; From 36e0aedae7b3dc044fe981fcfaf3730cb0c18a99 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 28 Sep 2016 13:31:27 +0200 Subject: [PATCH 09/48] f3: init at 6.0 --- pkgs/tools/filesystems/f3/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/filesystems/f3/default.nix diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix new file mode 100644 index 00000000000..e7f20b1e6b3 --- /dev/null +++ b/pkgs/tools/filesystems/f3/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "f3-${version}"; + version = "6.0"; + + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "AltraMayor"; + repo = "f3"; + rev = "v${version}"; + sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + patchPhase = "sed -i 's/-oroot -groot//' Makefile"; + + meta = { + description = "Fight Flash Fraud"; + homepage = http://oss.digirati.com.br/f3/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccfccbadea6..df04c4809f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -815,6 +815,8 @@ in ent = callPackage ../tools/misc/ent { }; + f3 = callPackage ../tools/filesystems/f3 { }; + facter = callPackage ../tools/system/facter { ruby = ruby_2_1; }; From 990c2be0080a89b779fff71a7b322bd8e18658d5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 08:47:27 -0400 Subject: [PATCH 10/48] asterisk: mark as broken https://github.com/NixOS/nixpkgs/issues/18856 --- pkgs/servers/asterisk/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index bb45f0a00e6..ed772e7b247 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -57,5 +57,8 @@ stdenv.mkDerivation rec { homepage = http://www.asterisk.org/; license = licenses.gpl2; maintainers = with maintainers; [ auntie ]; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } From 32ed8343877421e116413254944cbfe9455de4cb Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 08:47:18 -0400 Subject: [PATCH 11/48] cryptopp: mark as broken https://github.com/NixOS/nixpkgs/issues/18856 --- pkgs/development/libraries/crypto++/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 940af8c44e9..6fbd9451c56 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { license = licenses.boost; platforms = platforms.all; maintainers = [ ]; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } - From f9c9c1dac85444be95e970bced3d7dbbf7c7086d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 08:47:08 -0400 Subject: [PATCH 12/48] redmine: mark as broken https://github.com/NixOS/nixpkgs/issues/18856 --- pkgs/applications/version-management/redmine/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 0cb498fec06..f2786b15f34 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -67,5 +67,8 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.garbas ]; license = licenses.gpl2; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } From e2688e072d96f4ae286f8819ea73fca73faa9689 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 08:46:57 -0400 Subject: [PATCH 13/48] moodle: mark as broken https://github.com/NixOS/nixpkgs/issues/18856 --- nixos/modules/services/web-servers/apache-httpd/moodle.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix index 87b1fba5aa1..aa00e89967d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/moodle.nix +++ b/nixos/modules/services/web-servers/apache-httpd/moodle.nix @@ -63,6 +63,10 @@ let cp -r * $out cp ${moodleConfig} $out/config.php ''; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + meta.broken = true; + }; in From d92fe31e04a06c28223e821d300f767cd41d0e0b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 08:56:44 -0400 Subject: [PATCH 14/48] opera: mark as broken https://github.com/NixOS/nixpkgs/issues/18856 --- pkgs/applications/networking/browsers/opera/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index f1d40150eb3..fe7cb477371 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -84,5 +84,8 @@ stdenv.mkDerivation rec { homepage = http://www.opera.com; description = "Web browser"; license = stdenv.lib.licenses.unfree; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } From 86c9b471a6864093077ac308f040425fe0a8b44d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 08:57:26 -0400 Subject: [PATCH 15/48] openstack-neutron: mark as broken https://github.com/NixOS/nixpkgs/issues/18856 --- pkgs/applications/virtualization/openstack/neutron.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index 3371eb428e6..ac839d9f914 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -62,5 +62,8 @@ pythonPackages.buildPythonApplication rec { description = "Virtual network service for Openstack"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } From 337eb4d027e87ed7210f5fc2ac4be0fa81b9d059 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 08:58:03 -0400 Subject: [PATCH 16/48] mesos: mark as broken https://github.com/NixOS/nixpkgs/issues/18856 --- .../applications/networking/cluster/mesos/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 6768df2df02..ac7d94d5c9a 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo} - + substituteInPlace 3rdparty/libprocess/include/process/subprocess.hpp \ --replace '"sh"' '"${bash}/bin/bash"' @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/launcher/executor.cpp \ --replace '"sh"' '"${bash}/bin/bash"' - + substituteInPlace src/launcher/fetcher.cpp \ --replace '"gzip' '"${gzip}/bin/gzip' \ --replace '"tar' '"${gnutar}/bin/tar' \ @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/python/cli/src/mesos/cli.py \ --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" - + substituteInPlace src/slave/containerizer/mesos/launch.cpp \ --replace '"sh"' '"${bash}/bin/bash"' @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/linux/perf.cpp \ --replace '"perf ' '"${perf}/bin/perf ' - + substituteInPlace src/linux/systemd.cpp \ --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"' @@ -180,5 +180,8 @@ in stdenv.mkDerivation rec { description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline rushmorem ]; platforms = platforms.linux; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } From e3760e5ade1d5da7fa3f8fe3e1efd363685b973f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 25 Sep 2016 21:39:44 +0200 Subject: [PATCH 17/48] python-slob: init at 2016-03-04 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33d63cd24bd..7798cc322af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22338,6 +22338,31 @@ in modules // { }; }; + slob = buildPythonPackage rec { + name = "slob-unstable-2016-03-04"; + + disabled = !isPy3k; + + src = pkgs.fetchFromGitHub { + owner = "itkach"; + repo = "slob"; + rev = "31ad0e769360a5b10a4893f686587bb8e48c3895"; + sha256 = "06yn510178awhjsvy88cpjz7rlmyviqd5g58gc8gf4ivyqdlqbsl"; + }; + + propagatedBuildInputs = [ self.PyICU ]; + + checkPhase = "python3 -m unittest slob"; + + meta = { + homepage = https://github.com/itkach/slob/; + description = "Reference implementation of the slob (sorted list of blobs) format"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + slowaes = buildPythonPackage rec { name = "slowaes-${version}"; version = "0.1a1"; From d945046be9367912c80ec951eb9cfbf8f8815449 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 25 Sep 2016 21:41:23 +0200 Subject: [PATCH 18/48] xdxf2slob: init at 2015-06-30 --- pkgs/tools/misc/xdxf2slob/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/xdxf2slob/default.nix diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix new file mode 100644 index 00000000000..b5c3f937145 --- /dev/null +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "xdxf2slob-unstable-2015-06-30"; + + src = fetchFromGitHub { + owner = "itkach"; + repo = "xdxf2slob"; + rev = "6831b93c3db8c73200900fa4ddcb17350a677e1b"; + sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd"; + }; + + propagatedBuildInputs = [ python3Packages.PyICU python3Packages.slob ]; + + meta = with stdenv.lib; { + description = "Tool to convert XDXF dictionary files to slob format"; + homepage = https://github.com/itkach/xdxf2slob/; + license = licenses.gpl3; + maintainer = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 404965ccf52..7beaceb558c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4230,6 +4230,8 @@ in xdummy = callPackage ../tools/misc/xdummy { }; + xdxf2slob = callPackage ../tools/misc/xdxf2slob { }; + xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; xflux = callPackage ../tools/misc/xflux { }; From dbe350f5d002579b124a1420e5d78e6b201533bf Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 28 Sep 2016 17:45:45 +0200 Subject: [PATCH 19/48] bash-completion: 2.1 -> 2.4 --- pkgs/shells/bash-completion/bash-4.3.patch | 22 ------------------- pkgs/shells/bash-completion/default.nix | 25 ++++++++-------------- 2 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 pkgs/shells/bash-completion/bash-4.3.patch diff --git a/pkgs/shells/bash-completion/bash-4.3.patch b/pkgs/shells/bash-completion/bash-4.3.patch deleted file mode 100644 index e893b501d31..00000000000 --- a/pkgs/shells/bash-completion/bash-4.3.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit a9c556ccad819869a6a5d932aac0a75a99372f08 -Author: Barry Warsaw -Date: Wed Sep 17 19:32:43 2014 +0300 - - _init_completion: Handle cword < 0 (LP: #1289597) - - Previously only bash 4.3 seemed to provoke this, but now with the - empty command consistency tweak it occurs with earlier as well. - -diff --git a/bash_completion b/bash_completion -index 7e01ae4..3bb4bc2 100644 ---- a/bash_completion -+++ b/bash_completion -@@ -727,7 +727,7 @@ _init_completion() - fi - done - -- [[ $cword -eq 0 ]] && return 1 -+ [[ $cword -le 0 ]] && return 1 - prev=${words[cword-1]} - - [[ ${split-} ]] && _split_longopt && split=true diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 91d6b333541..ad4cc3d09d7 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -1,28 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bash-completion-2.1"; + name = "bash-completion-${version}"; + version = "2.4"; src = fetchurl { - url = "http://bash-completion.alioth.debian.org/files/${name}.tar.bz2"; - sha256 = "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"; + url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz"; + sha256 = "1xlhd09sb2w3bw8qaypxgkr0782w082mcbx8zf7yzjgy0996pxy0"; }; - patches = [ ./bash-4.3.patch ]; - doCheck = true; - # nmcli is included in the network-manager package - postInstall = '' - rm $out/share/bash-completion/completions/nmcli - ''; - - meta = { - homepage = "http://bash-completion.alioth.debian.org/"; + meta = with stdenv.lib; { + homepage = https://github.com/scop/bash-completion; description = "Programmable completion for the bash shell"; - license = "GPL"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.peti ]; }; } From e8817a2d20037b54ac9fe548c9f31d6e7c44bedf Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 28 Sep 2016 17:46:29 +0200 Subject: [PATCH 20/48] bash-completion: change attribute name This changes the attribute name of bash-completion from `bashCompletion` to `bash-completion`. Keeps `bashCompletion` as an alias for the new name. --- nixos/modules/programs/bash/bash.nix | 2 +- pkgs/tools/audio/beets/default.nix | 4 ++-- pkgs/tools/misc/colord/default.nix | 4 ++-- pkgs/tools/package-management/createrepo_c/default.nix | 4 ++-- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index c09bcfb70e2..e23849d350b 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -16,7 +16,7 @@ let # programmable completion. If we do, enable all modules installed in # the system (and user profile). if shopt -q progcomp &>/dev/null; then - . "${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh" + . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh" nullglobStatus=$(shopt -p nullglob) shopt -s nullglob for p in $NIX_PROFILES; do diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 283a6d48ca2..05d8bd0990f 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -19,7 +19,7 @@ , enableAlternatives ? false , enableCopyArtifacts ? false -, bashInteractive, bashCompletion +, bashInteractive, bash-completion }: assert enableAcoustid -> pythonPackages.pyacoustid != null; @@ -70,7 +70,7 @@ let allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins; testShell = "${bashInteractive}/bin/bash --norc"; - completion = "${bashCompletion}/share/bash-completion/bash_completion"; + completion = "${bash-completion}/share/bash-completion/bash_completion"; in pythonPackages.buildPythonApplication rec { name = "beets-${version}"; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 7e6c3f30784..6dc2c371e46 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchgit, bashCompletion +{ stdenv, fetchzip, fetchgit, bash-completion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms , libgudev, sane-backends }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection - bashCompletion argyllcms automake autoconf libgudev sane-backends ]; + bash-completion argyllcms automake autoconf libgudev sane-backends ]; postInstall = '' mkdir -p $out/etc/bash_completion.d diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index eed1ed1e526..8d27dc8aef0 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bashCompletion }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { rev = "0.10.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "set (PYTHON_INSTALL_DIR "$out/${python.sitePackages}")" ''; - buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bashCompletion ]; + buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bash-completion ]; meta = with stdenv.lib; { description = "C implementation of createrepo"; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index af8a162357b..68d13f7f17f 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -3,7 +3,7 @@ , gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive , nix, boost , enableCommandNotFound ? false -, enableBashCompletion ? false, bashCompletion ? null }: +, enableBashCompletion ? false, bash-completion ? null }: stdenv.mkDerivation rec { name = "packagekit-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ] - ++ lib.optional enableBashCompletion bashCompletion; + ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cc09abc49b5..14c3e513d6c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -24,6 +24,7 @@ doNotDisplayTwice rec { asciidocFull = asciidoc-full; # added 2014-06-22 bar = lemonbar; # added 2015-01-16 bar-xft = lemonbar-xft; # added 2015-01-16 + bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 bundler_HEAD = bundler; # added 2015-11-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72636b200dc..e05c8c42724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4333,7 +4333,7 @@ in interactive = true; }); - bashCompletion = callPackage ../shells/bash-completion { }; + bash-completion = callPackage ../shells/bash-completion { }; dash = callPackage ../shells/dash { }; From ff5cf3abff4f1a24d4a8379475c895ccd001c734 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 18:45:55 +0200 Subject: [PATCH 21/48] linux-3.10: fix build by upstream patch --- pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index b15d66278d9..d4e9f1e7275 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -139,4 +139,13 @@ rec { }; cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; + + lguest_entry-linkage = + { name = "lguest-asmlinkage.patch"; + patch = fetchpatch { + url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git" + + "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52"; + sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc"; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f3b1ff94b8..d467382cfaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10674,7 +10674,7 @@ in }; linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { - kernelPatches = with kernelPatches; [ bridge_stp_helper ] + kernelPatches = with kernelPatches; [ bridge_stp_helper lguest_entry-linkage ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill From 7a003eb9d52bc0210308af473e706c065a21aa40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2016 19:00:06 +0200 Subject: [PATCH 22/48] mesa_drivers: work around #16779 This works around missing newer wayland symbols when running some older packages on a system with updated opengl drivers. We have no good solution yet, unfortunately. This commit might break packages that rely on new wayland features, but those should be a minority. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d467382cfaa..e301871b9dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8314,6 +8314,7 @@ in mesa_drivers = mesaDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; + wayland = wayland_1_9; # work-around for #16779 }; in mo.drivers ); From 10be782f25a72f84aab5a1725797c1b13c3f5790 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 22 Sep 2016 22:55:15 +0200 Subject: [PATCH 23/48] connman: meta cleanup --- pkgs/tools/networking/connman/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 4c1fd1b5bba..565892181e4 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -51,10 +51,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Provides a daemon for managing internet connections"; - homepage = "https://connman.net/"; + description = "A daemon for managing internet connections"; + homepage = https://connman.net/; maintainers = [ maintainers.matejc ]; - # tested only on linux, might work on others also platforms = platforms.linux; license = licenses.gpl2; }; From 098113bbffbee5d8894e0e2514c68a7ddb6ccd5b Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sat, 19 Mar 2016 12:36:21 +0300 Subject: [PATCH 24/48] maintainers: change smironov email --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 24b87a5f36a..b83bd7ca9f4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -383,8 +383,8 @@ skeidel = "Sven Keidel "; skrzyp = "Jakub Skrzypnik "; sleexyz = "Sean Lee "; - smironov = "Sergey Mironov "; solson = "Scott Olson "; + smironov = "Sergey Mironov "; spacefrogg = "Michael Raitza "; spencerjanssen = "Spencer Janssen "; spinus = "Tomasz Czyż "; From f85dd8161d50a12124b8e4f5ad2fdc899dc87b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2016 20:23:11 +0200 Subject: [PATCH 25/48] samba3: apply security patches from upstream /cc #18856. --- pkgs/servers/samba/3.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index e2818a1f648..858f60b3885 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { sha256 = "0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g"; }; + patches = [(fetchurl { + url = "https://download.samba.org/pub/samba/patches/security/" + + "samba-3.6.25-security-2015-12-16.patch"; + sha256 = "00dcjcn577825mfdwdp76jfy5kcrqw3s4d5c41gqdq5gfcdbmqdb"; + })]; + buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] ++ stdenv.lib.optional useKerberos kerberos; From e7b3d9c7c899401ddfc9da2752304084bfdc8675 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Wed, 28 Sep 2016 19:18:42 +0000 Subject: [PATCH 26/48] wl-pprint: update to 2016-09-28 --- pkgs/development/idris-modules/wl-pprint.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index 66dd4cefe48..12e9b28d81c 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -4,25 +4,27 @@ , base , lib , idris -}: build-idris-package { - name = "wl-pprint"; +}: +build-idris-package { + name = "wl-pprint-2016-09-28"; src = fetchFromGitHub { owner = "shayan-najd"; repo = "wl-pprint"; - rev = "120f654b0b9838b57e10b163d3562d959439fb07"; - sha256 = "1yymdl251zla6hv9rcg06x73gbp6xb0n6f6a02bsy5fqfmrfngcl"; + rev = "4cc88a0865620a3b997863e4167d3b98e1a41b52"; + sha256 = "1yxxh366k5njad75r0xci2q5c554cddvzgrwk43b0xn8rq0vm11x"; }; + # The tests for this package fail. We should attempt to enable them when + # updating this package again. + doCheck = false; + propagatedBuildInputs = [ prelude base ]; meta = { description = "Wadler-Leijen pretty-printing library"; - homepage = https://github.com/shayan-najd/wl-pprint; - license = lib.licenses.bsd2; - inherit (idris.meta) platforms; }; } From 8bad6de0d237e3c65cafda1caf42ad86c74b83b8 Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 27 Sep 2016 23:53:26 +0200 Subject: [PATCH 27/48] pythonPackages.path-and-address: init at 2.0.1 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9573e25ab4..1251b61ed2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7817,6 +7817,24 @@ in modules // { }; }; + path-and-address = buildPythonPackage rec { + version = "2.0.1"; + name = "path-and-address-${version}"; + + src = pkgs.fetchurl { + url = "https://files.pythonhosted.org/packages/2b/b5/749fab14d9e84257f3b0583eedb54e013422b6c240491a4ae48d9ea5e44f/${name}.zip"; + sha256 = "1dviac24s0gm7ka2fwjjb25j9l2idc45zkgl662xx8mkhbcn6qz9"; + }; + + meta = { + description = "Functions for server CLI applications used by humans"; + homepage = https://github.com/joeyespo/path-and-address; + license = licenses.mit; + maintainers = with maintainers; [ koral]; + }; + }; + + pdfminer = buildPythonPackage rec { version = "20140328"; name = "pdfminer-${version}"; From 6aea928962b4a9b23ff5377a9fdc506f492f08bb Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 27 Sep 2016 23:54:06 +0200 Subject: [PATCH 28/48] pythonPackages.grip: init at 4.3.2 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1251b61ed2c..c039b7b6a6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6861,6 +6861,25 @@ in modules // { }; }; + grip = buildPythonPackage rec { + version = "4.3.2"; + name = "grip-${version}"; + + src = pkgs.fetchurl { + url = "https://files.pythonhosted.org/packages/8b/9d/698a7a3a8b57c28eacac27f269c9d0da228d20ee734edbe9451e3e0f7cde/${name}.zip"; + sha256 = "0sr6srp4liqjs6hxcy9kp8g5dzbnyfmwcsy2cn6qszkpp9x25w70"; + }; + + propagatedBuildInputs = with self; [ docopt flask markdown path-and-address pygments requests2 ]; + + meta = with stdenv.lib; { + description = "Preview GitHub Markdown files like Readme locally before committing them"; + homepage = https://github.com/joeyespo/grip; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; + }; + gst-python = callPackage ../development/libraries/gstreamer/python { gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; From 90556cedd0a9e9c0d143bcfe4411cbeef74c6906 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 28 Sep 2016 22:07:45 +0200 Subject: [PATCH 29/48] ranger: patch default pager --- pkgs/applications/misc/ranger/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 3334daa4aed..0a32fdf748e 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, w3m, file }: +{ stdenv, fetchurl, pythonPackages, w3m, file, less }: pythonPackages.buildPythonApplication rec { name = "ranger-1.7.2"; @@ -20,6 +20,8 @@ pythonPackages.buildPythonApplication rec { preConfigure = '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m + substituteInPlace ranger/__init__.py \ + --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${stdenv.lib.getBin less}/bin/less'" for i in ranger/config/rc.conf doc/config/rc.conf ; do substituteInPlace $i --replace /usr/share $out/share From 2960aa7f1b8806e2c5b70520f47d96142386a897 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 28 Sep 2016 13:21:50 +0200 Subject: [PATCH 30/48] mergerfs: init at 2.16.1 --- pkgs/tools/filesystems/mergerfs/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/filesystems/mergerfs/default.nix diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix new file mode 100644 index 00000000000..81f82108995 --- /dev/null +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, fuse, pkgconfig, which, attr, pandoc, git }: + +stdenv.mkDerivation rec { + name = "mergerfs-${version}"; + version = "2.16.1"; + + # not using fetchFromGitHub because of changelog being built with git log + src = fetchgit { + url = "https://github.com/trapexit/mergerfs"; + rev = "refs/tags/${version}"; + sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf"; + deepClone = true; + }; + + buildInputs = [ fuse pkgconfig which attr pandoc git ]; + + makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; + + meta = { + description = "A FUSE based union filesystem"; + homepage = https://github.com/trapexit/mergerfs; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccfccbadea6..a1aec3c3101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8291,6 +8291,8 @@ in menu-cache = callPackage ../development/libraries/menu-cache { }; + mergerfs = callPackage ../tools/filesystems/mergerfs { }; + mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesaDarwinOr = alternative: if stdenv.isDarwin From b1dc000df6425a6a5ea1f17f7293e673322f6987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 28 Sep 2016 23:21:17 +0200 Subject: [PATCH 31/48] grip: enable tests --- pkgs/top-level/python-packages.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58666094a93..8600fe89b9c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7020,13 +7020,21 @@ in modules // { version = "4.3.2"; name = "grip-${version}"; - src = pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/8b/9d/698a7a3a8b57c28eacac27f269c9d0da228d20ee734edbe9451e3e0f7cde/${name}.zip"; - sha256 = "0sr6srp4liqjs6hxcy9kp8g5dzbnyfmwcsy2cn6qszkpp9x25w70"; + src = pkgs.fetchFromGitHub { + owner = "joeyespo"; + repo = "grip"; + rev = "v${version}"; + sha256 = "05a169sfaj280k7gibbc1rznjn43l5m6l1gpl6a5cmp5r8827khs"; }; + buildInputs = with self; [ pytest responses ]; propagatedBuildInputs = with self; [ docopt flask markdown path-and-address pygments requests2 ]; + checkPhase = '' + export PATH="$PATH:$out/bin" + py.test -xm "not assumption" + ''; + meta = with stdenv.lib; { description = "Preview GitHub Markdown files like Readme locally before committing them"; homepage = https://github.com/joeyespo/grip; From ffb6c50b2039bc06fd0ed86a6a43275cf65fe129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 28 Sep 2016 23:22:16 +0200 Subject: [PATCH 32/48] path-and-address: enable tests --- pkgs/top-level/python-packages.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8600fe89b9c..4430583ba58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8008,9 +8008,15 @@ in modules // { version = "2.0.1"; name = "path-and-address-${version}"; - src = pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/2b/b5/749fab14d9e84257f3b0583eedb54e013422b6c240491a4ae48d9ea5e44f/${name}.zip"; - sha256 = "1dviac24s0gm7ka2fwjjb25j9l2idc45zkgl662xx8mkhbcn6qz9"; + buildInputs = with self; [ pytest ]; + + checkPhase = "py.test"; + + src = pkgs.fetchFromGitHub { + owner = "joeyespo"; + repo = "path-and-address"; + rev = "v${version}"; + sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6"; }; meta = { @@ -8020,7 +8026,7 @@ in modules // { maintainers = with maintainers; [ koral]; }; }; - + pdfminer = buildPythonPackage rec { version = "20140328"; From 0a2b08884c7f1e1d2f44beaf08ef42e9803c6f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Thu, 29 Sep 2016 00:18:35 +0200 Subject: [PATCH 33/48] man-pages: include man3 in $out The previous patch to this file removed the docdev output, but did not actually provide the files that were in the docdev output in out. This patch fixes the issue. --- pkgs/data/documentation/man-pages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 8eeebf40134..a488cb58e6f 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "MANDIR=$(out)/share/man" ]; + outputDocdev = "out"; meta = with stdenv.lib; { description = "Linux development manual pages"; From 4c493a32f90b674b7c3123b51dce35dbaff18f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Thu, 29 Sep 2016 00:51:14 +0200 Subject: [PATCH 34/48] ripgrep: update 0.1.17 -> 0.2.1 --- pkgs/tools/text/ripgrep/default.nix | 6 +++--- pkgs/top-level/rust-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index ca08a237128..3c2ef2e9533 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.1.17"; + version = "0.2.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "18bpb1jl9fnipgp9icf1wwzm7934lk0ycbpvzlhvs2873zqhv6a6"; + sha256 = "0whw6hqjkf6sysrfv931jaia2hqhy8m9aa5rxax1kygm4snz4j85"; }; - depsSha256 = "0fzjk5qynxivxmmz7r1za7mzdbdwzwwvxlc5a6cmxmzwnix2lby3"; + depsSha256 = "10f7pkgaxwizl7kzhkry7wx1rgm9wsybwkk92myc29s7sqir2mx4"; meta = with stdenv.lib; { description = "An untility that combines the usability of The Silver Searcher with the raw speed of grep"; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index d6eebf58092..20cc1396653 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-09-23"; - rev = "e2ac19b6236468033ba0c66ac23293b7ed9e3486"; - sha256 = "16kwzjjx67pigs9b8pxdfl685l812a8ja47s61h6gshxrg3j1cs7"; + version = "2016-09-29"; + rev = "12dc47026cadf5aa2823c9d0fdd055b9f2c0f52c"; + sha256 = "0la6wlnbiwjixcxbq6k0d8m5js8lk5wz5f3mvdx8hwl5car20w6m"; src = fetchFromGitHub { inherit rev; From 57e1250d895c4c5fd9aff0f1a484ad43a6506fff Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Thu, 29 Sep 2016 10:52:29 +1000 Subject: [PATCH 35/48] redprl: remove explicit builder patchPhase wasn't being called for me so I've switched out the explicit builder for the generic form. I can now build RedPRL on locally on NixOS. --- pkgs/applications/science/logic/redprl/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 70b3008156c..0cbe1d1cb37 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation { patchPhase = '' patchShebangs ./script/ ''; - builder = builtins.toFile "builder.sh" '' - source $stdenv/setup - mkdir -p $out/bin - cp -r $src/* . - chmod -R +w src + buildPhase = '' ./script/mlton.sh + ''; + installPhase = '' + mkdir -p $out/bin mv ./bin/redprl $out/bin ''; meta = { From 76aa997f209c017ed7e76623f846fc47dcc3cb71 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 29 Sep 2016 10:40:51 +0800 Subject: [PATCH 36/48] gnu global: 6.5.4 -> 6.5.5 --- pkgs/development/tools/misc/global/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 3d09bc92cd3..d609b3b664c 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "global-6.5.4"; + name = "global-${version}"; + version = "6.5.5"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "19hxajpwld6qx0faz4rzyh1hfs25ycjmws6bas8pavx4hskf05mg"; + sha256 = "0yyg91qw8399lnxfai4bxkh9yq71qdwp9kvadgzp05cdqni44nxw"; }; nativeBuildInputs = [ libtool makeWrapper ]; @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/global/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub peterhoeg ]; platforms = platforms.unix; }; } From ca9c21b0abd01165a6e07e950b940dc3108905b6 Mon Sep 17 00:00:00 2001 From: Yochai Date: Thu, 29 Sep 2016 09:26:50 +0300 Subject: [PATCH 37/48] rtl8812au: 4.2.2-1 -> 4.3.20 --- pkgs/os-specific/linux/rtl8812au/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index c38fa8843f4..56f14b30acd 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; - version = "4.2.2-1"; + version = "4.3.20"; src = fetchFromGitHub { - owner = "csssuf"; - repo = "rtl8812au"; - rev = "874906aec694c800bfc29b146737b88dae767832"; - sha256 = "14ifhplawipfd6971mxw76dv3ygwc0n8sbz2l3f0vvkin6x88bsj"; + owner = "Grawp"; + repo = "rtl8812au_rtl8821au"; + rev = "9c5b2978ab079081dd1e981353be681a1cf495de"; + sha256 = "0bx1vgs2qldwwhdgklbqz2vy9x4jg7cj3d6w6cpkndkcr7h0m5vz"; }; hardeningDisable = [ "pic" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = "https://github.com/csssuf/rtl8812au"; + homepage = "https://github.com/Grawp/rtl8812au_rtl8821au"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; broken = (kernel.features.grsecurity or false); From 4a542031b22586452d36edbbbd56c92a61ec0c2c Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 29 Sep 2016 18:30:40 +0900 Subject: [PATCH 38/48] groonga: 6.0.8 -> 6.0.9 --- pkgs/servers/search/groonga/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 7025ddbc12b..8587134ad39 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.0.8"; + version = "6.0.9"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "05mp6zkavxj87nbx0jr48rpjjcf7fzdczxa93sxp4zq2dsnn5s5r"; + sha256 = "1n7kf25yimgy9wy04hv5qvp4rzdzdr0ar92lhwms812qkhp3i4mq"; }; buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { ${optionalString lz4Support "--with-lz4"} ''; + doInstallCheck = true; + + installCheckPhase = "$out/bin/groonga --version"; + meta = with stdenv.lib; { homepage = http://groonga.org/; description = "An open-source fulltext search engine and column store"; From 75a1ec8a655e7e00a6bb6fc944663c21624fff60 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 15:26:37 +0200 Subject: [PATCH 39/48] NixOS: Use runCommand instead of mkDerivation in a few places --- nixos/doc/manual/default.nix | 77 +++++++------------ nixos/modules/i18n/input-method/default.nix | 29 +++---- .../cd-dvd/installation-cd-graphical-kde.nix | 8 +- nixos/modules/services/hardware/udev.nix | 26 +++---- nixos/modules/services/system/dbus.nix | 13 ++-- .../services/x11/desktop-managers/gnome3.nix | 6 +- .../services/x11/display-managers/kdm.nix | 22 +++--- .../display-managers/lightdm-greeters/gtk.nix | 9 +-- .../services/x11/display-managers/slim.nix | 6 +- nixos/modules/services/x11/xserver.nix | 15 ++-- nixos/modules/system/boot/stage-1.nix | 18 ++--- 11 files changed, 89 insertions(+), 140 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 13668dfd8eb..40d49f1541b 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -94,14 +94,11 @@ let "--stringparam chunk.toc ${toc}" ]; - olinkDB = stdenv.mkDerivation { - name = "manual-olinkdb"; - - inherit sources; - - buildInputs = [ libxml2 libxslt ]; - - buildCommand = '' + olinkDB = runCommand "manual-olinkdb" + { inherit sources; + buildInputs = [ libxml2 libxslt ]; + } + '' ${copySources} xsltproc \ @@ -133,15 +130,14 @@ let EOF ''; - }; in rec { # The NixOS options in JSON format. - optionsJSON = stdenv.mkDerivation { - name = "options-json"; - - buildCommand = '' + optionsJSON = runCommand "options-json" + { meta.description = "List of NixOS options in JSON format"; + } + '' # Export list of options in different format. dst=$out/share/doc/nixos mkdir -p $dst @@ -154,18 +150,14 @@ in rec { echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products ''; # */ - meta.description = "List of NixOS options in JSON format"; - }; - # Generate the NixOS manual. - manual = stdenv.mkDerivation { - name = "nixos-manual"; - - inherit sources; - - buildInputs = [ libxml2 libxslt ]; - - buildCommand = '' + manual = runCommand "nixos-manual" + { inherit sources; + buildInputs = [ libxml2 libxslt ]; + meta.description = "The NixOS manual in HTML format"; + allowedReferences = ["out"]; + } + '' ${copySources} # Check the validity of the manual sources. @@ -192,20 +184,12 @@ in rec { echo "doc manual $dst" >> $out/nix-support/hydra-build-products ''; # */ - meta.description = "The NixOS manual in HTML format"; - allowedReferences = ["out"]; - }; - - - manualEpub = stdenv.mkDerivation { - name = "nixos-manual-epub"; - - inherit sources; - - buildInputs = [ libxml2 libxslt zip ]; - - buildCommand = '' + manualEpub = runCommand "nixos-manual-epub" + { inherit sources; + buildInputs = [ libxml2 libxslt zip ]; + } + '' ${copySources} # Check the validity of the manual sources. @@ -234,17 +218,15 @@ in rec { mkdir -p $out/nix-support echo "doc-epub manual $manual" >> $out/nix-support/hydra-build-products ''; - }; + # Generate the NixOS manpages. - manpages = stdenv.mkDerivation { - name = "nixos-manpages"; - - inherit sources; - - buildInputs = [ libxml2 libxslt ]; - - buildCommand = '' + manpages = runCommand "nixos-manpages" + { inherit sources; + buildInputs = [ libxml2 libxslt ]; + allowedReferences = ["out"]; + } + '' ${copySources} # Check the validity of the man pages sources. @@ -264,7 +246,4 @@ in rec { ./man-pages.xml ''; - allowedReferences = ["out"]; - }; - } diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index 693e1df66c6..7ed4a584d64 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -3,26 +3,27 @@ with lib; let cfg = config.i18n.inputMethod; - gtk2_cache = pkgs.stdenv.mkDerivation { - preferLocalBuild = true; - allowSubstitutes = false; - name = "gtk2-immodule.cache"; - buildInputs = [ pkgs.gtk2 cfg.package ]; - buildCommand = '' + + gtk2_cache = pkgs.runCommand "gtk2-immodule.cache" + { preferLocalBuild = true; + allowSubstitutes = false; + buildInputs = [ pkgs.gtk2 cfg.package ]; + } + '' mkdir -p $out/etc/gtk-2.0/ GTK_PATH=${cfg.package}/lib/gtk-2.0/ gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache ''; - }; - gtk3_cache = pkgs.stdenv.mkDerivation { - preferLocalBuild = true; - allowSubstitutes = false; - name = "gtk3-immodule.cache"; - buildInputs = [ pkgs.gtk3 cfg.package ]; - buildCommand = '' + + gtk3_cache = pkgs.runCommand "gtk3-immodule.cache" + { preferLocalBuild = true; + allowSubstitutes = false; + buildInputs = [ pkgs.gtk3 cfg.package ]; + } + '' mkdir -p $out/etc/gtk-3.0/ GTK_PATH=${cfg.package}/lib/gtk-3.0/ gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache ''; - }; + in { options.i18n = { diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index d14768bc107..dc8d76c63e1 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -96,15 +96,13 @@ with lib; ''; in - pkgs.stdenv.mkDerivation { - inherit (pkg) name meta; - - buildCommand = '' + pkgs.runCommand pkg.name + { inherit (pkg) meta; } + '' mkdir -p $out cp -prf ${pkg}/* $out/ chmod a+w $out/share/apps/plasma-desktop/init cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js ''; - }; } diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 7c4c93d0fcb..14d65978c32 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -32,13 +32,11 @@ let ''; # Perform substitutions in all udev rules files. - udevRules = stdenv.mkDerivation { - name = "udev-rules"; - - preferLocalBuild = true; - allowSubstitutes = false; - - buildCommand = '' + udevRules = pkgs.runCommand "udev-rules" + { preferLocalBuild = true; + allowSubstitutes = false; + } + '' mkdir -p $out shopt -s nullglob set +o pipefail @@ -130,15 +128,12 @@ let ln -s /dev/null $out/80-drivers.rules ''} ''; # */ - }; - hwdbBin = stdenv.mkDerivation { - name = "hwdb.bin"; - - preferLocalBuild = true; - allowSubstitutes = false; - - buildCommand = '' + hwdbBin = pkgs.runCommand "hwdb.bin" + { preferLocalBuild = true; + allowSubstitutes = false; + } + '' mkdir -p etc/udev/hwdb.d for i in ${toString ([udev] ++ cfg.packages)}; do echo "Adding hwdb files for package $i" @@ -151,7 +146,6 @@ let ${udev}/bin/udevadm hwdb --update --root=$(pwd) mv etc/udev/hwdb.bin $out ''; - }; # Udev has a 512-character limit for ENV{PATH}, so create a symlink # tree to work around this. diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 6c4833afbe8..0f20725a9e4 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -20,13 +20,11 @@ let "${d}/etc/dbus-1/session.d" ])); - configDir = pkgs.stdenv.mkDerivation { - name = "dbus-conf"; - - preferLocalBuild = true; - allowSubstitutes = false; - - buildCommand = '' + configDir = pkgs.runCommand "dbus-conf" + { preferLocalBuild = true; + allowSubstitutes = false; + } + '' mkdir -p $out sed '${./dbus-system-local.conf.in}' \ @@ -38,7 +36,6 @@ let -e 's,@extra@,${sessionExtraxml},' \ > "$out/session-local.conf" ''; - }; in diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index b3da2544802..dc71531759b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -25,9 +25,8 @@ let ''; }; - nixos-gsettings-desktop-schemas = pkgs.stdenv.mkDerivation { - name = "nixos-gsettings-desktop-schemas"; - buildCommand = '' + nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {} + '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas @@ -46,7 +45,6 @@ let ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ ''; - }; in { diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index d9f7f8f0dfc..8b51c621e11 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -54,19 +54,17 @@ let ''} ''; - kdmrc = pkgs.stdenv.mkDerivation { - name = "kdmrc"; - config = defaultConfig + cfg.extraConfig; - preferLocalBuild = true; - buildCommand = - '' - echo "$config" > $out + kdmrc = pkgs.runCommand "kdmrc" + { config = defaultConfig + cfg.extraConfig; + preferLocalBuild = true; + } + '' + echo "$config" > $out - # The default kdmrc would add "-nolisten tcp", and we already - # have that managed by nixos. Hence the grep. - cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out - ''; - }; + # The default kdmrc would add "-nolisten tcp", and we already + # have that managed by nixos. Hence the grep. + cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out + ''; in diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 543dd628ce6..dfda90978b1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -16,11 +16,9 @@ let # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with # fonts/icons. - wrappedGtkGreeter = stdenv.mkDerivation { - name = "lightdm-gtk-greeter"; - buildInputs = [ pkgs.makeWrapper ]; - - buildCommand = '' + wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" + { buildInputs = [ pkgs.makeWrapper ]; } + '' # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ @@ -40,7 +38,6 @@ let Type=Application EOF ''; - }; gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" '' diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index ce44c9f54a3..ca2ae1a4772 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -26,15 +26,13 @@ let # Unpack the SLiM theme, or use the default. slimThemesDir = let - unpackedTheme = pkgs.stdenv.mkDerivation { - name = "slim-theme"; - buildCommand = '' + unpackedTheme = pkgs.runCommand "slim-theme" {} + '' mkdir -p $out cd $out unpackFile ${cfg.theme} ln -s * default ''; - }; in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme; in diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 6c6a1e79ed0..1bd578424ee 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -71,15 +71,11 @@ let monitors = reverseList (foldl mkMonitor [] xrandrHeads); in concatMapStrings (getAttr "value") monitors; - configFile = pkgs.stdenv.mkDerivation { - name = "xserver.conf"; - - xfs = optionalString (cfg.useXFS != false) - ''FontPath "${toString cfg.useXFS}"''; - - inherit (cfg) config; - - buildCommand = + configFile = pkgs.runCommand "xserver.conf" + { xfs = optionalString (cfg.useXFS != false) + ''FontPath "${toString cfg.useXFS}"''; + inherit (cfg) config; + } '' echo 'Section "Files"' >> $out echo $xfs >> $out @@ -102,7 +98,6 @@ let echo "$config" >> $out ''; # */ - }; in diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 40e67fa5f8d..8d02cd81e0e 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -134,10 +134,9 @@ let ''; # */ - udevRules = pkgs.stdenv.mkDerivation { - name = "udev-rules"; - allowedReferences = [ extraUtils ]; - buildCommand = '' + udevRules = pkgs.runCommand "udev-rules" + { allowedReferences = [ extraUtils ]; } + '' mkdir -p $out echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules @@ -176,7 +175,6 @@ let substituteInPlace $out/60-persistent-storage.rules \ --replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA ''; # */ - }; # The init script of boot stage 1 (loading kernel modules for @@ -230,16 +228,12 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } - { object = pkgs.stdenv.mkDerivation { - name = "initrd-kmod-blacklist-ubuntu"; - builder = pkgs.writeText "builder.sh" '' - source $stdenv/setup + { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" + { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; } + '' target=$out - ${pkgs.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out ''; - src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; - }; symlink = "/etc/modprobe.d/ubuntu.conf"; } { object = pkgs.kmod-debian-aliases; From 030e20f759d5a4e4962eabd4069fd06ae059e6f3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 14:10:36 +0200 Subject: [PATCH 40/48] Add a warning about using requireFile --- pkgs/build-support/trivial-builders.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 8775286b117..692ac685d62 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -97,12 +97,16 @@ rec { done < graph ''; + # Quickly create a set of symlinks to derivations. # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; } linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" + (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); - # Require file + + # Print an error message if the file with the specified name and + # hash doesn't exist in the Nix store. Do not use this function; it + # produces packages that cannot be built automatically. requireFile = { name ? null , sha256 ? null , sha1 ? null @@ -115,8 +119,8 @@ rec { let msg = if message != null then message else '' - Unfortunately, we may not download file ${name_} automatically. - Please, go to ${url} to download it yourself, and add it to the Nix store + Unfortunately, we cannot download file ${name_} automatically. + Please go to ${url} to download it yourself, and add it to the Nix store using either nix-store --add-fixed ${hashAlgo} ${name_} or @@ -143,6 +147,7 @@ rec { ''; }; + # Search in the environment if the same program exists with a set uid or # set gid bit. If it exists, run the first program found, otherwise run # the default binary. @@ -168,12 +173,14 @@ rec { exec ${bin} "$@" ''; + # Copy a path to the Nix store. # Nix automatically copies files to the store before stringifying paths. # If you need the store path of a file, ${copyPathToStore } can be # shortened to ${}. copyPathToStore = builtins.filterSource (p: t: true); + # Copy a list of paths to the Nix store. copyPathsToStore = builtins.map copyPathToStore; From c5ddb7dd56d9eb71cbe0430bcf85596d298caef8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 14:18:26 +0200 Subject: [PATCH 41/48] Move useSetUID to pam_usb, the only place where it's used --- pkgs/build-support/trivial-builders.nix | 26 -------------------- pkgs/os-specific/linux/pam_usb/default.nix | 28 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 692ac685d62..398426bf9a4 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -148,32 +148,6 @@ rec { }; - # Search in the environment if the same program exists with a set uid or - # set gid bit. If it exists, run the first program found, otherwise run - # the default binary. - useSetUID = drv: path: - let - name = baseNameOf path; - bin = "${drv}${path}"; - in assert name != ""; - writeScript "setUID-${name}" '' - #!${stdenv.shell} - inode=$(stat -Lc %i ${bin}) - for file in $(type -ap ${name}); do - case $(stat -Lc %a $file) in - ([2-7][0-7][0-7][0-7]) - if test -r "$file".real; then - orig=$(cat "$file".real) - if test $inode = $(stat -Lc %i "$orig"); then - exec "$file" "$@" - fi - fi;; - esac - done - exec ${bin} "$@" - ''; - - # Copy a path to the Nix store. # Nix automatically copies files to the store before stringifying paths. # If you need the store path of a file, ${copyPathToStore } can be diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index a96e951bf9b..cedb9bca1a0 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,6 +1,32 @@ -{stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages}: +{ stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript }: let + + # Search in the environment if the same program exists with a set uid or + # set gid bit. If it exists, run the first program found, otherwise run + # the default binary. + useSetUID = drv: path: + let + name = baseNameOf path; + bin = "${drv}${path}"; + in assert name != ""; + writeScript "setUID-${name}" '' + #!${stdenv.shell} + inode=$(stat -Lc %i ${bin}) + for file in $(type -ap ${name}); do + case $(stat -Lc %a $file) in + ([2-7][0-7][0-7][0-7]) + if test -r "$file".real; then + orig=$(cat "$file".real) + if test $inode = $(stat -Lc %i "$orig"); then + exec "$file" "$@" + fi + fi;; + esac + done + exec ${bin} "$@" + ''; + pmountBin = useSetUID pmount "/bin/pmount"; pumountBin = useSetUID pmount "/bin/pumount"; inherit (pythonPackages) python dbus-python; From a5ee4d2c78ad20c73b30717c648fe196b069851d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 14:56:17 +0200 Subject: [PATCH 42/48] qt-4: Use multiple outputs This is a pretty modest use of multiple outputs - mainly to eliminate -dev outputs from Qt's closure. --- .../development/libraries/qt-4.x/4.8/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index a93ae2fc8ad..8526a5f5b82 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; }; + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; + # The version property must be kept because it will be included into the QtSDK package name version = vers; @@ -87,8 +93,8 @@ stdenv.mkDerivation rec { -docdir $out/share/doc/${name} -plugindir $out/lib/qt4/plugins -importdir $out/lib/qt4/imports - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos + -examplesdir $TMPDIR/share/doc/${name}/examples + -demosdir $TMPDIR/share/doc/${name}/demos -datadir $out/share/${name} -translationdir $out/share/${name}/translations " @@ -98,6 +104,7 @@ stdenv.mkDerivation rec { ''; prefixKey = "-prefix "; + configureFlags = '' -v -no-separate-debug-info -release -no-fast -confirm-license -opensource @@ -153,6 +160,11 @@ stdenv.mkDerivation rec { sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release ''; + postInstall = + '' + rm -rf $out/tests + ''; + crossAttrs = let isMingw = stdenv.cross.libc == "msvcrt"; in { From 39181d4418eebfe1d58bdfd5a93413b16cdaa819 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 16:57:10 +0200 Subject: [PATCH 43/48] virtuoso: Use multiple outputs --- pkgs/servers/sql/virtuoso/6.x.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 715720b335f..5f6b3904155 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; }; + outputs = [ "out" "dev" "doc" ]; + buildInputs = [ libxml2 openssl readline gawk ]; CPP = "${stdenv.cc}/bin/gcc -E"; @@ -18,14 +20,22 @@ stdenv.mkDerivation rec { --enable-openssl=${openssl.dev} "; - postInstall='' + postInstall = '' echo Moving documentation mkdir -pv $out/share/doc mv -v $out/share/virtuoso/doc $out/share/doc/${name} + echo Removing jars and empty directories find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete - ''; - + + for f in $out/lib/*.la; do + echo "Fixing $f" + substituteInPlace $f \ + --replace "${readline.dev}" "${readline.out}/lib" \ + --replace "${openssl.dev}/lib" "${openssl.out}/lib" + done + ''; + meta = with stdenv.lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; From 711b536934b737dc523ce68874dc08f399512ee5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Sep 2016 16:48:35 +0200 Subject: [PATCH 44/48] polkit_qt4: Use multiple outputs --- pkgs/development/libraries/polkit-qt-1/qt-4.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index 523189c3b2e..54e10b96592 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -10,10 +10,21 @@ stdenv.mkDerivation { sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake pkgconfig automoc4 ]; propagatedBuildInputs = [ polkit glib qt4 ]; + postFixup = + '' + for i in $dev/lib/cmake/*/*.cmake; do + echo "fixing $i" + substituteInPlace $i \ + --replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib + done + ''; + meta = { description = "A Qt wrapper around PolKit"; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; From 7c31bc7e8987ca2b887573870871004cec09abfe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Sep 2016 18:05:25 +0200 Subject: [PATCH 45/48] gstreamer: Use multiple outputs --- .../libraries/gstreamer/legacy/gstreamer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index adda7697ffc..304d02087b4 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ perl bison flex pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty; From 9354e0e5189101da0419e3df94c1508c3cfdc33e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 13:27:58 +0200 Subject: [PATCH 46/48] glxinfo: Drop dependency on mesa-noglu.dev and glu.dev --- pkgs/tools/graphics/glxinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index a99e42891b6..03be1e90930 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibsWrapper, mesa}: +{ stdenv, fetchurl, xlibsWrapper, mesa_noglu }: let version = "8.3.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; - buildInputs = [xlibsWrapper mesa]; + buildInputs = [ xlibsWrapper mesa_noglu ]; configurePhase = "true"; From 62f055af478b97bfb6f981af7e758d149b60f629 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 13:34:00 +0200 Subject: [PATCH 47/48] google-talk-plugin: Use mesa_noglu instead of mesa --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 40955d0aeb0..3e89fb731d3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo +{ stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus_glib, alsaLib, libpulseaudio, systemd, pango }: @@ -10,7 +10,7 @@ let baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; rpathPlugin = makeLibraryPath - [ mesa + [ mesa_noglu xorg.libXt xorg.libX11 xorg.libXrender From 5df3ec85d8e9afd780fa80b9f96e496a61f699c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 13:33:45 +0200 Subject: [PATCH 48/48] gst-plugins-base: Use multiple outputs --- .../libraries/gstreamer/legacy/gst-plugins-base/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index eb55ae874e5..0e1e3c4897e 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { patch -p1 < ${./gcc-4.9.patch} ''; + outputs = [ "out" "dev" ]; + # TODO : v4l, libvisual buildInputs = [ pkgconfig glib cairo orc ]