From 62c5ace116892c5dc2602092307018540db1d86a Mon Sep 17 00:00:00 2001 From: awwpotato Date: Wed, 2 Apr 2025 20:27:54 -0700 Subject: [PATCH 1/5] sourcepawn-studio: init at 8.1.2 --- pkgs/by-name/so/sourcepawn-studio/package.nix | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/so/sourcepawn-studio/package.nix diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix new file mode 100644 index 000000000000..b6208dca0514 --- /dev/null +++ b/pkgs/by-name/so/sourcepawn-studio/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "sourcepawn-studio"; + version = "8.1.2"; + + src = fetchFromGitHub { + owner = "Sarrus1"; + repo = "sourcepawn-studio"; + tag = "v${finalAttrs.version}"; + hash = "sha256-L/xgzWbhfRTvoRElKApb9JKXNfqJF+nfDk9Xo/qwL00="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-5Zd3Stoi8AqsZE38pnilmjuRMgTPAGB+R8QI2JFZ7s4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + checkFlags = [ + # requires rustup and rustfmt + "--skip tests::sourcegen::generate_node_kinds" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "sourcepawn-studio"; + description = "LSP implementation for the SourcePawn programming language written in Rust"; + homepage = "https://sarrus1.github.io/sourcepawn-studio/"; + changelog = "https://github.com/Sarrus1/sourcepawn-studio/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.awwpotato ]; + }; +}) From 1c1c517c8d6e9b92179cb6f5b7c6a74e68bb8b79 Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Apr 2025 00:33:46 -0400 Subject: [PATCH 2/5] tests.importCargoLock.gitDependencyRevNonWorkspaceNestedCrate: use system zlib Fixes build on Darwin. (We could just bump libz-sys, but this is the preferred change anyways.) --- .../default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix index 5b1dcc1aef61..6dac7a801284 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix @@ -2,9 +2,8 @@ rustPlatform, pkg-config, openssl, + zlib, lib, - darwin, - stdenv, }: let fs = lib.fileset; @@ -26,13 +25,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + zlib + ]; cargoLock = { lockFile = ./Cargo.lock; From 0d25674d1d48022fafcd1792719c358c4d419de7 Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Apr 2025 00:38:55 -0400 Subject: [PATCH 3/5] tests.importCargoLock.gitDependencyWorkspaceInheritance: fix build Regressed in f80228a8059fd8b2ecf03bc82e910013badb3625. This shouldn't happen again unless we change the order that keys are inserted (like we did here), as tomli-w respects the sort order of its input. --- .../git-dependency-workspace-inheritance/want.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml index ec1331455bec..cd1cb594a769 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml @@ -12,8 +12,8 @@ keywords = [ bar = "1.0.0" [dependencies.foo] +version = "1.0.0" features = [ "cat", "meow", ] -version = "1.0.0" From c91fffabc2784ecbdd37ded2701ee68dd9c11880 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 12 Apr 2025 23:14:48 -0500 Subject: [PATCH 4/5] yaziPlugins.ouch: 0-unstable-2025-04-09 -> 0-unstable-2025-04-12 --- pkgs/by-name/ya/yazi/plugins/ouch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix index 360183fffe33..aec407f88dad 100644 --- a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "ouch.yazi"; - version = "0-unstable-2025-04-09"; + version = "0-unstable-2025-04-12"; src = fetchFromGitHub { owner = "ndtoan96"; repo = "ouch.yazi"; - rev = "73b7842bbccb12f15e1af54b8b06fc88f5efe82d"; - hash = "sha256-pdnQB9NSqCndqbeJLeSg2og2vBDg5zKx8EKWKVixqTM="; + rev = "2496cd9ac2d1fb52597b22ae84f3af06c826a86d"; + hash = "sha256-OsNfR7rtnq+ceBTiFjbz+NFMSV/6cQ1THxEFzI4oPJk="; }; meta = { From 10189aca67b6595de22c3b48f4fba3517694a353 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Fri, 11 Apr 2025 22:54:31 +0530 Subject: [PATCH 5/5] xdg-desktop-portal-cosmic: substitute fallback background path The directory `/usr/share/backgrounds/pop/` is not accessible on NixOS because the directory `/usr` does not exist on NixOS. The package `cosmic-wallpapers` exists in nixpkgs that provides the background image that is used in the COSMIC DE's screenshots on the first-party website[0]. Substitute the unreachable, FHS path with a valid path of the background image from the Nix store. Note: We are putting in a different fallback background path alltogether but I believe that this is okay because that is used by upstream in their marketing materials. Meaning, after substitution, we match marketing screenshots from upstream. [0]: https://system76.com/cosmic/ --- .../xd/xdg-desktop-portal-cosmic/package.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 2274dd104681..ad5d3b4dfca3 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -10,6 +10,7 @@ libgbm, pipewire, gst_all_1, + cosmic-wallpapers, coreutils, nix-update-script, nixosTests, @@ -59,8 +60,22 @@ rustPlatform.buildRustPackage (finalAttrs: { }) ]; - # Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly. postPatch = '' + # While the `kate-hazen-COSMIC-desktop-wallpaper.png` image is present + # in the `pop-wallpapers` package, we're using the Orion Nebula image + # from NASA available in the `cosmic-wallpapers` package. Mainly because + # the previous image was used in the GNOME shell extension and the + # Orion Nebula image is widely used in the Rust-based COSMIC DE's + # marketing materials. Another reason to use the Orion Nebula image + # is that it's actually the default wallpaper as configured by the + # `cosmic-bg` package's configuration in upstream [1] [2]. + # + # [1]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/config/src/lib.rs#L142 + # [2]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/data/v1/all#L3 + substituteInPlace src/screenshot.rs src/widget/screenshot.rs \ + --replace-fail '/usr/share/backgrounds/pop/kate-hazen-COSMIC-desktop-wallpaper.png' '${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg' + + # Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly. substituteInPlace data/org.freedesktop.impl.portal.desktop.cosmic.service \ --replace-fail 'Exec=/bin/false' 'Exec=${lib.getExe' coreutils "true"}' '';