From f0a8400f3db6f3f852ec73d74485625ffcd12dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Wed, 14 Aug 2024 20:33:44 +0200 Subject: [PATCH] Update dependencies --- attic/src/nix_store/bindings/nix.cpp | 2 +- attic/src/nix_store/bindings/nix.hpp | 16 ++++++------- flake.lock | 36 ++++++++++++++-------------- flake.nix | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/attic/src/nix_store/bindings/nix.cpp b/attic/src/nix_store/bindings/nix.cpp index 3b9a1da..abbbf04 100644 --- a/attic/src/nix_store/bindings/nix.cpp +++ b/attic/src/nix_store/bindings/nix.cpp @@ -44,7 +44,7 @@ CPathInfo::CPathInfo(nix::ref pi) : pi(pi) {} RHashSlice CPathInfo::nar_sha256_hash() { auto &hash = this->pi->narHash; - if (hash.type != nix::htSHA256) { + if (hash.type != nix::HashType::SHA256) { throw nix::Error("Only SHA-256 hashes are supported at the moment"); } diff --git a/attic/src/nix_store/bindings/nix.hpp b/attic/src/nix_store/bindings/nix.hpp index 8d9a81f..f3e2db5 100644 --- a/attic/src/nix_store/bindings/nix.hpp +++ b/attic/src/nix_store/bindings/nix.hpp @@ -13,14 +13,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include template using RVec = rust::Vec; diff --git a/flake.lock b/flake.lock index 493db42..58a0e66 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1721322122, - "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -90,17 +90,17 @@ "lix": { "flake": false, "locked": { - "lastModified": 1721371213, - "narHash": "sha256-7SdrlNe5DBlK5uLBhPPxVRWI50N1PFz3zMBeDYiX0Qs=", + "lastModified": 1723577950, + "narHash": "sha256-kOpGI9WPmte1L4QWHviuXsr8jxmGn27zwi82jtzYObM=", "ref": "refs/heads/main", - "rev": "aba5f19680b2f4c29d7ce2ff5e2a89128c1cb26d", - "revCount": 15985, + "rev": "b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf", + "revCount": 16134, "type": "git", - "url": "ssh://git@git.lix.systems/lix-project/lix" + "url": "https://git.lix.systems/lix-project/lix" }, "original": { "type": "git", - "url": "ssh://git@git.lix.systems/lix-project/lix" + "url": "https://git.lix.systems/lix-project/lix" } }, "lix-module": { @@ -115,26 +115,26 @@ ] }, "locked": { - "lastModified": 1720695775, - "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=", + "lastModified": 1723511483, + "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", "ref": "refs/heads/main", - "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a", - "revCount": 94, + "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", + "revCount": 106, "type": "git", - "url": "ssh://git@git.lix.systems/lix-project/nixos-module" + "url": "https://git.lix.systems/lix-project/nixos-module" }, "original": { "type": "git", - "url": "ssh://git@git.lix.systems/lix-project/nixos-module" + "url": "https://git.lix.systems/lix-project/nixos-module" } }, "nixpkgs": { "locked": { - "lastModified": 1721373214, - "narHash": "sha256-crpGeGQGFlnCsMyCE5eheyjzo3xo03o1FXJ2sAbm7No=", + "lastModified": 1723603349, + "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af9c15bc7a314c226d7d5d85e159f7a73e8d9fae", + "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a5fd15d..174b74c 100644 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,11 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; lix = { - url = "git+ssh://git@git.lix.systems/lix-project/lix"; + url = "git+https://git.lix.systems/lix-project/lix"; flake = false; }; lix-module = { - url = "git+ssh://git@git.lix.systems/lix-project/nixos-module"; + url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs.nixpkgs.follows = "nixpkgs"; inputs.lix.follows = "lix"; };