diff --git a/flake.lock b/flake.lock index c1f619e..d9b185a 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750330289, - "narHash": "sha256-16+LlTyw9wmINhxXB8BxGnSvngwm4nfrQ7GDKi7Cbdw=", + "lastModified": 1750594492, + "narHash": "sha256-8AP008pMieuJMFll32Qlyi2BkNNqqIq8FRqM7uXzr5o=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ed44dff18a42ae3852f0d182cd39eb10d6a723e3", + "rev": "1cbd3ce75615ab95c9dcca1d64e638e762fe4975", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1750260393, - "narHash": "sha256-DJtTX/hxht6X0mway2HMEKCm9bbFNkecz7SNte5GaAw=", + "lastModified": 1750579949, + "narHash": "sha256-Ry9SoBinv53YMMXmQA1D6wmOEzHiz4aoKAENirpMQcI=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "1e51d98b6e606f935faaf08f68c1a3a68d5ee441", + "rev": "b2fe700ac3c16bea86975b1abb00645e56658237", "type": "github" }, "original": { @@ -393,11 +393,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1750344736, - "narHash": "sha256-pPktfkA5r1zhza2Gw+u7K4g/s9EfpXXMh7m/IQ3mIbs=", + "lastModified": 1750531852, + "narHash": "sha256-ps4Fa8cq+q13Kb2nj9uxXjIGvsSRBUfcxW5CgquxiQI=", "owner": "helix-editor", "repo": "helix", - "rev": "036729211a94d058b835f5ee212ab15de83bc037", + "rev": "171dfc60e5cda8f9fb6c4f662872f35bbe864a53", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1750275572, - "narHash": "sha256-upC/GIlsIgtdtWRGd1obzdXWYQptNkfzZeyAFWgsgf0=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "0f355844e54e4c70906b1ef5cc35a0047d666c04", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1750230721, - "narHash": "sha256-rg/lnazeno/f4VNSv+t2Zwio/OyCYKx5zV9/8hfhfgA=", + "lastModified": 1750403547, + "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6c88df8c85ad3f80a5832edc50534a5add255b47", + "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", "type": "github" }, "original": { @@ -522,11 +522,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750390275, - "narHash": "sha256-k0cDsEK8aQLCYhBXXEMgBVdFWrPWd19JEtwJ5+DA91w=", + "lastModified": 1750471128, + "narHash": "sha256-oR2yjhAPXZDmfFb4UwBeVQcJBtrUNFwufovzN8sTBVc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3bebe770ebe600fc7f28cc593df14a9e90a3c02e", + "rev": "13e7a34df7aa4e7d8ec4dd9df9d5a01973f28f49", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1750331408, - "narHash": "sha256-Rjc9aW5Dxn+KeBsx1DvkC+4SyLvdjEEyKJSVD5Q5UZw=", + "lastModified": 1750590485, + "narHash": "sha256-0j3ZhM2G0QEpgnJwFTk8A0EwppMispfT7hME84c2jyg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "39eb68d021d698bc4d0cd86bf0c75a70285726cd", + "rev": "7f49ed84253338f47e4187aa0e7480baa5c784f9", "type": "github" }, "original": { @@ -614,11 +614,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -644,6 +644,38 @@ "type": "github" } }, + "nixpkgs-handbrake": { + "locked": { + "lastModified": 1749936441, + "narHash": "sha256-MfdTzz/ArELrweWK7FLofbK/NMvbpEhV8QCo6f7UBII=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c74daf34b6de017d7d43196c494f887a2b956f0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c74daf34b6de017d7d43196c494f887a2b956f0f", + "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": { "locked": { "lastModified": 1748740939, @@ -661,11 +693,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750259320, - "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=", + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { @@ -677,11 +709,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1750151854, - "narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=", + "lastModified": 1750330365, + "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244", + "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "type": "github" }, "original": { @@ -693,11 +725,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -709,11 +741,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -768,11 +800,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1750392203, - "narHash": "sha256-rJU+WeeLxDinRWEGXw5OT4tToIAO8zy/ULFVWHhLp/Q=", + "lastModified": 1750565010, + "narHash": "sha256-eetTl1TpPoD5W52RX02Lo8SLQdVcU2m7usCSh5VhnwE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "09e3cfed476fc06384610a7e6027df221fc93bd3", + "rev": "a24c53d008d362cfd5a96270b2bb331e26902af5", "type": "gitlab" }, "original": { @@ -798,6 +830,8 @@ "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", + "nixpkgs-handbrake": "nixpkgs-handbrake", + "nixpkgs-hurl": "nixpkgs-hurl", "nur-rycee": "nur-rycee", "sops-nix": "sops-nix", "stylix": "stylix", @@ -812,11 +846,11 @@ ] }, "locked": { - "lastModified": 1750214276, - "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", + "lastModified": 1750473400, + "narHash": "sha256-wiW2j63MyGQyyijRF25hf7Ab7vx4G8pCiGjUe3OGV4c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", + "rev": "3d7d4c4e284f26d6dc4840491c66884912be0062", "type": "github" }, "original": { @@ -854,11 +888,11 @@ ] }, "locked": { - "lastModified": 1750300711, - "narHash": "sha256-4XHPocwP+66PhxyyObPXfI+Rql4PoGe/xBK791N8I78=", + "lastModified": 1750560265, + "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4178888556c15e0a1c57850d2f103ac300a6e9e2", + "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", "type": "github" }, "original": { @@ -915,15 +949,15 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750369088, - "narHash": "sha256-njtrVYrl+4I3ikgAoKLyQ+5MZ1BKwazAiEpLq2efwrE=", - "owner": "danth", + "lastModified": 1750562714, + "narHash": "sha256-GEQdMsWrij7y1UjuONVZYWLBo1OPIt709KcyCxcDfxU=", + "owner": "nix-community", "repo": "stylix", - "rev": "8c1421ae02475a874f2a09cc4a7ad6de63fbc9e8", + "rev": "100b968012804d6526c5f48a32c30680916bc474", "type": "github" }, "original": { - "owner": "danth", + "owner": "nix-community", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index d492e89..1b78b84 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,20 @@ # nixpkgs.url = "github:NixOS/nixpkgs/master"; # nixpkgs.follows = "nixos-cosmic/nixpkgs"; + nixpkgs-hurl = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + ref = "refs/pull/418842/head"; + }; + + nixpkgs-handbrake = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + rev = "c74daf34b6de017d7d43196c494f887a2b956f0f"; + }; + lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; inputs = { @@ -137,7 +151,7 @@ stylix = { type = "github"; - owner = "danth"; + owner = "nix-community"; repo = "stylix"; inputs = { nixpkgs.follows = "nixpkgs"; diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 2f18ea8..9c2b5e2 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -11,6 +11,8 @@ in # ./QQ.nix ./helix.nix ./cliphist.nix + ./fix-hurl.nix + ./fix-handbrake.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/overlays/modifications/fix-handbrake.nix b/overlays/modifications/fix-handbrake.nix new file mode 100644 index 0000000..868b962 --- /dev/null +++ b/overlays/modifications/fix-handbrake.nix @@ -0,0 +1,5 @@ +{inputs, ...}: final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + inherit (inputs.nixpkgs-handbrake.legacyPackages.${system}) handbrake; +} diff --git a/overlays/modifications/fix-hurl.nix b/overlays/modifications/fix-hurl.nix new file mode 100644 index 0000000..b515d50 --- /dev/null +++ b/overlays/modifications/fix-hurl.nix @@ -0,0 +1,5 @@ +{inputs, ...}: final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + inherit (inputs.nixpkgs-hurl.legacyPackages.${system}) hurl; +} diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 6c27ed8..6996eb0 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2025-06-20", + "date": "2025-06-22", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,14 +34,14 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "434c1455c6877e91d2f399e3f8ec52727974167d", - "sha256": "sha256-UcDxpNWGO72pS54SsmaF09NWmUYo8y+peGaOVKMSxZA=", + "rev": "5a0135a913cd27cea026bd558d0319da3630f327", + "sha256": "sha256-YllDv9VEmBCWV0YrdD2yO54foDy/m+9FR2NBwEpSiCY=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "434c1455c6877e91d2f399e3f8ec52727974167d" + "version": "5a0135a913cd27cea026bd558d0319da3630f327" }, "cliphist": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index a4daf8a..0182b75 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -15,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "434c1455c6877e91d2f399e3f8ec52727974167d"; + version = "5a0135a913cd27cea026bd558d0319da3630f327"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "434c1455c6877e91d2f399e3f8ec52727974167d"; + rev = "5a0135a913cd27cea026bd558d0319da3630f327"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-UcDxpNWGO72pS54SsmaF09NWmUYo8y+peGaOVKMSxZA="; + sha256 = "sha256-YllDv9VEmBCWV0YrdD2yO54foDy/m+9FR2NBwEpSiCY="; }; - date = "2025-06-20"; + date = "2025-06-22"; }; cliphist = { pname = "cliphist"; diff --git a/pkgs/default.nix b/pkgs/default.nix index ac99da1..5ed876b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -7,7 +7,11 @@ ... }: let srcs = callPackages ./_sources/generated.nix {}; - callPackage = lib.callPackageWith (pkgs // {inherit inputs srcs callPackage rootPath;}); + callPackage = lib.callPackageWith (pkgs + // { + inherit inputs srcs callPackage rootPath; + inherit (inputs.nixpkgs-hurl.legacyPackages.${pkgs.system}) hurl; + }); in { pinentry-selector = callPackage ./pinentry-selector.nix {};