diff options
| -rw-r--r-- | _sources/generated.json | 35 | ||||
| -rw-r--r-- | _sources/generated.nix | 22 | ||||
| -rw-r--r-- | accounts/gkleen@sif/default.nix | 4 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | hosts/sif/default.nix | 1 | ||||
| -rw-r--r-- | nvfetcher.toml | 8 | ||||
| -rw-r--r-- | overlays/yt-dlp.nix | 13 |
7 files changed, 69 insertions, 20 deletions
diff --git a/_sources/generated.json b/_sources/generated.json index b5f06da0..9e22b48e 100644 --- a/_sources/generated.json +++ b/_sources/generated.json | |||
| @@ -505,11 +505,38 @@ | |||
| 505 | "passthru": null, | 505 | "passthru": null, |
| 506 | "pinned": false, | 506 | "pinned": false, |
| 507 | "src": { | 507 | "src": { |
| 508 | "deepClone": false, | ||
| 509 | "fetchSubmodules": false, | ||
| 510 | "leaveDotGit": false, | ||
| 508 | "name": null, | 511 | "name": null, |
| 509 | "sha256": "sha256-t3PIG7a3HLLBEc+4WfRTx6cc8u9E7/I0/xVYdxhMPk8=", | 512 | "owner": "yt-dlp", |
| 510 | "type": "url", | 513 | "repo": "yt-dlp", |
| 511 | "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.12.8.tar.gz" | 514 | "rev": "2025.12.08", |
| 515 | "sha256": "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g=", | ||
| 516 | "sparseCheckout": [], | ||
| 517 | "type": "github" | ||
| 518 | }, | ||
| 519 | "version": "2025.12.08" | ||
| 520 | }, | ||
| 521 | "yt-dlp-ejs": { | ||
| 522 | "cargoLock": null, | ||
| 523 | "date": null, | ||
| 524 | "extract": null, | ||
| 525 | "name": "yt-dlp-ejs", | ||
| 526 | "passthru": null, | ||
| 527 | "pinned": false, | ||
| 528 | "src": { | ||
| 529 | "deepClone": false, | ||
| 530 | "fetchSubmodules": false, | ||
| 531 | "leaveDotGit": false, | ||
| 532 | "name": null, | ||
| 533 | "owner": "yt-dlp", | ||
| 534 | "repo": "ejs", | ||
| 535 | "rev": "0.3.2", | ||
| 536 | "sha256": "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg=", | ||
| 537 | "sparseCheckout": [], | ||
| 538 | "type": "github" | ||
| 512 | }, | 539 | }, |
| 513 | "version": "2025.12.8" | 540 | "version": "0.3.2" |
| 514 | } | 541 | } |
| 515 | } \ No newline at end of file | 542 | } \ No newline at end of file |
diff --git a/_sources/generated.nix b/_sources/generated.nix index 30fe0839..e433bce4 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix | |||
| @@ -313,10 +313,24 @@ | |||
| 313 | }; | 313 | }; |
| 314 | yt-dlp = { | 314 | yt-dlp = { |
| 315 | pname = "yt-dlp"; | 315 | pname = "yt-dlp"; |
| 316 | version = "2025.12.8"; | 316 | version = "2025.12.08"; |
| 317 | src = fetchurl { | 317 | src = fetchFromGitHub { |
| 318 | url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.12.8.tar.gz"; | 318 | owner = "yt-dlp"; |
| 319 | sha256 = "sha256-t3PIG7a3HLLBEc+4WfRTx6cc8u9E7/I0/xVYdxhMPk8="; | 319 | repo = "yt-dlp"; |
| 320 | rev = "2025.12.08"; | ||
| 321 | fetchSubmodules = false; | ||
| 322 | sha256 = "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g="; | ||
| 323 | }; | ||
| 324 | }; | ||
| 325 | yt-dlp-ejs = { | ||
| 326 | pname = "yt-dlp-ejs"; | ||
| 327 | version = "0.3.2"; | ||
| 328 | src = fetchFromGitHub { | ||
| 329 | owner = "yt-dlp"; | ||
| 330 | repo = "ejs"; | ||
| 331 | rev = "0.3.2"; | ||
| 332 | fetchSubmodules = false; | ||
| 333 | sha256 = "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg="; | ||
| 320 | }; | 334 | }; |
| 321 | }; | 335 | }; |
| 322 | } | 336 | } |
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 2011e670..02241bd0 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix | |||
| @@ -506,8 +506,8 @@ in { | |||
| 506 | fira-code-symbols libreoffice xournalpp | 506 | fira-code-symbols libreoffice xournalpp |
| 507 | nixos-shell virt-viewer freerdp gnome-icon-theme | 507 | nixos-shell virt-viewer freerdp gnome-icon-theme |
| 508 | paper-icon-theme sshpassSecret weechat element-desktop | 508 | paper-icon-theme sshpassSecret weechat element-desktop |
| 509 | sieve-connect gimp3 inkscape udiskie glab nitrokey-app | 509 | sieve-connect gimp3 inkscape udiskie glab |
| 510 | pynitrokey gtklock wlrctl remmina openscad spice-record | 510 | gtklock wlrctl remmina openscad spice-record |
| 511 | nerd-fonts.fira-mono | 511 | nerd-fonts.fira-mono |
| 512 | nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts | 512 | nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts |
| 513 | swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE])) | 513 | swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE])) |
| @@ -813,11 +813,11 @@ | |||
| 813 | }, | 813 | }, |
| 814 | "nixpkgs_2": { | 814 | "nixpkgs_2": { |
| 815 | "locked": { | 815 | "locked": { |
| 816 | "lastModified": 1765186076, | 816 | "lastModified": 1765472234, |
| 817 | "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", | 817 | "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", |
| 818 | "owner": "NixOS", | 818 | "owner": "NixOS", |
| 819 | "repo": "nixpkgs", | 819 | "repo": "nixpkgs", |
| 820 | "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", | 820 | "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", |
| 821 | "type": "github" | 821 | "type": "github" |
| 822 | }, | 822 | }, |
| 823 | "original": { | 823 | "original": { |
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index f90f9249..258a83f7 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix | |||
| @@ -575,7 +575,6 @@ in { | |||
| 575 | firmware = [ pkgs.linux-firmware ]; | 575 | firmware = [ pkgs.linux-firmware ]; |
| 576 | 576 | ||
| 577 | keyboard.uhk.enable = true; | 577 | keyboard.uhk.enable = true; |
| 578 | nitrokey.enable = true; | ||
| 579 | }; | 578 | }; |
| 580 | 579 | ||
| 581 | # sound.enable = true; | 580 | # sound.enable = true; |
diff --git a/nvfetcher.toml b/nvfetcher.toml index 499a4e81..23f4c5dd 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml | |||
| @@ -105,8 +105,12 @@ src.prefix = "v" | |||
| 105 | fetch.tarball = "https://github.com/JonathonReinhart/spice-record/archive/refs/tags/v$ver.tar.gz" | 105 | fetch.tarball = "https://github.com/JonathonReinhart/spice-record/archive/refs/tags/v$ver.tar.gz" |
| 106 | 106 | ||
| 107 | [yt-dlp] | 107 | [yt-dlp] |
| 108 | src.pypi = "yt_dlp" | 108 | src.github = "yt-dlp/yt-dlp" |
| 109 | fetch.pypi = "yt_dlp" | 109 | fetch.github = "yt-dlp/yt-dlp" |
| 110 | |||
| 111 | [yt-dlp-ejs] | ||
| 112 | src.github = "yt-dlp/ejs" | ||
| 113 | fetch.github = "yt-dlp/ejs" | ||
| 110 | 114 | ||
| 111 | [netbootxyz-efi] | 115 | [netbootxyz-efi] |
| 112 | src.github = "netbootxyz/netboot.xyz" | 116 | src.github = "netbootxyz/netboot.xyz" |
diff --git a/overlays/yt-dlp.nix b/overlays/yt-dlp.nix index 435afd58..1c9f77d8 100644 --- a/overlays/yt-dlp.nix +++ b/overlays/yt-dlp.nix | |||
| @@ -1,8 +1,13 @@ | |||
| 1 | { prev, sources, ... }: { | 1 | { prev, final, sources, ... }: { |
| 2 | yt-dlp = prev.yt-dlp.overrideAttrs (oldAttrs: { | 2 | yt-dlp = prev.yt-dlp.overrideAttrs (oldAttrs: { |
| 3 | inherit (sources.yt-dlp) pname version src; | 3 | inherit (sources.yt-dlp) pname version src; |
| 4 | |||
| 5 | postPatch = ""; | ||
| 6 | installCheckPhase = "true"; | ||
| 7 | }); | 4 | }); |
| 5 | python3 = prev.python3.override { | ||
| 6 | packageOverrides = python-self: python-super: { | ||
| 7 | yt-dlp-ejs = python-super.yt-dlp-ejs.overridePythonAttrs (oldAttrs: { | ||
| 8 | inherit (sources.yt-dlp-ejs) pname version src; | ||
| 9 | }); | ||
| 10 | }; | ||
| 11 | }; | ||
| 12 | python3Packages = final.python3.pkgs; | ||
| 8 | } | 13 | } |
