From 2c49dfa642e93b349c3c99f4e2facb8c7fbb396c Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 29 Jun 2023 22:47:51 +0000 Subject: [PATCH] refactor: remove overlays/pins.nix --- TODO.md | 2 -- flake.nix | 18 ++++-------------- overlays/all.nix | 2 -- overlays/pins.nix | 31 ------------------------------- 4 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 overlays/pins.nix diff --git a/TODO.md b/TODO.md index e667ab9c1..c9e4d62f2 100644 --- a/TODO.md +++ b/TODO.md @@ -4,8 +4,6 @@ ## REFACTORING: -- remove unused `overlays/pins.nix` - ### sops/secrets - attach secrets to the thing they're used by (sane.programs) - rework secrets to leverage `sane.fs` diff --git a/flake.nix b/flake.nix index 94e856f22..5b6c92298 100644 --- a/flake.nix +++ b/flake.nix @@ -23,9 +23,6 @@ # preferably, i would rewrite the human-readable https URLs to nix-specific github: URLs with a helper, # but `inputs` is required to be a strict attrset: not an expression. inputs = { - # - # nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11"; - # branch workflow: # - daily: # - nixos-unstable cut from master after enough packages have been built in caches. @@ -180,12 +177,6 @@ optimizations = final: prev: import ./overlays/optimizations.nix final prev; passthru = final: prev: let - stable = - if inputs ? "nixpkgs-stable" then ( - final': prev': { - stable = inputs.nixpkgs-stable.legacyPackages."${prev'.stdenv.hostPlatform.system}"; - } - ) else (final': prev': {}); mobile = (import "${mobile-nixos}/overlay/overlay.nix"); uninsane = uninsane-dot-org.overlay; # nix-serve' = nix-serve.overlay; @@ -196,11 +187,10 @@ inherit (nix-serve.packages."${next.system}") nix-serve; }; in - (stable final prev) - // (mobile final prev) - // (uninsane final prev) - // (nix-serve' final prev) - ; + (mobile final prev) + // (uninsane final prev) + // (nix-serve' final prev) + ; }; nixosModules = rec { diff --git a/overlays/all.nix b/overlays/all.nix index cf4dd194f..8ced83efb 100644 --- a/overlays/all.nix +++ b/overlays/all.nix @@ -4,7 +4,6 @@ final: prev: let - pins = import ./pins.nix; pkgs = import ./pkgs.nix; disable-flakey-tests = import ./disable-flakey-tests.nix; optimizations = import ./optimizations.nix; @@ -18,7 +17,6 @@ let overlays; in renderOverlays [ - pins pkgs disable-flakey-tests (ifCross optimizations) diff --git a/overlays/pins.nix b/overlays/pins.nix deleted file mode 100644 index 627c8b414..000000000 --- a/overlays/pins.nix +++ /dev/null @@ -1,31 +0,0 @@ -# when a `nixos-rebuild` fails after a nixpkgs update: -# - take the failed package -# - search it here: -# - if it's broken by that upstream builder, then pin it: somebody will come along and fix the package. -# - otherwise, search github issues/PRs for knowledge of it before pinning. -# - if nobody's said anything about it yet, probably want to root cause it or hold off on updating. -# -# note that these pins apply to *all* platforms: -# - natively compiled packages -# - cross compiled packages -# - qemu-emulated packages - -(next: prev: { - # XXX: when invoked outside our flake (e.g. via NIX_PATH) there is no `next.stable`, - # so just forward the unstable packages. - inherit (next.stable or prev) - ; - # chromium can take 4 hours to build from source, with no signs of progress. - # disable it if you're in a rush. - # chromium = next.emptyDirectory; - - # lemmy-server = prev.lemmy-server.overrideAttrs (upstream: { - # patches = upstream.patches or [] ++ [ - # (next.fetchpatch { - # # "Fix docker federation setup (#2706)" - # url = "https://github.com/LemmyNet/lemmy/commit/2891856b486ad9397bca1c9839255d73be66361.diff"; - # hash = "sha256-qgRvBO2y7pmOWdteu4uiZNi8hs0VazOV+L5Z0wu60/E="; - # }) - # ]; - # }); -})