From 09751227eaba15b67d7f06d8b799a762bced0a01 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Tue, 30 Apr 2024 16:13:34 -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' (2024-04-16) --- flake.lock | 20 +++++++++++++++++++- flake.nix | 19 +++++++------------ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index e89e09ca..396bd2f2 100644 --- a/flake.lock +++ b/flake.lock @@ -218,6 +218,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", @@ -226,7 +243,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 2a268b18..5ed0022d 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ flake-utils.url = "github:numtide/flake-utils?ref=main"; nix-filter.url = "github:numtide/nix-filter?ref=main"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; + rocksdb = { url = "github:facebook/rocksdb?ref=v9.1.0"; flake = false; }; }; outputs = inputs: @@ -23,18 +24,12 @@ oci-image = self.callPackage ./nix/pkgs/oci-image {}; - rocksdb = - let - version = "9.1.0"; - in - pkgs.rocksdb.overrideAttrs (old: { - inherit version; - src = pkgs.fetchFromGitHub { - owner = "facebook"; - repo = "rocksdb"; - rev = "v${version}"; - hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8="; - }; + rocksdb = pkgs.rocksdb.overrideAttrs (old: { + src = inputs.rocksdb; + version = pkgs.lib.removePrefix + "v" + (builtins.fromJSON (builtins.readFile ./flake.lock)) + .nodes.rocksdb.original.ref; }); shell = self.callPackage ./nix/shell.nix {};