From 006d62f59fbc86380dd5e79a084746e9e7368a98 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 27 Feb 2018 18:07:43 +0000 Subject: [PATCH 01/26] usbguard: 0.7.0 -> 0.7.2 --- .../usbguard/daemon_read_only_config.patch | 13 -------- pkgs/os-specific/linux/usbguard/default.nix | 18 +++++------ .../linux/usbguard/documentation.patch | 32 ------------------- 3 files changed, 8 insertions(+), 55 deletions(-) delete mode 100644 pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch delete mode 100644 pkgs/os-specific/linux/usbguard/documentation.patch diff --git a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch b/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch deleted file mode 100644 index eb4d5df698ac..000000000000 --- a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Library/ConfigFilePrivate.cpp b/src/Library/ConfigFilePrivate.cpp -index 8aefa65..40914f7 100644 ---- a/src/Library/ConfigFilePrivate.cpp -+++ b/src/Library/ConfigFilePrivate.cpp -@@ -51,7 +51,7 @@ namespace usbguard - - void ConfigFilePrivate::open(const std::string& path) - { -- _stream.open(path, std::ios::in|std::ios::out); -+ _stream.open(path, std::ios::in); - if (!_stream.is_open()) { - throw std::runtime_error("Can't open " + path); - } diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 8ed4735dd278..2ca825a27d71 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, lib, - libxslt, pandoc, pkgconfig, + libxslt, pandoc, asciidoctor, pkgconfig, dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, + audit, libgcrypt ? null, libsodium ? null }: @@ -11,23 +12,19 @@ with stdenv.lib; assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.0"; + version = "0.7.2"; name = "usbguard-${version}"; - repo = "https://github.com/dkopecek/usbguard"; + repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { url = "${repo}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1e1485a2b47ba3bde9de2851b371d2552a807047a21e0b81553cf80d7f722709"; + sha256 = "5bd3e5219c590c3ae27b21315bd10b60e823cef64e5deff3305ff5b4087fc2d6"; }; - patches = [ - ./daemon_read_only_config.patch - ./documentation.patch - ]; - nativeBuildInputs = [ libxslt + asciidoctor pandoc # for rendering documentation pkgconfig ]; @@ -39,6 +36,7 @@ stdenv.mkDerivation rec { libseccomp polkit protobuf + audit qtbase qtsvg @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "The USBGuard software framework helps to protect your computer against BadUSB."; - homepage = "https://dkopecek.github.io/usbguard/"; + homepage = "https://usbguard.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.tnias ]; }; diff --git a/pkgs/os-specific/linux/usbguard/documentation.patch b/pkgs/os-specific/linux/usbguard/documentation.patch deleted file mode 100644 index 89de627131f5..000000000000 --- a/pkgs/os-specific/linux/usbguard/documentation.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/doc/usbguard-daemon.conf.5.md b/doc/usbguard-daemon.conf.5.md -index ea86ad1..63aec70 100644 ---- a/doc/usbguard-daemon.conf.5.md -+++ b/doc/usbguard-daemon.conf.5.md -@@ -30,21 +30,21 @@ The **usbguard-daemon.conf** file is loaded by the USBGuard daemon after it pars - **RestoreControllerDeviceState**=<*boolean*> - : The USBGuard daemon modifies some attributes of controller devices like the default authorization state of new child device instances. Using this setting, you can control whether the daemon will try to restore the attribute values to the state before modification on shutdown. - -+**DeviceManagerBackend**=<*backend*> -+: Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`. -+ - **IPCAllowedUsers**=<*username*> [<*username*> ...] - : A space delimited list of usernames that the daemon will accept IPC connections from. - - **IPCAllowedGroups**=<*groupname*> [<*groupname*> ...] - : A space delimited list of groupnames that the daemon will accept IPC connections from. - --**IPCAccessControlFiles**=<*path*> --: Path to a directory holding the IPC access control files. -- --**DeviceManagerBackend**=<*backend*> --: Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`. -- - **IPCAccessControlFiles**=<*path*> - : The files at this location will be interpreted by the daemon as IPC access control definition files. See the **IPC ACCESS CONTROL** section for more details. - -+**DeviceRulesWithPort**=<*boolean*> -+: Generate device specific rules including the "via-port" attribute. -+ - **AuditFilePath**=<*filepath*> - : USBGuard audit events log file path. - From 297fac40ca0768cac30977653857fa157b8238e7 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 27 Feb 2018 18:08:45 +0000 Subject: [PATCH 02/26] nixos/usbguard: Do not check permissions on rules file (using undocumented -P flag) --- nixos/modules/services/security/usbguard.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 4e685e633354..5d469cabe2cb 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -192,7 +192,7 @@ in { serviceConfig = { Type = "simple"; - ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}''; + ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -d -k -c ${daemonConfFile}''; Restart = "on-failure"; }; }; From 30d5c7ce5667cd85b4889a5af35b91a98cebe8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 28 Feb 2018 18:56:35 +0100 Subject: [PATCH 03/26] nix-bash-completions: 0.6.3 -> 0.6.4 Disables spotty nixops completion. --- pkgs/shells/nix-bash-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/nix-bash-completions/default.nix index fb6fa24ac334..c8582366d1a3 100644 --- a/pkgs/shells/nix-bash-completions/default.nix +++ b/pkgs/shells/nix-bash-completions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.3"; + version = "0.6.4"; name = "nix-bash-completions-${version}"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "1zmk9f53xpwk5j6qqisjlddgm2fr68p1q6pn3wa14bd777lranhj"; + sha256 = "1kdysrfc8dx24q438wj3aisn64g2w5yb6mx91qa385p5hz7b1yz2"; }; # To enable lazy loading via. bash-completion we need a symlink to the script From c58072309c69c8ef2fddc6db15545f1cc46a38cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 28 Feb 2018 14:54:52 +0100 Subject: [PATCH 04/26] programs/bash: install nix-bash-completions if completion is enabled --- nixos/doc/manual/release-notes/rl-1803.xml | 7 +++++++ nixos/modules/programs/bash/bash.nix | 3 +++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 29b252753830..9f80dcc29341 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -430,6 +430,13 @@ following incompatible changes: and stopJob provide an optional $user argument for that purpose. + + + Enabling bash completion on NixOS, programs.bash.enableCompletion, will now also enable + completion for the Nix command line tools by installing the + nix-bash-completions package. + + diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 1abdb4973a44..1a62f04972df 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -211,6 +211,9 @@ in "/share/bash-completion" ]; + environment.systemPackages = optional cfg.enableCompletion + pkgs.nix-bash-completions; + environment.shells = [ "/run/current-system/sw/bin/bash" "/var/run/current-system/sw/bin/bash" From 2ebceb5dad17ad7ba6c2779d61183d85b386d6f8 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 28 Feb 2018 13:12:02 -0300 Subject: [PATCH 05/26] redshift: depend on hicolor_icon_theme --- pkgs/applications/misc/redshift/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 9871c559523c..2992f32d2dee 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection -, gtk3, python, pygobject3, pyxdg, libdrm, libxcb }: +, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "redshift-${version}"; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { libdrm libxcb python + hicolor-icon-theme ]; pythonPath = [ pygobject3 pyxdg ]; From bbf430700ad5d8df67d299c157cfaad2951267c9 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 28 Feb 2018 13:18:37 -0300 Subject: [PATCH 06/26] xarchiver: depend on hicolor_icon_theme --- pkgs/tools/archivers/xarchiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 1c8d8367793a..189035a8c8b7 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }: +{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }: stdenv.mkDerivation rec { version = "0.5.4.12"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 intltool libxslt ]; + buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; From 8fbfd67f1f8064c0febcb556589a40aa70523140 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 28 Feb 2018 21:29:24 +0100 Subject: [PATCH 07/26] disnix module: make dbus service configurable --- nixos/modules/services/misc/disnix.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e96645c79c77..39d23610b064 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -32,11 +32,17 @@ in description = "Whether to enable Disnix"; }; + enableMultiUser = mkOption { + type = types.bool; + default = true; + description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; + }; + useWebServiceInterface = mkOption { default = false; description = "Whether to enable the DisnixWebService interface running on Apache Tomcat"; }; - + package = mkOption { type = types.path; description = "The Disnix package"; @@ -52,7 +58,7 @@ in config = mkIf cfg.enable { dysnomia.enable = true; - + environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; services.dbus.enable = true; @@ -71,7 +77,7 @@ in }; systemd.services = { - disnix = { + disnix = mkIf cfg.enableMultiUser { description = "Disnix server"; wants = [ "dysnomia.target" ]; wantedBy = [ "multi-user.target" ]; @@ -92,7 +98,7 @@ in } // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {}) // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {}); - + serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service"; }; From ba979433dcbe8d03ea5810e8a77e8f7b8428526a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 07:50:37 -0800 Subject: [PATCH 08/26] mynewt-newt: 1.0.0 -> 1.3.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newt -h` got 0 exit code - ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newt --help` got 0 exit code - ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newt help` got 0 exit code - ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newt version` and found version 1.3.0 - ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newtmgr -h` got 0 exit code - ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newtmgr --help` got 0 exit code - ran `/nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin/bin/newtmgr help` got 0 exit code - found 1.3.0 with grep in /nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin - found 1.3.0 in filename of file in /nix/store/cjkfm1v60ykkmnqbpwc5ikhrrghklj1n-mynewt-newt-1.3.0-bin cc "@pjones @ehmry @lethalman" --- pkgs/tools/package-management/mynewt-newt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 1b8c1b2f6402..74c2fd59d4e3 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "mynewt-newt-${version}"; - version = "1.0.0"; + version = "1.3.0"; goPackagePath = "mynewt.apache.org/newt"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "apache"; repo = "incubator-mynewt-newt"; rev = "mynewt_${builtins.replaceStrings ["."] ["_"] version}_tag"; - sha256 = "1ixqxqizd957prd4j2nijgnkv84rffj8cx5f7aqyjq9nkawjksf6"; + sha256 = "0ia6q1wf3ki2yw8ngw5gnbdrb7268qwi078j05f8gs1sppb3g563"; }; meta = with stdenv.lib; { From a04786c37e37fbcc78265032e3cf84905be80579 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 18:34:44 -0800 Subject: [PATCH 09/26] urh: 1.7.1 -> 1.9.2 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/lmai5nljfdfka498cvh0b265qi22x8r8-urh-1.9.2/bin/.urh-wrapped --version` and found version 1.9.2 - ran `/nix/store/lmai5nljfdfka498cvh0b265qi22x8r8-urh-1.9.2/bin/urh --version` and found version 1.9.2 - found 1.9.2 with grep in /nix/store/lmai5nljfdfka498cvh0b265qi22x8r8-urh-1.9.2 cc "@fpletz" --- pkgs/applications/misc/urh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 78305675f17f..6aba4e751503 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "1.7.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv"; + sha256 = "02jq2jas6gm08z4l09azi6dcsydaaaqbxfv4mb7pnrc1w8m593zr"; }; buildInputs = [ hackrf rtl-sdr ]; From 89fc5c1a23f8dc015a3ef3e3d7b9df64ffd57f2b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 18:53:41 -0800 Subject: [PATCH 10/26] wiggle: 1.0 -> 1.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/hs0xavmd2pyi30l05s20hp5q70bc63br-wiggle-1.1/bin/wiggle -h` got 0 exit code - ran `/nix/store/hs0xavmd2pyi30l05s20hp5q70bc63br-wiggle-1.1/bin/wiggle --help` got 0 exit code - ran `/nix/store/hs0xavmd2pyi30l05s20hp5q70bc63br-wiggle-1.1/bin/wiggle -V` and found version 1.1 - ran `/nix/store/hs0xavmd2pyi30l05s20hp5q70bc63br-wiggle-1.1/bin/wiggle --version` and found version 1.1 - found 1.1 with grep in /nix/store/hs0xavmd2pyi30l05s20hp5q70bc63br-wiggle-1.1 - found 1.1 in filename of file in /nix/store/hs0xavmd2pyi30l05s20hp5q70bc63br-wiggle-1.1 --- pkgs/development/tools/wiggle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index ffa6d4aac0ca..df32d68767fb 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "wiggle-1.0"; + name = "wiggle-1.1"; src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz"; - sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs"; + url = "https://github.com/neilbrown/wiggle/archive/v1.1.tar.gz"; + sha256 = "0gg1c0zcrd5fgawvjccmdscm3fka8h1qz4v807kvy1b2y1cf9c4w"; }; buildInputs = [ ncurses groff ]; From c0dca07e9257e736d3d7786a27fc6e9344b92757 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 18:33:02 -0800 Subject: [PATCH 11/26] unixODBC: 2.3.4 -> 2.3.5 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/isql --help` got 0 exit code - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/isql --version` and found version 2.3.5 - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/isql --help` and found version 2.3.5 - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/odbcinst --help` got 0 exit code - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/odbcinst --version` and found version 2.3.5 - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/odbcinst --help` and found version 2.3.5 - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/iusql --help` got 0 exit code - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/iusql --version` and found version 2.3.5 - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/iusql --help` and found version 2.3.5 - ran `/nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5/bin/odbc_config --version` and found version 2.3.5 - found 2.3.5 with grep in /nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5 - found 2.3.5 in filename of file in /nix/store/vs2i1mz87r31icar1kp880wq81bk2wy5-unixODBC-2.3.5 --- pkgs/development/libraries/unixODBC/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 99ab8a056162..7d59866d0431 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unixODBC-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - sha256 = "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f"; + sha256 = "0ns93daph4wmk92d7m2w48x0yki4m1yznxnn97p1ldn6bkh742bn"; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; From 2702a81533ba98bcf112d67d0ccbc169aa82c68c Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 18:48:43 -0800 Subject: [PATCH 12/26] waf: 1.9.0 -> 2.0.4 Semi-automatic update. These checks were performed: - built on NixOS - found 2.0.4 with grep in /nix/store/dr6xvrw483jr5vgznwpjj0hxx3jq86ha-waf-2.0.4 - found 2.0.4 in filename of file in /nix/store/dr6xvrw483jr5vgznwpjj0hxx3jq86ha-waf-2.0.4 cc "@vrthra" --- pkgs/development/tools/build-managers/waf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 61184cb6ba1a..65501b2b9350 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "1.9.0"; + version = "2.0.4"; src = fetchurl { url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "1sjpqzm2fzm8pxi3fwfinpsbw4z9040qkrzbg3lxik7ppsbjhn58"; + sha256 = "0zmnwgccq5j7ipfi2j0k5s40q27krp1m6v2bd650axgzdbpa7ain"; }; buildInputs = [ python2 ]; From 8681d46aa12d7f206e96a8f7744ef786a732df6b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 18:30:36 -0800 Subject: [PATCH 13/26] unclutter-xfixes: 1.2 -> 1.3 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/ypik1dbi5xwyf65q8qgs6l4xg1siiinm-unclutter-xfixes-1.3/bin/unclutter -v` and found version 1.3 - ran `/nix/store/ypik1dbi5xwyf65q8qgs6l4xg1siiinm-unclutter-xfixes-1.3/bin/unclutter --version` and found version 1.3 - found 1.3 with grep in /nix/store/ypik1dbi5xwyf65q8qgs6l4xg1siiinm-unclutter-xfixes-1.3 - found 1.3 in filename of file in /nix/store/ypik1dbi5xwyf65q8qgs6l4xg1siiinm-unclutter-xfixes-1.3 --- pkgs/tools/misc/unclutter-xfixes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index dd13a0d9adce..9f43a7bd699f 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -2,7 +2,7 @@ xlibsWrapper, libev, libXi, libXfixes, pkgconfig, asciidoc, libxslt, docbook_xsl }: -let version = "1.2"; in +let version = "1.3"; in stdenv.mkDerivation { name = "unclutter-xfixes-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Airblader"; repo = "unclutter-xfixes"; rev = "v${version}"; - sha256 = "1pw567mj7mq5kr8mqnyrvy7jj62qfg6zgqfyzz21nncslddnjzg8"; + sha256 = "1iikrz0023wygv29ny20xj1hlv9ry7hghlwjii6rj4jm59vl0mlz"; }; nativeBuildInputs = [pkgconfig]; From 75072efb4bd0b6302fb854af878ecaf375e8f6cf Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 18:21:06 -0800 Subject: [PATCH 14/26] tulip: 4.9.0 -> 5.1.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0/bin/tulip-config -h` got 0 exit code - ran `/nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0/bin/tulip-config --help` got 0 exit code - ran `/nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0/bin/tulip-config help` got 0 exit code - ran `/nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0/bin/tulip-config --version` and found version 5.1.0 - found 5.1.0 with grep in /nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0 cc "" --- pkgs/applications/science/misc/tulip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 9b8035fcefe7..af58aaafc9c9 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 , cmake, makeWrapper, libjpeg, python }: -let version = "4.9.0"; in +let version = "5.1.0"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { url = "mirror://sourceforge/auber/${name}_src.tar.gz"; - sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; + sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h"; }; buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ]; From 9d8a5a404f94fc69ba9c0890673937e778eca49f Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 17:53:14 -0800 Subject: [PATCH 15/26] ts: 0.7.6 -> 1.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/fx773gqzc7zwjjyyr13s1rqa6z96ipw7-ts-1.0/bin/ts -h` got 0 exit code - ran `/nix/store/fx773gqzc7zwjjyyr13s1rqa6z96ipw7-ts-1.0/bin/ts help` got 0 exit code - ran `/nix/store/fx773gqzc7zwjjyyr13s1rqa6z96ipw7-ts-1.0/bin/ts -V` and found version 1.0 - ran `/nix/store/fx773gqzc7zwjjyyr13s1rqa6z96ipw7-ts-1.0/bin/ts -h` and found version 1.0 - found 1.0 with grep in /nix/store/fx773gqzc7zwjjyyr13s1rqa6z96ipw7-ts-1.0 - found 1.0 in filename of file in /nix/store/fx773gqzc7zwjjyyr13s1rqa6z96ipw7-ts-1.0 cc "@viric" --- pkgs/tools/system/ts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 0e51b0610910..79ba7d893040 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "ts-0.7.6"; + name = "ts-1.0"; installPhase=''make install "PREFIX=$out"''; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://viric.name/~viric/soft/ts/${name}.tar.gz"; - sha256 = "07b61sx3hqpdxlg5a1xrz9sxww9yqdix3bmr0sm917r3rzk87lwk"; + sha256 = "15dkzczx10fhl0zs9bmcgkxfbwq2znc7bpscljm4rchbzx7y6lsg"; }; meta = with stdenv.lib; { From 8e4fe4a47daec1558c7668817c44972cc9c0931f Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 17:34:35 -0800 Subject: [PATCH 16/26] tilda: 1.3.3 -> 1.4.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/gkd67acmm6flkyisqmxpfc1njfyc6xqc-tilda-1.4.1/bin/wrapped/tilda --help` got 0 exit code - ran `/nix/store/gkd67acmm6flkyisqmxpfc1njfyc6xqc-tilda-1.4.1/bin/wrapped/tilda -v` and found version 1.4.1 - ran `/nix/store/gkd67acmm6flkyisqmxpfc1njfyc6xqc-tilda-1.4.1/bin/wrapped/tilda --version` and found version 1.4.1 - ran `/nix/store/gkd67acmm6flkyisqmxpfc1njfyc6xqc-tilda-1.4.1/bin/tilda --help` got 0 exit code - ran `/nix/store/gkd67acmm6flkyisqmxpfc1njfyc6xqc-tilda-1.4.1/bin/tilda -v` and found version 1.4.1 - ran `/nix/store/gkd67acmm6flkyisqmxpfc1njfyc6xqc-tilda-1.4.1/bin/tilda --version` and found version 1.4.1 - found 1.4.1 with grep in /nix/store/gkd67acmm6flkyisqmxpfc1njfyc6xqc-tilda-1.4.1 - found 1.4.1 in filename of file in /nix/store/gkd67acmm6flkyisqmxpfc1njfyc6xqc-tilda-1.4.1 cc "@AndersonTorres" --- pkgs/applications/misc/tilda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 7378950b189b..d5b927bb536c 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "tilda-${version}"; - version = "1.3.3"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; - sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki"; + sha256 = "0w2hry2bqcqrkik4l100b1a9jlsih6sq8zwhfpl8zzfq20i00lfs"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From dac1a530ac4a6a8731d4d78f774ddee6560db00b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 17:11:14 -0800 Subject: [PATCH 17/26] tcpkali: 0.9 -> 1.1.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/651sa1wikygbqqvimg3a609n37isc78w-tcpkali-1.1.1/bin/tcpkali --version` and found version 1.1.1 - found 1.1.1 with grep in /nix/store/651sa1wikygbqqvimg3a609n37isc78w-tcpkali-1.1.1 - found 1.1.1 in filename of file in /nix/store/651sa1wikygbqqvimg3a609n37isc78w-tcpkali-1.1.1 cc "@ethercrow" --- pkgs/applications/networking/tcpkali/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index 79bc32dfa40d..8a056e21692b 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -1,6 +1,6 @@ {stdenv, autoreconfHook, fetchFromGitHub, bison}: -let version = "0.9"; in +let version = "1.1.1"; in stdenv.mkDerivation rec { name = "tcpkali-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "machinezone"; repo = "tcpkali"; rev = "v${version}"; - sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82"; + sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bison]; From 18a37ae6c1751b3116c6be349bd59cc84fa8cc0a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 17:04:56 -0800 Subject: [PATCH 18/26] swagger-codegen: 2.2.1 -> 2.3.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/x901ajf5y7i8xg81lnngw7p9fwyn73da-swagger-codegen-2.3.1/bin/swagger-codegen help` got 0 exit code - ran `/nix/store/x901ajf5y7i8xg81lnngw7p9fwyn73da-swagger-codegen-2.3.1/bin/swagger-codegen version` and found version 2.3.1 - found 2.3.1 with grep in /nix/store/x901ajf5y7i8xg81lnngw7p9fwyn73da-swagger-codegen-2.3.1 - found 2.3.1 in filename of file in /nix/store/x901ajf5y7i8xg81lnngw7p9fwyn73da-swagger-codegen-2.3.1 cc "@jraygauthier" --- pkgs/tools/networking/swagger-codegen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index 0c3af79628e1..4fc456523f7d 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.3.1"; pname = "swagger-codegen"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oss.sonatype.org/content/repositories/releases/io/swagger/${pname}-cli/${version}/${jarfilename}"; - sha256 = "1pwxkl3r93c8hsif9xm0h1hmbjrxz1q7hr5qn5n0sni1x3c3k0d1"; + sha256 = "171qr0zx7i6cykv54vqjf3mplrf7w4a1fpq47wsj861lbf8xm322"; }; phases = [ "installPhase" ]; From cead247e4c2a862555641d2a0d26ffbdc1c8e931 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 17:03:27 -0800 Subject: [PATCH 19/26] surfraw: 2.2.9 -> 2.3.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/3w61z4y841pb4zykywl9p7ajb6lhqjf8-surfraw-2.3.0/bin/surfraw-update-path -h` got 0 exit code - ran `/nix/store/3w61z4y841pb4zykywl9p7ajb6lhqjf8-surfraw-2.3.0/bin/surfraw-update-path --help` got 0 exit code - ran `/nix/store/3w61z4y841pb4zykywl9p7ajb6lhqjf8-surfraw-2.3.0/bin/surfraw-update-path -h` and found version 2.3.0 - ran `/nix/store/3w61z4y841pb4zykywl9p7ajb6lhqjf8-surfraw-2.3.0/bin/surfraw-update-path --help` and found version 2.3.0 - found 2.3.0 with grep in /nix/store/3w61z4y841pb4zykywl9p7ajb6lhqjf8-surfraw-2.3.0 - found 2.3.0 in filename of file in /nix/store/3w61z4y841pb4zykywl9p7ajb6lhqjf8-surfraw-2.3.0 cc "" --- pkgs/tools/networking/surfraw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index 8624efeb3f77..b23616c57e92 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "surfraw-2.2.9"; + name = "surfraw-2.3.0"; src = fetchurl { - url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.9.tar.gz"; - sha256 = "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa"; + url = "http://surfraw.alioth.debian.org/dist/surfraw-2.3.0.tar.gz"; + sha256 = "099nbif0x5cbcf18snc58nx1a3q7z0v9br9p2jiq9pcc7ic2015d"; }; configureFlags = [ From a50424b6f3049671ba3940936b234abfe4f4e579 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 17:03:12 -0800 Subject: [PATCH 20/26] supercollider: 3.8.1 -> 3.9.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/4wlhzjj8k4a49dvpzgwhll2m03hvvcz9-supercollider-3.9.1/bin/scsynth -v` and found version 3.9.1 - ran `/nix/store/4wlhzjj8k4a49dvpzgwhll2m03hvvcz9-supercollider-3.9.1/bin/supernova -h` got 0 exit code - ran `/nix/store/4wlhzjj8k4a49dvpzgwhll2m03hvvcz9-supercollider-3.9.1/bin/supernova --help` got 0 exit code - ran `/nix/store/4wlhzjj8k4a49dvpzgwhll2m03hvvcz9-supercollider-3.9.1/bin/supernova -v` and found version 3.9.1 - ran `/nix/store/4wlhzjj8k4a49dvpzgwhll2m03hvvcz9-supercollider-3.9.1/bin/supernova --version` and found version 3.9.1 - ran `/nix/store/4wlhzjj8k4a49dvpzgwhll2m03hvvcz9-supercollider-3.9.1/bin/sclang -h` got 0 exit code - ran `/nix/store/4wlhzjj8k4a49dvpzgwhll2m03hvvcz9-supercollider-3.9.1/bin/sclang -v` and found version 3.9.1 - found 3.9.1 with grep in /nix/store/4wlhzjj8k4a49dvpzgwhll2m03hvvcz9-supercollider-3.9.1 --- pkgs/development/interpreters/supercollider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 19abfe1cea27..13184ad50e86 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "1y8yb20k3lvj7c93qz2srrkvfv175n4n7p3qj89w0dp085mj0qmw"; + sha256 = "150fgnjcmb06r3pa3mbsvb4iwnqlimjwdxgbs6p55zz6g8wbln7a"; }; hardeningDisable = [ "stackprotector" ]; From 228a7d2a335a353566c3de34794cc43dad3cc48f Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 16:47:46 -0800 Subject: [PATCH 21/26] squirrel-sql: 3.7.1 -> 3.8.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/d1xb2sv0zhj3q10zrggffmsjlgl8a4n9-squirrel-sql-3.8.1/bin/squirrel-sql -h` got 0 exit code - ran `/nix/store/d1xb2sv0zhj3q10zrggffmsjlgl8a4n9-squirrel-sql-3.8.1/bin/squirrel-sql --help` got 0 exit code - ran `/nix/store/d1xb2sv0zhj3q10zrggffmsjlgl8a4n9-squirrel-sql-3.8.1/bin/squirrel-sql help` got 0 exit code - found 3.8.1 with grep in /nix/store/d1xb2sv0zhj3q10zrggffmsjlgl8a4n9-squirrel-sql-3.8.1 - found 3.8.1 in filename of file in /nix/store/d1xb2sv0zhj3q10zrggffmsjlgl8a4n9-squirrel-sql-3.8.1 cc "@khumba" --- pkgs/development/tools/database/squirrel-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index afac17e121ad..7d4cf6ea5d5e 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,13 +5,13 @@ , drivers ? [] }: let - version = "3.7.1"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "1v141ply57k5krwbnnmz4mbs9hs8rbys0bkjz69gvxlqjizyiq23"; + sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2"; }; buildInputs = [ From df06864cdf812add72b86125acdfa0abf622652a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 16:41:44 -0800 Subject: [PATCH 22/26] soundtouch: 1.9.2 -> 2.0.0 Semi-automatic update. These checks were performed: - built on NixOS - found 2.0.0 with grep in /nix/store/mccg5fjzlk40fic8crh6mj0nknwmr774-soundtouch-2.0.0 - found 2.0.0 in filename of file in /nix/store/mccg5fjzlk40fic8crh6mj0nknwmr774-soundtouch-2.0.0 --- pkgs/development/libraries/soundtouch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 729967ea1b7f..c338d6762a4d 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pName = "soundtouch"; - name = "${pName}-1.9.2"; + name = "${pName}-2.0.0"; src = fetchurl { url = "http://www.surina.net/soundtouch/${name}.tar.gz"; - sha256 = "04y5l56yn4jvwpv9mn1p3m2vi5kdym9xpdac8pmhwhl13r8qdsya"; + sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; }; buildInputs = [ autoconf automake libtool ]; From e80c5917327e8bc098fbc72e2af4eaa385d00610 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 16:33:15 -0800 Subject: [PATCH 23/26] slurm: 17.02.9 -> 17.11.3 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/lp32291f98zl5fzhbzvd4icjl2s6mdad-slurm-17.11.3/bin/sattach -h` got 0 exit code - ran `/nix/store/lp32291f98zl5fzhbzvd4icjl2s6mdad-slurm-17.11.3/bin/sattach --help` got 0 exit code - ran `/nix/store/lp32291f98zl5fzhbzvd4icjl2s6mdad-slurm-17.11.3/bin/sattach -V` and found version 17.11.3 - ran `/nix/store/lp32291f98zl5fzhbzvd4icjl2s6mdad-slurm-17.11.3/bin/sattach --version` and found version 17.11.3 - ran `/nix/store/lp32291f98zl5fzhbzvd4icjl2s6mdad-slurm-17.11.3/bin/slurmd -h` got 0 exit code - ran `/nix/store/lp32291f98zl5fzhbzvd4icjl2s6mdad-slurm-17.11.3/bin/slurmd -V` and found version 17.11.3 - found 17.11.3 with grep in /nix/store/lp32291f98zl5fzhbzvd4icjl2s6mdad-slurm-17.11.3 - found 17.11.3 in filename of file in /nix/store/lp32291f98zl5fzhbzvd4icjl2s6mdad-slurm-17.11.3 cc "@jagajaga" --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 59d627901131..fe028cf812e7 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.02.9"; + version = "17.11.3"; src = fetchurl { url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "0w8v7fzbn7b3f9kg6lcj2jpkzln3vcv9s2cz37xbdifz0m2p1x7s"; + sha256 = "1x3i6z03d9m46fvj1cslrapm1drvgyqch9pn4xf23kvbz4gkhaps"; }; outputs = [ "out" "dev" ]; From 87d865232649d6ad11d7c960303fa26f441b4546 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 16:12:22 -0800 Subject: [PATCH 24/26] sleuthkit: 4.5.0 -> 4.6.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/img_cat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/img_stat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/mmls -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/mmstat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/mmcat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/blkcalc -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/blkcat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/blkls -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/blkstat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/ffind -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/fls -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/fcat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/fsstat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/icat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/ifind -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/ils -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/istat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/jcat -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/jls -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/usnjls -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/hfind -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/srch_strings -h` got 0 exit code - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/srch_strings -h` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/sigfind -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/tsk_recover -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/tsk_loaddb -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/tsk_comparedir -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/tsk_gettimes -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/fiwalk help` got 0 exit code - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/fiwalk -V` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/fiwalk version` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/fiwalk help` and found version 4.6.0 - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/jpeg_extract -h` got 0 exit code - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/jpeg_extract --help` got 0 exit code - ran `/nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0/bin/jpeg_extract help` got 0 exit code - found 4.6.0 with grep in /nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0 - found 4.6.0 in filename of file in /nix/store/p9a3kmrv42f95z3a7lm7lb7g7dwbi0wq-sleuthkit-4.6.0 cc "@raskin" --- pkgs/tools/system/sleuthkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index c4347da44607..616498593972 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.5.0"; + version = "4.6.0"; name = "sleuthkit-${version}"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = name; - sha256 = "0h9l9yl5ibbgriq12gizg8k0r6jw6bnii3iljjp4p963wc0ms9b9"; + sha256 = "0m5ll5sx0pxkn58y582b3v90rsfdrh8dm02kmv61psd0k6q0p91x"; }; postPatch = '' From 4de72b90f36641c81b19b44b4de0b63cabbf83aa Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 28 Feb 2018 16:55:00 -0500 Subject: [PATCH 25/26] nixos: nix.sshServe: Support ssh-ng. --- nixos/modules/services/misc/nix-ssh-serve.nix | 24 ++++++++---- nixos/release.nix | 1 + nixos/tests/nix-ssh-serve.nix | 39 +++++++++++++++++++ nixos/tests/openssh.nix | 17 +------- nixos/tests/ssh-keys.nix | 15 +++++++ 5 files changed, 74 insertions(+), 22 deletions(-) create mode 100644 nixos/tests/nix-ssh-serve.nix create mode 100644 nixos/tests/ssh-keys.nix diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 66148431709f..5bd9cf9086f1 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -1,8 +1,12 @@ { config, lib, pkgs, ... }: with lib; - -{ +let cfg = config.nix.sshServe; + command = + if cfg.protocol == "ssh" + then "nix-store --serve" + else "nix-daemon --stdio"; +in { options = { nix.sshServe = { @@ -10,7 +14,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = "Whether to enable serving the Nix store as a binary cache via SSH."; + description = "Whether to enable serving the Nix store as a remote store via SSH."; }; keys = mkOption { @@ -20,14 +24,20 @@ with lib; description = "A list of SSH public keys allowed to access the binary cache via SSH."; }; + protocol = mkOption { + type = types.enum [ "ssh" "ssh-ng" ]; + default = "ssh"; + description = "The specific Nix-over-SSH protocol to use."; + }; + }; }; - config = mkIf config.nix.sshServe.enable { + config = mkIf cfg.enable { users.extraUsers.nix-ssh = { - description = "Nix SSH substituter user"; + description = "Nix SSH store user"; uid = config.ids.uids.nix-ssh; useDefaultShell = true; }; @@ -41,11 +51,11 @@ with lib; PermitTTY no PermitTunnel no X11Forwarding no - ForceCommand ${config.nix.package.out}/bin/nix-store --serve + ForceCommand ${config.nix.package.out}/bin/${command} Match All ''; - users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = config.nix.sshServe.keys; + users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; }; } diff --git a/nixos/release.nix b/nixos/release.nix index 23f050367d69..558bbbf9a9d4 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -319,6 +319,7 @@ in rec { tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nginx = callTest tests/nginx.nix { }; tests.nghttpx = callTest tests/nghttpx.nix { }; + tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { }; tests.novacomd = callTestOnTheseSystems ["x86_64-linux"] tests/novacomd.nix { }; tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-ssh-serve.nix new file mode 100644 index 000000000000..aa366d8612d7 --- /dev/null +++ b/nixos/tests/nix-ssh-serve.nix @@ -0,0 +1,39 @@ +import ./make-test.nix ({ pkgs, lib, ... }: +let inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; + ssh-config = builtins.toFile "ssh.conf" '' + UserKnownHostsFile=/dev/null + StrictHostKeyChecking=no + ''; +in + { name = "nix-ssh-serve"; + meta.maintainers = [ lib.maintainers.shlevy ]; + nodes = + { server.nix.sshServe = + { enable = true; + keys = [ snakeOilPublicKey ]; + protocol = "ssh-ng"; + }; + server.nix.package = pkgs.nixUnstable; + client.nix.package = pkgs.nixUnstable; + }; + testScript = '' + startAll; + + $client->succeed("mkdir -m 700 /root/.ssh"); + $client->copyFileFromHost("${ssh-config}", "/root/.ssh/config"); + $client->succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa"); + $client->succeed("chmod 600 /root/.ssh/id_ecdsa"); + + $client->succeed("nix-store --add /etc/machine-id > mach-id-path"); + + $server->waitForUnit("sshd"); + + $client->fail("diff /root/other-store\$(cat mach-id-path) /etc/machine-id"); + # Currently due to shared store this is a noop :( + $client->succeed("nix copy --to ssh-ng://nix-ssh\@server \$(cat mach-id-path)"); + $client->succeed("nix-store --realise \$(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh\@server"); + $client->succeed("diff /root/other-store\$(cat mach-id-path) /etc/machine-id"); + ''; + } +) diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 291544996889..b2d254e9d9d9 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -1,20 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: -let - snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" '' - -----BEGIN EC PRIVATE KEY----- - MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49 - AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN - r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA== - -----END EC PRIVATE KEY----- - ''; - - snakeOilPublicKey = pkgs.lib.concatStrings [ - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" - "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" - "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" - ]; - +let inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; in { name = "openssh"; meta = with pkgs.stdenv.lib.maintainers; { diff --git a/nixos/tests/ssh-keys.nix b/nixos/tests/ssh-keys.nix new file mode 100644 index 000000000000..07d422196efa --- /dev/null +++ b/nixos/tests/ssh-keys.nix @@ -0,0 +1,15 @@ +pkgs: +{ snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" '' + -----BEGIN EC PRIVATE KEY----- + MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49 + AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN + r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA== + -----END EC PRIVATE KEY----- + ''; + + snakeOilPublicKey = pkgs.lib.concatStrings [ + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" + "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" + "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" + ]; +} From bddc23b13461f2d953309144af73a357fe5ffa92 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 25 Feb 2018 23:06:50 -0800 Subject: [PATCH 26/26] recoll: Allow building a non-X/inotify version on Darwin --- pkgs/applications/search/recoll/default.nix | 51 ++++++++++++--------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index ada68e47aa04..da6ccf940c7a 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -15,37 +15,44 @@ stdenv.mkDerivation rec { sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; - configureFlags = [ "--with-inotify" ]; + configureFlags = [ "--enable-recollq" ] ++ + (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); - buildInputs = [ qt4 xapian file python bison]; + buildInputs = [ qt4 xapian file python bison ]; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am + sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.in + ''; # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do - substituteInPlace $f --replace antiword ${lib.getBin antiword}/bin/antiword - substituteInPlace $f --replace awk ${lib.getBin gawk}/bin/awk - substituteInPlace $f --replace catppt ${lib.getBin catdoc}/bin/catppt - substituteInPlace $f --replace djvused ${lib.getBin djvulibre}/bin/djvused - substituteInPlace $f --replace djvutxt ${lib.getBin djvulibre}/bin/djvutxt - substituteInPlace $f --replace egrep ${lib.getBin gnugrep}/bin/egrep - substituteInPlace $f --replace groff ${lib.getBin groff}/bin/groff - substituteInPlace $f --replace gunzip ${lib.getBin gzip}/bin/gunzip - substituteInPlace $f --replace iconv ${lib.getBin libiconv}/bin/iconv - substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx - substituteInPlace $f --replace pdftotext ${lib.getBin poppler_utils}/bin/pdftotext - substituteInPlace $f --replace pstotext ${lib.getBin ghostscript}/bin/ps2ascii - substituteInPlace $f --replace sed ${lib.getBin gnused}/bin/sed - substituteInPlace $f --replace tar ${lib.getBin gnutar}/bin/tar - substituteInPlace $f --replace unzip ${lib.getBin unzip}/bin/unzip - substituteInPlace $f --replace xls2csv ${lib.getBin catdoc}/bin/xls2csv - substituteInPlace $f --replace xsltproc ${lib.getBin libxslt}/bin/xsltproc - substituteInPlace $f --replace unrtf ${lib.getBin unrtf}/bin/unrtf - substituteInPlace $f --replace untex ${lib.getBin untex}/bin/untex - substituteInPlace $f --replace wpd2html ${lib.getBin libwpd}/bin/wpd2html + substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"' + substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"' + substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"' + substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"' + substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"' + substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"' + substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"' + substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"' + substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"' + substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"' + substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"' + substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"' + substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"' + substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"' + substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"' + substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"' + substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"' + substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"' + substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"' substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl done + '' + stdenv.lib.optionalString stdenv.isLinux '' + substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx ''; enableParallelBuilding = true;