Merge pull request 'Lock file maintenance' (#596) from renovate/lock-file-maintenance into main

Reviewed-on: #596

config/desktop.nix

@@ -47,7 +47,7 @@ in {
       fira-code-symbols
       font-awesome
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts-emoji
       noto-fonts-extra
       (nerdfonts.override {fonts = ["FiraCode" "DroidSansMono" "Noto"];})

config/workarounds/default.nix

@@ -5,5 +5,8 @@
 }: {
   nixpkgs.overlays = [
     self.overlays.${system}
+    (self: super: {
+      utillinux = super.util-linux;
+    })
   ];
 }

flake.lock

@@ -67,9 +67,7 @@
         "flake-parts": [
           "flake-parts"
         ],
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1728796349,
@@ -159,11 +157,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1729193803,
+        "lastModified": 1729233248,
-        "narHash": "sha256-67agAdAhZwTUWJF2/pXgLbH5fORQHJimxI+AB/9Mkoo=",
+        "narHash": "sha256-tC9hlqcZPw9HGgtLpBXp++6dt8DHahyXnw0qzCDYius=",
         "ref": "refs/heads/main",
-        "rev": "87b068064beec3a22ad8fa6d402c1241a4344d33",
+        "rev": "4eecbcbfe0815f260e930a408bb2f7d62c68c451",
-        "revCount": 373,
+        "revCount": 376,
         "type": "git",
         "url": "https://git.chir.rs/chir.rs/chir.rs"
       },
@@ -465,11 +463,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729174520,
+        "lastModified": 1729321331,
-        "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=",
+        "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268",
+        "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
         "type": "github"
       },
       "original": {
@@ -482,7 +480,7 @@
       "inputs": {
         "lix": "lix",
         "nix-eval-jobs": "nix-eval-jobs",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1728321752,
@@ -607,11 +605,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729199869,
+        "lastModified": 1729367266,
-        "narHash": "sha256-buAN+K/8zIPo6dmb984BNOzZzQlK9TBdKPYLbdwWWGM=",
+        "narHash": "sha256-2MMOfmsdggnzNeJ3KseUYZfSFoV7AOacB8sKXC6OqmE=",
         "ref": "refs/heads/main",
-        "rev": "52b64662a4924741e465b9caed6b2b4f8539aced",
+        "rev": "0ff8f9132552e03497b07e1e5c068660a7a04515",
-        "revCount": 16346,
+        "revCount": 16365,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -696,11 +694,11 @@
         "umu": "umu"
       },
       "locked": {
-        "lastModified": 1729215603,
+        "lastModified": 1729388819,
-        "narHash": "sha256-v4fB1nH+pDATpt6Jq/nk+lU2I6Zn3LRF1s4gNPAvZko=",
+        "narHash": "sha256-Csa4LUgQWdUBQKj1bv8kKu3qFCOmnDWHAawWateCmls=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "79f0e311a18bfda913093b4388b24ab380d632d6",
+        "rev": "177e270423839dedb9721b43c757a5f849b1e9f8",
         "type": "github"
       },
       "original": {
@@ -757,11 +755,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724996935,
+        "lastModified": 1729339656,
-        "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
+        "narHash": "sha256-smV7HQ/OqZeRguQxNjsb3uQDwm0p6zKDbSDbPCav/oY=",
         "owner": "nlewo",
         "repo": "nix2container",
-        "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
+        "rev": "cc96df7c3747c61c584d757cfc083922b4f4b33e",
         "type": "github"
       },
       "original": {
@@ -772,11 +770,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1728729581,
+        "lastModified": 1729333370,
-        "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
+        "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
+        "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb",
         "type": "github"
       },
       "original": {
@@ -872,6 +870,21 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1728768054,
+        "narHash": "sha256-eDVWVreO1e1CN5V1Oq0aI449ESEyJcu7OtZeZ2zZ434=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b1ea4a36d6f1bb62734bce3483994df69910e6d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1728193676,
         "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
@@ -887,13 +900,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1729231104,
+        "lastModified": 1729399009,
-        "narHash": "sha256-bRfk5ns1kp+D9/ngAYm5RhT9f/egXkfL1Xhd5j0c0W8=",
+        "narHash": "sha256-mZXm1ka9mKh5L9Cu3rDvSwu0SEclA4tRcINI2SrIl1I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac76a342a8e881cfae21716a9ef0668422882837",
+        "rev": "67f803dcf82ebe958a53fcfa7c1edb276558c3f6",
         "type": "github"
       },
       "original": {
@@ -996,7 +1009,7 @@
         "nix2container": "nix2container_2",
         "nixos-hardware": "nixos-hardware",
         "nixos-vscode-server": "nixos-vscode-server",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "riscv-overlay": "riscv-overlay",
         "rust-overlay": "rust-overlay",
@@ -1011,11 +1024,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729218602,
+        "lastModified": 1729391507,
-        "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=",
+        "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94",
+        "rev": "784981a9feeba406de38c1c9a3decf966d853cca",
         "type": "github"
       },
       "original": {
@@ -1034,11 +1047,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728345710,
+        "lastModified": 1729394972,
-        "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
+        "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
+        "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
         "type": "github"
       },
       "original": {
@@ -1114,11 +1127,11 @@
       },
       "locked": {
         "dir": "packaging/nix",
-        "lastModified": 1729201498,
+        "lastModified": 1729381279,
-        "narHash": "sha256-i/yDOHQbgf/D1iWpBZF5oqoXbCBddu81S8p+ekRzHso=",
+        "narHash": "sha256-hlDGWvDjqvVlfGRcL+IcLEQOKgJf9QCxGb70tJuv0NQ=",
         "ref": "refs/heads/main",
-        "rev": "c714ae8692d5e518d2cc4bdef9c4b94cf1be3aab",
+        "rev": "51db53069883dce0624f6c6df1adbb2c3ba5728f",
-        "revCount": 794,
+        "revCount": 809,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/Open-Wine-Components/umu-launcher/"

flake.nix

@@ -23,7 +23,7 @@ rec {
       inputs.devshell.follows = "devshell";
       inputs.flake-compat.follows = "flake-compat";
       inputs.flake-parts.follows = "flake-parts";
-      inputs.nixpkgs.follows = "nixpkgs";
+      #inputs.nixpkgs.follows = "nixpkgs";
     };
     attic = {
       url = "github:DarkKirb/attic";