diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-11 09:40:10 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-11 09:40:10 +0200 |
| commit | 22cb7f25f2f939a5e38f5e0c0920a743c37a9480 (patch) | |
| tree | 0f40b2088d8ffcaab6d43cda6a4ee92931a35a83 /pkgs/applications/version-management | |
| parent | 6049c39bdb3d8bfc01e2a86d2fc6ef6e46f9b0be (diff) | |
| parent | 08b828d1c5169c08bce148df53cb1215b58e64d0 (diff) | |
| download | nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.gz nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.bz2 nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.lz nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.xz nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.zst nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/gitkraken/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitolite/default.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8b807d11e34a..12d22e2cc3ca 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme +, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid }: with stdenv.lib; @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "5.0.4"; + version = "6.0.0"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1fq0w8djkcx5jr2pw6izlq5rkwbq3r3f15xr3dmmbz6gjvi3nra0"; + sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f"; }; libPath = makeLibraryPath [ @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { gnome2.GConf libgnome-keyring openssl + at-spi2-atk + libuuid ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 78dd9dd49dfd..42c091007884 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Finely-grained git repository hosting"; - homepage = http://gitolite.com/gitolite/index.html; + homepage = https://gitolite.com/gitolite/index.html; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ]; |