movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 21:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

river: 0.3.7 -> 0.3.9 (#391612)

Browse source
This commit is contained in:
Adam C. Stephens 2025-03-20 13:58:49 -04:00 • committed by GitHub
commit 750fef2a63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

72
pkgs/by-name/ri/river/build.zig.zon.nix
View file

@ -16,15 +16,11 @@ with lib;
let let
unpackZigArtifact = unpackZigArtifact =
{ name, artifact }: { name, artifact }:
runCommandLocal name runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
{ hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
nativeBuildInputs = [ zig ]; mv "$TMPDIR/p/$hash" "$out"
} chmod 755 "$out"
'' '';
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
fetchZig = fetchZig =
{ {
@ -42,13 +38,12 @@ let
name, name,
url, url,
hash, hash,
rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
}: }:
let let
parts = splitString "#" url; parts = splitString "#" url;
url_base = elemAt parts 0; url_base = elemAt parts 0;
url_without_query = elemAt (splitString "?" url_base) 0; url_without_query = elemAt (splitString "?" url_base) 0;
rev_base = elemAt parts 1;
rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
in in
fetchgit { fetchgit {
inherit name rev hash; inherit name rev hash;
@ -61,20 +56,25 @@ let
name, name,
url, url,
hash, hash,
}: ...
}@args:
let let
parts = splitString "://" url; parts = splitString "://" url;
proto = elemAt parts 0; proto = elemAt parts 0;
path = elemAt parts 1; path = elemAt parts 1;
fetcher = { fetcher = {
"git+http" = fetchGitZig { "git+http" = fetchGitZig (
inherit name hash; args
url = "http://${path}"; // {
}; url = "http://${path}";
"git+https" = fetchGitZig { }
inherit name hash; );
url = "https://${path}"; "git+https" = fetchGitZig (
}; args
// {
url = "https://${path}";
}
);
http = fetchZig { http = fetchZig {
inherit name hash; inherit name hash;
url = "http://${path}"; url = "http://${path}";
@ -89,35 +89,35 @@ let
in in
linkFarm name [ linkFarm name [
{ {
name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56"; name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "zig-pixman"; name = "pixman";
url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz"; url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz";
hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ="; hash = "sha256-zX/jQV1NWGhalP3t0wjpmUo38BKCiUDPtgNGHefyxq0=";
}; };
} }
{ {
name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "zig-wayland"; name = "wayland";
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz";
hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA="; hash = "sha256-xU8IrETSFOKKQQMgwVyRKLwGaek4USaKXg49S9oHSTQ=";
}; };
} }
{ {
name = "122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1"; name = "wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "zig-wlroots"; name = "wlroots";
url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.1.tar.gz"; url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.2.tar.gz";
hash = "sha256-S77/Own9/GjhLCCE/eI56pdpmhlvMVP41WZ27b+Sook="; hash = "sha256-4/MGFCCgMeN6+oCaj0Z5dsbVo3s88oYk1+q0mMXrj8I=";
}; };
} }
{ {
name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f"; name = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "zig-xkbcommon"; name = "xkbcommon";
url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz"; url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz";
hash = "sha256-f5oEJU5i2qeVN3GBrnQcqzEJCiOT7l4ak7GQ6gw5cH0="; hash = "sha256-HhhUI+ayPtlylhTmZ1GrdSLbRIffTg3MeisGN1qs2iM=";
}; };
} }
] ]

10
pkgs/by-name/ri/river/package.nix
View file

@ -17,14 +17,14 @@
wayland-scanner, wayland-scanner,
wlroots_0_18, wlroots_0_18,
xwayland, xwayland,
zig_0_13, zig_0_14,
withManpages ? true, withManpages ? true,
xwaylandSupport ? true, xwaylandSupport ? true,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "river"; pname = "river";
version = "0.3.7"; version = "0.3.9";
outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
@ -34,18 +34,18 @@ stdenv.mkDerivation (finalAttrs: {
repo = "river"; repo = "river";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-4ac0LGQtLldHyXJ2GIRMHV+VZfUrRFdBYLiAHX5lWcw="; hash = "sha256-g6qjSkvcA2Ud4W+/NVzYZjiWoWkAuKvuD20KlO/zGhE=";
}; };
deps = callPackage ./build.zig.zon.nix { deps = callPackage ./build.zig.zon.nix {
zig = zig_0_13; zig = zig_0_14;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
wayland-scanner wayland-scanner
xwayland xwayland
zig_0_13.hook zig_0_14.hook
] ++ lib.optional withManpages scdoc; ] ++ lib.optional withManpages scdoc;
buildInputs = [ buildInputs = [