Merge 'Update and fix nix build' from Alexander Hirner

This makes `nix build .#turso_cli` succeed.
#835 argueed to remove nix packaging from the repo. I agree and hope
that a talented maintainer will include `turso_cli` in nixpkgs.
Given the currently broken state and the recent Beta release, maybe it's
worth to unbreak it for some last time.

Closes #3879
This commit is contained in:
Pekka Enberg
2025-11-01 11:13:19 +02:00
committed by GitHub
2 changed files with 16 additions and 16 deletions

20
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": {
"crane": {
"locked": {
"lastModified": 1752625801,
"narHash": "sha256-T1XWEFfw+iNrvlRczZS4BkaZJ5W3Z2Xp+31P2IShJj8=",
"lastModified": 1760924934,
"narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=",
"owner": "ipetkov",
"repo": "crane",
"rev": "471f8cd756349f4e86784ea10fdc9ccb91711fca",
"rev": "c6b4d5308293d0d04fcfeee92705017537cad02f",
"type": "github"
},
"original": {
@@ -35,11 +35,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1752480373,
"narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
"owner": "nixos",
"lastModified": 1760284886,
"narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
"rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"type": "github"
},
"original": {
@@ -64,11 +64,11 @@
]
},
"locked": {
"lastModified": 1752720268,
"narHash": "sha256-XCiJdtXIN09Iv0i1gs5ajJ9CVHk537Gy1iG/4nIdpVI=",
"lastModified": 1761878277,
"narHash": "sha256-6fCtyVdTzoQejwoextAu7dCLoy5fyD3WVh+Qm7t2Nhg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "dc221f842e9ddc8c0416beae8d77f2ea356b91ae",
"rev": "6604534e44090c917db714faa58d47861657690c",
"type": "github"
},
"original": {

View File

@@ -34,13 +34,13 @@
cargoArtifacts = craneLib.buildDepsOnly {
src = ./.;
pname = "limbo";
pname = "turso";
nativeBuildInputs = with pkgs; [ python3 ];
};
commonArgs = {
inherit cargoArtifacts;
pname = "limbo";
pname = "turso";
src = ./.;
nativeBuildInputs = with pkgs; [ python3 ];
strictDeps = true;
@@ -58,10 +58,10 @@
cargoClippyExtraArgs = "--all-targets";
});
};
packages.limbo = craneLib.buildPackage (commonArgs // {
cargoExtraArgs = "--bin limbo";
packages.turso_cli = craneLib.buildPackage (commonArgs // {
cargoExtraArgs = "--package turso_cli";
});
packages.default = packages.limbo;
packages.default = packages.turso_cli;
devShells.default = with pkgs; mkShell {
nativeBuildInputs = [
clang
@@ -85,4 +85,4 @@
};
}
);
}
}