From ff97aa19ed5ecb0bfc627a80be86d8389e1b1099 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Thu, 30 Jan 2025 22:12:51 +0100
Subject: [PATCH] chore: update nix flake
---
flake.lock | 111 +++++++++--------------------------------------------
flake.nix | 7 +++-
2 files changed, 25 insertions(+), 93 deletions(-)
diff --git a/flake.lock b/flake.lock
index 6dfd31d33..572e65e4a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,24 +25,6 @@
"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": {
"inputs": {
"nixpkgs": "nixpkgs"
@@ -65,26 +47,22 @@
},
"commonFlake_2": {
"inputs": {
- "common": "common",
- "flake-utils": "flake-utils_2",
- "git-commit": "git-commit",
"nixpkgs": [
"nixpkgs"
- ],
- "version": "version"
+ ]
},
"locked": {
- "lastModified": 1738266594,
- "narHash": "sha256-dMBJrr+7OccCAWfHBRjKvqb79+6AKxi7RI1UBLH+En0=",
+ "lastModified": 1738271129,
+ "narHash": "sha256-cktd+pC9HKAgXIeB5kA9cuVvbAFEifvWOqQtRRGcV1A=",
"ref": "refs/heads/master",
- "rev": "a85bffe5170192b50c69e35ecdfbd42251aa42e4",
- "revCount": 48,
+ "rev": "c24bd8c557d043ae096fcd7fb2db7bf6614652cd",
+ "revCount": 3,
"type": "git",
- "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git"
+ "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flake-common"
},
"original": {
"type": "git",
- "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git"
+ "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flake-common"
}
},
"flake-utils": {
@@ -122,24 +100,6 @@
"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": {
"inputs": {
"systems": "systems_2"
@@ -158,22 +118,24 @@
"type": "github"
}
},
- "git-commit": {
+ "gitCommitFlake": {
"inputs": {
"nixpkgs": [
- "commonFlake",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1,
- "narHash": "sha256-zWNwBND87qYqV7kQxb/Br+7FFX91AGliUU+F793dCdY=",
- "path": "./git-commit",
- "type": "path"
+ "lastModified": 1738271276,
+ "narHash": "sha256-QHpSScRFRnqnLDQO7xMGVlfcnG0OtgaiZYFYM2fCo/8=",
+ "ref": "refs/heads/master",
+ "rev": "447f0fafe0545837faf6c50385022b1f5834b14d",
+ "revCount": 2,
+ "type": "git",
+ "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flake-git-commit.git"
},
"original": {
- "path": "./git-commit",
- "type": "path"
+ "type": "git",
+ "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flake-git-commit.git"
}
},
"nixpkgs": {
@@ -242,7 +204,8 @@
"inputs": {
"certificatesFlake": "certificatesFlake",
"commonFlake": "commonFlake_2",
- "flake-utils": "flake-utils_3",
+ "flake-utils": "flake-utils_2",
+ "gitCommitFlake": "gitCommitFlake",
"nixpkgs": "nixpkgs_3",
"versionFlake": "versionFlake_2"
}
@@ -292,42 +255,6 @@
"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": {
"inputs": {
"nixpkgs": "nixpkgs_2"
diff --git a/flake.nix b/flake.nix
index f6fa38932..e0d74eee0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
flake-utils = {url = "github:numtide/flake-utils";};
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;
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -30,6 +30,7 @@
flake-utils,
versionFlake,
commonFlake,
+ gitCommitFlake,
certificatesFlake,
} @ inputs:
flake-utils.lib.eachDefaultSystem (system: let
@@ -45,6 +46,10 @@
common = commonPck;
})
+ (final: prev: {
+ gitCommit = gitCommitFlake.packages.${system}.gitCommit;
+ })
+
(final: prev: {
alvineDevCerts = certificatesFlake;
})
--
GitLab