From fc038883e5732b7c24fcd62f135281b1c2c589fc Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 29 Mar 2018 08:53:42 -0700 Subject: gitAndTools.stgit: 0.17.1 -> 0.18 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/stgit/versions. These checks were done: - built on NixOS - ran `/nix/store/fwhfsvfs23x3jwc2wgx805x229vxwd24-stgit-0.18/bin/stg -h` got 0 exit code - ran `/nix/store/fwhfsvfs23x3jwc2wgx805x229vxwd24-stgit-0.18/bin/stg --help` got 0 exit code - ran `/nix/store/fwhfsvfs23x3jwc2wgx805x229vxwd24-stgit-0.18/bin/stg help` got 0 exit code - found 0.18 with grep in /nix/store/fwhfsvfs23x3jwc2wgx805x229vxwd24-stgit-0.18 - directory tree listing: https://gist.github.com/b3a9f7bf9ff22a7858ac4f6e4d7d7be0 --- .../version-management/git-and-tools/stgit/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 7130e057d971..64e700273d12 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, python2, git }: let - name = "stgit-0.17.1"; + name = "stgit-${version}"; + version = "0.18"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download.gna.org/stgit/${name}.tar.gz"; - sha256 = "1pka0ns9x0kabn036zsf0mwmwiynckhnva51kgxsch9fqah6acyl"; + url = "https://github.com/ctmarinas/stgit/archive/v${version}.tar.gz"; + sha256 = "19fk6vw3pgp2a98wpd4j3kyiyll5dy9bi4921wq1mrky0l53mj00"; }; buildInputs = [ python2 git ]; -- cgit 1.4.1 From caf87949107dc31aaa23570ea5362c92412bb5cf Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 3 Apr 2018 10:46:55 +0300 Subject: nbstripout: fix tests Building of nbstripout has failed after the version was bumped to 0.3.1 because: the test files were missing from the new release tarball. This adds tests by using the release tarball from GitHub instead of PyPI. However, these tests fail because of a bug in one test. Thus, a patch is used to fix the tests. --- .../version-management/nbstripout/default.nix | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 324bbf690d56..18fb672226f2 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,4 +1,4 @@ -{lib, python2Packages, git, mercurial, coreutils}: +{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}: with python2Packages; buildPythonApplication rec { @@ -12,11 +12,30 @@ buildPythonApplication rec { buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; - src = fetchPypi { - inherit pname version; - sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95"; + # PyPI source is currently missing tests. Thus, use GitHub instead. + # See: https://github.com/kynan/nbstripout/issues/73 + # Use PyPI again after it has been fixed in a release. + src = fetchFromGitHub { + owner = "kynan"; + repo = pname; + rev = version; + sha256 = "1jifqmszjzyaqzaw2ir83k5fdb04iyxdad4lclawpb42hbink9ws"; }; + patches = [ + ( + # Fix git diff tests by using --no-index. + # See: https://github.com/kynan/nbstripout/issues/74 + # + # Remove this patch once the pull request has been merged and a new + # release made. + fetchurl { + url = "https://github.com/jluttine/nbstripout/commit/03e28424fb788dd09a95e99814977b0d0846c0b4.patch"; + sha256 = "09myfb77a2wh8lqqs9fcpam97vmaw8b7zbq8n5gwn6d80zbl7dn0"; + } + ) + ]; + # for some reason, darwin uses /bin/sh echo native instead of echo binary, so # force using the echo binary postPatch = '' -- cgit 1.4.1 From 7a77ba4a5faa5208ca6cfdf0bc03ae881e23d6a7 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Sun, 8 Apr 2018 10:50:58 +0200 Subject: sit: 0.1.3 -> 0.2.1 --- pkgs/applications/version-management/sit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 5c6e65915da5..eae72739ec2b 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.1.3"; + version = "0.2.1"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "1ysy1lhb7fxy02a3c9xk2awa49svnfa8bqcz2aj4x56r2f8vhj0h"; + sha256 = "1gcw5fqaqpxl2xgry0w8750g2msrk884zj1slym6r3nj7s2m9j22"; }; - cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw"; + cargoSha256 = "0hb82j97m8vw8m6gpb6s3bbi31xxv9nqh3aq7hkbmp1pqc02sg3q"; meta = with stdenv.lib; { description = "SCM-agnostic, file-based, offline-first, immutable issue tracker"; -- cgit 1.4.1 From 5d65b4ebeb6b2294654b3562fb15d7fa94751522 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 9 Apr 2018 10:02:57 +0200 Subject: git: 2.16.2 -> 2.17.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- .../git-and-tools/git/docbook2texi.patch | 16 ++++++++-------- .../git-and-tools/git/git-send-email-honor-PATH.patch | 8 +++----- .../git-and-tools/git/git-sh-i18n.patch | 8 ++++---- .../git-and-tools/git/symlinks-in-bin.patch | 8 ++++---- 5 files changed, 21 insertions(+), 23 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index e545cb33befe..93c56a626db7 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.2"; + version = "2.17.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; + sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch index bf36b2d321f3..ab5bb3c3a6c7 100644 --- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch +++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch @@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi', and (2) make sure `gitman.info' isn't produced since it's broken (duplicate node names). -diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile ---- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200 -+++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200 -@@ -101,7 +101,7 @@ +diff --git a/Documentation/Makefile b/Documentation/Makefile +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -122,7 +122,7 @@ MAKEINFO = makeinfo INSTALL_INFO = install-info -DOCBOOK2X_TEXI = docbook2x-texi +DOCBOOK2X_TEXI = docbook2texi DBLATEX = dblatex - ifndef PERL_PATH - PERL_PATH = /usr/bin/perl -@@ -205,7 +205,7 @@ + ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex + DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty +@@ -240,7 +240,7 @@ man5: $(DOC_MAN5) man7: $(DOC_MAN7) @@ -23,7 +23,7 @@ diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile pdf: user-manual.pdf -@@ -221,10 +221,9 @@ +@@ -256,10 +256,9 @@ install-info: info $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 9a484262b7b2..6b93d061a3be 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,22 +1,20 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index 8060ea35c..c81067a19 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. +@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'. specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration - option; the built-in default is to search for `sendmail` in - `/usr/sbin`, `/usr/lib` and $PATH if such program is -+ option; the built-in default is to search in $PATH if such program is ++ option; the built-in default is to search in $PATH if such program is available, falling back to `localhost` otherwise. --smtp-server-port=:: diff --git a/git-send-email.perl b/git-send-email.perl -index edcc6d346..8e357aeab 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { +@@ -944,8 +944,7 @@ if (defined $reply_to) { } if (!defined $smtp_server) { diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 97f50064bc3f..216c0e56b44c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +-elif test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary --elif test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch index 29d537db25f9..0a581a61d46d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch +++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch @@ -1,7 +1,7 @@ -diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile ---- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200 -+++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200 -@@ -2319,8 +2319,7 @@ +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -2609,8 +2609,7 @@ { test "$$bindir/" = "$$execdir/" || \ for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ $(RM) "$$execdir/$$p" && \ -- cgit 1.4.1