michael/blog
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages 1 Wiki Activity

nix builder changes
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
michael 2024-10-21 06:42:10 -05:00
parent 3e1745f215
commit e1d0bb6d33
4 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock
View file

@ -3,7 +3,9 @@
"agda": { "agda": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1729253305, "lastModified": 1729253305,
@ -56,18 +58,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723282977, "lastModified": 1729265718,
"narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixos-24.05", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
@ -88,25 +88,11 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1729265718,
"narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agda": "agda", "agda": "agda",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
} }
}, },
"systems": { "systems": {

5
flake.nix
View file

@ -1,12 +1,13 @@
{ {
inputs.agda.url = "github:agda/agda"; inputs.agda.url = "github:agda/agda";
inputs.agda.inputs.nixpkgs.follows = "nixpkgs";
outputs = { self, nixpkgs, flake-utils, agda, }: outputs = { self, nixpkgs, flake-utils, agda, }:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; overlays = [ agda.overlays.default ]; };
agda-pkg = agda.packages.x86_64-linux.default; agda-pkg = agda.packages.x86_64-linux.default;
flakePkgs = rec { flakePkgs = rec {
agda-bin = pkgs.callPackage ./nix/agda-bin.nix { inherit agda-pkg; }; agda-bin = pkgs.callPackage ./nix/agda-bin.nix { agda-pkg = pkgs.haskellPackages.Agda.bin; };
docker-builder = docker-builder =
pkgs.callPackage ./nix/docker-builder.nix { inherit agda-bin; }; pkgs.callPackage ./nix/docker-builder.nix { inherit agda-bin; };
}; };

4
nix/agda-bin.nix
View file

@ -6,8 +6,8 @@ let
writeTextFile { writeTextFile {
name = "agda-libraries"; name = "agda-libraries";
text = '' text = ''
${agdaPackages.cubical}/cubical.agda-lib ${agdaPackages.cubical.src}/cubical.agda-lib
${agdaPackages.standard-library}/standard-library.agda-lib ${agdaPackages.standard-library.src}/standard-library.agda-lib
''; '';
}; };

14
nix/docker-builder.nix
View file

@ -1,14 +1,15 @@
{ dockerTools { dockerTools
, awscli2
, agda-bin , agda-bin
, corepack
, rsync
, openssh
, bash , bash
, corepack
, coreutils , coreutils
, nodejs_20 , gitMinimal
, gnused , gnused
, minio-client
, nodejs_20
, openssh
, pkgsLinux , pkgsLinux
, rsync
}: }:
dockerTools.buildLayeredImage { dockerTools.buildLayeredImage {
@ -16,13 +17,14 @@ dockerTools.buildLayeredImage {
contents = with dockerTools; [ contents = with dockerTools; [
agda-bin agda-bin
awscli2
bash bash
caCertificates caCertificates
corepack corepack
coreutils coreutils
fakeNss fakeNss
gitMinimal
gnused gnused
minio-client
nodejs_20 nodejs_20
openssh openssh
rsync rsync