diff options
| author | Mark Nipper <nipsy@bitgnome.net> | 2026-02-19 22:51:03 -0800 |
|---|---|---|
| committer | Mark Nipper <nipsy@bitgnome.net> | 2026-02-19 22:51:03 -0800 |
| commit | 1a0ccb39362bb522bab73c16c70594313dcedd16 (patch) | |
| tree | 4d5b855d475b64f3b0699c687bd2122b6d14995d | |
| parent | f1f0249dd222b915e6efa65042f92a6ec41f5056 (diff) | |
| download | nix-1a0ccb39362bb522bab73c16c70594313dcedd16.tar nix-1a0ccb39362bb522bab73c16c70594313dcedd16.tar.gz nix-1a0ccb39362bb522bab73c16c70594313dcedd16.tar.bz2 nix-1a0ccb39362bb522bab73c16c70594313dcedd16.tar.lz nix-1a0ccb39362bb522bab73c16c70594313dcedd16.tar.xz nix-1a0ccb39362bb522bab73c16c70594313dcedd16.tar.zst nix-1a0ccb39362bb522bab73c16c70594313dcedd16.zip | |
Bump reaper to my pre-PR branch
| -rw-r--r-- | flake.nix | 10 | ||||
| -rw-r--r-- | hosts/caladan/default.nix | 1 | ||||
| -rw-r--r-- | overlays/default.nix | 26 |
3 files changed, 28 insertions, 9 deletions
@@ -30,6 +30,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages + my-nixpkgs.url = "github:nipsy/nixpkgs/update_reaper_7.61"; #nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; #nixpkgs-pr490633.url = "github:M0streng0/nixpkgs/yabridge-disable-bitbridge"; #nixpkgs-wine9_22.url = "github:nixos/nixpkgs/dea5930f0ed8c29d3758d5ade9898b4e99d80b74"; @@ -50,6 +51,7 @@ disko, home-manager-stable, home-manager, + my-nixpkgs, nixos-hardware, nixpkgs-master, #nixpkgs-pr490633, @@ -104,6 +106,14 @@ # in { # nixpkgs.overlays = [ overlay-yabridge-pr490633 ]; #}) + ({ config, pkgs, ... }: + let + overlay-my-nixpkgs = final: prev: { + reaper = my-nixpkgs.legacyPackages."x86_64-linux".reaper; + }; + in { + nixpkgs.overlays = [ overlay-my-nixpkgs ]; + }) disko.nixosModules.disko ./hosts/caladan home-manager.nixosModules.home-manager { diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index b48678f..c25eddb 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -139,6 +139,7 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.master-packages + outputs.overlays.my-nixpkgs-packages #outputs.overlays.pr490633-packages outputs.overlays.stable-packages #outputs.overlays.wine9_22-packages diff --git a/overlays/default.nix b/overlays/default.nix index e3d0862..7d0995b 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,7 +6,8 @@ # outputs.overlays.modifications # outputs.overlays."67e692392-packages" # outputs.overlays.master-packages -# outputs.overlays.pr476197-packages +# outputs.overlays.my-nixpkgs +# outputs.overlays.pr490633-packages # outputs.overlays.stable-packages # outputs.overlays.wine9_22-packages # ] @@ -50,14 +51,14 @@ version = "GE-Proton10-32"; }); - reaper = prev.reaper.overrideAttrs (old: rec { - pname = "reaper"; - src = prev.fetchurl { - hash = "sha256-NioXFiUNO2TzJn0xhoQKEWb8OD7HD8O+sHAf4enopxg="; - url = "https://www.reaper.fm/files/7.x/reaper761_linux_x86_64.tar.xz"; - }; - version = "7.61"; - }); + #reaper = prev.reaper.overrideAttrs (old: rec { + # pname = "reaper"; + # src = prev.fetchurl { + # hash = "sha256-NioXFiUNO2TzJn0xhoQKEWb8OD7HD8O+sHAf4enopxg="; + # url = "https://www.reaper.fm/files/7.x/reaper761_linux_x86_64.tar.xz"; + # }; + # version = "7.61"; + #}); }; #"67e692392-packages" = final: _prev: { @@ -83,6 +84,13 @@ }; }; + my-nixpkgs-packages = final: _prev: { + my-nixpkgs = import inputs.my-nixpkgs { + inherit (final) system; + config.allowUnfree = true; + }; + }; + #pr490633-packages = final: _prev: { # pr490633 = import inputs.nixpkgs-pr490633 { # inherit (final) system; |