From 42236cccf4c8ac05e74ce57022bd24f59adfc597 Mon Sep 17 00:00:00 2001 From: Eric Drechsel Date: Sun, 27 Feb 2022 17:37:02 -0800 Subject: [PATCH 01/55] wtype: 0.3 -> 0.4 Importantly, this fixes xwayland support which was a major gotcha --- pkgs/tools/wayland/wtype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wtype/default.nix b/pkgs/tools/wayland/wtype/default.nix index 3476f3abcdaa..452f51a04de9 100644 --- a/pkgs/tools/wayland/wtype/default.nix +++ b/pkgs/tools/wayland/wtype/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wtype"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "atx"; repo = "wtype"; rev = "v${version}"; - hash = "sha256-8q2PxI3ItR4tsP/KOiSlqnuK4ZSe7OdekheolEFVmys="; + hash = "sha256-TfpzAi0mkXugQn70MISyNFOXIJpDwvgh3enGv0Xq8S4="; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; From c330b2ac0ab84b29f898d7e5f13e9fe039919a39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 03:33:48 +0000 Subject: [PATCH 02/55] coursier: 2.1.0-M1 -> 2.1.0-M5 --- pkgs/development/tools/coursier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index c7450f738a1e..5f2e919e22fd 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.1.0-M1"; + version = "2.1.0-M5"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-JeqWzAkSSqhdbgkse1uSA3k4bupepWuvx6GUtBfodcg="; + sha256 = "sha256-mp341H7bvf3Lwt66GKk3afoCtXuBnD97dYrZNx/jkYI="; }; nativeBuildInputs = [ makeWrapper ]; From d6af5366a5ea9c041ac637914c8df08f711c9888 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 17:18:16 +0000 Subject: [PATCH 03/55] seaweedfs: 2.90 -> 2.91 --- pkgs/applications/networking/seaweedfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 4b6ae464e7d9..257d6c526893 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.90"; + version = "2.91"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-PZe/yUJGcj3/nIYaf7eAbiJIA2YASJ8nlMLIWWKJrbo="; + sha256 = "sha256-lpr+Z4INDUrMUArR9yU/US/d7rhQ3AcTS3bh/suOe4M="; }; - vendorSha256 = "sha256-E6bMpWzXb5dMPXkrVSJJWXJYvkmI3cNRseMgrQNpCl4="; + vendorSha256 = "sha256-T8JUc8UqdgBADWfQL1oY0lrwOOKTmbBiI7rtNiDvlGo="; subPackages = [ "weed" ]; From 32c25e929866400c09d79a8cc92f6f4eb1b653fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 02:06:24 +0000 Subject: [PATCH 04/55] checkstyle: 9.3 -> 10.0 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 6c135beea458..e7697b753cd7 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "9.3"; + version = "10.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-Aq0zB+RgWafE+K9sX2H0d7xf2RDlavsUXEWQTJXSE6w="; + sha256 = "sha256-aFCWGgNH9vsFQnlt3WU1ywIT6jiVCsV9iiXy6E/QI90="; }; nativeBuildInputs = [ makeWrapper ]; From 12341ef5350a115d8899216d1ecb362c0ab9170d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 03:06:42 +0000 Subject: [PATCH 05/55] codeql: 2.8.1 -> 2.8.2 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index a6a95e74e4a1..abc2dc244746 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.8.1"; + version = "2.8.2"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-zZoK5x+nE8AVZWDSMmsVPFuXNnAHBPyu9+1GgSwN19c="; + sha256 = "sha256-F0tr4oQPgusLVCP5jSCYxl/xHbZLrVXd2FFYSJY3PPs="; }; nativeBuildInputs = [ From 1e6556547236cfcd7cf61f10f0f859637bd96c44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Mar 2022 16:41:49 +0000 Subject: [PATCH 06/55] step-ca: 0.18.1 -> 0.18.2 --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 97a42646312e..b650b93f411b 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-oebmJ+xrJTV5gXH3U1lWCSQMHiVnUTa0ZTp39sVB7KM="; + sha256 = "sha256-BhPup3q2muYGWzAa/9b4vnIjBces4GhUHZ/mg4CWMRc="; }; - vendorSha256 = "sha256-IJXJS+Z93Hw1I1CAeRv4mq8as9DKebqNFa0IMgZ+Kic="; + vendorSha256 = "sha256-oVaziWZGslZCVqkEXL32XvOVU54VOf41Qg+VoVWo7x0="; ldflags = [ "-buildid=" ]; From e073f65d682b04a1e2394dd333cf71dbe5235df5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 13:04:44 +0000 Subject: [PATCH 07/55] gitlab-pages: 1.51.0 -> 1.54.0 --- pkgs/servers/http/gitlab-pages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index a907de3e73fe..9a5f03e4c0b9 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.51.0"; + version = "1.54.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-TOHD3SEKz5aVG4ikqls4sYMa+FnP8YaCoVAl+HRG9Sc="; + sha256 = "sha256-XPIUDHDoxuRiWar2P6dzPWY7YRn1jDU69TL3ZmGx1AM="; }; - vendorSha256 = "sha256-0Vp+dVDMLl52dKLj1v+mgg+odu5DNfrANBzTztVymh8="; + vendorSha256 = "sha256-knW8IiuNGyirHCs8LR3VwWG4hxhWr9SmFzxjdbQ9l+k="; subPackages = [ "." ]; meta = with lib; { From a411ab1872e22cbde57d76c0897fff85e8cf3d7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 20:39:43 +0000 Subject: [PATCH 08/55] activemq: 5.16.4 -> 5.17.0 --- pkgs/development/libraries/apache-activemq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 9776e85b4350..c974c886cb69 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.4"; + version = "5.17.0"; src = fetchurl { - sha256 = "sha256-+OBNioEBQbOGpcnDlgtfAej+c0YfTJmxkeEV1JOEBwE="; + sha256 = "sha256-6war1/Re+tQvT1a2cf7n3/TMrDh+B2Wx0lbhm+pm+Jc="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; From 92b9d84350c7f94f58853ecd9c28c78a3d2a2e95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 14:19:25 +0000 Subject: [PATCH 09/55] haproxy: 2.5.4 -> 2.5.5 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 47b7a601d438..2c65634f0125 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-3EAV2Fx/74EbRZgDt2MAHYCbB6klHcGGT+25oHtErvs="; + sha256 = "sha256-BjxIRc2y128pLvRNnAEXqFPY0Qrl2WFbQGsUpNdP5Lk="; }; buildInputs = [ openssl zlib ] From cbebf2e15e132d1e5a01b6e6ae1362b0e7151d7b Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Apr 2022 07:37:35 +0400 Subject: [PATCH 10/55] mate-control-center: make desktop font setting working --- pkgs/desktops/mate/mate-control-center/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index e95f3696e288..58828aa52b9d 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib -, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3 +, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, glib , desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook , mateUpdateScript }: @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=( # WM keyboard shortcuts --prefix XDG_DATA_DIRS : "${mate.marco}/share" + # Desktop font, works only when passed after gtk3 schemas in the wrapper for some reason + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath mate.caja}" ) ''; From bf2b42a2c18d91687cd2c139df8a138abf002677 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Apr 2022 07:38:47 +0400 Subject: [PATCH 11/55] mate-panel: fix workspace switcher settings --- pkgs/desktops/mate/mate-panel/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 3a2f57a86270..77569e116642 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + preFixup = '' + gappsWrapperArgs+=( + # Workspace switcher settings, works only when passed after gtk3 schemas in the wrapper for some reason + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath mate.marco}" + ) + ''; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname version; }; From 7ca4bdd62e116781644a898fbb4ffbad8e19c08f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Apr 2022 07:44:43 +0400 Subject: [PATCH 12/55] mate-settings-daemon-wrapped: init --- pkgs/desktops/mate/default.nix | 2 ++ .../mate/mate-settings-daemon/wrapped.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/desktops/mate/mate-settings-daemon/wrapped.nix diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 2c5b45a653e5..b9ce82e345bf 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -42,6 +42,7 @@ let mate-sensors-applet = callPackage ./mate-sensors-applet { }; mate-session-manager = callPackage ./mate-session-manager { }; mate-settings-daemon = callPackage ./mate-settings-daemon { }; + mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { }; mate-screensaver = callPackage ./mate-screensaver { }; mate-system-monitor = callPackage ./mate-system-monitor { }; mate-terminal = callPackage ./mate-terminal { }; @@ -70,6 +71,7 @@ let mate-polkit mate-session-manager mate-settings-daemon + mate-settings-daemon-wrapped mate-themes ]; diff --git a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix new file mode 100644 index 000000000000..8fe7a4cf2b28 --- /dev/null +++ b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix @@ -0,0 +1,22 @@ +{ stdenv, mate, glib, wrapGAppsHook }: + +stdenv.mkDerivation { + pname = "${mate.mate-settings-daemon.pname}-wrapped"; + version = mate.mate-settings-daemon.version; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ glib mate.mate-control-center ]; + dontWrapGApps = true; + dontUnpack = true; + installPhase = '' + mkdir -p $out/etc/xdg/autostart + cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart + ''; + postFixup = '' + mkdir -p $out/libexec + makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \ + "''${gappsWrapperArgs[@]}" + substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \ + --replace "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon" + ''; + meta = mate.mate-settings-daemon.meta // { priority = -10; }; +} From 8b167e18173e8d652702736011bcc3e944ce1f3e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Apr 2022 07:49:18 +0400 Subject: [PATCH 13/55] caja-extensions: patch gsettings calls to find the schemas --- .../desktops/mate/caja-extensions/default.nix | 18 +- .../caja-extensions/hardcode-gsettings.patch | 169 ++++++++++++++++++ 2 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 4cec39774892..25563c5d5a88 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript +, glib, substituteAll }: stdenv.mkDerivation rec { pname = "caja-extensions"; @@ -23,7 +24,22 @@ stdenv.mkDerivation rec { imagemagick ]; + patches = [ + (substituteAll { + src = ./hardcode-gsettings.patch; + CAJA_GSETTINGS_PATH = glib.getSchemaPath mate.caja; + TERM_GSETTINGS_PATH = glib.getSchemaPath mate.mate-terminal; + }) + ]; + postPatch = '' + substituteInPlace open-terminal/caja-open-terminal.c --subst-var-by \ + GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} + substituteInPlace sendto/caja-sendto-command.c --subst-var-by \ + GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} + substituteInPlace wallpaper/caja-wallpaper-extension.c --subst-var-by \ + GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} + for f in image-converter/caja-image-{resizer,rotator}.c; do substituteInPlace $f --replace "/usr/bin/convert" "${imagemagick}/bin/convert" done diff --git a/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch b/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch new file mode 100644 index 000000000000..d4cf5a44d1f4 --- /dev/null +++ b/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch @@ -0,0 +1,169 @@ +diff --git a/open-terminal/caja-open-terminal.c b/open-terminal/caja-open-terminal.c +index e14a9bf..691afab 100644 +--- a/open-terminal/caja-open-terminal.c ++++ b/open-terminal/caja-open-terminal.c +@@ -135,8 +135,18 @@ desktop_opens_home_dir (void) + { + gboolean result; + GSettings* settings; +- +- settings = g_settings_new (COT_SCHEMA); ++ GSettingsSchemaSource* schema_source; ++ GSettingsSchema* schema; ++ ++ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ COT_SCHEMA, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + result = g_settings_get_boolean (settings, COT_DESKTOP_KEY); + g_object_unref (settings); + return result; +@@ -147,8 +157,18 @@ set_desktop_opens_home_dir (gboolean val) + { + gboolean result; + GSettings* settings; +- +- settings = g_settings_new (COT_SCHEMA); ++ GSettingsSchemaSource* schema_source; ++ GSettingsSchema* schema; ++ ++ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ COT_SCHEMA, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + result = g_settings_set_boolean (settings, COT_DESKTOP_KEY, val); + g_object_unref (settings); + return result; +@@ -159,8 +179,18 @@ desktop_is_home_dir (void) + { + gboolean result; + GSettings* settings; +- +- settings = g_settings_new (CAJA_SCHEMA); ++ GSettingsSchemaSource* schema_source; ++ GSettingsSchema* schema; ++ ++ schema_source = g_settings_schema_source_new_from_directory("@CAJA_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ CAJA_SCHEMA, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + result = g_settings_get_boolean (settings, CAJA_DESKTOP_KEY); + g_object_unref (settings); + return result; +@@ -171,8 +201,18 @@ default_terminal_application (void) + { + gchar *result; + GSettings* settings; +- +- settings = g_settings_new (TERM_SCHEMA); ++ GSettingsSchemaSource* schema_source; ++ GSettingsSchema* schema; ++ ++ schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ TERM_SCHEMA, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + result = g_settings_get_string (settings, TERM_EXEC_KEY); + g_object_unref (settings); + +@@ -189,8 +229,18 @@ set_default_terminal_application (const gchar* exec) + { + gboolean result; + GSettings* settings; +- +- settings = g_settings_new (TERM_SCHEMA); ++ GSettingsSchemaSource* schema_source; ++ GSettingsSchema* schema; ++ ++ schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ TERM_SCHEMA, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + result = g_settings_set_string (settings, TERM_EXEC_KEY, exec); + g_object_unref (settings); + return result; +diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c +index 8181db6..579dc81 100644 +--- a/sendto/caja-sendto-command.c ++++ b/sendto/caja-sendto-command.c +@@ -801,6 +801,8 @@ caja_sendto_init (void) + int main (int argc, char **argv) + { + GOptionContext *context; ++ GSettingsSchemaSource* schema_source; ++ GSettingsSchema* schema; + GError *error = NULL; + + #ifdef ENABLE_NLS +@@ -818,7 +820,15 @@ int main (int argc, char **argv) + return 1; + } + +- settings = g_settings_new ("org.mate.Caja.Sendto"); ++ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.mate.Caja.Sendto", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + caja_sendto_init (); + if (caja_sendto_plugin_init () == FALSE) { + GtkWidget *error_dialog; +diff --git a/wallpaper/caja-wallpaper-extension.c b/wallpaper/caja-wallpaper-extension.c +index 3119e9f..4f80c88 100644 +--- a/wallpaper/caja-wallpaper-extension.c ++++ b/wallpaper/caja-wallpaper-extension.c +@@ -47,6 +47,8 @@ set_wallpaper_callback (CajaMenuItem *item, + { + GList *files; + GSettings *settings; ++ GSettingsSchemaSource* schema_source; ++ GSettingsSchema* schema; + CajaFileInfo *file; + gchar *uri; + gchar *filename; +@@ -57,7 +59,15 @@ set_wallpaper_callback (CajaMenuItem *item, + uri = caja_file_info_get_uri (file); + filename = g_filename_from_uri(uri, NULL, NULL); + +- settings = g_settings_new (WP_SCHEMA); ++ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ WP_SCHEMA, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + + g_settings_set_string (settings, WP_FILE_KEY, filename); + From c520b5069358e0e18adf1b6645d53aad3c91b9da Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Apr 2022 07:53:29 +0400 Subject: [PATCH 14/55] nixos/mate: make the session work without display managers --- .../services/x11/desktop-managers/mate.nix | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index a7fda4be9796..996cfb8502f2 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -4,17 +4,6 @@ with lib; let - addToXDGDirs = p: '' - if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} - fi - - if [ -d "${p}/lib/girepository-1.0" ]; then - export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib - fi - ''; - xcfg = config.services.xserver; cfg = xcfg.desktopManager.mate; @@ -48,24 +37,8 @@ in pkgs.mate.mate-session-manager ]; - services.xserver.displayManager.sessionCommands = '' - if test "$XDG_CURRENT_DESKTOP" = "MATE"; then - export XDG_MENU_PREFIX=mate- - - # Let caja find extensions - export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0 - - # Let caja extensions find gsettings schemas - ${concatMapStrings (p: '' - if [ -d "${p}/lib/caja/extensions-2.0" ]; then - ${addToXDGDirs p} - fi - '') config.environment.systemPackages} - - # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive) - ${addToXDGDirs pkgs.mate.mate-control-center} - fi - ''; + # Let caja find extensions + environment.sessionVariables.CAJA_EXTENSION_DIRS = [ "${config.system.path}/lib/caja/extensions-2.0" ]; # Let mate-panel find applets environment.sessionVariables."MATE_PANEL_APPLETS_DIR" = "${config.system.path}/share/mate-panel/applets"; @@ -83,7 +56,6 @@ in pkgs.gtk3.out pkgs.shared-mime-info pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - pkgs.mate.mate-settings-daemon pkgs.yelp # for 'Contents' in 'Help' menus ]) config.environment.mate.excludePackages; From 4509a43f25150c1c32a5155bbc5c3227016b4ba0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 3 Apr 2022 06:56:47 +0300 Subject: [PATCH 15/55] udisks2: use autoreconfHook, enable strictDeps, add passthru --- pkgs/os-specific/linux/udisks/2-default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 427e19ac9215..2f644ff36923 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, libtool, pkg-config, gettext, gnused +{ lib, stdenv, fetchFromGitHub, substituteAll, pkg-config, gnused, autoreconfHook , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted -, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake +, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43 , xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g +, nixosTests }: stdenv.mkDerivation rec { @@ -41,8 +42,11 @@ stdenv.mkDerivation rec { }) ]; + strictDeps = true; + # pkg-config had to be in both to find gtk-doc and gobject-introspection + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ - autoconf automake pkg-config libtool gettext which gobject-introspection + autoreconfHook which gobject-introspection pkg-config gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; @@ -75,6 +79,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.vm = nixosTests.udisks2; + meta = with lib; { description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; homepage = "https://www.freedesktop.org/wiki/Software/udisks/"; From 172165a1ba85c14696b4ab9559f15c05e26277a2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 3 Apr 2022 06:57:44 +0300 Subject: [PATCH 16/55] udisk2: add sysconfdir flags, fixes changing options in gnome-disk-utility --- pkgs/os-specific/linux/udisks/2-default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 2f644ff36923..5aff6e969705 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc") + "--sysconfdir=/etc" "--localstatedir=/var" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udevdir=$(out)/lib/udev" @@ -75,6 +76,10 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + enableParallelBuilding = true; doCheck = true; From 4d49c7e6d8233c85770c40e4024491149366b3e5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 3 Apr 2022 09:22:08 +0300 Subject: [PATCH 17/55] nixos/udisks2: add freeform settings --- nixos/modules/services/hardware/udisks2.nix | 39 +++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index 6be23f39754e..ea552ce867e8 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -4,6 +4,13 @@ with lib; +let + settingsFormat = pkgs.formats.ini { + listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {}); + }; + configFiles = mapAttrs (name: value: (settingsFormat.generate name value)) (mapAttrs' (name: value: nameValuePair name value ) config.services.udisks2.settings); +in + { ###### interface @@ -21,6 +28,36 @@ with lib; ''; }; + settings = mkOption rec { + type = types.attrsOf settingsFormat.type; + apply = recursiveUpdate default; + default = { + "udisks2.conf" = { + udisks2 = { + modules = [ "*" ]; + modules_load_preference = "ondemand"; + }; + defaults = { + encryption = "luks2"; + }; + }; + }; + example = literalExpression '' + { + "WDC-WD10EZEX-60M2NA0-WD-WCC3F3SJ0698.conf" = { + ATA = { + StandbyTimeout = 50; + }; + }; + }; + ''; + description = '' + Options passed to udisksd. + See here and + drive configuration in here for supported options. + ''; + }; + }; }; @@ -32,6 +69,8 @@ with lib; environment.systemPackages = [ pkgs.udisks2 ]; + environment.etc = mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles; + security.polkit.enable = true; services.dbus.packages = [ pkgs.udisks2 ]; From 7abc40e37a1213121430a5ef8aa8e6ae61e8f9c4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 6 Apr 2022 00:44:19 +0200 Subject: [PATCH 18/55] rakudo: 2022.02 -> 2022.03 --- pkgs/development/interpreters/rakudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 9de6c1b12398..fd8fbd42caeb 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2022.02"; + version = "2022.03"; src = fetchurl { url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "sha256-am6dvMbZoWEKNMbsZ+LT9pTXsz6eCg8iRUMIn6f3EzI="; + sha256 = "sha256-A+IVsAGoeXR2GNb8GOt/icC4EvXlQ6Q+1mwTQ56ooic="; }; nativeBuildInputs = [ removeReferencesTo ]; From 38b516e1448f8c3e18c1c5d07389ec44d2a5beae Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 6 Apr 2022 00:44:41 +0200 Subject: [PATCH 19/55] moarvm: 2022.02 -> 2022.03 --- pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 41462e67a4c9..6ecc3ad60536 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2022.02"; + version = "2022.03"; src = fetchurl { url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "sha256-T5PNzmuKVloyKCuzjMlxzv63H10CLIUMM47oFFV07pY="; + sha256 = "sha256-+3HNE5EkZEgrmbM/DAbp/XxRoVHG5jKpIgz5PFhV/a8="; }; postPatch = '' From db0a2f538e2ac85544b65fa8658437779f123361 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 6 Apr 2022 00:44:55 +0200 Subject: [PATCH 20/55] nqp: 2022.02 -> 2022.03 --- pkgs/development/interpreters/rakudo/nqp.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 57cdef94c02d..dbcb945f4c34 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,16 +2,26 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2022.02"; + version = "2022.03"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "sha256-JdPJl0XNhPQEmpvZzya7XcgXklq6r+ccm9tohBzbGLE="; + sha256 = "sha256-qV53iXDE0JwJHSqimcBQNiCM5LSw06evNzGYwSJYswY="; }; buildInputs = [ perl ]; configureScript = "${perl}/bin/perl ./Configure.pl"; + + # Fix for issue where nqp expects to find files from moarvm in the same output: + # https://github.com/Raku/nqp/commit/e6e069507de135cc71f77524455fc6b03b765b2f + # + preBuild = '' + share_dir="share/nqp/lib/MAST" + mkdir -p $out/$share_dir + ln -fs ${moarvm}/$share_dir/{Nodes,Ops}.nqp $out/$share_dir + ''; + configureFlags = [ "--backends=moar" "--with-moar=${moarvm}/bin/moar" From 457dbe93705bd314737a7e337a0a2dd6c2505ecd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 04:47:22 +0000 Subject: [PATCH 21/55] libqalculate: 4.1.0 -> 4.1.1 --- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 55132d155238..ddaa6ae3e1d4 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-P3mb5HEj9gHq2mABdIRxF6ZukrPd70sy0DRLT0qKDqk="; + sha256 = "sha256-y9GNf2xR3bZ8Pj99Y8qSBbK+hQEkg/+xOzUdyFI5HLw="; }; outputs = [ "out" "dev" "doc" ]; From 82040f52c9129f10f18e61e40b9521e311e34cf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 17:26:24 +0000 Subject: [PATCH 22/55] pdns-recursor: 4.6.1 -> 4.6.2 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 7b3b81ace277..d244b2920ba8 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1sqwasqxz4svn5rckrwr05gzk7qzdhzzzjr1l2l7xa44if8011bv"; + sha256 = "sha256-2mSYUHOf3XuvLfZFrMl3UszTkJc7VrjiUXHqew0lrSA="; }; nativeBuildInputs = [ pkg-config ]; From aefc117a59d13760e85063e8cffce5e0ae993c6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 23:16:02 +0000 Subject: [PATCH 23/55] python310Packages.gradient: 1.10.0 -> 1.11.0 --- pkgs/development/python-modules/gradient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 8daa95c53b86..fa70e62a6fd7 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.10.0"; + version = "1.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-wLdxU+PSREmTlX51scazmTC+U/mE95sSpfaUgHb8/Oc="; + hash = "sha256-IfScVoXFq6XPwUQdkcN87zOmuFY7kapbTkthxHqMAFU="; }; postPatch = '' From f34e646637cd4a1934fb097027f81543202d663c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 23:27:53 +0000 Subject: [PATCH 24/55] python310Packages.greeclimate: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/greeclimate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 531ead0f1945..a7a2c5594e56 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cmroche"; repo = "greeclimate"; - rev = "v${version}"; - hash = "sha256-KVrm99aP2Nq15pDa8zaYIvTTcl6JEYU+7IkcMayHRQw="; + rev = "refs/tags/v${version}"; + hash = "sha256-TFsuzw9twhoGrgOnTNSmYWqsUW4oqY+SGvrvPUT4tZY="; }; propagatedBuildInputs = [ From 445ad286a05f03e96ac7826e8d5f678bebe66407 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 23:51:25 +0000 Subject: [PATCH 25/55] python310Packages.hid: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/hid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix index ce6e1d58def3..5546b71fea0e 100644 --- a/pkgs/development/python-modules/hid/default.nix +++ b/pkgs/development/python-modules/hid/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hid"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9hsDgvN6M0vIuoYEvIS5SHXuT1lPu6+CssOz6CeIP8E="; + sha256 = "sha256-HpVOf3q5t8nfx421lQRpLBfbO3EklJK5drFSW5fbsOg="; }; propagatedBuildInputs = [ hidapi ]; From ec1fbd13615e0d0bde557961394285527a8b201a Mon Sep 17 00:00:00 2001 From: binsky Date: Sat, 9 Apr 2022 03:13:03 +0200 Subject: [PATCH 26/55] threema-desktop: 1.0.3 -> 1.2.0 --- .../instant-messengers/threema-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 30bfde7a96f1..0951f1d3d8e7 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.0.3"; + version = "1.2.0"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20211027194646/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "sha256-qiFv52nnyfHxCWTePmyxW/MgzFy3EUxmW6n+UIkw7tk="; + url = "https://web.archive.org/web/20220408213031if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "7c8e1e76ad82a0cf776eb8b0a683a41a00dc8752bb79a24b0ae9d795fdedcde6"; }; nativeBuildInputs = [ From 3bc830267e9f6dd7255958baed9a973d03c794ba Mon Sep 17 00:00:00 2001 From: Madoura Date: Sat, 9 Apr 2022 02:21:45 -0500 Subject: [PATCH 27/55] linux_testing_bcachefs: unstable-2022-03-21 -> unstable-2022-04-08 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index e86f6fced569..327da3e0f344 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2022-03-21" -, commit ? "c38b7167aa5f3b1b91dcc93ade57f30e95064590" -, diffHash ? "04lgwnng7p2rlz9sxn74n22750kh524xwfws3agqs12pcrvfsm0j" +, date ? "2022-04-08" +, commit ? "6ddf061e68560a2bb263b126af7e894a6c1afb5f" +, diffHash ? "1nkrr1cxavw0rqxlyiz7pf9igvqay0d5kk7194v9ph3fcp9rz5kc" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... From ba944d42b3174ef48438ffcf70b44b7df5cf5256 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sat, 9 Apr 2022 02:22:23 -0500 Subject: [PATCH 28/55] bcachefs-tools: unstable-2022-03-22 -> unstable-2022-04-08 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index e5325b1f9887..b94f1d83394b 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-03-22"; + version = "unstable-2022-04-08"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "f3cdace86c8b60a4efaced23b2d31c16dc610da9"; - sha256 = "1hg4cjrs4yr0mx3mmm1jls93w1skpq5wzp2dzx9rq4w5il2xmx19"; + rev = "986533d8d5b21c8eb512bbb3f0496d3d2a087c5d"; + sha256 = "1qvb5l937nnls5j82ipgrdh6q5fk923z752rzzqqcms6fz7rrjs4"; }; postPatch = '' From 7d691eadc377619481f6b3acdbcc7df91d2524b8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Apr 2022 08:13:28 +0000 Subject: [PATCH 29/55] ipxe: 1.21.1 -> unstable-2022-04-06 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit iPXE does not make stable releases[1]. The tag we were using was an anomoly[2], and is from 2020. The geniso script has been replaced with a generic genfsimg script that works differently. There are no longer variables we can set to tell it where to find isolinux.bin or ldlinux.c32, so we have to patch the script. It'll look in the same place for both files. The --preserve=mode modification doesn't seem to be necessary any more — when it was introduced in 4d7bea7e5ef ("ipxe: fix ISO build"), it was required to make a working ISO with an embedded script. But my ISO with an embedded script now works fine without that change. [1]: https://github.com/ipxe/ipxe/discussions/544 [2]: https://github.com/ipxe/ipxe/discussions/544#discussioncomment-1894506 --- pkgs/tools/misc/ipxe/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 76ce66e56864..601f2a57eea8 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, perl, cdrkit, xz, openssl, gnu-efi, mtools +{ stdenv, lib, fetchFromGitHub, unstableGitUpdater +, gnu-efi, mtools, openssl, perl, xorriso, xz , syslinux ? null , embedScript ? null , additionalTargets ? {} @@ -28,15 +29,15 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "1.21.1"; + version = "unstable-2022-04-06"; - nativeBuildInputs = [ perl cdrkit xz openssl gnu-efi mtools ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; + nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "v${version}"; - sha256 = "1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9"; + rev = "70995397e5bdfd3431e12971aa40630c7014785f"; + sha256 = "SrTNEYk13JXAcJuogm9fZ7CrzJIDRc0aziGdjRNv96I="; }; # not possible due to assembler code @@ -46,9 +47,6 @@ stdenv.mkDerivation rec { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. - ] ++ lib.optionals stdenv.hostPlatform.isx86 [ - "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" - "LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; @@ -62,8 +60,10 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure for opt in ${lib.escapeShellArgs enabledOptions}; do echo "#define $opt" >> src/config/general.h; done - sed -i '/cp \''${ISOLINUX_BIN}/s/$/ --no-preserve=mode/' src/util/geniso substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo + '' + lib.optionalString stdenv.hostPlatform.isx86 '' + substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux + '' + '' runHook postConfigure ''; @@ -89,6 +89,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = unstableGitUpdater {}; + meta = with lib; { description = "Network boot firmware"; homepage = "https://ipxe.org/"; From 5dadb0d98b87d903f9c4eecd0b37a34e6c00561e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 9 Apr 2022 11:18:30 +0200 Subject: [PATCH 30/55] wstunnel: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6c9f7499ce33..22bfcf0c8517 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2593,4 +2593,11 @@ self: super: { aeson = self.aeson_1_5_6_0; }); + # Support network >= 3.1.2 + # https://github.com/erebe/wstunnel/pull/107 + wstunnel = appendPatch (fetchpatch { + url = "https://github.com/erebe/wstunnel/pull/107/commits/47c1f62bdec1dbe77088d9e3ceb6d872f922ce34.patch"; + sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0="; + }) super.wstunnel; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 31a401ac8cc3..7e21b7e07621 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5595,7 +5595,6 @@ broken-packages: - wsdl - wsedit - wsjtx-udp - - wstunnel - wtk - wumpus-core - wxdirect diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bdd8a6e71ade..ecdae328277c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -233,6 +233,8 @@ package-maintainers: - total - turtle - typed-spreadsheet + gebner: + - wstunnel gridaphobe: - located-base jb55: From 56f79db0ba428f392c60a702ec07279fc3454958 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 9 Apr 2022 09:34:26 +0000 Subject: [PATCH 31/55] scmpuff: 0.3.0 -> 0.5.0 --- .../git-and-tools/scmpuff/default.nix | 22 +- .../git-and-tools/scmpuff/deps.nix | 273 ------------------ 2 files changed, 14 insertions(+), 281 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/scmpuff/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix index 1e65834f5193..9b16b07551c1 100644 --- a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -1,17 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testVersion, scmpuff }: -buildGoPackage rec { +buildGoModule rec { pname = "scmpuff"; - version = "0.3.0"; - goPackagePath = "github.com/mroth/scmpuff"; - - goDeps = ./deps.nix; + version = "0.5.0"; src = fetchFromGitHub { owner = "mroth"; repo = pname; - rev = "56dc2041f2c45ab15d41e63058c1c44fff905e81"; - sha256 = "0zrzzcs0i13pfwcqh8qb0sji54vh37rdr7qasg57y56cqpx16vl3"; + rev = "v${version}"; + sha256 = "sha256-+L0W+M8sZdUSCWj9Ftft1gkRRfWMHdxon2xNnotx8Xs="; + }; + + vendorSha256 = "sha256-7WHVSEz3y1nxWfbxkzkfHhINLC8+snmWknHyUUpNy7c="; + + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; + + passthru.tests.version = testVersion { + package = scmpuff; + command = "scmpuff version"; }; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/deps.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/deps.nix deleted file mode 100644 index da9052f9bb7b..000000000000 --- a/pkgs/applications/version-management/git-and-tools/scmpuff/deps.nix +++ /dev/null @@ -1,273 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "v2.0.0"; - sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.10"; - sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.4"; - sha256 = "1k7dq78fjz94lzifsprkmiv93swwzwcbg1vd64v20wvnga8v254b"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.3.2"; - sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a5c9d58dba9a"; - sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] From bc45ba1038748effb1862645077fc3ab6be3b4db Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 9 Apr 2022 12:12:04 +0200 Subject: [PATCH 32/55] foliate: Minor cleanup --- pkgs/applications/office/foliate/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix index 7eff0ac90976..a2d0d73f7903 100644 --- a/pkgs/applications/office/foliate/default.nix +++ b/pkgs/applications/office/foliate/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { ''; postFixup = '' - echo "fixing wrapper" sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.github.johnfactotum.Foliate';" $out/bin/.com.github.johnfactotum.Foliate-wrapped ln -s $out/bin/com.github.johnfactotum.Foliate $out/bin/foliate ''; From df0feb7a1fa9170fe509bd3758e33c5ca333e13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 9 Apr 2022 08:33:08 -0300 Subject: [PATCH 33/55] elementary-xfce-icon-theme: transfer maintainership to xfce team --- pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index ab1b6824f6d1..f43206db5f37 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; # darwin cannot deal with file names differing only in case platforms = platforms.linux; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } From d0fb4235c4312f31a770f200be15fd56dda92693 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Apr 2022 13:55:15 +0200 Subject: [PATCH 34/55] xgboost: fix eval without aliases See https://github.com/NixOS/nixpkgs/pull/167016#issuecomment-1093953843 --- pkgs/development/libraries/xgboost/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 6186661a12c2..7d50d2b53b1d 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -6,9 +6,8 @@ , gtest , doCheck ? true , cudaSupport ? config.cudaSupport or false -, cudatoolkit , ncclSupport ? false -, nccl +, cudaPackages , llvmPackages }: @@ -28,12 +27,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; - buildInputs = [ gtest ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional ncclSupport nccl; + buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ++ lib.optional ncclSupport cudaPackages.nccl; cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] - ++ lib.optionals (cudaSupport && lib.versionAtLeast cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ] + ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ] + ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ] ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]; inherit doCheck; From 5e868ecb7fbc77859afcc6eea4de3d0ba4a679d6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 9 Apr 2022 11:20:35 +0200 Subject: [PATCH 35/55] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 86637a302b07..1d3b1f488740 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -295744,8 +295744,7 @@ self: { ]; description = "Tunneling program over websocket protocol"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ gebner ]; }) {}; "wtk" = callPackage From 38f3573664a46300a60b60c39b456637e6104b60 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 9 Apr 2022 13:14:17 +0100 Subject: [PATCH 36/55] credhub-cli: 2.9.1 -> 2.9.3 --- pkgs/tools/admin/credhub-cli/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 844b65e0f6c3..841e63cae4ca 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,23 +2,15 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.1"; + version = "2.9.3"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-2+KOf6VQ1jTXfFE+Ptd3iiOEhvENU0XUclQ+e85DpUo="; + sha256 = "1wjj14gx2phpbxs1433k3jkkc0isx5mzbm62rpvxbfd8a7f6n1l5"; }; - patches = [ - # Fix test with Go 1.15 - (fetchpatch { - url = "https://github.com/cloudfoundry-incubator/credhub-cli/commit/4bd1accd513dc5e163e155c4b428878ca0bcedbc.patch"; - sha256 = "180n3q3d19aw02q7xsn7dxck18jgndz5garj2mb056cwa7mmhw0j"; - }) - ]; - # these tests require network access that we're not going to give them postPatch = '' rm commands/api_test.go From 0e46be9abb0b909b18434ea026030f11b242b118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 20:48:31 +0000 Subject: [PATCH 37/55] openethereum: 3.2.6 -> 3.3.5 --- pkgs/applications/blockchains/openethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 79ab37c7adb5..e9f5374f6ee4 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.2.6"; + version = "3.3.5"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "0lxps3cyg8dzb9qr1kg91s9jc3mnm6hxybwcbhva38pcq4yc40xc"; + sha256 = "sha256-PpRRoufuZ9fXbLonMAo6qaA/jtJZXW98uM0BEXdJ2oU="; }; - cargoSha256 = "08yrpls3szmw6vy2c4d6b1k907ga0809ylvyx0zb6f8mp8z7ahl2"; + cargoSha256 = "sha256-xXUNXQvVq6XqW/hmCfJ2/mHKkZu0amRZ77vX+Jib0iM="; nativeBuildInputs = [ cmake pkg-config ]; From 3681f292a07907f397f17cc8d2e765debfdc4922 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 13:32:23 +0000 Subject: [PATCH 38/55] python310Packages.whodap: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/whodap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index d4f6913105f2..60affb0cd5c6 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.4"; + version = "0.1.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pogzyb"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-L8fSf9AhmWbRvLKvf0aowKoal+5dG1SJXcA7Ssrhj6o="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Jm3+WMGuYc910TNDVzHjYcbNcts668D3xYORXxozWqA="; }; propagatedBuildInputs = [ From b20a1c34c2c387d9eee230be3341db7993131c23 Mon Sep 17 00:00:00 2001 From: Jennifer Graul Date: Sun, 3 Apr 2022 08:09:43 +0200 Subject: [PATCH 39/55] nixos/pam: fix pam_mount called multiple times fixes automatic unmounting with pam_mount by preventing it to be called multiple times at login --- nixos/modules/security/pam.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index c0ef8b5f30bd..141e1ee9c2c8 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -594,6 +594,7 @@ let session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so '' + optionalString cfg.pamMount '' + session [success=1 default=ignore] ${pkgs.pam}/lib/security/pam_succeed_if.so service = systemd-user quiet session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive '' + optionalString use_ldap '' From 3a8da578a7dd4a19b31303915ca831191d0f1511 Mon Sep 17 00:00:00 2001 From: Jennifer Graul Date: Sun, 3 Apr 2022 08:10:37 +0200 Subject: [PATCH 40/55] nixos/pam_mount: add more config options --- nixos/modules/security/pam_mount.nix | 84 ++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 6 deletions(-) diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index 462b7f89e2f4..1d0efee8ca8e 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -5,6 +5,14 @@ with lib; let cfg = config.security.pam.mount; + oflRequired = cfg.logoutHup || cfg.logoutTerm || cfg.logoutKill; + + fake_ofl = pkgs.writeShellScriptBin "fake_ofl" '' + SIGNAL=$1 + MNTPT=$2 + ${pkgs.lsof}/bin/lsof | ${pkgs.gnugrep}/bin/grep $MNTPT | ${pkgs.gawk}/bin/awk '{print $2}' | ${pkgs.findutils}/bin/xargs ${pkgs.util-linux}/bin/kill -$SIGNAL + ''; + anyPamMount = any (attrByPath ["pamMount"] false) (attrValues config.security.pam.services); in @@ -51,6 +59,71 @@ in You can define volume-specific options in the volume definitions. ''; }; + + debugLevel = mkOption { + type = types.int; + default = 0; + example = 1; + description = '' + Sets the Debug-Level. 0 disables debugging, 1 enables pam_mount tracing, + and 2 additionally enables tracing in mount.crypt. The default is 0. + For more information, visit . + ''; + }; + + logoutWait = mkOption { + type = types.int; + default = 0; + description = '' + Amount of microseconds to wait until killing remaining processes after + final logout. + For more information, visit . + ''; + }; + + logoutHup = mkOption { + type = types.bool; + default = false; + description = '' + Kill remaining processes after logout by sending a SIGHUP. + ''; + }; + + logoutTerm = mkOption { + type = types.bool; + default = false; + description = '' + Kill remaining processes after logout by sending a SIGTERM. + ''; + }; + + logoutKill = mkOption { + type = types.bool; + default = false; + description = '' + Kill remaining processes after logout by sending a SIGKILL. + ''; + }; + + createMountPoints = mkOption { + type = types.bool; + default = true; + description = '' + Create mountpoints for volumes if they do not exist. + ''; + }; + + removeCreatedMountPoints = mkOption { + type = types.bool; + default = true; + description = '' + Remove mountpoints created by pam_mount after logout. This + only affects mountpoints that have been created by pam_mount + in the same session. + ''; + }; }; }; @@ -77,21 +150,20 @@ in - - + - + ${makeBinPath ([ pkgs.util-linux ] ++ cfg.additionalSearchPaths)} - - + ${pkgs.fuse}/bin/mount.fuse %(VOLUME) %(MNTPT) -o ${concatStringsSep "," (cfg.fuseMountOptions ++ [ "%(OPTIONS)" ])} + ${pkgs.fuse}/bin/fusermount -u %(MNTPT) ${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT) ${pkgs.pam_mount}/bin/umount.crypt %(MNTPT) ${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION) - + ${optionalString oflRequired "${fake_ofl}/bin/fake_ofl %(SIGNAL) %(MNTPT)"} ${concatStrings (map userVolumeEntry (attrValues extraUserVolumes))} ${concatStringsSep "\n" cfg.extraVolumes} From d90962e7ed929b1231cb4709ab81f76f200d1cb4 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sat, 9 Apr 2022 15:33:43 +0200 Subject: [PATCH 41/55] croc: 9.5.2 -> 9.5.3 https://github.com/schollz/croc/releases/tag/v9.5.3 Re-enable passthru.tests.local-relay as it works fine with the latest croc release. --- pkgs/tools/networking/croc/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index fa55c6e94ef4..46b91fdf84c2 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,25 +2,22 @@ buildGoModule rec { pname = "croc"; - version = "9.5.2"; + version = "9.5.3"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ha84frbyRDxCRIDezlKeA+Fv9+rmpCoU+EAgMBkf3fo="; + sha256 = "sha256-yBXW9jrE9VUEu0EoBCtctTkQo129Vo+zFgP0Hkmm5hQ="; }; - vendorSha256 = "sha256-uaSDder/uzy708YE1xqpL9Te4629JD2IiVSCYhYzPwg="; - - doCheck = false; + vendorSha256 = "sha256-nRZbSkSix2knIQBEMPx5oC47VKXNZ2e1NgKt9mAhaPQ="; subPackages = [ "." ]; passthru = { tests = { - # test fails - #local-relay = callPackage ./test-local-relay.nix { }; + local-relay = callPackage ./test-local-relay.nix { }; }; }; meta = with lib; { From 23f619dca7bcde1e827f632f46e77e58abca2d0a Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sat, 9 Apr 2022 15:37:31 +0200 Subject: [PATCH 42/55] routinator: 0.11.0 -> 0.11.1 --- pkgs/servers/routinator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 2e5bd017216a..e11fb3272f9b 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GKn8JRgYXLkm5gX5Tv6lMdS7oFan2TF7dLqWK+nEeYg="; + sha256 = "sha256-8rILHWxUrQQx/ZpZQECa3JBCGD+a5Po8jdqb/rTx6WA="; }; - cargoSha256 = "sha256-r3Np9aAJRZUj0TezZhT5cJJkm8EBjV9yQpplcrNgzmU="; + cargoSha256 = "sha256-TYVpi4ZyM0Nl2RWRMEwLM+TeAEzk1IUCQTXZLG92vt4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 16998f568b4bbf3706cede067dc3d86441fe4d4f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 9 Apr 2022 15:00:54 +0800 Subject: [PATCH 43/55] crystal-builder: support the new crystal2nix format --- pkgs/development/compilers/crystal/build-package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 1bdc8989cf1d..ce8f0c32537b 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -6,6 +6,7 @@ , pkg-config , which , linkFarm +, fetchgit , fetchFromGitHub , installShellFiles , removeReferencesTo @@ -39,7 +40,10 @@ let crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { inherit name; - path = fetchFromGitHub value; + path = + if (builtins.hasAttr "url" value) + then fetchgit value + else fetchFromGitHub value; }) (import shardsFile)); From 75ffac013cf34a7ccb34a003390f20cce24bd1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= Date: Mon, 4 Apr 2022 09:38:25 +0200 Subject: [PATCH 44/55] maintainers: fix `loicreynier` --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b9faf227859a..2d83c04a0927 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7306,7 +7306,7 @@ name = "Anthony Lodi"; }; loicreynier = { - email = "loic@loireynier.fr"; + email = "loic@loicreynier.fr"; github = "loicreynier"; githubId = 88983487; name = "Loïc Reynier"; From 36d4734b641de3c62c207b93ceb520d29e43365a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= Date: Wed, 6 Apr 2022 15:38:43 +0200 Subject: [PATCH 45/55] toipe: init at 0.3.1 --- pkgs/applications/misc/toipe/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/misc/toipe/default.nix diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/applications/misc/toipe/default.nix new file mode 100644 index 000000000000..e9cd39162caf --- /dev/null +++ b/pkgs/applications/misc/toipe/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "toipe"; + version = "0.3.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-/vO5ABMldw3soh7mscjhN5TAZOcs+iMTaMxcdMmV0Xo="; + }; + + cargoSha256 = "sha256-AsRQ8kvDy1cH4/kaFAoU7en3dzDiG1T+O+4r6PKa0hM="; + + meta = with lib; { + description = "Trusty terminal typing tester"; + homepage = "https://github.com/Samyak2/toipe"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier samyak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caba6f8e7e8b..07f167514fd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29545,6 +29545,8 @@ with pkgs; toot = callPackage ../applications/misc/toot { }; + toipe = callPackage ../applications/misc/toipe { }; + tootle = callPackage ../applications/misc/tootle { }; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; From 3d94275c1555d429503421d518bc3d1c429f5516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= Date: Wed, 6 Apr 2022 15:39:02 +0200 Subject: [PATCH 46/55] maintainers: add `samyak` --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2d83c04a0927..9f5f18ca6a52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11046,6 +11046,16 @@ githubId = 107703; name = "Samuel Rivas"; }; + samyak = { + name = "Samyak Sarnayak"; + email = "samyak201@gmail.com"; + github = "Samyak2"; + githubId = 34161949; + keys = [{ + longkeyid = "rsa4096/0x365873F2F0C6153B"; + fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; + }]; + }; sander = { email = "s.vanderburg@tudelft.nl"; github = "svanderburg"; From 6a441683a0556f29fc416413b41aab88a3226a62 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 8 Apr 2022 18:57:24 -0400 Subject: [PATCH 47/55] mastodon: 3.5.0 -> 3.5.1 Co-authored-by: Kerstin Humm --- pkgs/servers/mastodon/default.nix | 11 +--- pkgs/servers/mastodon/gemset.nix | 93 ++++++++++++++++++++----------- pkgs/servers/mastodon/source.nix | 4 +- pkgs/servers/mastodon/version.nix | 2 +- 4 files changed, 66 insertions(+), 44 deletions(-) diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 84010a090368..f43747e185a7 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript , fetchYarnDeps, fixup_yarn_lock -, fetchpatch # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -19,17 +18,9 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-Ngfs15YKLfSBOKju3BzpZFnenB370jId2G1g9Qy1y5w="; + sha256 = "sha256-Swe7AH/j1+N1T20xaQ+U0Ajtoe9BGzsghAjN1QakOp8="; }; - patches = [ - # Fix indexing statuses in ElasticSearch - (fetchpatch { - url = "https://github.com/mastodon/mastodon/commit/ef196c913c77338be5ebb1e02af2f6225f857080.patch"; - sha256 = "sha256-uw8m6j4BzMQtev0LNLeIHW0xOJEmj3JikT/6gVfmvzs="; - }) - ]; - mastodon-gems = bundlerEnv { name = "${pname}-gems-${version}"; inherit version; diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 544e3b90412f..0b841c325db0 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -320,6 +320,17 @@ }; version = "2.9.1"; }; + better_html = { + dependencies = ["actionview" "activesupport" "ast" "erubi" "html_tokenizer" "parser" "smart_properties"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sssv94gg7bnxiqn5pbbpf8rdnmw3iyj2qwn2pbgxxs8xmmq158b"; + type = "gem"; + }; + version = "1.0.16"; + }; bindata = { groups = ["default"]; platforms = []; @@ -873,10 +884,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zmak7fgis1nk9j157g2rjzxrw9prr3jzlxap9vix3xm0gkihr53"; + sha256 = "0rgbmk044akxa84z9vdl8lkmd9z4xy3na1w0vh12pz02drxd93j9"; type = "gem"; }; - version = "2.27.0"; + version = "2.28.0"; }; faker = { dependencies = ["i18n"]; @@ -1113,10 +1124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rw99k86csafsgv4w7v7wzid5kvlk43nfyww1d3ss00mhjdhw619"; + sha256 = "1nxak6q0m0nd3m5a7vp9xqww9w5fqx97viv5g6pg3q62q9binm0j"; type = "gem"; }; - version = "0.5.0"; + version = "0.9.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1166,10 +1177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; type = "gem"; }; - version = "4.1.0"; + version = "5.0.0"; }; highline = { groups = ["default" "development" "test"]; @@ -1201,6 +1212,16 @@ }; version = "0.3.0"; }; + html_tokenizer = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dq6685sdzdn53mkzags6mvx3l0afcx6xma664zij6y3dxj2a7p8"; + type = "gem"; + }; + version = "0.0.7"; + }; htmlentities = { groups = ["default"]; platforms = []; @@ -1286,15 +1307,15 @@ version = "1.10.0"; }; i18n-tasks = { - dependencies = ["activesupport" "ast" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; + dependencies = ["activesupport" "ast" "better_html" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0baaaljm7nq5z9xrhdsw1nnzvj494wi4zzbv5s89gm0rwpxfg1g2"; + sha256 = "1f3pgfjk4xmyjhqqq8dpx3vbxbq1d9bwlh3d7957vnkpdwk432n0"; type = "gem"; }; - version = "0.9.37"; + version = "1.0.8"; }; idn-ruby = { groups = ["default"]; @@ -1513,10 +1534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac"; + sha256 = "15pjm9pa5m3mbv9xvfgfr16q4jyaznsg8y63jz9x4jqr8npw0vx3"; type = "gem"; }; - version = "0.11.2"; + version = "0.12.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1524,10 +1545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.15.0"; + version = "2.16.0"; }; mail = { dependencies = ["mini_mime"]; @@ -1817,10 +1838,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqhgvq006h6crbp8lffw66ll46zf319c2637g4sybdclglismma"; + sha256 = "0w474bz3s1hqhilvrddr33l2nkyikypaczp3808w0345jr88b5m7"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; openssl = { groups = ["default"]; @@ -1857,10 +1878,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15744bhmvw021a14gdks6k91gad6d1kgj2mc1zywpl0x9r3d85f2"; + sha256 = "054xq22rwj26jag43s5fb4vb4x2252dz6rvgjn42id8ycs51my2w"; type = "gem"; }; - version = "2.14.10"; + version = "2.14.11"; }; parallel = { groups = ["default" "development"]; @@ -1909,10 +1930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb"; + sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; pghero = { dependencies = ["activerecord"]; @@ -2026,10 +2047,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; + sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; type = "gem"; }; - version = "5.6.2"; + version = "5.6.4"; }; pundit = { dependencies = ["activesupport"]; @@ -2100,10 +2121,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k"; + sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; rack-proxy = { dependencies = ["rack"]; @@ -2283,10 +2304,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; responders = { dependencies = ["actionpack" "railties"]; @@ -2593,10 +2614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fgk2a66yn7v2011j8zk2z9mwgzmb52gjrkd5wb5xbpxwm8qfjqy"; + sha256 = "1b2dcw604mmjh4ncfwsidzbzqaa3fbngqidhvhsjv6ladpzsrb8y"; type = "gem"; }; - version = "7.1.15"; + version = "7.1.16"; }; simple-navigation = { dependencies = ["activesupport"]; @@ -2651,6 +2672,16 @@ }; version = "0.1.2"; }; + smart_properties = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jrqssk9qhwrpq41arm712226vpcr458xv6xaqbk8cp94a0kycpr"; + type = "gem"; + }; + version = "1.17.0"; + }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; groups = ["default"]; @@ -2731,10 +2762,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c5cdpykx2h4jx8q01hjhv8f0plw5r9iqm2i1m0ijiyk7dqm824w"; + sha256 = "12b3q2sw42nnilfb51nlqdv07f31vdv2j595kd99asnkw4cjlf5w"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; temple = { groups = ["default"]; @@ -2986,10 +3017,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m0jh8k7c0ifh2jhbn7ihqrmn5fi754wflva97zgy70hpdvxyjar"; + sha256 = "18jj50b44a471ig7hw1ax90wxaaz40acmrf6cm7m2iyshlffy53q"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 5581742ebe1e..aa915395e31d 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/mastodon/mastodon.git"; - rev = "v3.5.0"; - sha256 = "1181zqz7928b6mnp4p502gy2rrwxyv5ysgfydx0n04y8wiq00g48"; + rev = "v3.5.1"; + sha256 = "0n6ml245jdc2inzw7jwhxbqlfkp5bs61kslyy71ww6a29ndd6hv0"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index 90b75fe4fd16..7714a397576a 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.5.0" +"3.5.1" From 15313692cdad6fc066bfa4c441ada9bb9b10804a Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 9 Apr 2022 02:05:44 +0200 Subject: [PATCH 48/55] mastodon.updateScript: use correct input for nix-prefetch-git, better formatting --- pkgs/servers/mastodon/update.nix | 4 +-- pkgs/servers/mastodon/update.sh | 44 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/servers/mastodon/update.nix b/pkgs/servers/mastodon/update.nix index 2e7df482530f..1bd557a74a5b 100644 --- a/pkgs/servers/mastodon/update.nix +++ b/pkgs/servers/mastodon/update.nix @@ -6,12 +6,12 @@ , bundix , coreutils , diffutils -, nix-prefetch-github +, nix-prefetch-git , gnused , jq }: let - binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; + binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-git gnused jq ]; in runCommand "mastodon-update-script" { diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index 77071be6ea90..3a0686a72158 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -9,29 +9,29 @@ while [[ $# -gt 0 ]]; do case $key in --url) - URL="$2" - shift # past argument - shift # past value - ;; + URL="$2" + shift # past argument + shift # past value + ;; --ver) - VERSION="$2" - shift # past argument - shift # past value - ;; - --rev) - REVISION="$2" - shift # past argument - shift # past value - ;; - --patches) - PATCHES="$2" - shift # past argument - shift # past value - ;; - *) # unknown option - POSITIONAL+=("$1") - shift # past argument - ;; + VERSION="$2" + shift # past argument + shift # past value + ;; + --rev) + REVISION="$2" + shift # past argument + shift # past value + ;; + --patches) + PATCHES="$2" + shift # past argument + shift # past value + ;; + *) # unknown option + POSITIONAL+=("$1") + shift # past argument + ;; esac done From 71e504ff21517889f334ffd3f027c2388a3ad44c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 9 Apr 2022 22:37:23 +0800 Subject: [PATCH 49/55] scmpuff: remove unnecessary `platforms` See #153464, for buildGoModule this should only be set if the package doesn't work with the default platforms. --- .../version-management/git-and-tools/scmpuff/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix index 9b16b07551c1..3396718edbc2 100644 --- a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -25,6 +25,5 @@ buildGoModule rec { homepage = "https://github.com/mroth/scmpuff"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; - platforms = concatLists (with platforms; [ linux darwin windows ]); }; } From ce56f53d3272901bb96972239bc254df5b56c703 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sat, 6 Mar 2021 13:46:43 +0100 Subject: [PATCH 50/55] nethoscope: init at 0.1.1 --- pkgs/tools/networking/nethoscope/default.nix | 59 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/tools/networking/nethoscope/default.nix diff --git a/pkgs/tools/networking/nethoscope/default.nix b/pkgs/tools/networking/nethoscope/default.nix new file mode 100644 index 000000000000..276579f361fc --- /dev/null +++ b/pkgs/tools/networking/nethoscope/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, alsa-lib +, libpcap +, expect +}: + +rustPlatform.buildRustPackage rec { + pname = "nethoscope"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "vvilhonen"; + repo = "nethoscope"; + rev = "v${version}"; + sha256 = "0dsv1f0ncwji8x7q1ix62955qji4jijgjx6xg3hxvl0vvvwqxcdz"; + }; + + cargoSha256 = "0cl0i4m8fxyxfib95x90x6qr284y41wwgwqhflyfa7d3r6qwq8nk"; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + alsa-lib + libpcap + ]; + + LD_LIBRARY_PATH = lib.makeLibraryPath [ + libpcap + alsa-lib + ]; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$(${expect}/bin/unbuffer "$out/bin/${pname}" --help 2> /dev/null | strings | grep ${version} | tr -d '\n')" == " ${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + + meta = with lib; { + description = "Listen to your network traffic"; + longDescription = '' + Employ your built-in wetware pattern recognition and + signal processing facilities to understand your network traffic. + ''; + homepage = "https://github.com/vvilhonen/nethoscope"; + license = licenses.isc; + maintainers = with maintainers; [ _0x4A6F ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caba6f8e7e8b..4b9cf8441e13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8214,6 +8214,8 @@ with pkgs; nethogs = callPackage ../tools/networking/nethogs { }; + nethoscope = callPackage ../tools/networking/nethoscope { }; + netkittftp = callPackage ../tools/networking/netkit/tftp { }; netlify-cli = callPackage ../development/web/netlify-cli { }; From c57232d31cccfee6444bdd9dcddad95f816f85f2 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sun, 7 Mar 2021 11:38:12 +0100 Subject: [PATCH 51/55] programs/nethoscope: add security.wrapper --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/nethoscope.nix | 30 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nixos/modules/programs/nethoscope.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c11497e46f10..329c8685c36d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -185,6 +185,7 @@ ./programs/nbd.nix ./programs/nix-ld.nix ./programs/neovim.nix + ./programs/nethoscope.nix ./programs/nm-applet.nix ./programs/nncp.nix ./programs/npm.nix diff --git a/nixos/modules/programs/nethoscope.nix b/nixos/modules/programs/nethoscope.nix new file mode 100644 index 000000000000..495548e9c656 --- /dev/null +++ b/nixos/modules/programs/nethoscope.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.programs.nethoscope; +in +{ + meta.maintainers = with maintainers; [ _0x4A6F ]; + + options = { + programs.nethoscope = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to add nethoscope to the global environment and configure a + setcap wrapper for it. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ nethoscope ]; + security.wrappers.nethoscope = { + source = "${pkgs.nethoscope}/bin/nethoscope"; + capabilities = "cap_net_raw,cap_net_admin=eip"; + }; + }; +} From a876b46fef86ddc616ed36e59d80895ec83d3661 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Thu, 30 Sep 2021 23:23:01 +0200 Subject: [PATCH 52/55] nixos/release-notes: add programs.nethoscope --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 10985e6e3f4f..7bcfcebe21b2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -130,6 +130,13 @@ services.matrix-conduit. + + + nethoscope, + listen to your network traffic. Available as + programs.nethoscope. + + filebeat, diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 127d44443be0..a086751a2f37 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -41,6 +41,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable). +- [nethoscope](https://github.com/vvilhonen/nethoscope), listen to your network traffic. Available as [programs.nethoscope](#opt-programs.nethoscope.enable). + - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable). - [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS). From e56914680c8a2bbc704da02fa78b833d048e46a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 15:22:20 +0000 Subject: [PATCH 53/55] libsForQt5.qtutilities: 6.5.3 -> 6.6.0 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 6027e5b03854..6d6b413957a8 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.5.3"; + version = "6.6.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P1vAmH1cF5qQxpa4AOIOyK8ogLZgyXt8jaxaHwE9qck="; + sha256 = "sha256-ArPTWUQV9h+AK/m4oUIXsGWFO6Fj9IIOKSXCdWGztNM="; }; buildInputs = [ qtbase cpp-utilities ]; From 41234df5c67e927b108ea4a070d70b494de2df33 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 9 Apr 2022 08:31:21 -0400 Subject: [PATCH 54/55] pythonPackages.polars: init at 0.13.19 --- .../python-modules/polars/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/polars/default.nix diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix new file mode 100644 index 000000000000..aa97cf6cc03f --- /dev/null +++ b/pkgs/development/python-modules/polars/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, rustPlatform +, libiconv +, fetchzip +}: +let + pname = "polars"; + version = "0.13.19"; + rootSource = fetchzip { + url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-polars-v${version}.tar.gz"; + sha256 = "sha256-JOHjxTTPzS9Dd/ODp4r0ebU9hEonxrbjURJoq0BQCyI="; + }; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + disabled = pythonOlder "3.6"; + src = rootSource; + preBuild = '' + cd py-polars + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + src = rootSource; + preBuild = '' + cd py-polars + ''; + name = "${pname}-${version}"; + sha256 = "sha256-KEt8lITY4El2afuh2cxnrDkXGN3MZgfKQU3Pe2jECF0="; + }; + cargoRoot = "py-polars"; + + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + pythonImportsCheck = [ "polars" ]; + # checkInputs = [ + # pytestCheckHook + # fixtures + # graphviz + # matplotlib + # networkx + # numpy + # pydot + # ]; + + meta = with lib; { + description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; + homepage = "https://github.com/pola-rs/polars"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad2f91731238..cb7e2a3de3e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6425,6 +6425,8 @@ in { poezio = callPackage ../applications/networking/instant-messengers/poezio { }; + polars = callPackage ../development/python-modules/polars { }; + polarizationsolver = callPackage ../development/python-modules/polarizationsolver { }; polib = callPackage ../development/python-modules/polib { }; From 922028139c33aad8d70381999ea579263ef338fd Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sat, 9 Apr 2022 11:25:46 -0600 Subject: [PATCH 55/55] upwork: 5.6.10.1 -> 5.6.10.7 --- pkgs/applications/misc/upwork/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index dc50a3b95678..9afd1a6930ee 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -2,15 +2,15 @@ , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender -, libXScrnSaver, libXtst, mesa, nspr, nss, pango, systemd }: +, libXScrnSaver, libXtst, mesa, nspr, nss, openssl, pango, systemd }: stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.1"; + version = "5.6.10.7"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_1_de501d28cc034306/${pname}_${version}_amd64.deb"; - sha256 = "8faf896d2570d1d210793f46a3860e934d03498c1f11640d43721b6eb2b56860"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb"; + sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280"; }; nativeBuildInputs = [ @@ -39,13 +39,22 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mv usr $out mv opt $out + + # Now it requires lib{ssl,crypto}.so.1.0.0. Fix based on Spotify pkg. + # https://github.com/NixOS/nixpkgs/blob/efea022d6fe0da84aa6613d4ddeafb80de713457/pkgs/applications/audio/spotify/default.nix#L129 + mkdir -p $out/lib/upwork + ln -s ${lib.getLib openssl}/lib/libssl.so $out/lib/upwork/libssl.so.1.0.0 + ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/upwork/libcrypto.so.1.0.0 + sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop makeWrapper $out/opt/Upwork/upwork \ $out/bin/upwork \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath} + runHook postInstall '';