diff options
author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2021-12-24 00:24:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-24 00:24:37 +0100 |
commit | 85b6f5299c2f3a58c5c3a40043e4f80e324806cb (patch) | |
tree | 5a0e47e44eb7e871fddbd5d3d97b4765d716f9e1 /pkgs/applications/graphics | |
parent | 9726130c9abcb2ab6f757aa3a5bb11118ce6b023 (diff) | |
parent | 1d047ac77efe7d13afc6fd88602240b6e3ff2500 (diff) |
Merge pull request #150542 from Stunkymonkey/treewide-github-1
treewide: switch to fetchFromGitHub part 1
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/geeqie/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/graphics/scantailor/default.nix | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 5d44c5dceeac2..299c335e76c46 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext, intltool +{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.6.0"; + version = "1.6"; - src = fetchurl { - url = "https://github.com/BestImageViewer/geeqie/archive/refs/tags/v1.6.tar.gz"; - sha256 = "0ky248j6n8hszkwwi949i1ypm2l5444byaspaa6564d9rpij01aj"; + src = fetchFromGitHub { + owner = "BestImageViewer"; + repo = "geeqie"; + rev = "v${version}"; + sha256 = "sha256-fvqpimrtzNy2UStOw3qLfC8i8V1fSrmTTsvc1ihqPsU="; }; patches = [ diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index a0e52ab5d3032..3e2037f6d45d8 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: +{ lib, stdenv, fetchFromGitHub, qt4, cmake, libjpeg, libtiff, boost }: stdenv.mkDerivation rec { pname = "scantailor"; version = "0.9.12.1"; - src = fetchurl { - url = "https://github.com/scantailor/scantailor/archive/RELEASE_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; + src = fetchFromGitHub { + owner = "scantailor"; + repo = "scantailor"; + rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-Jn8+X737vwaE0ZPYdQv/1SocmWFA74XL90IW8yNiafA="; }; nativeBuildInputs = [ cmake ]; |