From 4bdcb220c9c9d965d37d3e18c5dcb10ef2605d22 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 8 Sep 2017 21:23:42 +0300 Subject: protobufc: 1.1 -> 1.3 --- pkgs/development/libraries/protobufc/1.0.nix | 11 ----------- pkgs/development/libraries/protobufc/1.1.nix | 11 ----------- pkgs/top-level/all-packages.nix | 5 ++--- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/protobufc/1.0.nix delete mode 100644 pkgs/development/libraries/protobufc/1.1.nix diff --git a/pkgs/development/libraries/protobufc/1.0.nix b/pkgs/development/libraries/protobufc/1.0.nix deleted file mode 100644 index d64ea5790c61..000000000000 --- a/pkgs/development/libraries/protobufc/1.0.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage, fetchFromGitHub, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.0.2"; - src = fetchFromGitHub { - owner = "protobuf-c"; - repo = "protobuf-c"; - rev = "v${version}"; - sha256 = "1harabw7qdgcmh098664xkcv8bkyach6i35sisc40yhvagr3fzsz"; - }; -}) diff --git a/pkgs/development/libraries/protobufc/1.1.nix b/pkgs/development/libraries/protobufc/1.1.nix deleted file mode 100644 index 97fc8642778e..000000000000 --- a/pkgs/development/libraries/protobufc/1.1.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage, fetchFromGitHub, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.1.1"; - src = fetchFromGitHub { - owner = "protobuf-c"; - repo = "protobuf-c"; - rev = "v${version}"; - sha256 = "0mdl2i87394l4zdvq2npsxq4zs8p7sqhqmbm2r380ngjs6zic6gw"; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 776405195803..fabe4586077c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9996,9 +9996,8 @@ with pkgs; protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; - protobufc = protobufc1_1; - protobufc1_1 = callPackage ../development/libraries/protobufc/1.1.nix { }; - protobufc1_0 = callPackage ../development/libraries/protobufc/1.0.nix { }; + protobufc = protobufc1_3; + protobufc1_3 = callPackage ../development/libraries/protobufc/1.3.nix { }; flatbuffers = callPackage ../development/libraries/flatbuffers { }; -- cgit 1.4.1