backports/README.md

@@ -1,9 +1,5 @@
 # backports
 This is a nixpkgs overlay that contains temporary fixes for build failures or
 other issues, usually backported from the nixpkgs master branch. Each package
-defined in this overlay shall automatically disable itself once a certain
+defined in this overlay shall automatically disable itself once the upstream
-condition is met, such as the upstream package being updated or the nixpkgs
+package has been updated.
-modification date passing a certain time.
-
-This is in place because I am extremely forgetful; I will almost certainly
-forget to undo a temporary fix later, so this takes care of it for me.

backports/default.nix

@@ -1,12 +1,8 @@
-nixfiles: final: prev:
+final: prev:
 let
-  inherit (prev) callPackage fetchFromGitHub;
+  inherit (final) callPackage fetchFromGitHub;
-  inherit (prev.lib) recurseIntoAttrs optionalAttrs;
+  inherit (final.lib) recurseIntoAttrs;
 
-  # if you can't do version based just make it time based and deal with it in a
-  # month if it's not fixed
-  # 2024-04-10T08:11:11
-  gap-hold = (nixfiles.inputs.nixpkgs-unstable.lastModified <= 1712751071);
   gimpPlugins-gap = let
     src = fetchFromGitHub {
       owner = "Scrumplex";
@@ -15,4 +11,6 @@ let
       hash="sha256-oat4TwOorFevUMZdBFgaQHx/UKqGW7CGMoOHVgQxVdM="; 
     };
   in recurseIntoAttrs (callPackage "${src}/pkgs/applications/graphics/gimp/plugins" {});
-in (optionalAttrs gap-hold { gimpPlugins = gimpPlugins-gap; })
+in {
+  gimpPlugins = if prev.gimpPlugins.gap.version == "2.6.0" then gimpPlugins-gap else prev.gimpPlugins;
+}

flake.lock

@@ -80,11 +80,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710452332,
+        "lastModified": 1710164657,
-        "narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=",
+        "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9",
+        "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710415616,
+        "lastModified": 1709391291,
-        "narHash": "sha256-1qVByzzCcKoCmP8ReUSAjKU5V9pfTLHQIM4WI1tvQ9E=",
+        "narHash": "sha256-NJwAgXRKLVuO3YLkGxXIanLvTKN+cJsYwbLoWOa7ODk=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "75420d09f93346d9d23d5a1e26b42699f6b66cd6",
+        "rev": "2d4ece4a008feefddc194bde785b1d39f987b5a7",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710465727,
+        "lastModified": 1709980437,
-        "narHash": "sha256-ta/Ojz+tdf4YjyVXvmuHTlzkTHsFS65Kdp3BfyVcPtA=",
+        "narHash": "sha256-rp1MwfRaZl7TPM4E5i1HxQGJCCfMcIa7dOzTX3SW7ro=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "74612685fd6ee5f6d8d1b04903f7009b089d7ee6",
+        "rev": "e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9",
         "type": "github"
       },
       "original": {
@@ -247,11 +247,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1710408871,
+        "lastModified": 1710159071,
-        "narHash": "sha256-YpSGYZR96I8g5OK/Fdm0O4+mHLen6YPA1cPanqqNqT0=",
+        "narHash": "sha256-CT0WKgcmlcWZPZL/sSSICN/Vbm4Of0ZDgxc0GFf6sYU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bd5ddf2c6bfafff031edf80221e1ee94e86ca10a",
+        "rev": "0fbcc4b2e8571f4af39be41752581ea09dd9ab06",
         "type": "github"
       },
       "original": {
@@ -263,11 +263,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1710420202,
+        "lastModified": 1710021367,
-        "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
+        "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
+        "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d",
         "type": "github"
       },
       "original": {
@@ -316,11 +316,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710468700,
+        "lastModified": 1710123130,
-        "narHash": "sha256-YGN6R0nLfB2L57J8T/DX+LcB06QipyYzHSz7AD8B0n0=",
+        "narHash": "sha256-EoGL/WSM1M2L099Q91mPKO/FRV2iu2ZLOEp3y5sLfiE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7ff8e9a04ac7777a3446788cb4018b452157ab8a",
+        "rev": "73aca260afe5d41d3ebce932c8d896399c9d5174",
         "type": "github"
       },
       "original": {

flake.nix

@@ -68,7 +68,7 @@
       })
 
       # various temporary fixes that automatically revert
-      (import ./backports self)
+      (import ./backports)
 
       inputs.hyprwm-contrib.overlays.default
       inputs.rust-overlay.overlays.default

hosts/nixos-wsl/configuration.nix

@@ -7,7 +7,6 @@
       profile.base.enable = true;
       binfmt.enable = true;
     };
-    wsl.interop.register = true;
 
     networking.networkmanager.enable = false;
     programs.gnupg.agent = {

system/hardware/binfmt.nix

@@ -33,5 +33,10 @@ in
     (lib.mkIf enable {
       boot.binfmt = {inherit emulatedSystems;};
     })
+
+    # keep Windows binfmt registration on wsl
+    (lib.mkIf (cfg.enable && lib.hasAttrByPath [ "wsl" "interop" "register" ] options) {
+      wsl.interop.register = lib.mkDefault true;
+    })
   ];
 }