Merge branch 'master' into vizqq

nix-community · Dec 6, 2024 · 8f1c50d · 8f1c50d
2 parents b4d9545 + a4ae8a2
commit 8f1c50d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/default.nix b/default.nix
@@ -1,7 +1,14 @@
 {
   nurpkgs ? import <nixpkgs> { }, # For nixpkgs dependencies used by NUR itself
   # Dependencies to call NUR repos with
-  pkgs ? null,
+  # The override handles the case where NUR is installed via standalone channel or channel + override
+  pkgs ? (
+    import <nixpkgs> {
+      overrides = [
+        (final: prev: if prev ? nur then prev else { nur = ./. { pkgs = final; }; })
+      ];
+    }
+  ),
   repoOverrides ? { },
 }:
 

diff --git a/repos.json.lock b/repos.json.lock
@@ -36,8 +36,8 @@
             "url": "https://github.com/Adamekka/nur-packages"
         },
         "AndrewKvalheim": {
-            "rev": "cf335961df7430cc78e36bc1fc607cbf93e39145",
-            "sha256": "0q4jhy7zkh4i1mhfm26arzkc4vivspl8sn16dmhwxgvf7fdhjnm1",
+            "rev": "b42b78f40bc905a299226fcab6a4110ff1c03cad",
+            "sha256": "0yd1i7jzpja5h0zxf4xaxkiqrrf856pj4gxgg7n3plfqdykg3rss",
             "url": "https://codeberg.org/AndrewKvalheim/configuration"
         },
         "AsterisMono": {
@@ -146,8 +146,8 @@
             "url": "https://git.sr.ht/~aasg/nixexprs"
         },
         "abszero": {
-            "rev": "fed5c72d8aa4d589659d383d810986a47759db8b",
-            "sha256": "114k7hdjvvkhsy18bipxn5674a4q2ac92lv03i556sy03zpqw5fn",
+            "rev": "0ab9b577e726f497e85c6d42a2c1a6dc98d8777e",
+            "sha256": "0sjib3fzmj2hp1rihv9zk361d82bvi6qb8i8f2h4k764k4ww3djx",
             "url": "https://github.com/Weathercold/nixfiles"
         },
         "afreakk": {
@@ -442,8 +442,8 @@
             "url": "https://github.com/CRTified/nur-packages"
         },
         "cryolitia": {
-            "rev": "e95558283b0d8065bade4095fa53c05b643501cb",
-            "sha256": "017lbpxvsk0qvcs8pzy63qcawbv3nvdl373nykq1jgf9l3d0mmsb",
+            "rev": "f545196a11ec21545a0ecb8deef900bd1c700c72",
+            "sha256": "07ikkpn47apdcq9wy228mmr517rrxp38j76p817l8vys23ifahdc",
             "url": "https://github.com/Cryolitia/nur-packages"
         },
         "cwyc": {
@@ -598,8 +598,8 @@
             "url": "https://github.com/Eggflaw/nur-packages"
         },
         "eh5": {
-            "rev": "350bbbe0e394ced2313deba361c769f1e6150759",
-            "sha256": "0x7cln9l9jslhbi2laxpk964m5ic6ljfhisw0i52pdciwlmxfrpy",
+            "rev": "1b5437a7249c4d1a62c4bc55c45b815a37ca5c84",
+            "sha256": "1ll544hi8phqj4var384iifqx0a471l3iml05qy59a1x1w32zydw",
             "url": "https://github.com/EHfive/flakes"
         },
         "emiller88": {
@@ -668,8 +668,8 @@
             "url": "https://github.com/Fius/nur-packages"
         },
         "fliegendewurst": {
-            "rev": "40fb2d2f913cf72940efa9ee1e05263f7af1fbcc",
-            "sha256": "0xm9r6f8bnavaxjij8vdvam5hgig02zmxxmdihpg6rj53j7xpif3",
+            "rev": "4cd1d62cb90d4d9b4ded93e819a2b5b3a64a7fd0",
+            "sha256": "1js93cq1zjsi0bd0mw27hkwjn1rjf6ap1z1jmjwa1kxqsva80lnl",
             "url": "https://github.com/FliegendeWurst/nur-packages/"
         },
         "fooker": {
@@ -1454,8 +1454,8 @@
             "url": "https://github.com/phandox/nur-packages"
         },
         "picokeys-nix": {
-            "rev": "a0f3a29a2f3a11cc883ef5d5619f627d4b7fcbe5",
-            "sha256": "1950s16mp7ns30cy85b57rd0fp7zdnqnp1mjxw7g8yifw5hwdycx",
+            "rev": "2fbbb7fec78d2a7dec38de08bd37f5b77b203c94",
+            "sha256": "0x15j23aq1gn4ywd0z1mvn06r6ighlx6ighjbnspwf5f9v083mlq",
             "url": "https://github.com/ViZiD/picokeys-nix"
         },
         "piegames": {
@@ -1605,8 +1605,8 @@
             "url": "https://github.com/ryan4yin/nur-packages"
         },
         "rycee": {
-            "rev": "5f39164f253794b0101d596b7d4a7a0253f4b762",
-            "sha256": "1dzna3xwk870rlnkd2y43qjfqjmrnfhwnxqql5jl8qhs9cicbkbc",
+            "rev": "656d7f28b05f70d132851c8655771f1a29e25a76",
+            "sha256": "1zgj0xh61yradn78p5i2py1m04mk0wks8hi1rlsya5qcr7yagy0j",
             "url": "https://gitlab.com/rycee/nur-expressions"
         },
         "sagikazarmark": {
@@ -1886,8 +1886,8 @@
             "url": "https://github.com/wyzdwdz/nur-pkgs"
         },
         "xddxdd": {
-            "rev": "4ba0829e314b81b784903c2d58cd9eab1437bd0e",
-            "sha256": "0gs1na0g46wg1yiwi80n9v2ygxg21angb5sqli3rvsyf759xhcz5",
+            "rev": "3012be4f1d9a92968f7c6bfe0374589c613ab2f6",
+            "sha256": "0rjgvq1zgwqrcdlnzn1rpgf003yhayd8nqin9ik18v8sw7m1lvgx",
             "url": "https://github.com/xddxdd/nur-packages"
         },
         "xe": {