diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index a22f0bc60d47..4ab54593ed8d 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -1,30 +1,33 @@ -{lib, stdenv, fetchurl, libdmtx, pkg-config, imagemagick}: -let - s = # Generated upstream information - rec { - baseName="dmtx-utils"; - version="0.7.4"; - name="${baseName}-${version}"; - hash="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; - url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; - sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libdmtx imagemagick - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit nativeBuildInputs buildInputs; - src = fetchurl { - inherit (s) url sha256; +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libdmtx +, imagemagick +}: + +stdenv.mkDerivation rec { + pname = "dmtx-utils"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "dmtx"; + repo = "dmtx-utils"; + rev = "v${version}"; + sha256 = "06m3qncqdlcnmw83n95yrx2alaq6bld320ax26z4ndnla41yk0p4"; }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libdmtx imagemagick ]; + meta = { - inherit (s) version; description = "Data matrix command-line utilities"; - license = lib.licenses.lgpl2 ; - maintainers = [lib.maintainers.raskin]; + homepage = "https://github.com/dmtx/dmtx-utils"; + changelog = "https://github.com/dmtx/dmtx-utils/blob/v${version}/ChangeLog"; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/dmtx-utils/default.upstream b/pkgs/tools/graphics/dmtx-utils/default.upstream deleted file mode 100644 index 2bb7fe31bf7c..000000000000 --- a/pkgs/tools/graphics/dmtx-utils/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/libdmtx/files/libdmtx/ -SF_version_dir -version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$' -SF_redirect