From 09a5be4b45c9f2df9d60b9fa6f638d40d3ac2422 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 11 Jan 2019 21:24:40 +0100 Subject: [PATCH 1/7] perlPackages.GitVersionCompare: init at 1.004 (cherry picked from commit 877a62d05eec5f18db130535899e28d76fb9d928) --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bbfa8289c0e6..18f36535d355 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6396,6 +6396,19 @@ let }; }; + GitVersionCompare = buildPerlPackage rec { + name = "Git-Version-Compare-1.004"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + sha256 = "63e8264ed351cb2371b47852a72366214164b5f3fad9dbd68309c7fc63d06491"; + }; + buildInputs = [ TestNoWarnings ]; + meta = { + description = "Functions to compare Git versions"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Glib = buildPerlPackage rec { name = "Glib-1.328"; src = fetchurl { From 94f5caa2625d51c686d465927302c2a358d93f3e Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 11 Jan 2019 22:38:06 +0100 Subject: [PATCH 2/7] perlPackages.TestRequiresGit: init at 1.008 (cherry picked from commit 402a492f53f10e51bb7268a308c061327c7f5595) --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18f36535d355..4155e9027f00 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15589,6 +15589,19 @@ let }; }; + TestRequiresGit = buildPerlPackage rec { + name = "Test-Requires-Git-1.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + sha256 = "70916210970d84d7491451159ab8b67e15251c8c0dae7c3df6c8d88542ea42a6"; + }; + propagatedBuildInputs = [ GitVersionCompare ]; + meta = { + description = "Check your test requirements against the available version of Git"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestRequiresInternet = buildPerlPackage rec { name = "Test-RequiresInternet-0.05"; src = fetchurl { From 8c0cf0715268a22dc4aa84b1a7a8057c04d851fa Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 11 Jan 2019 22:40:00 +0100 Subject: [PATCH 3/7] perlPackages.SystemCommand: init at 1.119 (cherry picked from commit 7abee46bc01d0c1f6d642aa163b177044f5a38ff) --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4155e9027f00..57ed1aad1241 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14398,6 +14398,19 @@ let }; }; + SystemCommand = buildPerlPackage rec { + name = "System-Command-1.119"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + sha256 = "c8c9fb1e527c52463cab1476500efea70396a0b62bea625d2d6faea994dc46e7"; + }; + propagatedBuildInputs = [ IPCRun ]; + meta = { + description = "Object for running system commands"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SysVirt = buildPerlModule rec { version = "4.10.0"; name = "Sys-Virt-${version}"; From 9276cd20e0a6ecb7bc447563fb7841c1d9c5efc0 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 11 Jan 2019 22:41:19 +0100 Subject: [PATCH 4/7] perlPackages.GitRepository: init at 1.323 (cherry picked from commit 193b9743445c7212768fff1bd15d795e789e13c1) --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57ed1aad1241..89faccfacad2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6396,6 +6396,20 @@ let }; }; + GitRepository = buildPerlPackage rec { + name = "Git-Repository-1.323"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + sha256 = "966575fcecc9f56ab8739ea451b3825e278bc9179d785a20a9ae52473f33683e"; + }; + buildInputs = [ TestRequiresGit ]; + propagatedBuildInputs = [ GitVersionCompare SystemCommand namespaceclean ]; + meta = { + description = "Perl interface to Git repositories"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GitVersionCompare = buildPerlPackage rec { name = "Git-Version-Compare-1.004"; src = fetchurl { From f44f2a62da92b9c6d49858add30d015d144ac2b1 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 11 Jan 2019 22:42:39 +0100 Subject: [PATCH 5/7] perlPackages.XMLMini: init at 1.38 (cherry picked from commit 67fb9ec80cb70aa0b792438ec10633484d38f318) --- pkgs/top-level/perl-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 89faccfacad2..1a80d39f1e71 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17524,6 +17524,17 @@ let propagatedBuildInputs = [ XMLLibXML ]; }; + XMLMini = buildPerlPackage rec { + name = "XML-Mini-1.38"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PD/PDEEGAN/${name}.tar.gz"; + sha256 = "af803d38036a3184e124a682e5466f1bc107f48a89ef35b0c7647e11a073fe2d"; + }; + meta = { + license = "unknown"; + }; + }; + XMLNamespaceSupport = buildPerlPackage { name = "XML-NamespaceSupport-1.12"; src = fetchurl { From c6952eb7538ee7430c4fb3217dcdbbcb23ed5a1a Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 11 Jan 2019 20:28:14 +0100 Subject: [PATCH 6/7] maintainers: Add myself to maintainers list. (cherry picked from commit 305b401ef8ac0943ea2cb062171dce5c65be4975) --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7043b25e97bf..99c448a51f2d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -485,6 +485,11 @@ github = "avnik"; name = "Alexander V. Nikolaev"; }; + aw = { + email = "aw-nixos@meterriblecrew.net"; + github = "herrwiese"; + name = "Andreas Wiese"; + }; aycanirican = { email = "iricanaycan@gmail.com"; github = "aycanirican"; From 14af84240ef24e417173e083d60ea45d4ce6e257 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 11 Jan 2019 22:43:52 +0100 Subject: [PATCH 7/7] ham: init at (unstable-)2019-01-22 (cherry picked from commit 8d53c3474363eabb8da6276e1140a4e247e9090c) --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/perl-packages.nix | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0afe17f5ae2..f18f775ec2b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3313,6 +3313,8 @@ in halide = callPackage ../development/compilers/halide { }; + ham = pkgs.perlPackages.ham; + hardinfo = callPackage ../tools/system/hardinfo { }; hdapsd = callPackage ../os-specific/linux/hdapsd { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a80d39f1e71..f7ff14cb7f4d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6789,6 +6789,47 @@ let buildInputs = [ TestSimple13 ]; }; + ham = buildPerlPackage rec { + name = "ham-unstable-${version}"; + version = "2019-01-22"; + + src = fetchFromGitHub { + owner = "kernkonzept"; + repo = "ham"; + rev = "37c2e4e8b8bd779ba0f8c48a3c6ba34bad860b92"; + sha256 = "0h5r5256niskypl4g1j2573wqi0nn0mai5p04zsa06xrgyjqcy2j"; + }; + + outputs = [ "out" ]; + + buildInputs = [ pkgs.makeWrapper ]; + propagatedBuildInputs = [ pkgs.openssh GitRepository URI XMLMini ]; + + preConfigure = '' + patchShebangs . + touch Makefile.PL + rm -f Makefile + ''; + + installPhase = '' + mkdir -p $out/lib $out/bin + cp -r . $out/lib/ham + + makeWrapper $out/lib/ham/ham $out/bin/ham --argv0 ham \ + --prefix PATH : ${pkgs.openssh}/bin + ''; + + doCheck = false; + + meta = { + description = "A tool to manage big projects consisting of multiple loosely-coupled git repositories"; + homepage = https://github.com/kernkonzept/ham; + license = "unknown"; # should be gpl2, but not quite sure + maintainers = with stdenv.lib.maintainers; [ aw ]; + platforms = stdenv.lib.platforms.unix; + }; + }; + HashFlatten = buildPerlPackage rec { name = "Hash-Flatten-1.19"; src = fetchurl {