Merge master into staging

2020-02-16 08:50:59 +01:00
parent 40971eca7b 9f2bc434ca
commit 0c7143462b
567 changed files with 8470 additions and 3109 deletions
@@ -0,0 +1,31 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }:
+
+buildPythonApplication rec {
+  pname = "bump2version";
+  version = "1.0.0";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "c4urself";
+    repo = "${pname}";
+    rev = "refs/tags/v${version}";
+    sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja";
+  };
+
+  checkInputs = [ pytest testfixtures ];
+  # X's in pytest are git tests which won't run in sandbox
+  checkPhase = ''
+    pytest tests/ -k 'not usage_string_fork'
+  ''; 
+
+  meta = with stdenv.lib; {
+    description = "Version-bump your software with a single command";
+    longDescription = ''
+      A small command line tool to simplify releasing software by updating 
+      all version strings in your source code by the correct increment.
+    '';
+    homepage = "https://github.com/c4urself/bump2version";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jefflabonte ];
+  };
+}
@@ -22,6 +22,8 @@ let

  bitbucket-server-cli = callPackage ./bitbucket-server-cli { };

+  bump2version = pkgs.python37Packages.callPackage ./bump2version { };
+
  darcsToGit = callPackage ./darcs-to-git { };

  delta = callPackage ./delta { };
@@ -192,6 +194,8 @@ let

  transcrypt = callPackage ./transcrypt { };

+  ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff;
+
 } // lib.optionalAttrs (config.allowAliases or true) (with self; {
  # aliases
  gitAnnex = git-annex;
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
    sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6";
  };

+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
  cargoSha256 = "1zmk70hccrxn1gdr1bksnvh6sa2h4518s0ni8k2ihxi4ld1ch5p2";

  meta = with lib; {
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "gh";
-  version = "0.5.3";
+  version = "0.5.5";

  src = fetchFromGitHub {
    owner = "cli";
    repo = "cli";
    rev = "v${version}";
-    sha256 = "033y9bwdaj8735nmj22k8lrgkgimji7hyly9i4jyp11iaa7cgd7a";
+    sha256 = "0jmkcx95kngzylqhllg33s094rggpsrgky704z8v6j4969xgrfnc";
  };

  modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h";
@@ -29,7 +29,7 @@ buildGoModule rec {

  meta = with lib; {
    description = "GitHub CLI tool";
-    homepage = "https://github.com/cli/cli";
+    homepage = "https://cli.github.com/";
    license = licenses.mit;
    maintainers = with maintainers; [ zowoq ];
  };
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {

  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];

+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
  cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd";

  meta = with stdenv.lib; {
@@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec {
    sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
  };

+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
  cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9";

  meta = with lib; {
@@ -26,6 +26,9 @@ buildRustPackage rec {
    sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2";
  };

+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
  cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy";

  nativeBuildInputs = [
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
    sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh";
  };

+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
  cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2";

  nativeBuildInputs = [ pkgconfig makeWrapper ];
@@ -13,6 +13,9 @@ buildRustPackage rec {
    sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
  };

+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
  cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf";

  nativeBuildInputs = [ pkgconfig ];
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
    sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q";
  };

+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
  cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk";

  buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -17,8 +17,6 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466";

-  legacyCargoFetcher = false;
-
  buildInputs = with stdenv; lib.optional isDarwin Security;

  meta = with stdenv.lib; {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:

 let
-  version = "1.0.16";
+  version = "1.0.17";
 in
 stdenv.mkDerivation {
  pname = "svn-all-fast-export";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
    owner = "svn-all-fast-export";
    repo = "svn2git";
    rev = version;
-    sha256 = "1xs3gngjkna458liaqjsc8ryld03mdmvycnkzwsgyzfxsgjx1i3l";
+    sha256 = "13gmrxh4i34scv51h9x38v8jqfjykbbd9w7zzqjnxzvzpzsczg9a";
  };

  nativeBuildInputs = [ qmake qttools ];