diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-01-28 15:04:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-28 15:04:28 +0100 |
commit | 7088d3f2ed4c63440aa61ea72138c20d3c7ffa92 (patch) | |
tree | f90c828abb91c08a496304b5977392cb673429a6 | |
parent | 63aa9a887f38488758b2569aa6bece4f9f83bfd7 (diff) | |
parent | e036a3d61635bd7241f5f2485f2c3ad5022f24b2 (diff) | |
download | nixpkgs-7088d3f2ed4c63440aa61ea72138c20d3c7ffa92.tar nixpkgs-7088d3f2ed4c63440aa61ea72138c20d3c7ffa92.tar.gz nixpkgs-7088d3f2ed4c63440aa61ea72138c20d3c7ffa92.tar.bz2 nixpkgs-7088d3f2ed4c63440aa61ea72138c20d3c7ffa92.tar.lz nixpkgs-7088d3f2ed4c63440aa61ea72138c20d3c7ffa92.tar.xz nixpkgs-7088d3f2ed4c63440aa61ea72138c20d3c7ffa92.tar.zst nixpkgs-7088d3f2ed4c63440aa61ea72138c20d3c7ffa92.zip |
Merge pull request #54177 from baracoder/smartigt-18_2_4
smartgithg: 18_1_5 -> 18.2.4
-rw-r--r-- | pkgs/applications/version-management/smartgithg/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index d6ae37c3f7f..21382091801 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "18_1_5"; + version = "18.2.4"; src = fetchurl { - url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "0f2aj3259jvn7n0x6m8sbwliikln9lqffd00jg75dblhxwl8adg3"; + url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; + sha256 = "0ch6vcvndn1fpx05ym9yp2ssfw2af6ac0pw8ssvjkc676zc0jr73"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b138d0b8573..5477c91251b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19317,7 +19317,9 @@ in libpng = libpng12; }; - smartgithg = callPackage ../applications/version-management/smartgithg { }; + smartgithg = callPackage ../applications/version-management/smartgithg { + jre = openjdk11; + }; slimThemes = recurseIntoAttrs (callPackage ../applications/display-managers/slim/themes.nix {}); |