From 64b347a30a7f82d9746bf95a34a648360c1199f4 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 13 May 2023 20:28:52 +0200 Subject: [PATCH 01/19] betterlockscreen: make dunst optional When dunst is detected *and* awesomeWM is used (its internal notification system to be exact) then betterlockscreen waits for dunst to reply on the DBus. Due to dunstctl being in PATH through the wrapper, dunst will always be tried to reach. None of the workarounds mentioned in the awesome and betterlockscreen repos do not work with this version, as dunstctl is always called and has to time out first. In the current master of BLS there is a change that makes BLS check and env-var first, and would ignore any dunstctl in PATH. Once the new release happened this could still be used to reduce the closure size. --- pkgs/misc/screensavers/betterlockscreen/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index f53cb5a97760..8c7740ae7bb5 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -7,6 +7,7 @@ , bc , coreutils , dbus +, withDunst ? true , dunst , i3lock-color , gawk @@ -17,6 +18,12 @@ , xorg }: +let + runtimeDeps = + [ bc coreutils dbus i3lock-color gawk gnugrep gnused imagemagick procps xorg.xdpyinfo xorg.xrandr xorg.xset ] + ++ lib.optionals withDunst [ dunst ]; +in + stdenv.mkDerivation rec { pname = "betterlockscreen"; version = "4.0.4"; @@ -36,7 +43,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp betterlockscreen $out/bin/betterlockscreen wrapProgram "$out/bin/betterlockscreen" \ - --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xorg.xdpyinfo xorg.xrandr xorg.xset ]}" + --prefix PATH : "$out/bin:${lib.makeBinPath runtimeDeps}" runHook postInstall ''; From 77d3ac188fbff8ab565f8e11c5962c99b9c831e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 05:52:15 +0000 Subject: [PATCH 02/19] swayrbar: 0.3.5 -> 0.3.6 --- pkgs/tools/wayland/swayrbar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index 76a49cad8a84..72f2d8b93be3 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayrbar"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayrbar-${version}"; - sha256 = "sha256-uYQGwccSwqHJ1w8CyxXimmENnGx7e3EMA1MKZuZDTIk="; + sha256 = "sha256-Vv+Hw+iJAi2GnfkiYitDyH3H58tydUDa6GcWITok7Oc="; }; - cargoHash = "sha256-PdPaUqJUycUhleaND6XwKkRvwO0MHbvw5lzz95bdfCQ="; + cargoHash = "sha256-5alzkHzwuymo6bXFgabYQ3LWJDib0+ESQCSIPmINViY="; # don't build swayr buildAndTestSubdir = pname; From f5ab2390de07615b7c86b5af1b3b94fc31d05853 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 15 May 2023 23:45:00 +0200 Subject: [PATCH 03/19] _90secondportraits: use copyDesktopItems --- pkgs/games/90secondportraits/default.nix | 51 ++++++++++-------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 1cf7829cfcd0..fd6bb9239938 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -1,51 +1,44 @@ -{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, love, makeWrapper, makeDesktopItem, copyDesktopItems }: let pname = "90secondportraits"; - version = "1.01b"; icon = fetchurl { url = "http://tangramgames.dk/img/thumb/90secondportraits.png"; sha256 = "13k6cq8s7jw77j81xfa5ri41445m778q6iqbfplhwdpja03c6faw"; }; - desktopItem = makeDesktopItem { - name = "90secondportraits"; - exec = pname; - icon = icon; - comment = "A silly speed painting game"; - desktopName = "90 Second Portraits"; - genericName = "90secondportraits"; - categories = [ "Game" ]; - }; + desktopItems = [ + (makeDesktopItem { + name = "90secondportraits"; + exec = pname; + icon = icon; + comment = "A silly speed painting game"; + desktopName = "90 Second Portraits"; + genericName = "90secondportraits"; + categories = [ "Game" ]; + }) + ]; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; +in stdenv.mkDerivation rec { + inherit pname desktopItems; + version = "1.01b"; src = fetchurl { url = "https://github.com/SimonLarsen/90-Second-Portraits/releases/download/${version}/${pname}-${version}.love"; sha256 = "0jj3k953r6vb02212gqcgqpb4ima87gnqgls43jmylxq2mcm33h5"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ lua love ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; dontUnpack = true; - installPhase = - '' - mkdir -p $out/bin - mkdir -p $out/share/games/lovegames - - cp -v $src $out/share/games/lovegames/${pname}.love - - makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love - - chmod +x $out/bin/${pname} - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ + installPhase = '' + runHook preInstall + install -Dm444 $src $out/share/games/lovegames/${pname}.love + makeWrapper ${love}/bin/love $out/bin/${pname} \ + --add-flags $out/share/games/lovegames/${pname}.love + runHook postInstall ''; meta = with lib; { From 066176719dd73bd295fd17d26f8679182f579fd4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 May 2023 18:02:48 -0400 Subject: [PATCH 04/19] cargo-nextest: 0.9.52 -> 0.9.53 Diff: https://github.com/nextest-rs/nextest/compare/cargo-nextest-0.9.52...cargo-nextest-0.9.53 Changelog: https://nexte.st/CHANGELOG.html --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 8732a9628274..69ca714bd685 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.52"; + version = "0.9.53"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-Sl3ax2s81LiXejb0QP1fnmByAjAl8/JosUnw/RjEff8="; + hash = "sha256-oDkPURyVLOXSnRReCEkXubj0nNeMvHNH/WqG+Wp54ek="; }; - cargoHash = "sha256-H3MzVH3868wqT1/j827u13nvGbTti8ePoCtrVQHoSCY="; + cargoHash = "sha256-iXZy4pPYnf3A3mPg5Os00I//QJha68agvwhLU5vf320="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 5610d2ec67a4b54bfdf722cb3a2afd8342ee56fe Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 16 May 2023 10:52:13 +0200 Subject: [PATCH 05/19] swayrbar: Fix pulseaudio as optional dependency (default: disabled) --- pkgs/tools/wayland/swayrbar/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index 72f2d8b93be3..79cc1635a9cd 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromSourcehut, rustPlatform }: +{ lib, fetchFromSourcehut, rustPlatform, makeWrapper, withPulseaudio ? false, pulseaudio }: rustPlatform.buildRustPackage rec { pname = "swayrbar"; @@ -16,10 +16,17 @@ rustPlatform.buildRustPackage rec { # don't build swayr buildAndTestSubdir = pname; + nativeBuildInputs = [ makeWrapper ]; + preCheck = '' export HOME=$TMPDIR ''; + postInstall = lib.optionals withPulseaudio '' + wrapProgram "$out/bin/swayrbar" \ + --prefix PATH : "$out/bin:${lib.makeBinPath [ pulseaudio ]}" + ''; + meta = with lib; { description = "Status command for sway's swaybar implementing the swaybar-protocol"; homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara"; From 48c9864e7d0990406300a0f57349bbf0c8b95b96 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 16 May 2023 10:16:56 -0400 Subject: [PATCH 06/19] cargo-zigbuild: 0.16.7 -> 0.16.8 Diff: https://github.com/messense/cargo-zigbuild/compare/v0.16.7...v0.16.8 Changelog: https://github.com/messense/cargo-zigbuild/releases/tag/v0.16.8 --- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 4957191daa50..451e03c813ea 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.16.7"; + version = "0.16.8"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XMlmggT0L9F3J8/WA6AUZTnpCzyZTtb7feKDabPvW/Y="; + sha256 = "sha256-T/npT2KUPIXbjRjNqOJP8JiOE2DpvVDnabrfwhZganY="; }; - cargoSha256 = "sha256-OLMKvB7l29vM/n59dklyEXT5DXvImYKc3EdwnPVY968="; + cargoSha256 = "sha256-+u1TWAzathwdo1Q+NyBGJVfRceawFBBF4HkT7AY8BZw="; nativeBuildInputs = [ makeWrapper ]; From 339670f1dc2704f15f2fb9e70445fa29c7eed7cc Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 13 May 2023 04:37:50 +0000 Subject: [PATCH 07/19] temporal-cli: update tctl-next --- .../networking/cluster/temporal-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index fb3268ab55a9..72622d25c3c1 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -3,20 +3,20 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-yQnFw3uYGKrTevGFVZNgkWwKCCWiGy0qwJJOmnMpTJQ="; + hash = "sha256-zgi1wNx7fWf/iFGKaVffcXnC90vUz+mBT6HhCGdXMa0="; }; - vendorHash = "sha256-ld59ADHnlgsCA2mzVhdq6Vb2aa9rApvFxs3NpHiCKxo="; + vendorHash = "sha256-muTNwK2Sb2+0df/6DtAzT14gwyuqa13jkG6eQaqhSKg="; nativeBuildInputs = [ installShellFiles ]; - excludedPackages = [ "./cmd/docgen" ]; + excludedPackages = [ "./cmd/docgen" "./tests" ]; ldflags = [ "-s" From 1030469295f031d89bc6f6ba854fab32f1190f81 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 May 2023 21:10:56 +0300 Subject: [PATCH 08/19] vscode: 1.78.0 -> 1.78.2 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1ee9ac930575..d1c851c1c5fc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "11ibgnpcs0qvirgjnk799zkb63zp0nbc8y636l5g9nay6jm8lr8s"; - x86_64-darwin = "0wg2xbvg3v20w4dh9vf27xcf95r5dv2l118vxxjfz2chfxmkk1qw"; - aarch64-linux = "1gff1ildisczwb0dx7a0jvhj8rgn60n93rzcj1d7lihkgd00zjg6"; - aarch64-darwin = "1zmfg1lv6izv1dmhawmnjs108pg99kq37pi6adyqnfw9yssn0ar5"; - armv7l-linux = "10gr9p5vf0wcc9dgyc79p20vip12ja15qas4i3kwdp9lp4hzh1ss"; + x86_64-linux = "0kir1grd150gb7im6yx2l16hi43wwsi8q3dlpgah4m7na064xgyd"; + x86_64-darwin = "1fw73483ja4zav8xd0j03ygib5zbviy3kd02jzmgbbbsac5li96m"; + aarch64-linux = "1w0dxpvrj06m1d15q45xi4sl4g3fk0nf04vh2ar956lg67dqj7i6"; + aarch64-darwin = "0i5vj3km6wkdc2mrks2rjbqbn1isg4l4ss6zs7qfra3zcj62bkc2"; + armv7l-linux = "1jx8cz43ac35as414mxsj9abpkr4a7v10fg1msjy2ykcrzv9v3dr"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.78.0"; + version = "1.78.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 6d148248b1327c66298bfbd690f34ecc54c8264f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 May 2023 21:11:13 +0300 Subject: [PATCH 09/19] vscodium: 1.77.3.23102 -> 1.78.2.23132, drop armhf armhf was dropped upstream: https://github.com/VSCodium/vscodium/commit/7afbfe03adf1d91f0fbd9df9608bc94e350c1828 --- pkgs/applications/editors/vscode/update-vscodium.sh | 2 -- pkgs/applications/editors/vscode/vscodium.nix | 11 +++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index c7d9c1068b14..bfb171e395cb 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -36,5 +36,3 @@ update_vscodium $VSCODIUM_VER darwin-x64 x86_64-darwin zip update_vscodium $VSCODIUM_VER linux-arm64 aarch64-linux tar.gz update_vscodium $VSCODIUM_VER darwin-arm64 aarch64-darwin zip - -update_vscodium $VSCODIUM_VER linux-armhf armv7l-linux tar.gz diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 6e9cefae79e9..b2cc9d41b15f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,10 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "049vn3gwwl0sxf8hvd8raaamy9f0x2z9p3sz8xzafa1h129iiybr"; - x86_64-darwin = "1gbpbi3b0ag6v9znm02amvp35j05kpxs2mfsdq6dwmvg3hxmff2f"; - aarch64-linux = "14pvsrpl7rsjvni7n2ch7wmvgpj9n8mwla7s7mlmi7wv46ykpk2a"; - aarch64-darwin = "1x5bw928yp4fb57bc3qff46w7020zlyp1mfpm7vakjfaqnfwzzzn"; - armv7l-linux = "0xliai5c3dd6qbgb9agvmn18n230zh4qxx3jjmaqn2851d6sx5xz"; + x86_64-linux = "0ymgy0xisfxqrrmwpy0ga2rhlzhxqq39ppjfawxaf0dfdnkhgkgr"; + x86_64-darwin = "1q5fg7cm8d4iwvx8b589aqby5vw1b66y85dxgrq6sapz9cg2pvhz"; + aarch64-linux = "13vdqbhap9qd96y5n0immlwr61v8f7yvbwc9m0qas06f30b71f3z"; + aarch64-darwin = "01dc7hv13ngr0xv2cmd2likmdc2gz0jbmgashmkm12gdrjp4q968"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +28,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.77.3.23102"; + version = "1.78.2.23132"; pname = "vscodium"; executableName = "codium"; From 72ffc9994d1f563e302c9b875fe669413f473086 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 May 2023 21:11:54 +0300 Subject: [PATCH 10/19] vscode: clean up generic expression now that everything is 1.78 --- pkgs/applications/editors/vscode/generic.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 8f547534cabd..a7aa4eae44f3 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -19,7 +19,6 @@ }: let - inherit (stdenv.hostPlatform) system; unwrapped = stdenv.mkDerivation { inherit pname version src sourceRoot dontFixup; @@ -135,9 +134,6 @@ let # this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg - '' + lib.optionalString (lib.versionOlder version "1.78.0" && stdenv.isLinux) '' - # see https://github.com/gentoo/gentoo/commit/4da5959 - chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper ''; inherit meta; From 826e69915ab0a0ba2d3ea934cde439ae2eecba07 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Tue, 16 May 2023 20:28:25 +0000 Subject: [PATCH 11/19] plexamp: 4.6.2 -> 4.7.4 --- pkgs/applications/audio/plexamp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 553ceb8be95a..5c1325819730 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.6.2"; + version = "4.7.4"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "xGmE/ikL3ez0WTJKiOIcB5QtI7Ta9wq1Qedy9albWVpCS04FTnxQH5S0esTXw6j+iDTD8Lc2JbOhw8tYo/zRXg=="; + sha512 = "TZ7JNSrUtsqnH+fWIcd1v4fY0jPnMV7nqV/QsbD7ZpqIBCkN3R9WQvc/E9gah163Ab40g9CmdghTGo3v8VW2Rw=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/49"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/50"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; From 7974082b587b4d57a44553d8392174029816d129 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 16 May 2023 22:30:24 +0200 Subject: [PATCH 12/19] linuxPackages.nvidia_x11_vulkan_beta: 525.47.22 -> 525.47.24 Also update settings/persistenced to latest production version. --- pkgs/os-specific/linux/nvidia-x11/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 843d58a64473..db00d4e4e989 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -65,13 +65,13 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.22"; - persistencedVersion = "525.85.05"; - settingsVersion = "525.85.05"; - sha256_64bit = "sha256-y8XgeGljiR2q/Wzp2btCQ8Wa+9KvWsWxZHb+NIqfCYQ="; - openSha256 = "sha256-Y8XL8BJWSV2K1p4VR8T9Z2DOqySgQqkB4Dvf6E6vcxI="; - settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; - persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; + version = "525.47.24"; + persistencedVersion = "525.116.04"; + settingsVersion = "525.116.04"; + sha256_64bit = "sha256-T0yIX1I3p+QcvFvq0VkbzjyLuCZuX7oeOqtt/aNZ3WI="; + openSha256 = "sha256-I9MNN2f0eMWFLNtb/8MjjrB1fGv4FeBm/RcCHjAhmAM="; + settingsSha256 = "sha256-qNjfsT9NGV151EHnG4fgBonVFSKc4yFEVomtXg9uYD4="; + persistencedSha256 = "sha256-ci86XGlno6DbHw6rkVSzBpopaapfJvk0+lHcR4LDq50="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; }; From 1e52e0711f2c999647bfb53fdbe2b660850cf43b Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 16 May 2023 18:20:18 -0400 Subject: [PATCH 13/19] rust-analyzer-unwrapped: 2023-05-01 -> 2023-05-15 Diff: https://github.com/rust-lang/rust-analyzer/compare/2023-05-01...2023-05-15 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 9c20f3a0eb46..c33fad31ed0d 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-05-01"; - cargoSha256 = "sha256-ZjJ4EZYUyeO/IpiYcUaEsTx4aaNf36KoUHG3lt9gKbw="; + version = "2023-05-15"; + cargoSha256 = "sha256-UnyhgSTvgfMN/jUrr9PcmwxViRnD17tXjcf/wcS75kk="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-FPQKPvlHIU2DsDF6GMoRtrZhil0vHi6MFd8vpKEx/n8="; + sha256 = "sha256-epmeDLdze4RtOgS/7yQvK5ZImJ51OMBcEeLiR5aaVr0="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From fbf754a3a250d13e3f385d58ee8887db02db1200 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 May 2023 01:03:33 +0000 Subject: [PATCH 14/19] sqlcmd: 0.15.4 -> 1.0.0 --- pkgs/development/tools/database/sqlcmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index ed46312a580f..8311563d52af 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "0.15.4"; + version = "1.0.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-6ofLXGrwkPBXQC+wb3sNqeMsVin5kBD8GyM7Ywu7xDs="; + sha256 = "sha256-93igyFjIRkxDb4uRSbB6JAStZLRoqvL6Rn5GPPPWTUA="; }; - vendorHash = "sha256-6JfxKzYAjSQ9JFuFGDUZ0ALS1D7f2LK3bP0Fbl2ivo0="; + vendorHash = "sha256-m3+zCa4nwu3W8K9BoFyKHE/dM8bFyklJDFP7w1XBprc="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From f8938533601019766822ed0ca4e59bc10be49f81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 May 2023 03:29:56 +0000 Subject: [PATCH 15/19] rymdport: 3.3.5 -> 3.3.6 --- pkgs/applications/networking/rymdport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index 521787a7bca0..d7594a18d35b 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "rymdport"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-dwIfkslbqphLQrmDNeukDhLskH1bBGG65Ve9LQzNeJg="; + hash = "sha256-IBGvlDgpONa04u3DBJ3k8VZbtNs/W5DUHzREFpjIqrs="; }; vendorHash = "sha256-Q3bUH1EhY63QF646FYwiVXusWPTqI5Am2AVJq+qyNVo="; From 4a61453d0a0556abbc69a950189d7c4033ff5097 Mon Sep 17 00:00:00 2001 From: Jayesh Bhoot Date: Wed, 17 May 2023 09:37:04 +0530 Subject: [PATCH 16/19] maintainers: update jayeshbhoot --- 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 047fe343043f..cf0fadb5425d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7081,7 +7081,7 @@ }; jayesh-bhoot = { name = "Jayesh Bhoot"; - email = "jayesh@bhoot.sh"; + email = "jb@jayeshbhoot.com"; github = "jayeshbhoot"; githubId = 1915507; }; From 36304516f4f9353a3e77494d9acd58cf0a3f16be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 03:06:25 +0000 Subject: [PATCH 17/19] terraform-providers.cloudflare: 4.5.0 -> 4.6.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c36d5505f55e..1623c92ff039 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -218,13 +218,13 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-0bHKQe4wIieKdxPF0S7Qv8QLlg+AZzBOG8n2qiMOM0g=", + "hash": "sha256-vVVwWZAkTzEQ+toZOblEoq1Xg4zC4zZD4Eoi1ocU6Rc=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.5.0", + "rev": "v4.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cXnaUHqJrPplLO61u20UscSjo0aOnrJyIvGh8+TfqE0=" + "vendorHash": "sha256-NuvPhARQucbVEmO6iLWPZDe9VF/xROCbmC7jM7srUmE=" }, "cloudfoundry": { "hash": "sha256-SFA0rG80BWaJHwvAWEugdVd3nR+YGflyYONOuoS++P8=", From fbdd5de1f16b6cdd4ee3ea71d2d260bc887a5f48 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 03:11:06 +0000 Subject: [PATCH 18/19] terraform-providers.google: 4.65.0 -> 4.65.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1623c92ff039..e07725a45b85 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -437,12 +437,12 @@ "vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ=" }, "google": { - "hash": "sha256-LJyKBoFkw93okFrLLBAW8bBuXtOf6/g310ZhJNXQpks=", + "hash": "sha256-U3vK9QvsipQDEZu0GW1uzt9JA7exT+VgvZI8Tt9A0XI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.65.0", + "rev": "v4.65.2", "spdx": "MPL-2.0", "vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q=" }, From 3c4aa21bee209a73f0045f9341b8b394037e61e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 03:11:48 +0000 Subject: [PATCH 19/19] terraform-providers.google-beta: 4.65.0 -> 4.65.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e07725a45b85..c5582de412c2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -447,12 +447,12 @@ "vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q=" }, "google-beta": { - "hash": "sha256-JI0GyEeCjKvoXlA+BzODQ9XArLVvf8Z6ajK5voIQ7IA=", + "hash": "sha256-b2N5ayMvvfJXPAc+lRXaz/G0O+u3FDAcsPS6ymV9v3s=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.65.0", + "rev": "v4.65.2", "spdx": "MPL-2.0", "vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q=" },