diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/simple/dic.nix | 6 | ||||
| -rw-r--r-- | pkgs/simple/garage-k2v-client.nix | 23 |
2 files changed, 10 insertions, 19 deletions
diff --git a/pkgs/simple/dic.nix b/pkgs/simple/dic.nix index 0875c73..5154d4d 100644 --- a/pkgs/simple/dic.nix +++ b/pkgs/simple/dic.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation { name = "dic"; src = pkgs.fetchgit { - url = https://cgit.ni.krebsco.de/dic; - rev = "refs/tags/v1.1.1"; - sha256 = "1gbj967a5hj53fdkkxijqgwnl9hb8kskz0cmpjq7v65ffz3v6vag"; + url = "https://cgit.krebsco.de/dic"; + rev = "refs/tags/v1.1.2"; + hash = "sha256-pqzXgn+0rQ2EWXpslhibctpxHN+nMr/GMJMr3cmTBpw="; }; phases = [ diff --git a/pkgs/simple/garage-k2v-client.nix b/pkgs/simple/garage-k2v-client.nix index 6c517b8..d6a7ca4 100644 --- a/pkgs/simple/garage-k2v-client.nix +++ b/pkgs/simple/garage-k2v-client.nix @@ -2,22 +2,10 @@ pkgs.rustPlatform.buildRustPackage { pname = "garage-k2v-client"; - version = "0.0.4"; - src = pkgs.fetchgit { - url = "https://git.deuxfleurs.fr/Deuxfleurs/garage.git"; - rev = "v1.0.0"; - hash = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8="; - }; - - cargoHash = "sha256-Ggau8m0FVqpS1vMbpwBSkwBx6/2SrBw3ZpYhrjqkhNs="; - - # Copied from nixpkgs@e402c3e's ./pkgs/tools/filesystems/garage/default.nix - postPatch = '' - # Starting in 0.9.x series, Garage is using mold in local development - # and this leaks in this packaging, we remove it to use the default linker. - rm .cargo/config.toml || true - ''; + version = pkgs.garage.version; + src = pkgs.garage.src; + cargoHash = pkgs.garage.cargoHash; preBuild = '' cd src/k2v-client @@ -36,5 +24,8 @@ pkgs.rustPlatform.buildRustPackage { # (but would have to do it after the tests instead.) doCheck = false; - buildFeatures = [ "cli" ]; + buildFeatures = [ + "cli" + "serde/std" + ]; } |