diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
commit | 2fec9c6e297e02718db6be53d645524f0052a7bc (patch) | |
tree | 93e73a98dfaa40b290a6e15cf7f61054e5dc59e0 /pkgs/applications/version-management | |
parent | e9961bf9a9f7410c2891c7e86c21ed6388c70d78 (diff) | |
parent | ba816ee08721d0c2f5f7e6652091bed085ac7687 (diff) | |
download | nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.gz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.bz2 nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.lz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.xz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.zst nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/development/tools/build-managers/conan/default.nix
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/gitea/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/version-management/gitkraken/default.nix | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index f09d02ab022e..8fcc3e7e9270 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "11gzb6x8zixmkm57x8hdncmdbbvppzld3yf7p7m0abigg8zyybsj"; + sha256 = "0ikkpvarp6mzsqk56ihw72fbv7r98g5v5i83rxq8dk709fdqplm6"; }; patches = [ ./static-root-path.patch ]; @@ -43,7 +43,7 @@ buildGoPackage rec { meta = { description = "Git with a cup of tea"; - homepage = http://gitea.io; + homepage = https://gitea.io; license = licenses.mit; maintainers = [ maintainers.disassembler ]; }; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index ba525bacbc9b..1e29b458a314 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -7,18 +7,21 @@ with stdenv.lib; +let + curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; +in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.3.4"; + version = "3.4.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "1djrbpm1f258cicf65ddvndpxi1izmnc12253k1zwl77z4jjbwls"; + sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1"; }; libPath = makeLibraryPath [ stdenv.cc.cc.lib - curl + curlWithGnuTls udev libX11 libXext |