From 08d28f1f1d93fc453e14d600036d982a1fb4fbf4 Mon Sep 17 00:00:00 2001 From: js6pak Date: Sun, 7 Jan 2024 16:00:59 +0100 Subject: [PATCH 1/5] vscode-utils: add relativeLocation in toExtensionJson --- pkgs/applications/editors/vscode/extensions/vscode-utils.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 0eba230ad8e0..940636606001 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -109,6 +109,8 @@ let version = ext.version; + relativeLocation = ext.vscodeExtUniqueId; + location = { "$mid" = 1; fsPath = ext.outPath + "/share/vscode/extensions/${ext.vscodeExtUniqueId}"; From 7601af5b1846193c2644c890dbf834c1e07c1855 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 12 Apr 2024 14:09:53 -0300 Subject: [PATCH 2/5] ciscoPacketTracer8: small refactor, qol - Ignore custom QT themes: dark themes work buggy - Remove unused arguments - I still didn't figure out about that "Missing Script Module" error Signed-off-by: lucasew --- .../by-name/ci/ciscoPacketTracer8/package.nix | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 9dbd32c31b3f..fca1924b087a 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -2,29 +2,16 @@ , lib , alsa-lib , autoPatchelfHook -, buildFHSEnv -, ciscoPacketTracer8 , copyDesktopItems , dbus , dpkg , expat , fontconfig , glib -, libdrm -, libglvnd -, libpulseaudio -, libudev0-shim -, libxkbcommon -, libxml2 -, libxslt -, lndir , makeDesktopItem , makeWrapper -, nspr -, nss , qt5 , requireFile -, xorg }: let @@ -40,14 +27,14 @@ let }; in -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (args: { pname = "ciscoPacketTracer8"; version = "8.2.2"; src = requireFile { - name = names.${version}; - hash = hashes.${version}; + name = names.${args.version}; + hash = hashes.${args.version}; url = "https://www.netacad.com"; }; @@ -88,6 +75,7 @@ stdenvNoCC.mkDerivation rec { makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \ "''${qtWrapperArgs[@]}" \ + --set QT_QPA_PLATFORMTHEME "" \ --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" install -D $out/opt/pt/art/app.png $out/share/icons/hicolor/128x128/apps/ciscoPacketTracer8.png @@ -122,4 +110,4 @@ stdenvNoCC.mkDerivation rec { platforms = [ "x86_64-linux" ]; mainProgram = "packettracer8"; }; -} +}) From 8a3c26b0342e0d18b6743fff466bb92f632d5d57 Mon Sep 17 00:00:00 2001 From: Kimmo Suominen Date: Sat, 13 Apr 2024 10:57:58 +0300 Subject: [PATCH 3/5] tcsh: Add suominen to maintainers --- pkgs/by-name/tc/tcsh/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tc/tcsh/package.nix b/pkgs/by-name/tc/tcsh/package.nix index abc58430f2e6..f254fed78080 100644 --- a/pkgs/by-name/tc/tcsh/package.nix +++ b/pkgs/by-name/tc/tcsh/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { - job control ''; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres suominen ]; platforms = lib.platforms.unix; }; }) From 84f74ee14b7370234d58e99d7fcc37156b5bcc1c Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 13 Apr 2024 18:20:43 +0200 Subject: [PATCH 4/5] bird: add herbetom as maintainer --- pkgs/servers/bird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index f18d01a5ba7c..b1e3c09db214 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "BIRD Internet Routing Daemon"; homepage = "http://bird.network.cz"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ herbetom ]; platforms = platforms.linux; }; } From 9239dfa065af4f87672ee08137199d45b2a94e5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Apr 2024 16:23:53 +0000 Subject: [PATCH 5/5] linkerd_edge: 24.3.5 -> 24.4.2 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 405980c22d9e..e268dadd262d 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.3.5"; - sha256 = "0sl4xxdsabma6q15fh0cqhgi5gmq3q2kzlw2wvcxhy78mm8qn8b0"; - vendorHash = "sha256-Oe8NMpcLGHmmlt3ceQQHHt1aV0zrWUI/TmCpyOVElCg="; + version = "24.4.2"; + sha256 = "0apwhbcnghy7b9kwalbhcgvgcrwv6s55gzlgax55qaa5lxm6r6yz"; + vendorHash = "sha256-bLTummNoDfGMYvtfSLxICgCFZEymPJcRWkQyWOSzKR8="; }