From de8aec4d942305747eff044c3415180bf2a22812 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 13 Nov 2017 00:33:07 -0600 Subject: [PATCH 01/71] quartz-wm: fix and avoid impurities --- pkgs/servers/x11/quartz-wm/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 45e4df2bb8b9..ce129773b57b 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, AppKit, Xplugin }: +{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, AppKit, Xplugin, darwin }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,11 +19,8 @@ in stdenv.mkDerivation { xorg.libXext pixman pkgconfig - AppKit Xplugin + AppKit Xplugin darwin.apple_sdk.frameworks.Foundation ]; - NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include"; - NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin - "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; meta = with lib; { license = licenses.apsl20; platforms = platforms.darwin; From a2bce20390fa6ce91f0b6ccdc7a5f7aec7373768 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 13 Nov 2017 00:33:45 -0600 Subject: [PATCH 02/71] quartz-wm: add myself as maintainer --- pkgs/servers/x11/quartz-wm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index ce129773b57b..d724a81debbb 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -24,5 +24,6 @@ in stdenv.mkDerivation { meta = with lib; { license = licenses.apsl20; platforms = platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; }; } From f90b3dcf05249f88063f8023cea2c9849ca4a1e6 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 27 Sep 2017 15:53:12 +0100 Subject: [PATCH 03/71] firefox.syncserver service: No need for configurable user --- .../networking/firefox/sync-server.nix | 39 ++++++------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index a9f3fd65d76b..974914ebe1eb 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -70,18 +70,6 @@ in ''; }; - user = mkOption { - type = types.str; - default = "syncserver"; - description = "User account under which syncserver runs."; - }; - - group = mkOption { - type = types.str; - default = "syncserver"; - description = "Group account under which syncserver runs."; - }; - publicUrl = mkOption { type = types.str; default = "http://localhost:5000/"; @@ -138,6 +126,8 @@ in systemd.services.syncserver = let syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]); + user = "syncserver"; + group = "syncserver"; in { after = [ "network.target" ]; description = "Firefox Sync Server"; @@ -145,8 +135,8 @@ in path = [ pkgs.coreutils syncServerEnv ]; serviceConfig = { - User = cfg.user; - Group = cfg.group; + User = user; + Group = group; PermissionsStartOnly = true; }; @@ -156,32 +146,27 @@ in echo > ${cfg.privateConfig} '[syncserver]' echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" fi - chown ${cfg.user}:${cfg.group} ${cfg.privateConfig} + chown ${user}:${group} ${cfg.privateConfig} '' + optionalString (cfg.sqlUri == defaultSqlUri) '' if ! test -e $(dirname ${defaultDbLocation}); then mkdir -m 700 -p $(dirname ${defaultDbLocation}) - chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation}) + chown ${user}:${group} $(dirname ${defaultDbLocation}) fi # Move previous database file if it exists oldDb="/var/db/firefox-sync-server.db" if test -f $oldDb; then mv $oldDb ${defaultDbLocation} - chown ${cfg.user}:${cfg.group} ${defaultDbLocation} + chown ${user}:${group} ${defaultDbLocation} fi ''; serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}"; }; - users.extraUsers = optionalAttrs (cfg.user == "syncserver") - (singleton { - name = "syncserver"; - group = cfg.group; - isSystemUser = true; - }); + users.users.syncserver = { + group = "syncserver"; + isSystemUser = true; + }; - users.extraGroups = optionalAttrs (cfg.group == "syncserver") - (singleton { - name = "syncserver"; - }); + users.groups.syncserver = {}; }; } From 573719e32899aa2f8ec2f850b6d8ec56597e1718 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 27 Sep 2017 15:59:38 +0100 Subject: [PATCH 04/71] firefox.syncserver service: Fix permissions --- nixos/modules/services/networking/firefox/sync-server.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 974914ebe1eb..c0b1673b6c34 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -142,16 +142,21 @@ in preStart = '' if ! test -e ${cfg.privateConfig}; then - mkdir -m 700 -p $(dirname ${cfg.privateConfig}) + mkdir -p $(dirname ${cfg.privateConfig}) echo > ${cfg.privateConfig} '[syncserver]' + chmod 600 ${cfg.privateConfig} echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" fi + chmod 600 ${cfg.privateConfig} + chmod 755 $(dirname ${cfg.privateConfig}) chown ${user}:${group} ${cfg.privateConfig} + '' + optionalString (cfg.sqlUri == defaultSqlUri) '' if ! test -e $(dirname ${defaultDbLocation}); then mkdir -m 700 -p $(dirname ${defaultDbLocation}) chown ${user}:${group} $(dirname ${defaultDbLocation}) fi + # Move previous database file if it exists oldDb="/var/db/firefox-sync-server.db" if test -f $oldDb; then From 8851ef84c8a8963b6ad13bf4c2318fe48bfcd3ab Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 27 Sep 2017 16:03:18 +0100 Subject: [PATCH 05/71] firefox.syncserver service: Add nadrieril to maintainers --- lib/maintainers.nix | 1 + nixos/modules/services/networking/firefox/sync-server.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index de8627b0804a..242372ef3a7b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -446,6 +446,7 @@ mudri = "James Wood "; muflax = "Stefan Dorn "; myrl = "Myrl Hex "; + nadrieril = "Nadrieril Feneanar "; namore = "Roman Naumann "; nand0p = "Fernando Jose Pando "; Nate-Devv = "Nathan Moore "; diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index c0b1673b6c34..1a660ccd0559 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -33,6 +33,8 @@ let in { + meta.maintainers = with lib.maintainers; [ nadrieril ]; + options = { services.firefox.syncserver = { enable = mkOption { From ae416b47cf2a2185747cf1540b4e14ff1b6b49a8 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 19 Oct 2017 23:22:10 +0100 Subject: [PATCH 06/71] firefox.syncserver service: Fix missing dependency --- nixos/modules/services/networking/firefox/sync-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 1a660ccd0559..97d223a56cab 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -127,7 +127,7 @@ in config = mkIf cfg.enable { systemd.services.syncserver = let - syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]); + syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript requests ]); user = "syncserver"; group = "syncserver"; in { From 9f5d779641389e135fda838e5559eca09edd4cff Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Fri, 8 Dec 2017 22:23:14 +0000 Subject: [PATCH 07/71] Mark services.firefox.syncserver.{user,group} as removed --- nixos/modules/rename.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index eb10d4f428be..473a832c6500 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -198,6 +198,8 @@ with lib; "See the 16.09 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") + (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") + (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] "Set the option `services.xserver.displayManager.sddm.package' instead.") From 3f5c80056af5ebb1f799a1dd7ae38057bfc6d288 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sun, 31 Dec 2017 19:02:53 +0100 Subject: [PATCH 08/71] hash_extender: init at 2017-04-10 --- pkgs/tools/security/hash_extender/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/security/hash_extender/default.nix diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix new file mode 100644 index 000000000000..0c5691a1e106 --- /dev/null +++ b/pkgs/tools/security/hash_extender/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + name = "hash_extender-${version}"; + version = "2017-04-10"; + + src = fetchFromGitHub { + owner = "iagox86"; + repo = "hash_extender"; + rev = "d27581e062dd0b534074e11d7d311f65a6d7af21"; + sha256 = "1npwbgqaynjh5x39halw43i116v89sxkpa1g1bbvc1lpi8hkhhcb"; + }; + + buildInputs = [ openssl ]; + + installPhase = '' + mkdir -p $out/bin + cp hash_extender $out/bin + ''; + + meta = with stdenv.lib; { + description = "Tool to automate hash length extension attacks"; + homepage = https://github.com/iagox86/hash_extender; + license = licenses.bsd3; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b31298701e6..ee6523d65502 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2609,6 +2609,8 @@ with pkgs; hashcat = callPackage ../tools/security/hashcat { }; + hash_extender = callPackage ../tools/security/hash_extender { }; + hash-slinger = callPackage ../tools/security/hash-slinger { }; hal-flash = callPackage ../os-specific/linux/hal-flash { }; From 1d28f2ba6980971290b8acf9d57383f57bc845a8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 5 Jan 2018 01:44:06 -0200 Subject: [PATCH 09/71] Add watcom-1.0 license --- lib/licenses.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 1fdcc15fd725..29d6abf3648b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -2,7 +2,7 @@ let spdx = lic: lic // { - url = "http://spdx.org/licenses/${lic.spdxId}"; + url = "http://spdx.org/licenses/${lic.spdxId}.html"; }; in @@ -564,6 +564,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Vovida Software License v1.0"; }; + watcom = spdx { + spdxId = "Watcom-1.0"; + fullName = "Sybase Open Watcom Public License 1.0"; + }; + w3c = spdx { spdxId = "W3C"; fullName = "W3C Software Notice and License"; @@ -598,5 +603,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; - } From 4a553dc247e80b3361da31cff4e25d62a60a75b4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 5 Jan 2018 01:47:15 -0200 Subject: [PATCH 10/71] jwasm: init at git-2017-11-22 --- pkgs/development/compilers/jwasm/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/compilers/jwasm/default.nix diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix new file mode 100644 index 000000000000..9800b33e7a9e --- /dev/null +++ b/pkgs/development/compilers/jwasm/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub +, cmake }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "jwasm-${version}"; + version = "git-2017-11-22"; + + src = fetchFromGitHub { + owner = "JWasm"; + repo = "JWasm"; + rev = "26f97c8b5c9d9341ec45538701116fa3649b7766"; + sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w"; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = "mkdir -p $out/bin ; cp jwasm $out/bin/"; + + meta = { + description = "A MASM-compatible x86 assembler"; + homepage = http://jwasm.github.io/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.darwin ++ platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2074d9986eef..8fddd2481e77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6215,6 +6215,8 @@ with pkgs; julia = julia_06; + jwasm = callPackage ../development/compilers/jwasm { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { From 012ead33e7477e5a05e6a5c12658ab642555f045 Mon Sep 17 00:00:00 2001 From: schneefux Date: Wed, 3 Jan 2018 22:06:07 +0100 Subject: [PATCH 11/71] wallabag: fix config file not being loaded from WALLABAG_DATA --- pkgs/servers/web-apps/wallabag/default.nix | 13 +++++----- .../web-apps/wallabag/wallabag-data.patch | 26 +++++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 pkgs/servers/web-apps/wallabag/wallabag-data.patch diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index e6137a2db7c2..07b530f4ef72 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -13,13 +13,11 @@ stdenv.mkDerivation rec { outputs = [ "out" ]; - patchPhase = '' + patches = [ ./wallabag-data.patch ]; # exposes $WALLABAG_DATA + + prePatch = '' rm Makefile # use the "shared hosting" package with bundled dependencies - substituteInPlace app/AppKernel.php \ - --replace "__DIR__" "getenv('WALLABAG_DATA')" - substituteInPlace var/bootstrap.php.cache \ - --replace "\$this->rootDir = \$this->getRootDir()" "\$this->rootDir = getenv('WALLABAG_DATA')" - ''; # exposes $WALLABAG_DATA + ''; installPhase = '' mkdir $out/ @@ -31,11 +29,12 @@ stdenv.mkDerivation rec { longDescription = '' wallabag is a self hostable application for saving web pages. - To use, point the environment variable $WALLABAG_DATA to a directory called `app` that contains the folder `config` with wallabag's configuration files. These need to be updated every package upgrade. In `app`'s parent folder, a directory called `var` containing wallabag's data will be created. + Point the environment variable $WALLABAG_DATA to a data directory that contains the folder `app/config` which must be a clone of wallabag's configuration files with your customized `parameters.yml`. These need to be updated every package upgrade. After a package upgrade, empty the `var/cache` folder. ''; license = licenses.mit; homepage = http://wallabag.org; + maintainers = with maintainers; [ schneefux ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/servers/web-apps/wallabag/wallabag-data.patch new file mode 100644 index 000000000000..086e93959800 --- /dev/null +++ b/pkgs/servers/web-apps/wallabag/wallabag-data.patch @@ -0,0 +1,26 @@ +diff --git a/app/AppKernel.php b/app/AppKernel.php +index 40726f05..7d44e600 100644 +--- a/app/AppKernel.php ++++ b/app/AppKernel.php +@@ -58,14 +58,19 @@ class AppKernel extends Kernel + return $bundles; + } + ++ public function getProjectDir() ++ { ++ return getenv('WALLABAG_DATA') ?: dirname(__DIR__); ++ } ++ + public function getCacheDir() + { +- return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment(); ++ return $this->getProjectDir() . '/var/cache/' . $this->getEnvironment(); + } + + public function getLogDir() + { +- return dirname(__DIR__) . '/var/logs'; ++ return $this->getProjectDir() . '/var/logs'; + } + + public function registerContainerConfiguration(LoaderInterface $loader) From 9b9cb0a0385d941b4fd70f19541fd5db7b218103 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 15 Sep 2017 19:35:25 -0500 Subject: [PATCH 12/71] leo-editor: 5.5 -> 5.6, add docutils and use pyqt56 --- pkgs/applications/editors/leo-editor/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index b05bbd053c1f..924e662b8084 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,20 +1,20 @@ -{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, makeDesktopItem }: +{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { name = "leo-editor-${version}"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr"; + sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j"; }; dontBuild = true; - nativeBuildInputs = [ makeWrapper python3Packages.python ]; - propagatedBuildInputs = with python3Packages; [ pyqt5 ]; + nativeBuildInputs = [ makeWrapper python3 ]; + propagatedBuildInputs = with python3.pkgs; [ pyqt56 docutils ]; desktopItem = makeDesktopItem rec { name = "leo-editor"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/leo-editor mv * $out/share/leo-editor - makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \ + makeWrapper ${python3.interpreter} $out/bin/leo \ --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \ --add-flags "-O $out/share/leo-editor/launchLeo.py" ''; From 480f04301aa786e4129688787cdc5a3a87582c5d Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Mon, 8 Jan 2018 12:35:29 +1100 Subject: [PATCH 13/71] SunVox: init at 1.9.3b --- pkgs/applications/audio/sunvox/default.nix | 48 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/audio/sunvox/default.nix diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix new file mode 100644 index 000000000000..ccbceddefd2f --- /dev/null +++ b/pkgs/applications/audio/sunvox/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: + +let + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; + arch = + if stdenv.isAarch64 + then "arm64" + else if stdenv.isArm + then "arm_armhf_raspberry_pi" + else if stdenv.is64bit + then "x86_64" + else "x86"; +in +stdenv.mkDerivation rec { + name = "SunVox-${version}"; + version = "1.9.3b"; + + src = fetchurl { + url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; + sha256 = "0k74rcq7niw4p17vj3zp9lpgi932896dmzqv4ln43g0pz7l18c8b"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = "unzip $src"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share $out/bin + mv sunvox $out/share/ + + bin="$out/share/sunvox/sunvox/linux_${arch}/sunvox" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + "$bin" + + ln -s "$bin" $out/bin/sunvox + ''; + + meta = with stdenv.lib; { + description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; + license = licenses.unfreeRedistributable; + homepage = "http://www.warmplace.ru/soft/sunvox/"; + maintainers = with maintainers; [ puffnfresh ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3008f2975eaf..431a5e78d79e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17054,6 +17054,8 @@ with pkgs; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; + sunvox = callPackage ../applications/audio/sunvox { }; + swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; From 3e952780ebeb65c5e4101c8e25983d817b78acc8 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Sat, 13 Jan 2018 20:25:35 +1030 Subject: [PATCH 14/71] nextcloud-client: fix icon name in desktop file The desktop file bundled with nextcloud calls the icon `nextcloud`, but the icons are named `Nextcloud` and so desktop environments won't find it. --- pkgs/applications/networking/nextcloud-client/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 652de194a5e7..3cbc03e8d73c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; - postInstall = stdenv.lib.optionalString (withGnomeKeyring) '' + postInstall = '' + sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ + $out/share/applications/nextcloud.desktop + '' + stdenv.lib.optionalString (withGnomeKeyring) '' wrapProgram "$out/bin/nextcloud" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]} ''; From 413cb93e127b845323780f41848cbd502e808917 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Wed, 10 Jan 2018 16:04:27 +0000 Subject: [PATCH 15/71] google-chrome: add dependency on kerberos Without this, Chrome doesn't work with websites requiring Kerberos authentication. --- pkgs/applications/networking/browsers/google-chrome/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b868c434e234..130c50478366 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,6 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk +, kerberos # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -58,6 +59,7 @@ let liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at_spi2_atk + kerberos ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; From 75068a67702f734f254c1f2ebf6e04c86e8a07d0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 31 Jan 2018 05:46:52 +0900 Subject: [PATCH 16/71] psol, ngx_pagespeed: 1.13.35.1 -> 1.13.35.2 --- pkgs/development/libraries/psol/default.nix | 4 ++-- pkgs/servers/http/nginx/modules.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix index dd6037e68329..263473b8626a 100644 --- a/pkgs/development/libraries/psol/default.nix +++ b/pkgs/development/libraries/psol/default.nix @@ -1,5 +1,5 @@ { callPackage }: callPackage ./generic.nix {} { - version = "1.13.35.1"; # Latest beta, 2017-11-08 - sha256 = "126823gpr3rdqakwixmr887rbvwhksr3xg14jnyzlp84q4hg1p0n"; + version = "1.13.35.2"; # Latest beta, 2018-01-11 + sha256 = "1z8m0qgvk5gqj37p4kps3y4h7jwaqk0rw0y513nlsb163z4b05f5"; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 36d0ea6b1e88..4b4818b1f655 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -153,7 +153,7 @@ owner = "pagespeed"; repo = "ngx_pagespeed"; rev = "v${version}-beta"; - sha256 = "176skx7zmi7islc1hmdxcynix4lkvgmr78lknn13s9gskc7qi25w"; + sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp"; }; ngx_pagespeed = pkgs.runCommand From 5877cfb9cea394f0fc703a8f77de4fd0accc5563 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Wed, 31 Jan 2018 22:29:02 +1100 Subject: [PATCH 17/71] lambdabot: add Hoogle --- pkgs/development/tools/haskell/lambdabot/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 7282fb4970ee..edf967f7d110 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -7,15 +7,13 @@ , configuration ? "[]" }: -# FIXME: fix hoogle search - let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ packages pkgs; mueval' = mueval.override { inherit haskellPackages; packages = allPkgs; }; bins = lib.makeBinPath ([ mueval' - (haskellPackages.ghcWithPackages allPkgs) + (haskellPackages.ghcWithHoogle allPkgs) haskellPackages.unlambda haskellPackages.brainfuck ] From e565dd8f2c7ec453ea8bb0bb2cba3a46b33605a9 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 31 Jan 2018 13:49:12 +0100 Subject: [PATCH 18/71] dafny: 1.9.8 -> 2.1.0 --- pkgs/top-level/dotnet-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 1a37d58c70d1..43182b3f2aaa 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -331,13 +331,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Dafny = buildDotnetPackage rec { baseName = "Dafny"; - version = "1.9.8"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/Microsoft/dafny/archive/v${version}.tar.gz"; - sha256 = "0n4pk4cv7d2zsn4xmyjlxvpfl9avq79r06c7kzmrng24p3k4qj6s"; + sha256 = "1iyhy0zpi6wvqif7826anzgdipgsy5bk775ds9qqwfw27j7x6fy5"; }; + postPatch = '' + sed -i \ + -e 's/ Visible="False"//' \ + -e "s/Exists(\$(CodeContractsInstallDir))/Exists('\$(CodeContractsInstallDir)')/" \ + Source/*/*.csproj + ''; + preBuild = '' ln -s ${pkgs.z3} Binaries/z3 ''; @@ -345,7 +352,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ Boogie ]; xBuildFiles = [ "Source/Dafny.sln" ]; - xBuildFlags = [ ]; + xBuildFlags = [ "/p:Configuration=Checked" "/p:Platform=Any CPU" "/t:Rebuild" ]; outputFiles = [ "Binaries/*" ]; From 1fec496f384c53df39684035bafb482865d3eff8 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 1 Feb 2018 12:13:17 +0100 Subject: [PATCH 19/71] nixos/networking-interfaces: add preferTempAddress option --- nixos/modules/system/boot/networkd.nix | 3 ++- .../tasks/network-interfaces-systemd.nix | 1 + nixos/modules/tasks/network-interfaces.nix | 22 ++++++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 9d2cea3ad165..23b725aaa357 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -94,7 +94,7 @@ let checkNetwork = checkUnitConfig "Network" [ (assertOnlyFields [ "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute" - "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond" + "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond" "IPv6PrivacyExtensions" ]) (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"]) (assertValueOneOf "DHCPServer" boolValues) @@ -104,6 +104,7 @@ let (assertValueOneOf "IPv4LLRoute" boolValues) (assertValueOneOf "LLMNR" boolValues) (assertValueOneOf "MulticastDNS" boolValues) + (assertValueOneOf "IPv6PrivacyExtensions" ["yes" "no" "prefer-public" "kernel"]) ]; checkAddress = checkUnitConfig "Address" [ diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 5d72ad0f1bde..be7f52a76def 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -91,6 +91,7 @@ in (if i.useDHCP != null then i.useDHCP else cfg.useDHCP && interfaceIps i == [ ])); address = flip map (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); + networkConfig.IPv6PrivacyExtensions = "kernel"; } ]; }))) (mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index f4851988d63d..f80c5045c07d 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -155,6 +155,16 @@ let description = "Name of the interface."; }; + preferTempAddress = mkOption { + type = types.bool; + default = cfg.enableIPv6; + defaultText = literalExample "config.networking.enableIpv6"; + description = '' + When using SLAAC prefer a temporary (IPv6) address over the EUI-64 + address for originating connections. This is used to reduce tracking. + ''; + }; + useDHCP = mkOption { type = types.nullOr types.bool; default = null; @@ -941,6 +951,11 @@ in message = '' The networking.interfaces."${i.name}" must not have any defined ips when it is a slave. ''; + })) ++ (flip map interfaces (i: { + assertion = i.preferTempAddress -> cfg.enableIPv6; + message = '' + Temporary addresses are only needed when IPv6 is enabled. + ''; })) ++ [ { assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId); @@ -963,9 +978,10 @@ in "net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6); "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6); "net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces); - } // listToAttrs (concatLists (flip map (filter (i: i.proxyARP) interfaces) - (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true)) - )); + } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces) + (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true))) + // listToAttrs (flip map (filter (i: i.preferTempAddress) interfaces) + (i: nameValuePair "net.ipv6.conf.${i.name}.use_tempaddr" 2)); # Capabilities won't work unless we have at-least a 4.3 Linux # kernel because we need the ambient capability From 4050c30da2e0ec42123c381be1312b8d0b2cc118 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 1 Feb 2018 15:50:35 +0100 Subject: [PATCH 20/71] nixos/tests: add test for temporary IPv6 addresses --- nixos/tests/networking.nix | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 182328b32962..fa3dc0538729 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -476,6 +476,63 @@ let ); ''; }; + privacy = { + name = "Privacy"; + nodes.router = { config, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; + networking = { + useNetworkd = networkd; + interfaces.eth1 = { + ipv6Address = "fd00:1234:5678:1::1"; + ipv6PrefixLength = 64; + }; + }; + services.radvd = { + enable = true; + config = '' + interface eth1 { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag on; + + prefix fd00:1234:5678:1::/64 { + AdvAutonomous on; + AdvOnLink on; + }; + }; + ''; + }; + }; + nodes.client = { config, pkgs, ... }: with pkgs.lib; { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = networkd; + useDHCP = true; + interfaces.eth1 = { + preferTempAddress = true; + ip4 = mkOverride 0 [ ]; + ip6 = mkOverride 0 [ ]; + }; + }; + }; + testScript = { nodes, ... }: + '' + startAll; + + $client->waitForUnit("network.target"); + $router->waitForUnit("network-online.target"); + + # Wait until we have an ip address + $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"); + + # Test vlan 1 + $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1"); + + # Test address used is temporary + $client->succeed("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"); + ''; + }; }; in mapAttrs (const (attrs: makeTest (attrs // { From 27ec2df59eb0d69883f696b217994157f837cd3f Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 26 Jan 2018 21:42:20 +0900 Subject: [PATCH 21/71] cataclysm-dda{,-git}: clean up - Remove cmath include (introduced by 97c484a) since the current gcc/clang works fine without it. - Suppress known compiler warnings instead of removing -Werror flag. --- pkgs/games/cataclysm-dda/default.nix | 10 +++++----- pkgs/games/cataclysm-dda/git.nix | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index be6f32654305..541b174cc6a9 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -22,11 +22,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - sed -i Makefile \ - -e 's,-Werror,,g' - - sed '1i#include ' \ - -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp ''; makeFlags = [ @@ -35,6 +30,11 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ "NATIVE=osx CLANG=1" "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above + ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + "WARNINGS+=-Wno-deprecated-declarations" + "WARNINGS+=-Wno-ignored-attributes" + ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + "WARNINGS+=-Wno-inconsistent-missing-override" ]; postBuild = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 3d8ec7d68448..ac2c1f9fdb16 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - sed -i Makefile \ - -e 's,-Werror,,g' - - sed '1i#include ' \ - -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp ''; makeFlags = [ From 18618fae96156dfb4c5b18c4cf7c4def6c0c169a Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 8 Feb 2018 13:47:11 +0900 Subject: [PATCH 22/71] cataclysm-dda: require ncurses5 --- 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 22ce05089f85..d4a9c94f1407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18250,6 +18250,7 @@ with pkgs; cataclysm-dda = callPackage ../games/cataclysm-dda { inherit (darwin.apple_sdk.frameworks) Cocoa; + ncurses = ncurses5; }; cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix { From 9ef3f90de79113c4cf6718c6fc6f18fc6aaf7ad8 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Sat, 27 Jan 2018 22:25:59 +0900 Subject: [PATCH 23/71] cataclysm-dda{,-git}: update homepage --- pkgs/games/cataclysm-dda/default.nix | 2 +- pkgs/games/cataclysm-dda/git.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index 541b174cc6a9..c1b68e4ddbab 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; - homepage = http://en.cataclysmdda.com/; + homepage = http://cataclysmdda.org/; license = licenses.cc-by-sa-30; maintainers = [ maintainers.skeidel ]; platforms = platforms.unix; diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index ac2c1f9fdb16..504a738c8b3b 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; - homepage = http://en.cataclysmdda.com/; + homepage = http://cataclysmdda.org/; license = licenses.cc-by-sa-30; platforms = platforms.unix; }; From 5c325869dff36a3b5ec807fe145877ea483c05e1 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 26 Jan 2018 21:47:51 +0900 Subject: [PATCH 24/71] cataclysm-dda-git: differentiate the version display from 0.C Previously the version shown in the title was 0.C, not distinguishable from the stable version. --- pkgs/games/cataclysm-dda/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 504a738c8b3b..9f3ac07ec6ba 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1" "LANGUAGES=all" + "VERSION=git-${version}-${stdenv.lib.substring 0 8 src.rev}" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "NATIVE=osx CLANG=1" ]; From f3014ad8cc4013be896b131e30fbade07076807a Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 26 Jan 2018 21:47:51 +0900 Subject: [PATCH 25/71] cataclysm-dda-git: install the launcher for Linux desktop environments --- pkgs/games/cataclysm-dda/git.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 9f3ac07ec6ba..0f6f5fd7b5e6 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + sed -i data/xdg/com.cataclysmdda.cataclysm-dda.desktop \ + -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2," ''; makeFlags = [ @@ -31,7 +33,10 @@ stdenv.mkDerivation rec { "NATIVE=osx CLANG=1" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) '' + install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T $out/share/applications/cataclysm-dda.desktop + install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps + '' + stdenv.lib.optionalString stdenv.isDarwin '' app=$out/Applications/Cataclysm.app install -D -m 444 data/osx/Info.plist -t $app/Contents install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources From 289c8df4e53759287d47662a95d5dd2565c30ff9 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 26 Jan 2018 17:58:19 +0900 Subject: [PATCH 26/71] cataclysm-dda-{,git}: support the console (no tiles) version You can install the console version with `cataclysm-dda{,-git}.override { tiles = false; }`. --- pkgs/games/cataclysm-dda/default.nix | 17 ++++++++++------- pkgs/games/cataclysm-dda/git.nix | 16 ++++++++++------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index c1b68e4ddbab..ae662232ba8a 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, -SDL2_mixer, freetype, gettext, Cocoa, libicns }: +SDL2_mixer, freetype, gettext, Cocoa, libicns, tiles ? true }: stdenv.mkDerivation rec { version = "0.C"; @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libicns ]; + ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ libicns ]; - buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ ncurses lua gettext ] + ++ stdenv.lib.optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] + ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ Cocoa ]; patches = [ ./patches/fix_locale_dir.patch ]; @@ -25,8 +26,10 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1" + "PREFIX=$(out) LUA=1 RELEASE=1 USE_HOME_DIR=1" # "LANGUAGES=all" # vanilla C:DDA installs all translations even without this flag! + ] ++ stdenv.lib.optionals tiles [ + "TILES=1 SOUND=1" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "NATIVE=osx CLANG=1" "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above @@ -37,12 +40,12 @@ stdenv.mkDerivation rec { "WARNINGS+=-Wno-inconsistent-missing-override" ]; - postBuild = stdenv.lib.optionalString stdenv.isDarwin '' + postBuild = stdenv.lib.optionalString (tiles && stdenv.isDarwin) '' # iconutil on macOS is not available in nixpkgs png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/* ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (tiles && stdenv.isDarwin) '' app=$out/Applications/Cataclysm.app install -D -m 444 data/osx/Info.plist -t $app/Contents install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 0f6f5fd7b5e6..bad2338b2b84 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, -SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa }: +SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa, tiles ? true }: stdenv.mkDerivation rec { version = "2017-12-09"; @@ -14,8 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa ]; + buildInputs = [ ncurses lua gettext ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ] + ++ stdenv.lib.optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] + ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ Cocoa ]; patches = [ ./patches/fix_locale_dir_git.patch ]; @@ -26,17 +28,19 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1" + "PREFIX=$(out) LUA=1 RELEASE=1 USE_HOME_DIR=1" "LANGUAGES=all" "VERSION=git-${version}-${stdenv.lib.substring 0 8 src.rev}" + ] ++ stdenv.lib.optionals tiles [ + "TILES=1 SOUND=1" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "NATIVE=osx CLANG=1" ]; - postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postInstall = stdenv.lib.optionalString (tiles && !stdenv.isDarwin) '' install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T $out/share/applications/cataclysm-dda.desktop install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + stdenv.lib.optionalString (tiles && stdenv.isDarwin) '' app=$out/Applications/Cataclysm.app install -D -m 444 data/osx/Info.plist -t $app/Contents install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources From 9696add026aedc1267fe643ece25b16c34bb4bfc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 9 Feb 2018 13:10:32 -0600 Subject: [PATCH 27/71] figlet: simplify, enable tests, fix for cross and musl --- pkgs/tools/misc/figlet/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index f68ae1ec2455..86434847b4a2 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { name = "figlet-2.2.5"; @@ -9,12 +9,17 @@ stdenv.mkDerivation { sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; - installPhase = "make prefix=$out install"; + patches = [ + (fetchpatch { + url = https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399; + name = "musl-fix-cplusplus-decls.patch"; + sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; + }) + ]; - preConfigure = '' - mkdir -p $out/{man/man6,bin} - makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet CC=cc LD=cc" - ''; + makeFlags = [ "prefix=$(out)" "CC:=$(CC)" "LD:=$(CC)" ]; + + doCheck = true; meta = { description = "Program for making large letters out of ordinary text"; From 65faff97ffe19bca242166c333eeb6b191aa3dd2 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Sat, 10 Feb 2018 17:18:53 +0900 Subject: [PATCH 28/71] nixos/lxd: partial fix --- nixos/modules/virtualisation/lxd.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index b1ff0337994e..4988886baf60 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -38,6 +38,15 @@ in environment.systemPackages = [ pkgs.lxd ]; + security.apparmor = { + enable = true; + profiles = [ + "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start" + "${pkgs.lxc}/etc/apparmor.d/lxc-containers" + ]; + packages = [ pkgs.lxc ]; + }; + systemd.services.lxd = { description = "LXD Container Management Daemon"; @@ -47,6 +56,10 @@ in # TODO(wkennington): Add lvm2 and thin-provisioning-tools path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ]; + preStart = '' + mkdir -m 0755 -p /var/lib/lxc/rootfs + ''; + serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd"; serviceConfig.Type = "simple"; serviceConfig.KillMode = "process"; # when stopping, leave the containers alone From 2a2e885cd0cdb2ee1a1b1b37b3e33d58a935b462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?= Date: Sat, 27 Jan 2018 15:44:50 +0100 Subject: [PATCH 29/71] nixos/freeradius : init - Added freeradius service Inspired from the dhcpd service implementation Only 2 configurations options at the moment: - enabled - path to config directory (defaults to /etc/raddb) Implementation was also inspired from ArchLinux systemd file and corrected with @dotlambda and @fpletz help. --- .../services/networking/freeradius.nix | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 nixos/modules/services/networking/freeradius.nix diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix new file mode 100644 index 000000000000..45cba1ce2770 --- /dev/null +++ b/nixos/modules/services/networking/freeradius.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.freeradius; + + freeradiusService = cfg: + { + description = "FreeRadius server"; + wantedBy = ["multi-user.target"]; + after = ["network-online.target"]; + wants = ["network-online.target"]; + preStart = '' + ${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout + ''; + + serviceConfig = { + ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout -xx"; + ExecReload = [ + "${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout" + "${pkgs.coreutils}/bin/kill -HUP $MAINPID" + ]; + User = "radius"; + ProtectSystem = "full"; + ProtectHome = "on"; + Restart = "on-failure"; + RestartSec = 2; + }; + }; + + freeradiusConfig = { + enable = mkEnableOption "the freeradius server"; + + configDir = mkOption { + type = types.path; + default = "/etc/raddb"; + description = '' + The path of the freeradius server configuration directory. + ''; + }; + + }; + +in + +{ + + ###### interface + + options = { + services.freeradius = freeradiusConfig; + }; + + + ###### implementation + + config = mkIf (cfg.enable) { + + users = { + extraUsers.radius = { + /*uid = config.ids.uids.radius;*/ + description = "Radius daemon user"; + }; + }; + + systemd.services.freeradius = freeradiusService cfg; + + }; + +} From 95e86ba6517bc977e5d2f7df15bf9c4ed2bf0d67 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 10 Feb 2018 10:48:28 +0100 Subject: [PATCH 30/71] dmd: 2.078.1 -> 2.078.2 --- pkgs/development/compilers/dmd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index de3544a3a638..094cdb06b698 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -3,9 +3,9 @@ , curl, tzdata, gdb, darwin , callPackage , bootstrapVersion ? false -, version ? "2.078.1" -, dmdSha256 ? "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2" -, druntimeSha256 ? "16jv40m073cflpkyl0vmg1g58cianybfcsgcvwli7pfryxbgsbrr" +, version ? "2.078.2" +, dmdSha256 ? "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls" +, druntimeSha256 ? "0nfqjcmwqc490bzi3582x1c3zigkf306g4nyd1cyd3vs8lfm6x66" , phobosSha256 ? "08ircpf4ilznz638kra272hz8fi5ccvw2cswj5hqckssl1lyqzs8" }: @@ -111,7 +111,7 @@ let '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' - # See https://github.com/NixOS/nixpkgs/issues/29443 + # See https://github.com/dlang/phobos/pull/5960 substituteInPlace phobos/std/path.d \ --replace "\"/root" "\"${ROOT_HOME_DIR}" ''; From a1f920e900c71c9800d00cac7b3a14940a1037d0 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 10 Feb 2018 10:49:17 +0100 Subject: [PATCH 31/71] dtools: 2.078.1 -> 2.078.2 --- pkgs/development/tools/dtools/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index daa25de95080..d76bbb7f53a3 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.078.1"; + version = "2.078.2"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2"; + sha256 = "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls"; name = "dmd"; }) (fetchFromGitHub { @@ -28,23 +28,11 @@ stdenv.mkDerivation rec { cd dtools ''; - postPatch = '' - substituteInPlace posix.mak \ - --replace "../dmd/generated/\$(OS)/release/\$(MODEL)/dmd" ${dmd.out}/bin/dmd - - substituteInPlace posix.mak \ - --replace gcc $CC - - # To fix rdmd test with newer phobos - substituteInPlace rdmd.d \ - --replace " std.stdiobase," "" - ''; - nativeBuildInputs = [ dmd ]; buildInputs = [ curl ]; makeCmd = '' - make -f posix.mak DMD=${dmd.out}/bin/dmd DMD_DIR=dmd + make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc ''; buildPhase = '' From a2df3ee29340cff2a92dd9dd9540f2761c806fc4 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Wed, 7 Feb 2018 00:01:15 +0900 Subject: [PATCH 32/71] cataclysm-dda{,-git}: styling --- pkgs/games/cataclysm-dda/default.nix | 30 ++++++++++++++---------- pkgs/games/cataclysm-dda/git.nix | 34 ++++++++++++++++------------ 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index ae662232ba8a..a3adec384015 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, -SDL2_mixer, freetype, gettext, Cocoa, libicns, tiles ? true }: +SDL2_mixer, freetype, gettext, Cocoa, libicns, +tiles ? true }: stdenv.mkDerivation rec { version = "0.C"; @@ -15,9 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ libicns ]; - buildInputs = [ ncurses lua gettext ] - ++ stdenv.lib.optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] - ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ Cocoa ]; + buildInputs = with stdenv.lib; [ ncurses lua gettext ] + ++ optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] + ++ optionals (tiles && stdenv.isDarwin) [ Cocoa ]; patches = [ ./patches/fix_locale_dir.patch ]; @@ -25,18 +26,23 @@ stdenv.mkDerivation rec { patchShebangs . ''; - makeFlags = [ - "PREFIX=$(out) LUA=1 RELEASE=1 USE_HOME_DIR=1" + makeFlags = with stdenv.lib; [ + "PREFIX=$(out)" + "LUA=1" + "RELEASE=1" + "USE_HOME_DIR=1" # "LANGUAGES=all" # vanilla C:DDA installs all translations even without this flag! - ] ++ stdenv.lib.optionals tiles [ - "TILES=1 SOUND=1" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "NATIVE=osx CLANG=1" + ] ++ optionals tiles [ + "TILES=1" + "SOUND=1" + ] ++ optionals stdenv.isDarwin [ + "NATIVE=osx" + "CLANG=1" "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above - ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + ] ++ optionals stdenv.cc.isGNU [ "WARNINGS+=-Wno-deprecated-declarations" "WARNINGS+=-Wno-ignored-attributes" - ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ optionals stdenv.cc.isClang [ "WARNINGS+=-Wno-inconsistent-missing-override" ]; diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index bad2338b2b84..fcc2481cb695 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, -SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa, tiles ? true }: +SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa, +tiles ? true }: stdenv.mkDerivation rec { version = "2017-12-09"; @@ -14,10 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses lua gettext ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ] - ++ stdenv.lib.optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] - ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ Cocoa ]; + buildInputs = with stdenv.lib; [ ncurses lua gettext ] + ++ optionals stdenv.isDarwin [ CoreFoundation ] + ++ optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] + ++ optionals (tiles && stdenv.isDarwin) [ Cocoa ]; patches = [ ./patches/fix_locale_dir_git.patch ]; @@ -27,20 +28,25 @@ stdenv.mkDerivation rec { -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2," ''; - makeFlags = [ - "PREFIX=$(out) LUA=1 RELEASE=1 USE_HOME_DIR=1" + makeFlags = with stdenv.lib; [ + "PREFIX=$(out)" + "LUA=1" + "RELEASE=1" + "USE_HOME_DIR=1" "LANGUAGES=all" - "VERSION=git-${version}-${stdenv.lib.substring 0 8 src.rev}" - ] ++ stdenv.lib.optionals tiles [ - "TILES=1 SOUND=1" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "NATIVE=osx CLANG=1" + "VERSION=git-${version}-${substring 0 8 src.rev}" + ] ++ optionals tiles [ + "TILES=1" + "SOUND=1" + ] ++ optionals stdenv.isDarwin [ + "NATIVE=osx" + "CLANG=1" ]; - postInstall = stdenv.lib.optionalString (tiles && !stdenv.isDarwin) '' + postInstall = with stdenv.lib; optionalString (tiles && !stdenv.isDarwin) '' install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T $out/share/applications/cataclysm-dda.desktop install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps - '' + stdenv.lib.optionalString (tiles && stdenv.isDarwin) '' + '' + optionalString (tiles && stdenv.isDarwin) '' app=$out/Applications/Cataclysm.app install -D -m 444 data/osx/Info.plist -t $app/Contents install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources From 1ac2ce107cd150eaa29c7c0679b956c1872bb136 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 10 Feb 2018 11:08:51 +0100 Subject: [PATCH 33/71] dub: 1.7.1 -> 1.7.2 --- .../tools/build-managers/dub/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 8af11f057380..da404a63d85f 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -4,7 +4,7 @@ let dubBuild = stdenv.mkDerivation rec { name = "dubBuild-${version}"; - version = "1.7.1"; + version = "1.7.2"; enableParallelBuilding = true; @@ -12,9 +12,13 @@ let owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "09bcc9bq2z1rbm8sdip1l81y5p8q13r30k02lzifyasiplrnpvlv"; + sha256 = "073ibvgm1gphcqs1yjrav9ryp677nh3b194nxmvicwgvdc0sb6w9"; }; + postUnpack = '' + patchShebangs . + ''; + patches = [ # TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354 (fetchpatch { @@ -23,12 +27,11 @@ let }) ]; + # Can be removed with https://github.com/dlang/dub/pull/1368 + dubvar = "\\$DUB"; postPatch = '' - # Avoid that the version file is overwritten - substituteInPlace build.sh \ - --replace source/dub/version_.d /dev/null - - patchShebangs . + substituteInPlace test/fetchzip.sh \ + --replace "dub remove" "\"${dubvar}\" remove" ''; nativeBuildInputs = [ dmd libevent rsync ]; @@ -70,6 +73,7 @@ let patches = dubBuild.patches; + postUnpack = dubBuild.postUnpack; postPatch = dubBuild.postPatch; nativeBuildInputs = dubBuild.nativeBuildInputs; From 5e12d76361b98ace4cbe24557423e9745978e4a0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 3 Feb 2018 23:36:09 -0800 Subject: [PATCH 34/71] openmpi: fix broken modules, disable dsos --- pkgs/development/libraries/openmpi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 3f764b1d8453..9aca076c5dcb 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; - configureFlags = with stdenv; [] + configureFlags = with stdenv; [ "--disable-mca-dso" ] ++ lib.optional isLinux "--with-libnl=${libnl.dev}" ++ lib.optional enableSGE "--with-sge" ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default" From 0e09abd9c45b44a3120bc8aeff5492161b08a968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 13 Feb 2018 11:51:02 +0100 Subject: [PATCH 35/71] fd: install fish shell completions --- pkgs/tools/misc/fd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index a18c78382715..3c8262068693 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec { mkdir -p "$out/man/man1" cp "$src/doc/fd.1" "$out/man/man1" - mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions} + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} cp target/release/build/fd-find-*/out/fd.bash "$out/share/bash-completion/completions/" - cp target/release/build/fd-find-*/out/fd.fish "$out/share/fish/completions/" + cp target/release/build/fd-find-*/out/fd.fish "$out/share/fish/vendor_completions.d/" cp target/release/build/fd-find-*/out/_fd "$out/share/zsh/site-functions/" ''; From ecfafc4fbdd5a19e36c40e89bb882827485fc7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 13 Feb 2018 11:43:47 +0100 Subject: [PATCH 36/71] autojump: install fish shell completions --- pkgs/tools/misc/autojump/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 817510bfb761..ba38a55dda02 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -22,6 +22,9 @@ in mkdir -p "$out/etc/bash_completion.d" cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d" + mkdir -p $out/share/fish/vendor_completions.d/ + cp -v $out/share/autojump/autojump.fish "$out/share/fish/vendor_completions.d/autojump.fish" + cat <