rhi/quox
rhi/quox
1
0
Fork 0
Code Issues 15 Pull requests 1 Releases Wiki Activity

nix stuff

Browse source
This commit is contained in:
rhiannon morris 2022-05-26 19:00:08 +02:00
parent b4ac58f866
commit 9920bea6e3
2 changed files with 43 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
flake.lock
View file

@ -114,26 +114,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1649676176, "lastModified": 1652776076,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,7 +249,9 @@
"dot-parse": "dot-parse", "dot-parse": "dot-parse",
"effect": "effect", "effect": "effect",
"elab-util": "elab-util", "elab-util": "elab-util",
"flake-utils": "flake-utils_2", "flake-utils": [
"flake-utils"
],
"frex": "frex", "frex": "frex",
"fvect": "fvect", "fvect": "fvect",
"hashable": "hashable", "hashable": "hashable",
@ -278,7 +265,9 @@
"json": "json", "json": "json",
"katla": "katla", "katla": "katla",
"lsp": "lsp", "lsp": "lsp",
"nixpkgs": "nixpkgs", "nixpkgs": [
"nixpkgs"
],
"odf": "odf", "odf": "odf",
"pretty-show": "pretty-show", "pretty-show": "pretty-show",
"python": "python", "python": "python",
@ -401,18 +390,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1639213685, "lastModified": 1638239011,
"narHash": "sha256-Evuobw7o9uVjAZuwz06Al0fOWZ5JMKOktgXR0XgWBtg=", "narHash": "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "453bcb8380fd1777348245b3c44ce2a2b93b2e2d", "rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixpkgs-21.11-darwin", "ref": "21.11",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"odf": { "odf": {
@ -499,10 +487,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"idris2-pkgs": "idris2-pkgs", "idris2-pkgs": "idris2-pkgs",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"idris2-pkgs",
"nixpkgs"
],
"tap": "tap" "tap": "tap"
} }
}, },
@ -563,16 +548,15 @@
"idris2-pkgs" "idris2-pkgs"
], ],
"nixpkgs": [ "nixpkgs": [
"idris2-pkgs",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1653572671, "lastModified": 1653651071,
"narHash": "sha256-ev1z+LW5f6AAWegLQjGpsH6qGccJ5kelzTx4pQddT7k=", "narHash": "sha256-fHr67LkChBYwDa3e4tFT0d4zhP5Ufhj0f9iakOdor8A=",
"ref": "main", "ref": "main",
"rev": "4c0ab9ca9b669869b341851f3fd2fa591d5aa4b2", "rev": "97deb5f288fccc091d62f708a5bd2efabd08e220",
"revCount": 4, "revCount": 9,
"type": "git", "type": "git",
"url": "https://git.rhiannon.website/rhi/idris2-tap" "url": "https://git.rhiannon.website/rhi/idris2-tap"
}, },

41
flake.nix
View file

@ -1,24 +1,29 @@
{ description = "quox: quantitative extensional type theory"; { description = "quox: quantitative extensional type theory";
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils"; nixpkgs.url = "nixpkgs/21.11";
idris2-pkgs.url = "github:claymager/idris2-pkgs";
nixpkgs.follows = "idris2-pkgs/nixpkgs";
tap.url = "git+https://git.rhiannon.website/rhi/idris2-tap?ref=main"; flake-utils = {
tap.inputs = { url = "github:numtide/flake-utils";
flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs";
idris2-pkgs.follows = "idris2-pkgs"; };
nixpkgs.follows = "idris2-pkgs/nixpkgs";
idris2-pkgs = {
url = "github:claymager/idris2-pkgs";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
tap = {
url = "git+https://git.rhiannon.website/rhi/idris2-tap?ref=main";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
inputs.idris2-pkgs.follows = "idris2-pkgs";
}; };
}; };
outputs = { self, nixpkgs, idris2-pkgs, flake-utils, tap }: outputs = { self, nixpkgs, idris2-pkgs, flake-utils, tap }:
let systems = with flake-utils.lib.system; flake-utils.lib.eachDefaultSystem (system:
# [ x86_64-darwin x86_64-linux i686-linux ]; # FIXME
[ x86_64-linux ];
in
flake-utils.lib.eachSystem systems (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -28,12 +33,10 @@
testDeps = tap.packages.${system}; testDeps = tap.packages.${system};
packages = rec { packages = let ipkg = builders.idrisPackage; in rec {
quox-lib = builders.idrisPackage ./lib { }; quox-lib = ipkg ./lib { };
quox = builders.idrisPackage ./exe { extraPkgs = packages; }; quox = ipkg ./exe { extraPkgs = packages; };
quox-tests = builders.idrisPackage ./tests { quox-tests = ipkg ./tests { extraPkgs = packages // testDeps; };
extraPkgs = packages // testDeps;
};
}; };
devShells = devShells =