From 3af18d859c9485ac3d2a0a97b534ce58bbb1ba8c Mon Sep 17 00:00:00 2001 From: Joonas Rautiola Date: Sun, 10 Nov 2024 19:00:45 +0200 Subject: [PATCH] Update flake inputs --- flake.lock | 233 +++++++++++++---------------------------------------- flake.nix | 15 ---- 2 files changed, 56 insertions(+), 192 deletions(-) diff --git a/flake.lock b/flake.lock index 8943ed4..9af16b0 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1730829751, - "narHash": "sha256-qESBP6HsR5LrI65TVFO8+yw63U7Q5o7PFhighIECtrs=", + "lastModified": 1731085946, + "narHash": "sha256-dzfJGn+st1IoflP8WdV8D3rkZYfeANSM/jVKvify6xk=", "owner": "joinemm", "repo": "bin", - "rev": "d47e031876d4dacc8344808e7e68666739d34cad", + "rev": "a1754ae35eb746f8a7e4658d24653d7bc0699a1d", "type": "github" }, "original": { @@ -45,27 +45,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixarr", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", - "owner": "numtide", - "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -73,11 +52,11 @@ ] }, "locked": { - "lastModified": 1730751873, - "narHash": "sha256-sdY29RWz0S7VbaoTwSy6RummdHKf0wUTaBlqPxrtvmQ=", + "lastModified": 1731060864, + "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", "owner": "nix-community", "repo": "disko", - "rev": "856a2902156ba304efebd4c1096dbf7465569454", + "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", "type": "github" }, "original": { @@ -91,11 +70,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -124,28 +103,6 @@ "type": "github" } }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nixarr", - "vpnconfinement", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-root": { "locked": { "lastModified": 1723604017, @@ -161,21 +118,6 @@ "type": "github" } }, - "flake-root_2": { - "locked": { - "lastModified": 1723604017, - "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", - "owner": "srid", - "repo": "flake-root", - "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -201,11 +143,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -223,11 +165,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1730770711, - "narHash": "sha256-UHm56cW/04efHY4NgboGFOXliGQCqRRY+l1HM7c8/Ms=", + "lastModified": 1731202990, + "narHash": "sha256-Ac3ff4w9+xePGX6TF90zEVyhdHJkhg58pUafvoAjVEY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "0c25376479d11073346ed22de8571805543ede71", + "rev": "faf26ec552997488d75a0fdb07783c0c2edd3d5f", "type": "github" }, "original": { @@ -263,11 +205,11 @@ ] }, "locked": { - "lastModified": 1730604744, - "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", + "lastModified": 1731209121, + "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", + "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", "type": "github" }, "original": { @@ -278,28 +220,17 @@ }, "nixarr": { "inputs": { - "devshell": "devshell", - "flake-parts": [ - "flake-parts" - ], - "flake-root": "flake-root_2", "nixpkgs": [ "nixpkgs" ], - "submerger": [ - "submerger" - ], - "treefmt-nix": [ - "treefmt-nix" - ], "vpnconfinement": "vpnconfinement" }, "locked": { - "lastModified": 1726847117, - "narHash": "sha256-fBxizpL5SJIgzh5mIeUWghHr5437jUc+BLu8dOwnDZo=", + "lastModified": 1730985328, + "narHash": "sha256-bo85pgteuF6oIAU9rpg8SPpiOrIZ7qbMumNeUAYEdHQ=", "owner": "rasmus-kirk", "repo": "nixarr", - "rev": "a3fad60dd2f5110536eb13f24e7529b2506ade6d", + "rev": "104db0ba7ca96f8a7f605ba068d0cba6f57e4003", "type": "github" }, "original": { @@ -316,11 +247,11 @@ ] }, "locked": { - "lastModified": 1730720546, - "narHash": "sha256-5147A6X0MH6u/YDxLe+Nnva3oxfLQanC716LarG/uoo=", + "lastModified": 1731135107, + "narHash": "sha256-ikb/GQG8N0fkn1wQspT3ORxFMx7hOQ9jPGNBrOETKjo=", "owner": "kaylorben", "repo": "nixcord", - "rev": "e3e27c77316f7526b1a846778ae9c759c9377611", + "rev": "19f824c6a15238bb5a205fa7be2330a461d39fb9", "type": "github" }, "original": { @@ -331,11 +262,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730828750, - "narHash": "sha256-XrnZLkLiBYNlwV5gus/8DT7nncF1TS5la6Be7rdVOpI=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "2e78b1af8025108ecd6edaa3ab09695b8a4d3d55", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -346,11 +277,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1730958623, + "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "85f7e662eda4fa3a995556527c87b2524b691933", "type": "github" }, "original": { @@ -362,14 +293,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-old": { @@ -406,11 +337,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -437,11 +368,11 @@ "treefmt-nix": [] }, "locked": { - "lastModified": 1730792264, - "narHash": "sha256-Ue3iywjyaNOxXgw7esVSBX3bZzM2bSPubZamYsBKIG8=", + "lastModified": 1731155487, + "narHash": "sha256-+D57j7BcV5O3XH9za3c3XXVLHr+F+enThAN2EeF6H/M=", "owner": "nix-community", "repo": "nixvim", - "rev": "3d24cb72618738130e6af9c644c81fe42aa34ebc", + "rev": "31364af1990067d5529846a2ebf17a42c5ab22ff", "type": "github" }, "original": { @@ -468,34 +399,12 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-old": "nixpkgs-old", "nixvim": "nixvim", - "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", - "submerger": "submerger", "treefmt-nix": "treefmt-nix", "zen-browser": "zen-browser", "zmk-nix": "zmk-nix" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730773675, - "narHash": "sha256-pULo7GryzLkqGveWvnNWVz1Kk6EJqvq+HQeSkwvr7DA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "e19e9d54fac1e53f73411ebe22d19f946b1ba0bd", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -504,11 +413,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730746162, - "narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=", + "lastModified": 1731213149, + "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", "owner": "mic92", "repo": "sops-nix", - "rev": "59d6988329626132eaf107761643f55eb979eef1", + "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", "type": "github" }, "original": { @@ -517,29 +426,6 @@ "type": "github" } }, - "submerger": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1729941594, - "narHash": "sha256-edy337w7tQ8dsEEl/gHfgyXCufghUVh3/plT+wqZOZ4=", - "owner": "rasmus-kirk", - "repo": "submerger", - "rev": "9956bc9e91a5bcc56c63bb0a6cbb39b1632b49c6", - "type": "github" - }, - "original": { - "owner": "rasmus-kirk", - "repo": "submerger", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -584,11 +470,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1730559589, - "narHash": "sha256-o4NT2Kt7yEA63j38Ic5mrh2U/iQjs3YSNvIbCccIYP0=", + "lastModified": 1730836236, + "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=", "ref": "refs/heads/main", - "rev": "70645c290dfc6ed10282bf4d2ae38c0bf7b1a3fb", - "revCount": 830, + "rev": "90352466d502c40e147cfd11a428dde6c2899ab3", + "revCount": 833, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -601,19 +487,12 @@ } }, "vpnconfinement": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "nixarr", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1725824375, - "narHash": "sha256-c0nVYn1Jcjqt7XLXRM7jBmkvwMu+qcUVO7AL8+ZwiaQ=", + "lastModified": 1729977304, + "narHash": "sha256-T/ABQpSbPJxO7TGl1P2fBd87xsQmnVflIFgHQTxwvBs=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "0fc1023446e906094fef69ccd6991d8659b34d42", + "rev": "3b11ba59f1c852493203b86c8acd715259a6c3cd", "type": "github" }, "original": { @@ -629,11 +508,11 @@ ] }, "locked": { - "lastModified": 1730647781, - "narHash": "sha256-+UK/IVvDa1CkZTksIMkn4f2/K7+F35Joh55BHN00shg=", + "lastModified": 1731201824, + "narHash": "sha256-A1Kc1YwPMKWzNVqL3kL2MXpdM5fNp+wsHXoKuADas8A=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "23f1d349d5f8c5f23818d1776c0266729d3948c4", + "rev": "9346d7ad60c4bb155e3868385d7c8f974280ff25", "type": "github" }, "original": { @@ -649,11 +528,11 @@ ] }, "locked": { - "lastModified": 1730663558, - "narHash": "sha256-qJG7KoBmO326k4c3JnUI8cQ0aEi5tx/bnQl2nIw1hnI=", + "lastModified": 1731198911, + "narHash": "sha256-7W+slivoV0zSfDxXlhMVL3yPodrhCiYQiFbtbco1r5U=", "owner": "lilyinstarlight", "repo": "zmk-nix", - "rev": "f9fceeff2451a0db6fb72909e7f30868151ea175", + "rev": "1d7d7aeef7c62d3a80a688b26c6484123c26cde6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index deda68a..1d37041 100644 --- a/flake.nix +++ b/flake.nix @@ -121,25 +121,10 @@ }; }; - # https://github.com/rasmus-kirk/nixarr/issues/40 - submerger = { - url = "github:rasmus-kirk/submerger"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; - }; - - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixarr = { url = "github:rasmus-kirk/nixarr"; inputs = { - flake-parts.follows = "flake-parts"; nixpkgs.follows = "nixpkgs"; - submerger.follows = "submerger"; - treefmt-nix.follows = "treefmt-nix"; }; }; };