Skip to content
Snippets Groups Projects
Verified Commit ff97aa19 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

chore: update nix flake

parent b672a3c5
No related branches found
No related tags found
No related merge requests found
...@@ -25,24 +25,6 @@ ...@@ -25,24 +25,6 @@
"url": "https://gitlab.schukai.com/alvine/certificates.git" "url": "https://gitlab.schukai.com/alvine/certificates.git"
} }
}, },
"common": {
"inputs": {
"nixpkgs": [
"commonFlake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1,
"narHash": "sha256-Y3yDl1bmmFlfgusAEK32oZgnb5ZV8YaXkVixXyn8zME=",
"path": "./common",
"type": "path"
},
"original": {
"path": "./common",
"type": "path"
}
},
"commonFlake": { "commonFlake": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
...@@ -65,26 +47,22 @@ ...@@ -65,26 +47,22 @@
}, },
"commonFlake_2": { "commonFlake_2": {
"inputs": { "inputs": {
"common": "common",
"flake-utils": "flake-utils_2",
"git-commit": "git-commit",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"version": "version"
}, },
"locked": { "locked": {
"lastModified": 1738266594, "lastModified": 1738271129,
"narHash": "sha256-dMBJrr+7OccCAWfHBRjKvqb79+6AKxi7RI1UBLH+En0=", "narHash": "sha256-cktd+pC9HKAgXIeB5kA9cuVvbAFEifvWOqQtRRGcV1A=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "a85bffe5170192b50c69e35ecdfbd42251aa42e4", "rev": "c24bd8c557d043ae096fcd7fb2db7bf6614652cd",
"revCount": 48, "revCount": 3,
"type": "git", "type": "git",
"url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git" "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flake-common"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git" "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flake-common"
} }
}, },
"flake-utils": { "flake-utils": {
...@@ -122,24 +100,6 @@ ...@@ -122,24 +100,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakeUtils": { "flakeUtils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
...@@ -158,22 +118,24 @@ ...@@ -158,22 +118,24 @@
"type": "github" "type": "github"
} }
}, },
"git-commit": { "gitCommitFlake": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"commonFlake",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1738271276,
"narHash": "sha256-zWNwBND87qYqV7kQxb/Br+7FFX91AGliUU+F793dCdY=", "narHash": "sha256-QHpSScRFRnqnLDQO7xMGVlfcnG0OtgaiZYFYM2fCo/8=",
"path": "./git-commit", "ref": "refs/heads/master",
"type": "path" "rev": "447f0fafe0545837faf6c50385022b1f5834b14d",
"revCount": 2,
"type": "git",
"url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flake-git-commit.git"
}, },
"original": { "original": {
"path": "./git-commit", "type": "git",
"type": "path" "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flake-git-commit.git"
} }
}, },
"nixpkgs": { "nixpkgs": {
...@@ -242,7 +204,8 @@ ...@@ -242,7 +204,8 @@
"inputs": { "inputs": {
"certificatesFlake": "certificatesFlake", "certificatesFlake": "certificatesFlake",
"commonFlake": "commonFlake_2", "commonFlake": "commonFlake_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"gitCommitFlake": "gitCommitFlake",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"versionFlake": "versionFlake_2" "versionFlake": "versionFlake_2"
} }
...@@ -292,42 +255,6 @@ ...@@ -292,42 +255,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"version": {
"inputs": {
"nixpkgs": [
"commonFlake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1736378864,
"narHash": "sha256-7JSw/0AbjzM9jdkJQILEHKq8hjfTDB1tHJPLDI2oLVo=",
"ref": "refs/heads/master",
"rev": "b721b3d463b9f796b7652df59de975a362cc7542",
"revCount": 130,
"type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git"
},
"original": {
"type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git"
}
},
"versionFlake": { "versionFlake": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
flake-utils = {url = "github:numtide/flake-utils";}; flake-utils = {url = "github:numtide/flake-utils";};
commonFlake = { commonFlake = {
url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git?dir=common&ref=master"; url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flake-common";
flake = true; flake = true;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
flake-utils, flake-utils,
versionFlake, versionFlake,
commonFlake, commonFlake,
gitCommitFlake,
certificatesFlake, certificatesFlake,
} @ inputs: } @ inputs:
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let
...@@ -45,6 +46,10 @@ ...@@ -45,6 +46,10 @@
common = commonPck; common = commonPck;
}) })
(final: prev: {
gitCommit = gitCommitFlake.packages.${system}.gitCommit;
})
(final: prev: { (final: prev: {
alvineDevCerts = certificatesFlake; alvineDevCerts = certificatesFlake;
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment