From c997311beae4becb5f8c11c46bb1c821b0935dbd Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 4 Apr 2023 16:56:51 -0700
Subject: [PATCH 1/7] Revert "build(nix): fix flake builds"
This reverts commit 5d913f701083e1519a3595190e63193c519fbc6b.
Sorry, I don't understand how any of this works, and it seems pretty
opaque/difficult to fine-tune.
---
flake.lock | 374 +++++------------------------------------------------
flake.nix | 122 +++++++++--------
2 files changed, 99 insertions(+), 397 deletions(-)
diff --git a/flake.lock b/flake.lock
index 1bb11232..bfe0a9bc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,124 +1,18 @@
{
"nodes": {
- "alejandra": {
- "inputs": {
- "fenix": "fenix",
- "flakeCompat": "flakeCompat",
- "nixpkgs": [
- "d2n",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1658427149,
- "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=",
- "owner": "kamadorueda",
- "repo": "alejandra",
- "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be",
- "type": "github"
- },
- "original": {
- "owner": "kamadorueda",
- "repo": "alejandra",
- "type": "github"
- }
- },
- "all-cabal-json": {
- "flake": false,
- "locked": {
- "lastModified": 1665552503,
- "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
- "owner": "nix-community",
- "repo": "all-cabal-json",
- "rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "hackage",
- "repo": "all-cabal-json",
- "type": "github"
- }
- },
- "crane": {
- "flake": false,
- "locked": {
- "lastModified": 1670900067,
- "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "repo": "crane",
- "type": "github"
- }
- },
- "d2n": {
- "inputs": {
- "alejandra": "alejandra",
- "all-cabal-json": "all-cabal-json",
- "crane": "crane",
- "devshell": "devshell",
- "flake-parts": "flake-parts",
- "flake-utils-pre-commit": "flake-utils-pre-commit",
- "ghc-utils": "ghc-utils",
- "gomod2nix": "gomod2nix",
- "mach-nix": "mach-nix",
- "nix-pypi-fetcher": "nix-pypi-fetcher",
- "nixpkgs": [
- "nixpkgs"
- ],
- "poetry2nix": "poetry2nix",
- "pre-commit-hooks": "pre-commit-hooks"
- },
- "locked": {
- "lastModified": 1674848374,
- "narHash": "sha256-1+xlsmUWzpptK8mLjznwqOLogeicLkxB8tV6XUZbobc=",
- "owner": "nix-community",
- "repo": "dream2nix",
- "rev": "d91e7381fa303be02f70e472207e05b26ce35b41",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "dream2nix",
- "type": "github"
- }
- },
- "devshell": {
- "flake": false,
- "locked": {
- "lastModified": 1663445644,
- "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=",
- "owner": "numtide",
- "repo": "devshell",
- "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "devshell",
- "type": "github"
- }
- },
"fenix": {
"inputs": {
"nixpkgs": [
- "d2n",
- "alejandra",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1657607339,
- "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=",
+ "lastModified": 1671776618,
+ "narHash": "sha256-myjhExbKIzZy+kqqFyqvX59KErqYZVNTPsCfgByTOKo=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d",
+ "rev": "64d1607710b99e72d9afb2cde11bd1c2cea7cb91",
"type": "github"
},
"original": {
@@ -127,31 +21,13 @@
"type": "github"
}
},
- "flake-parts": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
- },
- "locked": {
- "lastModified": 1668450977,
- "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
"flake-utils": {
"locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+ "lastModified": 1667395993,
+ "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+ "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@@ -160,228 +36,57 @@
"type": "github"
}
},
- "flake-utils-pre-commit": {
+ "naersk": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
"locked": {
- "lastModified": 1644229661,
- "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+ "lastModified": 1671096816,
+ "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=",
+ "owner": "nix-community",
+ "repo": "naersk",
+ "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
"type": "github"
},
"original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flakeCompat": {
- "flake": false,
- "locked": {
- "lastModified": 1650374568,
- "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "ghc-utils": {
- "flake": false,
- "locked": {
- "lastModified": 1662774800,
- "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
- "ref": "refs/heads/master",
- "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
- "revCount": 1072,
- "type": "git",
- "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
- },
- "original": {
- "type": "git",
- "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
- }
- },
- "gomod2nix": {
- "flake": false,
- "locked": {
- "lastModified": 1627572165,
- "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=",
- "owner": "tweag",
- "repo": "gomod2nix",
- "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8",
- "type": "github"
- },
- "original": {
- "owner": "tweag",
- "repo": "gomod2nix",
- "type": "github"
- }
- },
- "mach-nix": {
- "flake": false,
- "locked": {
- "lastModified": 1634711045,
- "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=",
- "owner": "DavHau",
- "repo": "mach-nix",
- "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d",
- "type": "github"
- },
- "original": {
- "id": "mach-nix",
- "type": "indirect"
- }
- },
- "nix-pypi-fetcher": {
- "flake": false,
- "locked": {
- "lastModified": 1669065297,
- "narHash": "sha256-UStjXjNIuIm7SzMOWvuYWIHBkPUKQ8Id63BMJjnIDoA=",
- "owner": "DavHau",
- "repo": "nix-pypi-fetcher",
- "rev": "a9885ac6a091576b5195d547ac743d45a2a615ac",
- "type": "github"
- },
- "original": {
- "owner": "DavHau",
- "repo": "nix-pypi-fetcher",
+ "owner": "nix-community",
+ "repo": "naersk",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1674641431,
- "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-lib": {
- "locked": {
- "dir": "lib",
- "lastModified": 1665349835,
- "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
+ "lastModified": 1671780662,
+ "narHash": "sha256-Tsc64sN8LLHa7eqDZVVeubI8CyqIjs9l5tQ5EeRlgvM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
+ "rev": "339063a22409514cb2baea677b329e618faa6a08",
"type": "github"
},
"original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-lib_2": {
- "locked": {
- "dir": "lib",
- "lastModified": 1672350804,
- "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
- "type": "github"
- },
- "original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "parts": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib_2"
- },
- "locked": {
- "lastModified": 1674771137,
- "narHash": "sha256-Zpk1GbEsYrqKmuIZkx+f+8pU0qcCYJoSUwNz1Zk+R00=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "7c7a8bce3dffe71203dcd4276504d1cb49dfe05f",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "poetry2nix": {
- "flake": false,
- "locked": {
- "lastModified": 1666918719,
- "narHash": "sha256-BkK42fjAku+2WgCOv2/1NrPa754eQPV7gPBmoKQBWlc=",
- "owner": "nix-community",
- "repo": "poetry2nix",
- "rev": "289efb187123656a116b915206e66852f038720e",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "1.36.0",
- "repo": "poetry2nix",
- "type": "github"
- }
- },
- "pre-commit-hooks": {
- "inputs": {
- "flake-utils": [
- "d2n",
- "flake-utils-pre-commit"
- ],
- "nixpkgs": [
- "d2n",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1646153636,
- "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": {
"inputs": {
- "d2n": "d2n",
- "nixpkgs": "nixpkgs",
- "parts": "parts",
- "rust-overlay": "rust-overlay"
+ "fenix": "fenix",
+ "flake-utils": "flake-utils",
+ "naersk": "naersk",
+ "nixpkgs": "nixpkgs"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1657557289,
- "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=",
+ "lastModified": 1671750139,
+ "narHash": "sha256-xbL8BZU87rHfQkF3tuFXduNGPW8fDwFI+0fFmRJx66E=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "caf23f29144b371035b864a1017dbc32573ad56d",
+ "rev": "a06525517b0b69cd97f2c39a4012d96f44bf0776",
"type": "github"
},
"original": {
@@ -390,27 +95,6 @@
"repo": "rust-analyzer",
"type": "github"
}
- },
- "rust-overlay": {
- "inputs": {
- "flake-utils": "flake-utils",
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1674786480,
- "narHash": "sha256-n25V3Ug/dJewbJaxj1gL0cUMBdOonrVkIQCHd9yHHvw=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "296dd673b46aaebe1c8355f1848ceb7c905dda35",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index f4db253e..e10e8bbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,56 +1,74 @@
{
- inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- inputs.d2n.url = "github:nix-community/dream2nix";
- inputs.d2n.inputs.nixpkgs.follows = "nixpkgs";
- inputs.parts.url = "github:hercules-ci/flake-parts";
- inputs.rust-overlay.url = "github:oxalica/rust-overlay";
- inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
+ inputs = {
+ nixpkgs.url = "github:NixOS/nixpkgs";
+ flake-utils.url = "github:numtide/flake-utils";
- outputs = inp:
- inp.parts.lib.mkFlake {inputs = inp;} {
- systems = ["x86_64-linux"];
- imports = [inp.d2n.flakeModuleBeta];
- perSystem = {
- config,
- system,
- pkgs,
- ...
- }: let
- cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
- pkgsWithToolchain = pkgs.appendOverlays [inp.rust-overlay.overlays.default];
-
- toolchains = pkgsWithToolchain.rust-bin.stable."${cargoToml.package.rust-version}";
- # toolchain to use when building conduit, includes only cargo and rustc to reduce closure size
- buildToolchain = toolchains.minimal;
- # toolchain to use in development shell
- # the "default" component set of toolchain adds rustfmt, clippy etc.
- devToolchain = toolchains.default.override {
- extensions = ["rust-src"];
- };
-
- # flake outputs for conduit project
- conduitOutputs = config.dream2nix.outputs.conduit;
- in {
- dream2nix.inputs.conduit = {
- source = inp.self;
- projects.conduit = {
- name = "conduit";
- subsystem = "rust";
- translator = "cargo-lock";
- };
- packageOverrides = {
- "^.*".set-toolchain.overrideRustToolchain = _: {
- cargo = buildToolchain;
- rustc = buildToolchain;
- };
- };
- };
- devShells.conduit = conduitOutputs.devShells.conduit.overrideAttrs (old: {
- # export default crate sources for rust-analyzer to read
- RUST_SRC_PATH = "${devToolchain}/lib/rustlib/src/rust/library";
- nativeBuildInputs = (old.nativeBuildInputs or []) ++ [devToolchain];
- });
- devShells.default = config.devShells.conduit;
- };
+ fenix = {
+ url = "github:nix-community/fenix";
+ inputs.nixpkgs.follows = "nixpkgs";
};
+ naersk = {
+ url = "github:nix-community/naersk";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+ };
+
+ outputs =
+ { self
+ , nixpkgs
+ , flake-utils
+
+ , fenix
+ , naersk
+ }: flake-utils.lib.eachDefaultSystem (system:
+ let
+ pkgs = nixpkgs.legacyPackages.${system};
+
+ # Nix-accessible `Cargo.toml`
+ cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
+
+ # The Rust toolchain to use
+ toolchain = fenix.packages.${system}.toolchainOf {
+ # Use the Rust version defined in `Cargo.toml`
+ channel = cargoToml.package.rust-version;
+
+ # THE rust-version HASH
+ sha256 = "sha256-8len3i8oTwJSOJZMosGGXHBL5BVuGQnWOT2St5YAUFU=";
+ };
+
+ builder = (pkgs.callPackage naersk {
+ inherit (toolchain) rustc cargo;
+ }).buildPackage;
+ in
+ {
+ packages.default = builder {
+ src = ./.;
+
+ nativeBuildInputs = (with pkgs.rustPlatform; [
+ bindgenHook
+ ]);
+ };
+
+ devShells.default = pkgs.mkShell {
+ # Rust Analyzer needs to be able to find the path to default crate
+ # sources, and it can read this environment variable to do so
+ RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library";
+
+ # Development tools
+ nativeBuildInputs = (with pkgs.rustPlatform; [
+ bindgenHook
+ ]) ++ (with toolchain; [
+ cargo
+ clippy
+ rust-src
+ rustc
+ rustfmt
+ ]);
+ };
+
+ checks = {
+ packagesDefault = self.packages.${system}.default;
+ devShellsDefault = self.devShells.${system}.default;
+ };
+ });
}
From a0c449e570886b67d1558016689dfdf7fef990ff Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 4 Apr 2023 16:58:19 -0700
Subject: [PATCH 2/7] update flake.lock
---
flake.lock | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/flake.lock b/flake.lock
index bfe0a9bc..280e1b52 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1671776618,
- "narHash": "sha256-myjhExbKIzZy+kqqFyqvX59KErqYZVNTPsCfgByTOKo=",
+ "lastModified": 1680607374,
+ "narHash": "sha256-U5iiPqbAanr+sQCCZ7zxYhwCXdcDpish8Uy4ELZeXM0=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "64d1607710b99e72d9afb2cde11bd1c2cea7cb91",
+ "rev": "e70d498e97017daa59363eafa054619d4fa160c3",
"type": "github"
},
"original": {
@@ -23,11 +23,11 @@
},
"flake-utils": {
"locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+ "lastModified": 1678901627,
+ "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+ "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
@@ -43,11 +43,11 @@
]
},
"locked": {
- "lastModified": 1671096816,
- "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=",
+ "lastModified": 1679567394,
+ "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=",
"owner": "nix-community",
"repo": "naersk",
- "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
+ "rev": "88cd22380154a2c36799fe8098888f0f59861a15",
"type": "github"
},
"original": {
@@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1671780662,
- "narHash": "sha256-Tsc64sN8LLHa7eqDZVVeubI8CyqIjs9l5tQ5EeRlgvM=",
+ "lastModified": 1680652733,
+ "narHash": "sha256-FFG6Nai9M71C0Uc+D8TxyHoAjTplM0/9uWKsl7ALfUs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "339063a22409514cb2baea677b329e618faa6a08",
+ "rev": "cc5bde408572508efd1273852862d418bb313443",
"type": "github"
},
"original": {
@@ -82,11 +82,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1671750139,
- "narHash": "sha256-xbL8BZU87rHfQkF3tuFXduNGPW8fDwFI+0fFmRJx66E=",
+ "lastModified": 1680435407,
+ "narHash": "sha256-IPBtZCOh3BdrR+V77cL7r6WQnclWcZ/85BDYnmq/GnQ=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "a06525517b0b69cd97f2c39a4012d96f44bf0776",
+ "rev": "236576227a299fd19ba836b1834ab50c948af994",
"type": "github"
},
"original": {
From 2b63e46fc5c4234823a1d71b2a7eac4ee15cd9be Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 4 Apr 2023 16:47:08 -0700
Subject: [PATCH 3/7] use system rocksdb
This mostly just improves build times.
---
flake.nix | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/flake.nix b/flake.nix
index e10e8bbb..baa3261d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,6 +36,10 @@
sha256 = "sha256-8len3i8oTwJSOJZMosGGXHBL5BVuGQnWOT2St5YAUFU=";
};
+ # Point to system RocksDB
+ ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb_6_23}/include";
+ ROCKSDB_LIB_DIR = "${pkgs.rocksdb_6_23}/lib";
+
builder = (pkgs.callPackage naersk {
inherit (toolchain) rustc cargo;
}).buildPackage;
@@ -44,6 +48,9 @@
packages.default = builder {
src = ./.;
+ # Use system RocksDB
+ inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR;
+
nativeBuildInputs = (with pkgs.rustPlatform; [
bindgenHook
]);
@@ -54,6 +61,9 @@
# sources, and it can read this environment variable to do so
RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library";
+ # Use system RocksDB
+ inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR;
+
# Development tools
nativeBuildInputs = (with pkgs.rustPlatform; [
bindgenHook
From 55149e33361b07c87be66a8b6632d9fcb2711548 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 4 Apr 2023 17:30:30 -0700
Subject: [PATCH 4/7] use crane instead of naersk
I guess naersk still doesn't support git dependencies using workspace
inheritance, but crane does.
---
flake.lock | 88 +++++++++++++++++++++++++++++++++++++++++-------------
flake.nix | 12 ++++----
2 files changed, 73 insertions(+), 27 deletions(-)
diff --git a/flake.lock b/flake.lock
index 280e1b52..d76ff59b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,30 @@
{
"nodes": {
+ "crane": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "flake-utils": [
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "rust-overlay": "rust-overlay"
+ },
+ "locked": {
+ "lastModified": 1680584903,
+ "narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=",
+ "owner": "ipetkov",
+ "repo": "crane",
+ "rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ipetkov",
+ "repo": "crane",
+ "type": "github"
+ }
+ },
"fenix": {
"inputs": {
"nixpkgs": [
@@ -21,6 +46,22 @@
"type": "github"
}
},
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"flake-utils": {
"locked": {
"lastModified": 1678901627,
@@ -36,26 +77,6 @@
"type": "github"
}
},
- "naersk": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1679567394,
- "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=",
- "owner": "nix-community",
- "repo": "naersk",
- "rev": "88cd22380154a2c36799fe8098888f0f59861a15",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "naersk",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
"lastModified": 1680652733,
@@ -73,9 +94,9 @@
},
"root": {
"inputs": {
+ "crane": "crane",
"fenix": "fenix",
"flake-utils": "flake-utils",
- "naersk": "naersk",
"nixpkgs": "nixpkgs"
}
},
@@ -95,6 +116,31 @@
"repo": "rust-analyzer",
"type": "github"
}
+ },
+ "rust-overlay": {
+ "inputs": {
+ "flake-utils": [
+ "crane",
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "crane",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1680488274,
+ "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index baa3261d..6ed12dec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,10 @@
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
- naersk = {
- url = "github:nix-community/naersk";
+ crane = {
+ url = "github:ipetkov/crane";
inputs.nixpkgs.follows = "nixpkgs";
+ inputs.flake-utils.follows = "flake-utils";
};
};
@@ -19,7 +20,7 @@
, flake-utils
, fenix
- , naersk
+ , crane
}: flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
@@ -40,9 +41,8 @@
ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb_6_23}/include";
ROCKSDB_LIB_DIR = "${pkgs.rocksdb_6_23}/lib";
- builder = (pkgs.callPackage naersk {
- inherit (toolchain) rustc cargo;
- }).buildPackage;
+ builder =
+ ((crane.mkLib pkgs).overrideToolchain toolchain.toolchain).buildPackage;
in
{
packages.default = builder {
From 3be32c4dac30fe428eefc007d565fd23fddaae40 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 4 Apr 2023 17:52:15 -0700
Subject: [PATCH 5/7] factor out shared things
---
flake.nix | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/flake.nix b/flake.nix
index 6ed12dec..5e7d2061 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,6 +41,11 @@
ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb_6_23}/include";
ROCKSDB_LIB_DIR = "${pkgs.rocksdb_6_23}/lib";
+ # Shared between the package and the devShell
+ nativeBuildInputs = (with pkgs.rustPlatform; [
+ bindgenHook
+ ]);
+
builder =
((crane.mkLib pkgs).overrideToolchain toolchain.toolchain).buildPackage;
in
@@ -51,9 +56,7 @@
# Use system RocksDB
inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR;
- nativeBuildInputs = (with pkgs.rustPlatform; [
- bindgenHook
- ]);
+ inherit nativeBuildInputs;
};
devShells.default = pkgs.mkShell {
@@ -65,9 +68,7 @@
inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR;
# Development tools
- nativeBuildInputs = (with pkgs.rustPlatform; [
- bindgenHook
- ]) ++ (with toolchain; [
+ nativeBuildInputs = nativeBuildInputs ++ (with toolchain; [
cargo
clippy
rust-src
From a6712627e4758a973af4f6f157778e55308b076d Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 4 Apr 2023 19:15:09 -0700
Subject: [PATCH 6/7] tiny refactor
---
flake.nix | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/flake.nix b/flake.nix
index 5e7d2061..7162c93a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,7 @@
sha256 = "sha256-8len3i8oTwJSOJZMosGGXHBL5BVuGQnWOT2St5YAUFU=";
};
- # Point to system RocksDB
+ # The system's RocksDB
ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb_6_23}/include";
ROCKSDB_LIB_DIR = "${pkgs.rocksdb_6_23}/lib";
@@ -53,10 +53,10 @@
packages.default = builder {
src = ./.;
- # Use system RocksDB
- inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR;
-
- inherit nativeBuildInputs;
+ inherit
+ nativeBuildInputs
+ ROCKSDB_INCLUDE_DIR
+ ROCKSDB_LIB_DIR;
};
devShells.default = pkgs.mkShell {
@@ -64,8 +64,9 @@
# sources, and it can read this environment variable to do so
RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library";
- # Use system RocksDB
- inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR;
+ inherit
+ ROCKSDB_INCLUDE_DIR
+ ROCKSDB_LIB_DIR;
# Development tools
nativeBuildInputs = nativeBuildInputs ++ (with toolchain; [
From eb4323cc0fab563655ddf9ce1471302e657724e4 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 4 Apr 2023 19:11:34 -0700
Subject: [PATCH 7/7] use mold on linux
---
flake.nix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/flake.nix b/flake.nix
index 7162c93a..970e8474 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,12 @@
let
pkgs = nixpkgs.legacyPackages.${system};
+ # Use mold on Linux
+ stdenv = if pkgs.stdenv.isLinux then
+ pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv
+ else
+ pkgs.stdenv;
+
# Nix-accessible `Cargo.toml`
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
@@ -54,12 +60,13 @@
src = ./.;
inherit
+ stdenv
nativeBuildInputs
ROCKSDB_INCLUDE_DIR
ROCKSDB_LIB_DIR;
};
- devShells.default = pkgs.mkShell {
+ devShells.default = (pkgs.mkShell.override { inherit stdenv; }) {
# Rust Analyzer needs to be able to find the path to default crate
# sources, and it can read this environment variable to do so
RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library";