diff options
17 files changed, 89 insertions, 89 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 047fe343043..cf0fadb5425 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; }; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 553ceb8be95..5c132581973 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" ]; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 8f547534cab..a7aa4eae44f 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; diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index c7d9c1068b1..bfb171e395c 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/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1ee9ac93057..d1c851c1c5f 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"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 6e9cefae79e..b2cc9d41b15 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"; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index fb3268ab55a..72622d25c3c 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" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c36d5505f55..c5582de412c 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=", @@ -437,22 +437,22 @@ "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=" }, "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=" }, diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index 521787a7bca..d7594a18d35 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="; diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index ed46312a580..8311563d52a 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}" ]; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 8732a962827..69ca714bd68 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 ]; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 4957191daa5..451e03c813e 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 ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 9c20f3a0eb4..c33fad31ed0 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" ]; diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 1cf7829cfcd..fd6bb923993 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" ]; - }; - -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; + 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 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; { diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index f53cb5a9776..8c7740ae7bb 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 ''; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 843d58a6447..db00d4e4e98 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"; }; diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index 76a49cad8a8..79cc1635a9c 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -1,25 +1,32 @@ -{ lib, fetchFromSourcehut, rustPlatform }: +{ lib, fetchFromSourcehut, rustPlatform, makeWrapper, withPulseaudio ? false, pulseaudio }: 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; + 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"; |