libgit2: 0.25.1 -> 0.26.0 #31119

peterhoeg · 2017-11-02T05:04:22Z

Motivation for this change

This causes fairly significant rebuilding.

It also supersedes #30982 which I wasn't aware of before doing this.

Cc @orivej @wizeman

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

orivej · 2017-11-02T05:29:30Z

pythonPackages.pygit2 has to be kept in sync, otherwise it fails to build.

Let's close #30982 when this one is merged.

peterhoeg · 2017-11-02T08:36:41Z

Now pygit2 tracks the version of libgit2 as well.

disassembler · 2017-11-02T13:12:04Z

pkgs/top-level/python-packages.nix

@@ -16229,24 +16229,13 @@ in {
  };

  pygit2 = buildPythonPackage rec {
-    name = "pygit2-0.25.1";
+    name = "pygit2-${pkgs.libgit2.version}";

    src = pkgs.fetchurl {


Could fetchPyPi be used here instead?

wizeman · 2017-11-02T13:17:28Z

pkgs/development/libraries/git2/default.nix

-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; all;
+    license = licenses.gpl2;
+    platforms = with platforms; all;


Perhaps platforms = platforms.all would be simpler?

orivej

v0.26.0 has a breaking change that requires gnome3.libgit2-glib to be updated too, or it fails to build.

orivej · 2017-11-02T14:11:52Z

pkgs/top-level/python-packages.nix

@@ -16229,24 +16229,13 @@ in {
  };

  pygit2 = buildPythonPackage rec {
-    name = "pygit2-0.25.1";
+    name = "pygit2-${pkgs.libgit2.version}";


This is clever: the version will be kept in sync. Since its a fetchurl, the src.name will contain the version and the store path will change even if somebody updates libgit2 version but forgets to update pygit2 hash.

Well, it will break as the hash no longer matches so nothing stays silent.

FRidh · 2017-11-02T18:23:11Z

pkgs/top-level/python-packages.nix

@@ -16229,24 +16229,13 @@ in {
  };

  pygit2 = buildPythonPackage rec {


Could you move the expression to python-modules

orivej · 2017-11-03T03:10:19Z

@peterhoeg If you don't mind I'll complete this PR.

peterhoeg · 2017-11-03T03:19:22Z

If you don't mind I'll complete this PR.

Please do. You saw @FRidh 's note about separating out the python module?

orivej · 2017-11-03T03:23:33Z

Yes. I don't see why we should do this manually (I asked him here), but this time I'll do it just to try.

jtojnar · 2017-11-03T22:47:17Z

pkgs/desktops/gnome-3/misc/gitg/src.nix


  src = fetchurl {
-    url = mirror://gnome/sources/gitg/3.24/gitg-3.24.0.tar.xz;
-    sha256 = "3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e";
+    url = "mirror://gnome/sources/gitg/${major}/${name}.tar.xz";


The attributes will be erased in the next gnome update. You can update the file the same way using maintainers/scripts/gnome.sh update gitg 3.26.

jtojnar · 2017-11-03T22:56:55Z

pkgs/development/libraries/git2/default.nix

+    owner = "libgit2";
+    repo = "libgit2";
+    rev = "v${version}";
+    inherit sha256;
  };

  # TODO: `cargo` (rust's package manager) surfaced a serious bug in


The patch here should no longer necessary since libgit2/libgit2#3885 was fixed in 2.24.4.

jtojnar · 2017-11-03T23:02:52Z

It would be also nice if you could clean up the libgit2_glib dependencies as I did in jtojnar@fd33a6a, to save me a round trip.

jtojnar · 2017-11-05T12:21:56Z

pkgs/development/libraries/git2/0.25.nix

+    sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj";
+  };
+
+  # TODO: `cargo` (rust's package manager) surfaced a serious bug in


It probably is not necessary even here.

Indeed, thank you.

... and switch to fetchFromGitHub to avoid future hash changes.

It's libgit2 test fails with libgit2 0.26.0.

orivej · 2017-11-05T18:48:14Z

Merged into staging because this is borderline massive, and I expect staging to reach master soon.

peterhoeg requested a review from nbp as a code owner November 2, 2017 05:04

GrahamcOfBorg added 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 labels Nov 2, 2017

peterhoeg requested a review from FRidh as a code owner November 2, 2017 08:35

disassembler reviewed Nov 2, 2017

View reviewed changes

wizeman reviewed Nov 2, 2017

View reviewed changes

orivej suggested changes Nov 2, 2017

View reviewed changes

FRidh reviewed Nov 2, 2017

View reviewed changes

orivej force-pushed the u/lg branch from 433d277 to ae04922 Compare November 3, 2017 12:01

orivej changed the title ~~libgit2: 0.25.1 -> 0.26.0~~ [WIP] libgit2: 0.25.1 -> 0.26.0 Nov 3, 2017

orivej force-pushed the u/lg branch from ae04922 to e2872c2 Compare November 3, 2017 17:50

orivej mentioned this pull request Nov 3, 2017

[wip] Various GNOME 3.26 libraries: update #30371

Merged

8 tasks

jtojnar requested changes Nov 3, 2017

View reviewed changes

orivej force-pushed the u/lg branch 3 times, most recently from 3e0d01a to 4c944e2 Compare November 5, 2017 12:16

orivej approved these changes Nov 5, 2017

View reviewed changes

orivej changed the title ~~[WIP] libgit2: 0.25.1 -> 0.26.0~~ libgit2: 0.25.1 -> 0.26.0 Nov 5, 2017

jtojnar reviewed Nov 5, 2017

View reviewed changes

orivej force-pushed the u/lg branch from 4c944e2 to 68f077f Compare November 5, 2017 16:38

orivej changed the base branch from master to staging November 5, 2017 18:42

libgit2: fix hash

1aef6f4

... and switch to fetchFromGitHub to avoid future hash changes.

orivej and others added 7 commits November 5, 2017 18:43

libgit2: 0.25.1 -> 0.26.0

ce1b0c0

pythonPackages.pygit2: 0.25.1 -> 0.26.0

4393445

libgit2-glib: 0.25.0 -> 0.26.0

711f260

gitg: 3.24.0 -> 3.26.0

2b9975c

git-series: fix build after "source" name change

2fb0edd

julia_05: use libgit2_0_25

225a059

It's libgit2 test fails with libgit2 0.26.0.

libgit2: delete obsolete patch

62e18a9

orivej force-pushed the u/lg branch from 68f077f to 62e18a9 Compare November 5, 2017 18:44

orivej merged commit d3895ce into NixOS:staging Nov 5, 2017

orivej mentioned this pull request Nov 5, 2017

libgit2: fix hash #30982

Closed

8 tasks

jtojnar mentioned this pull request Nov 5, 2017

gnome3: 3.24 → 3.26 #29392

Merged

71 tasks

peterhoeg deleted the u/lg branch November 6, 2017 02:08

phunehehe mentioned this pull request Nov 17, 2017

openssh: "No user exists for uid" #31762

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

libgit2: 0.25.1 -> 0.26.0 #31119

libgit2: 0.25.1 -> 0.26.0 #31119

peterhoeg commented Nov 2, 2017 •

edited

orivej commented Nov 2, 2017 •

edited

peterhoeg commented Nov 2, 2017

disassembler Nov 2, 2017

wizeman Nov 2, 2017

orivej left a comment

orivej Nov 2, 2017 •

edited

peterhoeg Nov 3, 2017

FRidh Nov 2, 2017

orivej commented Nov 3, 2017

peterhoeg commented Nov 3, 2017

orivej commented Nov 3, 2017

jtojnar Nov 3, 2017

jtojnar Nov 3, 2017

jtojnar commented Nov 3, 2017

jtojnar Nov 5, 2017

orivej Nov 5, 2017

orivej commented Nov 5, 2017

		@@ -16229,24 +16229,13 @@ in {
		};

		pygit2 = buildPythonPackage rec {

libgit2: 0.25.1 -> 0.26.0 #31119

libgit2: 0.25.1 -> 0.26.0 #31119

Conversation

peterhoeg commented Nov 2, 2017 • edited

Motivation for this change

Things done

orivej commented Nov 2, 2017 • edited

peterhoeg commented Nov 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

orivej left a comment

Choose a reason for hiding this comment

orivej Nov 2, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

orivej commented Nov 3, 2017

peterhoeg commented Nov 3, 2017

orivej commented Nov 3, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jtojnar commented Nov 3, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

orivej commented Nov 5, 2017

peterhoeg commented Nov 2, 2017 •

edited

orivej commented Nov 2, 2017 •

edited

orivej Nov 2, 2017 •

edited