From f7b9e752ad9388532afb5aef0afc861ab0aca334 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 8 Aug 2024 01:34:43 +0000 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03) → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d?narHash=sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC%2Bx4%3D' (2024-08-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1855c9961e0bfa2e776fa4b58b7d43149eeed431?narHash=sha256-o87oh2nLDzZ1E9%2Bj1I6GaEvd9865OWGYvxaPSiH9DEU%3D' (2024-07-24) → 'github:NixOS/nixpkgs/92bb3f6051ce28e9f203dcaa31c73dc186408466?narHash=sha256-kPUAXbwT%2BlCWaHEZnJB0Zm12AOk6sEvuILoSY8I70Yw%3D' (2024-08-07) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/8db8970be1fb8be9c845af7ebec53b699fe7e009?narHash=sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ%2B3ihtunJ014%3D' (2024-07-23) → 'github:numtide/treefmt-nix/768acdb06968e53aa1ee8de207fd955335c754b7?narHash=sha256-uru7JzOa33YlSRwf9sfXpJG%2BUAV%2BbnBEYMjrzKrQZFw%3D' (2024-07-30) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ac47b16a..018ebc87 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721838734, - "narHash": "sha256-o87oh2nLDzZ1E9+j1I6GaEvd9865OWGYvxaPSiH9DEU=", + "lastModified": 1723024704, + "narHash": "sha256-kPUAXbwT+lCWaHEZnJB0Zm12AOk6sEvuILoSY8I70Yw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1855c9961e0bfa2e776fa4b58b7d43149eeed431", + "rev": "92bb3f6051ce28e9f203dcaa31c73dc186408466", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1721769617, - "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", + "lastModified": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", "type": "github" }, "original": { From 2327719e8e848dd8da482769d3999d375c46357f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 10 Aug 2024 14:28:03 +0000 Subject: [PATCH 2/4] harmonia: drop garnix.io binary cache I have my own binary cache but for most stuff it's not so useful and I don't want people to rely on it. --- flake.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/flake.nix b/flake.nix index 96f75587..861c9243 100644 --- a/flake.nix +++ b/flake.nix @@ -9,14 +9,6 @@ inputs.treefmt-nix.url = "github:numtide/treefmt-nix"; inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; - nixConfig.extra-substituters = [ - "https://cache.garnix.io" - ]; - - nixConfig.extra-trusted-public-keys = [ - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - ]; - outputs = inputs@{ flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { systems = [ From a7b6564a65cfba717a3582211d91dcf829982ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 10 Aug 2024 14:33:12 +0000 Subject: [PATCH 3/4] fix build with latest nix version --- libnixstore/src/nix.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libnixstore/src/nix.cpp b/libnixstore/src/nix.cpp index e06d6016..51b9761e 100644 --- a/libnixstore/src/nix.cpp +++ b/libnixstore/src/nix.cpp @@ -29,9 +29,8 @@ template overloaded(Ts...) -> overloaded; static nix::ref get_store() { static std::shared_ptr _store; if (!_store) { - nix::initLibStore(); + nix::initLibStore(true); - nix::loadConfFile(); nix::Store::Params params; // Disable caching since we run as a deamon and non-reproduceable builds // might have a different result for hashes From 69206d7ffd15adf583f817b4f0513a8cf7063256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 10 Aug 2024 14:41:26 +0000 Subject: [PATCH 4/4] fix clippy warning --- libnixstore/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libnixstore/README.md b/libnixstore/README.md index 09d287ad..e7519268 100644 --- a/libnixstore/README.md +++ b/libnixstore/README.md @@ -42,8 +42,6 @@ stdenv.mkDerivation { ## Example ```rust -fn main() { - libnixstore::init(); - println!("{}", libnixstore::get_store_dir()); -} +libnixstore::init(); +println!("{}", libnixstore::get_store_dir()); ```