From a9300b2b6ba8161187e19f944602dca868defdb3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Jul 2018 15:29:51 -0500 Subject: [PATCH 1/4] libgit2_0_27: init --- pkgs/development/libraries/git2/0.27.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/git2/0.27.nix diff --git a/pkgs/development/libraries/git2/0.27.nix b/pkgs/development/libraries/git2/0.27.nix new file mode 100644 index 00000000000..8d9ff3cfe43 --- /dev/null +++ b/pkgs/development/libraries/git2/0.27.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, python +, zlib, libssh2, openssl, http-parser, curl +, libiconv, Security +}: + +stdenv.mkDerivation rec { + version = "0.27.3"; + name = "libgit2-${version}"; + + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "044dzwgl8zf1i1mk2g1z07hzxz46gma9sh63x09hswhw8j6zqx61"; + }; + + cmakeFlags = [ "-DTHREADSAFE=ON" ]; + + nativeBuildInputs = [ cmake python pkgconfig ]; + + buildInputs = [ zlib libssh2 openssl http-parser curl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + + enableParallelBuilding = true; + + doCheck = false; # hangs. or very expensive? + + meta = { + description = "The Git linkable library"; + homepage = https://libgit2.github.com/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1bcfaced0a..554667148e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9339,6 +9339,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; + glbinding = callPackage ../development/libraries/glbinding { }; gle = callPackage ../development/libraries/gle { }; From c9d79c639ff2236226c3dfbb2d06a7be461f4c9e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Jul 2018 15:32:10 -0500 Subject: [PATCH 2/4] grv: 0.1.2 -> 0.2.0 Needs libgit2 0.27 apparently, doesn't build with 0.26 or 0.25 in-tree. --- .../version-management/git-and-tools/grv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index be5b58c5733..cfb028004c7 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }: +{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }: let - version = "0.1.2"; + version = "0.2.0"; in buildGoPackage { name = "grv-${version}"; - buildInputs = [ ncurses readline curl libgit2_0_25 ]; + buildInputs = [ ncurses readline curl libgit2_0_27 ]; nativeBuildInputs = [ pkgconfig ]; goPackagePath = "github.com/rgburke/grv"; @@ -14,7 +14,7 @@ buildGoPackage { owner = "rgburke"; repo = "grv"; rev = "v${version}"; - sha256 = "1i8cr5xxdacpby60nqfyj8ijyc0h62029kbds2lq26rb8nn9qih2"; + sha256 = "0hlqw6b51jglqzzjgazncckpgarp25ghshl0lxv1mff80jg8wd1a"; fetchSubmodules = true; }; From 84c75d5a504fb74014794945980982c19f3df203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Jul 2018 13:34:35 +0100 Subject: [PATCH 3/4] blsd: bump libgit --- pkgs/tools/misc/blsd/deps.nix | 19 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/blsd/deps.nix b/pkgs/tools/misc/blsd/deps.nix index 55e6daea5e2..d212f213a60 100644 --- a/pkgs/tools/misc/blsd/deps.nix +++ b/pkgs/tools/misc/blsd/deps.nix @@ -1,11 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ -{ - goPackagePath = "github.com/libgit2/git2go"; - fetch = { - type = "git"; - url = "https://github.com/libgit2/git2go"; - rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5"; - sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc"; - }; -} + { + goPackagePath = "github.com/libgit2/git2go"; + fetch = { + type = "git"; + url = "https://github.com/libgit2/git2go"; + rev = "14280de4da0f392935854a7cbdd67b2a5505c3a8"; + sha256 = "17ppd7byzir8rhdk645dmggi700scb8f401yiwx8zy81q41dk1qi"; + }; + } ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 554667148e3..c3687b45856 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -898,7 +898,7 @@ with pkgs; blockdiag = pythonPackages.blockdiag; blsd = callPackage ../tools/misc/blsd { - libgit2 = libgit2_0_25; + libgit2 = libgit2_0_27; }; bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; From f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Jul 2018 13:35:24 +0100 Subject: [PATCH 4/4] libgit2_0_25: remove --- pkgs/development/libraries/git2/0.25.nix | 36 ------------------------ pkgs/top-level/all-packages.nix | 9 ++---- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/libraries/git2/0.25.nix diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix deleted file mode 100644 index 6bb1de2cf34..00000000000 --- a/pkgs/development/libraries/git2/0.25.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, python -, zlib, libssh2, openssl, http-parser, curl -, libiconv, Security -}: - -stdenv.mkDerivation rec { - version = "0.25.1"; - name = "libgit2-${version}"; - - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj"; - }; - - cmakeFlags = [ "-DTHREADSAFE=ON" ]; - - nativeBuildInputs = [ cmake python pkgconfig ]; - - buildInputs = [ zlib libssh2 openssl http-parser curl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; - - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - - enableParallelBuilding = true; - - doCheck = false; # hangs. or very expensive? - - meta = { - description = "The Git linkable library"; - homepage = https://libgit2.github.com/; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3687b45856..3cc36804527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6796,7 +6796,6 @@ with pkgs; julia_05 = callPackage ../development/compilers/julia/0.5.nix { gmp = gmp6; - libgit2 = libgit2_0_25; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; llvm = llvm_38; @@ -9335,10 +9334,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -11868,7 +11863,7 @@ with pkgs; sofia_sip = callPackage ../development/libraries/sofia-sip { }; soil = callPackage ../development/libraries/soil { }; - + sonic = callPackage ../development/libraries/sonic { }; soprano = callPackage ../development/libraries/soprano { }; @@ -20943,7 +20938,7 @@ with pkgs; spyder = pythonPackages.spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; - + stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; tulip = callPackage ../applications/science/misc/tulip {