Merge branch 'staging/nixpkgs-2023-04-24-staging-next'

flake.lock

@@ -82,11 +82,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1682272886,
-        "narHash": "sha256-fBeoSYSvFeZte9jVxUlyKbWQdzLjfMrXK3Dhwg/usoI=",
+        "lastModified": 1682404149,
+        "narHash": "sha256-vilYNldFXiu56HGD0lPcWsiED7EmjGMViCLZoQsv7Jk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7d385961ebe582fed4e850a326d8d200be79f6b8",
+        "rev": "d0ea36ece469a71a909ebff90777c2f7a49478bb",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1682218555,
-        "narHash": "sha256-kojMklCNBnPe8KtRvJvBtFGU/gPAqRKYpZEqyehHfn4=",
+        "lastModified": 1682338428,
+        "narHash": "sha256-T7AL/Us6ecxowjMAlO77GETTQO2SO+1XX2+Y/OSfHk8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8a95e6f8cd160a05c2b560e66f702432a53b59ac",
+        "rev": "7c8e9727a2ecf9994d4a63d577ad5327e933b6a4",
         "type": "github"
       },
       "original": {

overlays/pins.nix

@@ -18,15 +18,4 @@
   # 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;
-
-  # TODO(2023/04/24): remove this. it's upstreamed for next staging-next `nix flake update`
-  sway-unwrapped = prev.sway-unwrapped.overrideAttrs (upstream: {
-    patches = upstream.patches or [] ++ [
-      (next.fetchpatch {
-        name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch";
-        url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff";
-        hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0=";
-      })
-    ];
-  });
 })

pkgs/lightdm-mobile-greeter/default.nix

@@ -33,7 +33,13 @@ rustPlatform.buildRustPackage rec {
     rev = "f3511ec71a4a1f491d759711e0bcf031e335ea70";
     hash = "sha256-U5chzm3q3vycgX1HSLf6sk6M3YoJ4CHGLKRg4ViIhu8=";
   };
-  cargoHash = "sha256-2NMXR+D/CnDhUToQmMwK2Cb2l+4/N9BrCz/lt1NZ6Wk=";
+  # cargoHash = "sha256-2NMXR+D/CnDhUToQmMwK2Cb2l+4/N9BrCz/lt1NZ6Wk=";
+  cargoLock = {
+    lockFile = "${src}/Cargo.lock";
+    outputHashes = {
+      "light-dm-sys-0.0.1" = "sha256-91MZhbO/Or0QOt0yVAUhtorpMBBzElFg6U59mF7WB0k=";
+    };
+  };
 
   buildInputs = [
     gtk3