youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pkgs: Synchronize upstream inputs for flake and remove patch for hurl

Browse source
This commit is contained in:
ulic-youthlic 2025-06-24 21:42:12 +08:00
parent cb75cf2135
commit 16fd11acdb
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
5 changed files with 66 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

147
flake.lock generated
View file

@ -96,11 +96,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1750649006, "lastModified": 1750854959,
"narHash": "sha256-P313UXYYRhGqQpaVpkrrwQugFK16tFKXLNJ2Gl7YgtQ=", "narHash": "sha256-aL8Nu/gDUwMZpCsf1Crx+tT24yE+Fa8n0+hVjFKOpQQ=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "c11fb47645d24baaf5074a4dcfa7ca4a756ab545", "rev": "c417f3d4efc3042682c54631c975d554481a3bdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750579949, "lastModified": 1750820125,
"narHash": "sha256-Ry9SoBinv53YMMXmQA1D6wmOEzHiz4aoKAENirpMQcI=", "narHash": "sha256-WDN3/TUs9vqZVXL6jMjl+D0pNsHJ4oO4muMVxnIc5hk=",
"owner": "daeuniverse", "owner": "daeuniverse",
"repo": "flake.nix", "repo": "flake.nix",
"rev": "b2fe700ac3c16bea86975b1abb00645e56658237", "rev": "2eeb017f69333eea5bc348c555ebcefa0269a071",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +393,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1750531852, "lastModified": 1750857684,
"narHash": "sha256-ps4Fa8cq+q13Kb2nj9uxXjIGvsSRBUfcxW5CgquxiQI=", "narHash": "sha256-pbF4oz+HZE/rXsm9YOOA9aV/QnwTvc0zHDTpkaHpYK4=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "171dfc60e5cda8f9fb6c4f662872f35bbe864a53", "rev": "c3c4895179d4bc5a00e22fdf129d41c1af96226a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +415,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750614446, "lastModified": 1750730235,
"narHash": "sha256-6WH0aRFay79r775RuTqUcnoZNm6A4uHxU1sbcNIk63s=", "narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7c35504839f915abec86a96435b881ead7eb6a2b", "rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -435,11 +435,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750654717, "lastModified": 1750798083,
"narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -473,11 +473,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747597901, "lastModified": 1750762203,
"narHash": "sha256-jS+P57tXZEl+zvPfEIHFbd1j3xfuWcrcMrcnbm9wWbE=", "narHash": "sha256-LmQhjQ7c+AOkwhvR9GFgJOy8oHW35MoQRELtrwyVnPw=",
"rev": "33eaaf02fd3f380e99032b25e741eeeb10573cad", "rev": "38b358ce27203f972faa2973cf44ba80c758f46e",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/33eaaf02fd3f380e99032b25e741eeeb10573cad.tar.gz?rev=33eaaf02fd3f380e99032b25e741eeeb10573cad" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/38b358ce27203f972faa2973cf44ba80c758f46e.tar.gz?rev=38b358ce27203f972faa2973cf44ba80c758f46e"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -496,11 +496,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748803223, "lastModified": 1750776670,
"narHash": "sha256-FXndw1CihZcqQu49DziuMQuc0fG8L0nvGkm0JHZKimo=", "narHash": "sha256-EfA5K5EZAnspmraJrXQlziffVpaT+QDBiE6yKmuaNNQ=",
"ref": "release-2.93", "ref": "release-2.93",
"rev": "2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62", "rev": "c3c78a32273e89d28367d8605a4c880f0b6607e3",
"revCount": 145, "revCount": 146,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -522,11 +522,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1750634718, "lastModified": 1750847367,
"narHash": "sha256-wVCB2iwu1sP9GfUVLSYJTE/U9I8InxCUlqK5WIwOUaw=", "narHash": "sha256-BQzKA0b7B73PRwgQLEs37w1YhLdCm49GB2RhR0Xjt0Y=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "e291d0634368fe8406cf237d3e8bc0326079752d", "rev": "bde02c6f392a7bfd487352a537183ebf2da7f53b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -555,11 +555,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750334747, "lastModified": 1750791124,
"narHash": "sha256-nsD1Z6vVP2Hhdgrd0uYHacre2+NhaH/53TFRXn6pRcs=", "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "e0b0b04b445f7044f383e50104f861e632e1c905", "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -599,11 +599,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1750590485, "lastModified": 1750849699,
"narHash": "sha256-0j3ZhM2G0QEpgnJwFTk8A0EwppMispfT7hME84c2jyg=", "narHash": "sha256-MzTjtv7AcRwJRoU9shc+B3tW4Rr/HkdI+st3ThKVo+w=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "7f49ed84253338f47e4187aa0e7480baa5c784f9", "rev": "cfc96e2a5e57cbe1831c4b44f63cd66eb7743e42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -614,11 +614,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1750431636, "lastModified": 1750837715,
"narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -630,11 +630,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750506804, "lastModified": 1750741721,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa", "rev": "4b1164c3215f018c4442463a27689d973cffd750",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -644,22 +644,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-hurl": {
"locked": {
"lastModified": 1750581657,
"narHash": "sha256-2oGXIngJiuqrcxTRbs/0D+1YidC7osJfPlMwwpfwpYU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6da24ccc7e889a6b80da047db51ee497c0f7b137",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "refs/pull/418842/head",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1748740939, "lastModified": 1748740939,
@ -677,11 +661,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1750400657, "lastModified": 1750622754,
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -693,11 +677,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1750330365, "lastModified": 1750646418,
"narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -709,11 +693,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1750365781, "lastModified": 1750741721,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "rev": "4b1164c3215f018c4442463a27689d973cffd750",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -725,11 +709,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1750506804, "lastModified": 1750741721,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa", "rev": "4b1164c3215f018c4442463a27689d973cffd750",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -784,11 +768,11 @@
"nur-rycee": { "nur-rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750651402, "lastModified": 1750824237,
"narHash": "sha256-mT97WT4FlJyvfWp7rso3tUZca0qKU46czyi/HBJHG4w=", "narHash": "sha256-jrJs7RMjB2P/V4y0n8qtN6EU5vId9W+6/le2XcRPg+4=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "13fa5e2e89062281dee88508f97e93360bfe2e2d", "rev": "6d3d0527e3e273e9aaef9f5c433ef8046245fbb2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -814,7 +798,6 @@
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-hurl": "nixpkgs-hurl",
"nur-rycee": "nur-rycee", "nur-rycee": "nur-rycee",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix",
@ -829,11 +812,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750560265, "lastModified": 1750732748,
"narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", "narHash": "sha256-HR2b3RHsPeJm+Fb+1ui8nXibgniVj7hBNvUbXEyz0DU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", "rev": "4b4494b2ba7e8a8041b2e28320b2ee02c115c75f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -871,11 +854,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750560265, "lastModified": 1750819193,
"narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", "narHash": "sha256-XvkupGPZqD54HuKhN/2WhbKjAHeTl1UEnWspzUzRFfA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", "rev": "1ba3b9c59b68a4b00156827ad46393127b51b808",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -932,11 +915,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1750562714, "lastModified": 1750862951,
"narHash": "sha256-GEQdMsWrij7y1UjuONVZYWLBo1OPIt709KcyCxcDfxU=", "narHash": "sha256-oUhnj0mzeSAX3IFaWn6LKLbmuFeNd7ulIAkxf0Jc07A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "100b968012804d6526c5f48a32c30680916bc474", "rev": "37b8c5f68086f36a109074c3fedebbbf8c20ecda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1116,11 +1099,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750388715, "lastModified": 1750821680,
"narHash": "sha256-6WMpcn3Ga/L71NiX9SdWw7ZELpNfrFnWJ0Gt2uAHjJg=", "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "03cbb2ee3a9da931bb9a39eb917674297a0b9318", "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View file

@ -38,13 +38,6 @@
# nixpkgs.url = "github:NixOS/nixpkgs/master"; # nixpkgs.url = "github:NixOS/nixpkgs/master";
# nixpkgs.follows = "nixos-cosmic/nixpkgs"; # nixpkgs.follows = "nixos-cosmic/nixpkgs";
nixpkgs-hurl = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "refs/pull/418842/head";
};
lix-module = { lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93";
inputs = { inputs = {

1
overlays/modifications/default.nix
View file

@ -11,7 +11,6 @@ in
# ./QQ.nix # ./QQ.nix
./helix.nix ./helix.nix
./cliphist.nix ./cliphist.nix
./fix-hurl.nix
] ]
|> map (file: import file args) |> map (file: import file args)
|> (overlays: (lib.composeManyExtensions overlays) final prev) |> (overlays: (lib.composeManyExtensions overlays) final prev)

5
overlays/modifications/fix-hurl.nix
View file

@ -1,5 +0,0 @@
{inputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
inherit (inputs.nixpkgs-hurl.legacyPackages.${system}) hurl;
}

6
pkgs/default.nix
View file

@ -7,11 +7,7 @@
... ...
}: let }: let
srcs = callPackages ./_sources/generated.nix {}; srcs = callPackages ./_sources/generated.nix {};
callPackage = lib.callPackageWith (pkgs callPackage = lib.callPackageWith (pkgs // {inherit inputs srcs callPackage rootPath;});
// {
inherit inputs srcs callPackage rootPath;
inherit (inputs.nixpkgs-hurl.legacyPackages.${pkgs.system}) hurl;
});
in in
{ {
pinentry-selector = callPackage ./pinentry-selector.nix {}; pinentry-selector = callPackage ./pinentry-selector.nix {};