From b635e807ef05d734adbdad5fbc5c23bf91ac04d3 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Sun, 21 Apr 2024 17:17:37 -0700 Subject: [PATCH] get rocksdb via flake inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Added input 'rocksdb': 'github:facebook/rocksdb/bcf88d48ce8aa8b536aee4dd305533b3b83cf435?narHash=sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8%3D' (2024-04-16) --- flake.lock | 20 +++++++++++++++++++- flake.nix | 18 +++++------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 99fff55b..bb767e47 100644 --- a/flake.lock +++ b/flake.lock @@ -214,6 +214,23 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1713310517, + "narHash": "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8=", + "owner": "facebook", + "repo": "rocksdb", + "rev": "bcf88d48ce8aa8b536aee4dd305533b3b83cf435", + "type": "github" + }, + "original": { + "owner": "facebook", + "ref": "v9.1.0", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "attic": "attic", @@ -222,7 +239,8 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "rocksdb": "rocksdb" } }, "rust-analyzer-src": { diff --git a/flake.nix b/flake.nix index 9ac4e5f5..a9ca5cee 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ flake-utils.url = "github:numtide/flake-utils"; nix-filter.url = "github:numtide/nix-filter"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; + rocksdb = { url = "github:facebook/rocksdb?ref=v9.1.0"; flake = false; }; }; outputs = @@ -23,19 +24,10 @@ pkgsHost = nixpkgs.legacyPackages.${system}; allocator = null; - rocksdb' = pkgs: - let - version = "9.1.0"; - in - (pkgs.rocksdb.overrideAttrs (old: { - inherit version; - src = pkgs.fetchFromGitHub { - owner = "facebook"; - repo = "rocksdb"; - rev = "bcf88d48ce8aa8b536aee4dd305533b3b83cf435"; - hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8"; - }; - })); + rocksdb' = pkgs: (pkgs.rocksdb.overrideAttrs (old: { + version = "9.1.0"; + src = inputs.rocksdb; + })); # Nix-accessible `Cargo.toml` cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);