diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/protobufc | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/protobufc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/protobufc/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/protobufc/default.nix b/nixpkgs/pkgs/development/libraries/protobufc/default.nix index dc3b2c92f191..d152512783f0 100644 --- a/nixpkgs/pkgs/development/libraries/protobufc/default.nix +++ b/nixpkgs/pkgs/development/libraries/protobufc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , protobuf @@ -11,28 +10,20 @@ stdenv.mkDerivation rec { pname = "protobuf-c"; - version = "1.4.1"; + version = "unstable-2023-07-08"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - rev = "refs/tags/v${version}"; - hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM="; + rev = "fa86fddbd000316772d1deb5a8d1201fa7599ef7"; + hash = "sha256-pmqZYFREPgSrWPekymTglhtAv6gQR1gP3dOl3hqjYig="; }; - patches = [ - # https://github.com/protobuf-c/protobuf-c/pull/534 - (fetchpatch { - url = "https://github.com/protobuf-c/protobuf-c/commit/a6c9ea5207aeac61c57b446ddf5a6b68308881d8.patch"; - hash = "sha256-wTb8+YbvrCrOVpgthI5SJdG/CpQcOzCX4Bv47FPY804="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; - PROTOC = lib.getExe buildPackages.protobuf; + env.PROTOC = lib.getExe buildPackages.protobuf; meta = with lib; { homepage = "https://github.com/protobuf-c/protobuf-c/"; |