bump flake. rm cargo patch. fix version

This commit is contained in:
waalge 2025-03-25 09:44:30 +00:00
parent 9bd670767d
commit 6dfac19942
2 changed files with 8 additions and 11 deletions

12
flake.lock generated vendored
View File

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739214665, "lastModified": 1742669843,
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,11 +62,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1739327257, "lastModified": 1742870002,
"narHash": "sha256-rlGK8wxz/e50Z+PQRzuP+m03IrGkhcPGmgkBnkEZ9C8=", "narHash": "sha256-eQnw8ufyLmrboODU8RKVNh2Mv7SACzdoFrRUV5zdNNE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e01f2c035b7b8a428c119b183f4cbc55f2eef07c", "rev": "b4c18f262dbebecb855136c1ed8047b99a9c75b6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -25,8 +25,8 @@
darwin.apple_sdk.frameworks.SystemConfiguration darwin.apple_sdk.frameworks.SystemConfiguration
]; ];
cargoTomlContents = builtins.readFile ./crates/aiken/Cargo.toml; cargoTomlContents = builtins.readFile ./Cargo.toml;
version = (builtins.fromTOML cargoTomlContents).package.version; version = (builtins.fromTOML cargoTomlContents).workspace.package.version;
aiken = pkgs.rustPlatform.buildRustPackage { aiken = pkgs.rustPlatform.buildRustPackage {
inherit version; inherit version;
@ -39,9 +39,6 @@
src = pkgs.lib.cleanSourceWith {src = self;}; src = pkgs.lib.cleanSourceWith {src = self;};
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
cargoLock.outputHashes = {
"textplots-0.9.6" = "sha256-Bx3zFEOnvqT7ZVfO5T8ii5u+3cPBeQTmw0F6CHQimao=";
};
GIT_COMMIT_HASH_SHORT = self.shortRev or "unknown"; GIT_COMMIT_HASH_SHORT = self.shortRev or "unknown";
postPatch = '' postPatch = ''