From 6c8b42cc9464cfacf93305714a510888609fd869 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Mon, 18 Dec 2023 06:28:40 +1000 Subject: [PATCH 1/3] modem-manager-gui: use `finalAttrs` pattern --- pkgs/applications/networking/modem-manager-gui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 21748a86e81b..8f2a0b5f1f60 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -15,7 +15,7 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "modem-manager-gui"; version = "0.0.20"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = "modem-manager-gui"; - rev = "upstream%2F${version}"; + rev = "upstream%2F${finalAttrs.version}"; sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "modem-manager-gui"; }; -} +}) From eff4440d59de63e8c774ad7f01961ed1baec4f3a Mon Sep 17 00:00:00 2001 From: kashw2 Date: Mon, 18 Dec 2023 06:29:14 +1000 Subject: [PATCH 2/3] modem-manager-gui: swapped `sha256` -> `hash` --- pkgs/applications/networking/modem-manager-gui/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 8f2a0b5f1f60..0c74135a0648 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "modem-manager-gui"; rev = "upstream%2F${finalAttrs.version}"; sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; + hash = "sha256-+VXqfA7TUUemY+DWeRHupWb8weJTeiSMZu+orlcmXd4="; }; nativeBuildInputs = [ @@ -49,19 +50,19 @@ stdenv.mkDerivation (finalAttrs: { # Fix missing tray icon (fetchpatch { url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/fix-tray-icon.patch"; - sha256 = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8="; + hash = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8="; }) # Fix build with meson 0.61 # appdata/meson.build:3:5: ERROR: Function does not take positional arguments. (fetchpatch { url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/meson0.61.patch"; - sha256 = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ="; + hash = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ="; }) # Fix segfault on launch: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004258 # Segmentation fault at address: 0x20 (fetchpatch { url = "https://salsa.debian.org/debian/modem-manager-gui/-/commit/8ccffd6dd6b42625d09d5408f37f155d91411116.patch"; - sha256 = "sha256-q+B+Bcm3uitJ2IfkCiMo3reFV1C06ekmy1vXWC0oHnw="; + hash = "sha256-q+B+Bcm3uitJ2IfkCiMo3reFV1C06ekmy1vXWC0oHnw="; }) ]; From 8c844e6964bbbd98fc03d4585be1fe277ff3817b Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 21 Dec 2023 14:58:36 +1000 Subject: [PATCH 3/3] modem-manager-gui: fixed revision download --- pkgs/applications/networking/modem-manager-gui/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 0c74135a0648..ba14278292bc 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "salsa.debian.org"; owner = "debian"; repo = "modem-manager-gui"; - rev = "upstream%2F${finalAttrs.version}"; - sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; + rev = "upstream/${finalAttrs.version}"; hash = "sha256-+VXqfA7TUUemY+DWeRHupWb8weJTeiSMZu+orlcmXd4="; };