diff options
| -rw-r--r-- | nix-dependencies/dependencies.nix | 10 | ||||
| -rw-r--r-- | nix/sources.json | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nix-dependencies/dependencies.nix b/nix-dependencies/dependencies.nix index cce0911..7205417 100644 --- a/nix-dependencies/dependencies.nix +++ b/nix-dependencies/dependencies.nix @@ -3,7 +3,7 @@ , bash , pkg-config , coreutils -, protobuf_25 +, protobuf , grpc , clang , fmt @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - protobuf_25 - grpc jo bash ]; @@ -35,14 +33,16 @@ stdenv.mkDerivation rec { coreutils gnugrep unixtools.xxd + protobuf + grpc ]; buildPhase = '' echo PKG_CONFIG_PATH=$PKG_CONFIG_PATH jo TOOLCHAIN_CONFIG=$(jo \ CC=$(jo PATH=$(jo -a ${clang}/bin ${coreutils}/bin ${busybox}/bin)) \ - PROTO=$(jo PATH=$(jo -a ${protobuf_25}/bin ${grpc}/bin) \ - PROTOC=${protobuf_25}/bin/protoc \ + PROTO=$(jo PATH=$(jo -a ${protobuf}/bin ${grpc}/bin) \ + PROTOC=${protobuf}/bin/protoc \ GRPC_PLUGIN=${grpc}/bin/grpc_cpp_plugin \ ) \ shell=$(jo PATH=$(jo -a ${coreutils}/bin)) \ diff --git a/nix/sources.json b/nix/sources.json index 8dfabc6..f1bc287 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "f7c538837892dd2eb83567c9f380a11efb59b53f", - "sha256": "0xl33k24vfc29cg9lnp95kvcq69qbq5fzb7jk9ig4lgrhaarh651", + "rev": "e2f66fe558481d6b569358d27db06f7e972ed71b", + "sha256": "1xn822jajags6bigdr1ssxvfiyd7d3adhnmmrr9x3maphchkr0x0", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/f7c538837892dd2eb83567c9f380a11efb59b53f.tar.gz", + "url": "https://github.com/nmattia/niv/archive/e2f66fe558481d6b569358d27db06f7e972ed71b.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs-unstable": { @@ -17,10 +17,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", - "sha256": "0xh6fmkn2p8ivwqymb9gymfz07lw16fycyipgiydhxzgx6y9j7gd", + "rev": "b2243f41e860ac85c0b446eadc6930359b294e79", + "sha256": "0bhibarcx56j1szd40ygv1nm78kap3yr4s24p5cv1kdiy4hsb21k", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/6132b0f6e344ce2fe34fc051b72fb46e34f668e0.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/b2243f41e860ac85c0b446eadc6930359b294e79.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } |