aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nix/sources.json8
-rw-r--r--nix/sources.nix22
-rw-r--r--server/uplcg.cabal10
3 files changed, 30 insertions, 10 deletions
diff --git a/nix/sources.json b/nix/sources.json
index 25afdf1..370697a 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -12,15 +12,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
- "branch": "release-21.11",
+ "branch": "release-22.11",
"description": "Nix Packages collection",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "19df09617db3022225761dfbf68d3ed798c96f14",
- "sha256": "0dzk8vzyv4iqa1sfgzm7skcsq1krq9afzkgb4zrcp060446pvy66",
+ "rev": "219b2fc946a59851cdfc59efdd11129e1cee2b44",
+ "sha256": "05sgy7bdbqyyin07vzbx8fnc4mjw5780qf0r1ia8188ss2vxw4yr",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/19df09617db3022225761dfbf68d3ed798c96f14.tar.gz",
+ "url": "https://github.com/NixOS/nixpkgs/archive/219b2fc946a59851cdfc59efdd11129e1cee2b44.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
diff --git a/nix/sources.nix b/nix/sources.nix
index 1938409..9a01c8a 100644
--- 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;
diff --git a/server/uplcg.cabal b/server/uplcg.cabal
index cdca873..7baed6a 100644
--- a/server/uplcg.cabal
+++ b/server/uplcg.cabal
@@ -27,22 +27,22 @@ Library
Uplcg.Views
Build-depends:
- aeson >= 1.4 && < 1.6,
+ aeson >= 1.4,
async >= 2.2 && < 2.3,
base >= 4.9 && < 5,
blaze-html >= 0.9 && < 0.10,
bytestring >= 0.10 && < 0.11,
- elm-bridge >= 0.5 && < 0.7,
- fast-logger >= 3.0 && < 3.1,
+ elm-bridge >= 0.5,
+ fast-logger >= 3.0,
hashable >= 1.3 && < 1.4,
http-types >= 0.12 && < 0.13,
- lens >= 4.18 && < 4.20,
+ lens >= 4.18,
mtl >= 2.2 && < 2.3,
process >= 1.6 && < 1.7,
random >= 1.1 && < 1.3,
scotty >= 0.11 && < 0.13,
stm >= 2.5 && < 2.6,
- template-haskell >= 2.15 && < 2.17,
+ template-haskell >= 2.15,
text >= 1.2 && < 1.3,
time >= 1.9 && < 1.10,
unordered-containers >= 0.2 && < 0.3,