diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-02 21:08:27 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-02 21:08:27 +0100 |
| commit | 092e3b50a8ff501a6ad1caf20165d2284d1ad5cb (patch) | |
| tree | 6de2bf3a88d2fcf4d947312ccfabebcf5651dbed /pkgs/applications/version-management | |
| parent | 070290bda7972072a531c7e79a29bd005ebb84df (diff) | |
| parent | 82f679c269e504d00b02ef79a88934de7165dc8c (diff) | |
| download | nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.gz nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.bz2 nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.lz nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.xz nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.zst nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitkraken/default.nix | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index adfdb9a541c1..a8df4846bf5c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-remote-gcrypt-${version}"; - version = "1.1"; + version = "1.2"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0mhz5mqnr35rk7j4wyhp7hzmqgv8r554n9qlm4iw565bz7acvq24"; + sha256 = "0isfg0vlmcphxzj4jm32dycprhym26ina1b28jgc4j57kiqqrdcy"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 0fcbe54be175..dfc2484b1a51 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,8 +1,8 @@ { stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome2, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem +, dpkg, makeDesktopItem, openssl }: with stdenv.lib; @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "15wxcahlnz2k3331wqv30d5gq38fqh178hv87xky9b9vyh8qpcvz"; + sha256 = "188k6vaafv6szzhslsfabnnn68ispsv54d98rcm3m0bmp8kg5p7f"; }; libPath = makeLibraryPath [ @@ -49,9 +49,10 @@ stdenv.mkDerivation rec { libXcomposite libXfixes libXrender - gtk2 + gtk3 gnome2.GConf libgnome-keyring + openssl ]; desktopItem = makeDesktopItem { |