commit 5d24470979330555b730cfc61fdd64e9596fdc69
parent d1b67be5ecf55361cf0fadce519d0ea1aacbf339
Author: Leah (ctucx) <leah@ctu.cx>
Date: Sat, 21 May 2022 11:42:28 +0200
parent d1b67be5ecf55361cf0fadce519d0ea1aacbf339
Author: Leah (ctucx) <leah@ctu.cx>
Date: Sat, 21 May 2022 11:42:28 +0200
niv: update all channels
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "ryantm", "repo": "agenix", - "rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01", - "sha256": "1mb9xgblx9bc56sv6v0jfjlfj6qkvq3jhzlsgs6z0mgcvpb5jvwb", + "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", + "sha256": "1cfdd2ja56g8clllygf91il7dignr90ij1bl29g3kl7dl977dhl4", "type": "tarball", - "url": "https://github.com/ryantm/agenix/archive/0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01.tar.gz", + "url": "https://github.com/ryantm/agenix/archive/7e5e58b98c3dcbf497543ff6f22591552ebfe65b.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "darwin": { @@ -53,10 +53,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a3499e427191083853c64dcdfe073d7e7d89de9", - "sha256": "0gizsd04mjlhjbc0jxlgb73zn6a8p0zlzg2b2n2s4aahiv6n2svf", + "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009", + "sha256": "09ffmjs9lwm97p8v8977p319kc8ys2fjnyv08gb99kgbr7gfiyfd", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5a3499e427191083853c64dcdfe073d7e7d89de9.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/cbd40c72b2603ab54e7208f99f9b35fc158bc009.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgsUnstable": { @@ -65,10 +65,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51d859cdab1ef58755bd342d45352fc607f5e59b", - "sha256": "02wi4nll9ninm3szny31r5a40lpg8vgmqr2n87gxyysb50c17w4i", + "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "sha256": "1mc7qncf38agvyd589akch0war71gx5xwfli9lh046xqsqsbhhl0", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/51d859cdab1ef58755bd342d45352fc607f5e59b.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/52dc75a4fee3fdbcb792cb6fba009876b912bfe0.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } }
diff --git a/nix/sources.nix b/nix/sources.nix @@ -31,8 +31,28 @@ let if spec ? branch then "refs/heads/${spec.branch}" else if spec ? tag then "refs/tags/${spec.tag}" else abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; + submodules = if spec ? submodules then spec.submodules else false; + submoduleArg = + let + nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0; + emptyArgWithWarning = + if submodules == true + then + builtins.trace + ( + "The niv input \"${name}\" uses submodules " + + "but your nix's (${builtins.nixVersion}) builtins.fetchGit " + + "does not support them" + ) + {} + else {}; + in + if nixSupportsSubmodules + then { inherit submodules; } + else emptyArgWithWarning; in - builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; + builtins.fetchGit + ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg); fetch_local = spec: spec.path;