commit 71c0b8691540bbc837e351d47d55f820bcc7ef8c parent 5ec8612c513b6c6e2f51928aa0c63cab635711a7 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Sun, 22 Nov 2020 00:07:32 +0300 Cleanup Diffstat:
90 files changed, 332 insertions(+), 494 deletions(-)
diff --git a/pkgs/applications/anki/bin.nix b/pkgs/applications/anki/bin.nix @@ -1,10 +1,8 @@ { stdenv, fetchfromgh, undmg }: -let + +stdenv.mkDerivation rec { pname = "anki"; version = "2.1.35"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchfromgh { owner = "ankitects"; diff --git a/pkgs/applications/gis/basecamp/default.nix b/pkgs/applications/gis/basecamp/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchurl, undmg, xar, cpio }: -let + +stdenv.mkDerivation rec { pname = "basecamp"; version = "4.8.10"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "https://download.garmin.com/software/BaseCampforMac_${stdenv.lib.replaceStrings [ "." ] [ "" ] version}.dmg"; diff --git a/pkgs/applications/gis/mapsoft/default.nix b/pkgs/applications/gis/mapsoft/default.nix @@ -28,13 +28,11 @@ , zlib , getopt }: -let - pname = "mapsoft"; - date = stdenv.lib.substring 0 10 sources.mapsoft.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "mapsoft-unstable"; + version = stdenv.lib.substring 0 10 sources.mapsoft.date; + src = sources.mapsoft; patches = [ ./0001-fix-build.patch ]; diff --git a/pkgs/applications/gis/qgis/bin.nix b/pkgs/applications/gis/qgis/bin.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, undmg, releaseType ? "pr" }: -assert releaseType == "pr" || releaseType == "ltr"; -let +assert stdenv.lib.assertOneOf "releaseType" releaseType [ "pr" "ltr" ]; + +stdenv.mkDerivation rec { pname = "qgis"; version = { pr = "3.14.16"; ltr = "3.10.10"; }.${releaseType}; -in -stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "https://qgis.org/downloads/macos/qgis-macos-${releaseType}.dmg"; diff --git a/pkgs/applications/gis/qmapshack/bin.nix b/pkgs/applications/gis/qmapshack/bin.nix @@ -1,18 +1,15 @@ { stdenv, fetchfromgh, unzip }: -let + +stdenv.mkDerivation rec { pname = "qmapshack"; version = "1.15.0"; - sha256 = "0dhl2km0xbv77xabjwdiv3y1psbjwjlyqs5222ji5d33wxl8m07n"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchfromgh { owner = "Maproom"; repo = pname; version = "V_${version}"; name = "QMapShack_OSX.${stdenv.appleSdkVersion}_${version}.zip"; - inherit sha256; + sha256 = "0dhl2km0xbv77xabjwdiv3y1psbjwjlyqs5222ji5d33wxl8m07n"; }; sourceRoot = "."; diff --git a/pkgs/applications/goldendict/bin.nix b/pkgs/applications/goldendict/bin.nix @@ -1,10 +1,8 @@ { stdenv, fetchurl, undmg }: -let + +stdenv.mkDerivation rec { pname = "goldendict"; version = "1.5.0-RC2-372-gc3ff15f"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "https://downloads.sourceforge.net/project/goldendict/early%20access%20builds/MacOS/GoldenDict-${version}%28Qt_5121%29.dmg"; diff --git a/pkgs/applications/gpxlab/default.nix b/pkgs/applications/gpxlab/default.nix @@ -9,13 +9,11 @@ , substituteAll , withI18n ? true }: -let - pname = "gpxlab"; - date = lib.substring 0 10 sources.gpxlab.date; - version = "unstable-" + date; -in -mkDerivation { - inherit pname version; + +mkDerivation rec { + pname = "gpxlab-unstable"; + version = lib.substring 0 10 sources.gpxlab.date; + src = sources.gpxlab; patches = (substituteAll { @@ -29,7 +27,6 @@ mkDerivation { ''; nativeBuildInputs = [ qmake ] ++ (lib.optional withI18n qttools); - buildInputs = [ qtbase ]; preConfigure = lib.optionalString withI18n '' lrelease GPXLab/locale/*.ts diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix @@ -1,10 +1,8 @@ { stdenv, fetchurl, undmg, sources }: -let + +stdenv.mkDerivation rec { pname = "gpxsee"; version = "7.36"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "mirror://sourceforge/gpxsee/GPXSee-${version}.dmg"; diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix @@ -9,13 +9,11 @@ , substituteAll , withI18n ? true }: -let - pname = "gpxsee"; - date = lib.substring 0 10 sources.gpxsee.date; - version = "unstable-" + date; -in -mkDerivation { - inherit pname version; + +mkDerivation rec { + pname = "gpxsee-unstable"; + version = lib.substring 0 10 sources.gpxsee.date; + src = sources.gpxsee; patches = (substituteAll { diff --git a/pkgs/applications/iterm2/bin.nix b/pkgs/applications/iterm2/bin.nix @@ -1,10 +1,8 @@ { stdenv, fetchurl, unzip }: -let + +stdenv.mkDerivation rec { pname = "iterm2"; version = "3.3.12"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "https://iterm2.com/downloads/stable/iTerm2-${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}.zip"; diff --git a/pkgs/applications/macpass/bin.nix b/pkgs/applications/macpass/bin.nix @@ -1,17 +1,15 @@ { stdenv, fetchfromgh, unzip }: -let + +stdenv.mkDerivation rec { pname = "MacPass"; version = "0.7.12"; - sha256 = "1gikixbrz1pvyjspp62msdmhjdy1rfkx8jhy7rajjr8bzm8pzpmc"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchfromgh { owner = "MacPass"; repo = pname; name = "MacPass-${version}.zip"; - inherit version sha256; + sha256 = "1gikixbrz1pvyjspp62msdmhjdy1rfkx8jhy7rajjr8bzm8pzpmc"; + inherit version; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix @@ -1,10 +1,8 @@ { stdenv, fetchfromgh, undmg, sources }: -let + +stdenv.mkDerivation rec { pname = "klogg"; version = "20.4"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchfromgh { owner = "variar"; diff --git a/pkgs/applications/misc/klogg/default.nix b/pkgs/applications/misc/klogg/default.nix @@ -6,13 +6,11 @@ , sources , useSentry ? stdenv.isLinux }: -let - pname = "klogg"; - date = lib.substring 0 10 sources.klogg.date; - version = "unstable-" + date; -in -mkDerivation { - inherit pname version; + +mkDerivation rec { + pname = "klogg-unstable"; + version = lib.substring 0 10 sources.klogg.date; + src = sources.klogg; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/applications/networking/qutebrowser/bin.nix b/pkgs/applications/networking/qutebrowser/bin.nix @@ -1,10 +1,8 @@ { stdenv, fetchfromgh, undmg }: -let + +stdenv.mkDerivation rec { pname = "qutebrowser"; version = "1.14.0"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchfromgh { owner = "qutebrowser"; diff --git a/pkgs/applications/nnn-plugins/default.nix b/pkgs/applications/nnn-plugins/default.nix @@ -1,11 +1,9 @@ { stdenv, sources }: -let - pname = "nnn-plugins"; - date = stdenv.lib.substring 0 10 sources.nnn.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "nnn-plugins"; + version = stdenv.lib.substring 0 10 sources.nnn.date; + src = sources.nnn; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/openorienteering-mapper/bin.nix b/pkgs/applications/openorienteering-mapper/bin.nix @@ -1,10 +1,8 @@ { stdenv, fetchfromgh, undmg, sources }: -let + +stdenv.mkDerivation rec { pname = "Openorienteering-Mapper"; version = "20201026.1"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchfromgh { owner = "OpenOrienteering"; diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix @@ -18,13 +18,11 @@ , sources , substituteAll }: -let - pname = "OpenOrienteering-Mapper"; - date = lib.substring 0 10 sources.mapper.date; - version = "unstable-" + date; -in -mkDerivation { - inherit pname version; + +mkDerivation rec { + pname = "OpenOrienteering-Mapper-unstable"; + version = lib.substring 0 10 sources.mapper.date; + src = sources.mapper; patches = [ diff --git a/pkgs/applications/redict/default.nix b/pkgs/applications/redict/default.nix @@ -14,18 +14,17 @@ , sources , withI18n ? true }: -let - pname = "redict"; - date = lib.substring 0 10 sources.redict.date; - version = "unstable-" + date; -in + mkDerivation { - inherit pname version; + pname = "redict-unstable"; + version = lib.substring 0 10 sources.redict.date; + src = sources.redict; - nativeBuildInputs = [ qmake pkgconfig ] ++ (lib.optional withI18n qttools); - buildInputs = - [ qtbase qtmultimedia qtsvg ] ++ (lib.optionals stdenv.isLinux [ qtx11extras libX11 libXext libXtst ]); + nativeBuildInputs = [ qmake pkgconfig ] + ++ lib.optional withI18n qttools; + buildInputs = [ qtmultimedia qtsvg ] + ++ lib.optionals stdenv.isLinux [ qtx11extras libX11 libXext libXtst ]; postPatch = '' substituteInPlace redict.pro \ diff --git a/pkgs/applications/visualgps/default.nix b/pkgs/applications/visualgps/default.nix @@ -6,8 +6,8 @@ }: mkDerivation { - pname = "visualgps"; - version = "unstable-2020-03-29"; + pname = "visualgps-unstable"; + version = "2020-03-29"; src = fetchFromGitHub { owner = "VisualGPS"; diff --git a/pkgs/applications/window-managers/amethyst/bin.nix b/pkgs/applications/window-managers/amethyst/bin.nix @@ -1,18 +1,15 @@ { stdenv, fetchfromgh, unzip }: -let + +stdenv.mkDerivation rec { pname = "Amethyst"; version = "0.15.4"; - sha256 = "16n5vdyjs6m4saqibv3fb420w6x83lsiw182qm3prnilh4q9qld3"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchfromgh { owner = "ianyh"; repo = pname; version = "v${version}"; name = "Amethyst.zip"; - inherit sha256; + sha256 = "16n5vdyjs6m4saqibv3fb420w6x83lsiw182qm3prnilh4q9qld3"; }; sourceRoot = "."; diff --git a/pkgs/applications/window-managers/yabai/default.nix b/pkgs/applications/window-managers/yabai/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchFromGitHub, Cocoa, ScriptingBridge, xxd }: -let + +stdenv.mkDerivation rec { pname = "yabai"; version = "3.3.0"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchFromGitHub { owner = "koekeishiya"; diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix @@ -1,10 +1,9 @@ { stdenvNoCC, lib, pandoc, stardict-tools, sources }: -let + +stdenvNoCC.mkDerivation { pname = "it-sanasto"; version = lib.substring 0 10 sources.it-sanasto.date; -in -stdenvNoCC.mkDerivation { - inherit pname version; + src = sources.it-sanasto; nativeBuildInputs = [ pandoc stardict-tools ]; @@ -12,13 +11,13 @@ stdenvNoCC.mkDerivation { buildPhase = '' for i in *.md; do pandoc -f markdown -t html -s $i | awk -F "</*td>" '/<\/*td>.*/ {print $2}' - done | paste -d"#" - - - | sed 's/#/\t/;s/#/\\n/' > ${pname}.tab + done | paste -d"#" - - - | sed 's/#/\t/;s/#/\\n/' > it-sanasto.tab - stardict-tabfile ${pname}.tab + stardict-tabfile it-sanasto.tab ''; installPhase = '' - install -Dm644 ${pname}.{dict,idx,ifo} -t $out + install -Dm644 it-sanasto.{dict,idx,ifo} -t $out ''; meta = with lib; { diff --git a/pkgs/data/firmwares/gpsmap64/default.nix b/pkgs/data/firmwares/gpsmap64/default.nix @@ -11,9 +11,7 @@ fetchurl { downloadToTemp = true; recursiveHash = true; preferLocalBuild = true; - postFetch = '' - install -Dm644 $downloadedFile $out/garmin/${filename} - ''; + postFetch = "install -Dm644 $downloadedFile $out/${filename}"; meta = with lib; { homepage = "https://www8.garmin.com/support/download_details.jsp?id=6805"; diff --git a/pkgs/data/maps/dem/default.nix b/pkgs/data/maps/dem/default.nix @@ -1,4 +1,5 @@ -{ stdenvNoCC, lib, fetchurl, unzip, gdal }: +{ stdenvNoCC, lib, fetchurl, unzip +, withVRT ? true, gdal }: let dem1 = builtins.fromJSON (builtins.readFile ./dem1.json); in @@ -10,6 +11,8 @@ stdenvNoCC.mkDerivation { unpackPhase = "for src in $srcs; do ${unzip}/bin/unzip $src; done"; + nativeBuildInputs = lib.optional withVRT gdal; + dontConfigure = true; dontBuild = true; dontFixup = true; @@ -18,7 +21,8 @@ stdenvNoCC.mkDerivation { installPhase = '' install -Dm644 **/*.hgt -t $out - ${gdal}/bin/gdalbuildvrt $out/SRTM.vrt $out/*.hgt + '' + lib.optionalString withVRT '' + gdalbuildvrt $out/SRTM.vrt $out/*.hgt ''; meta = with lib; { diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix @@ -19,13 +19,11 @@ "World/marshruty.ru.xml" ] }: -let - pname = "gpxsee-maps"; - date = lib.substring 0 10 sources.gpxsee-maps.date; - version = "unstable-" + date; -in + stdenvNoCC.mkDerivation { - inherit pname version; + pname = "gpxsee-maps"; + version = lib.substring 0 10 sources.gpxsee-maps.date; + src = sources.gpxsee-maps; postPatch = '' diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix @@ -1,11 +1,9 @@ { stdenv, cgpsmapper, gmaptool, imagemagick, mapsoft, netpbm, zip, sources }: -let - pname = "slazav-hr"; - date = stdenv.lib.substring 0 10 sources.map-hr.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "slazav-hr-unstable"; + version = stdenv.lib.substring 0 10 sources.map-hr.date; + src = sources.map-hr; patches = [ ./0001-fix-hr.patch ]; diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix @@ -1,11 +1,9 @@ { stdenv, cgpsmapper, gmaptool, imagemagick, mapsoft, netpbm, zip, sources }: -let - pname = "slazav-podm"; - date = stdenv.lib.substring 0 10 sources.map-podm.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "slazav-podm-unstable"; + version = stdenv.lib.substring 0 10 sources.map-podm.date; + src = sources.map-podm; patches = [ ./0001-fix-podm.patch ]; @@ -32,9 +30,7 @@ stdenv.mkDerivation { buildFlags = [ "out" "img" ]; - installPhase = '' - install -Dm644 podm.img -t $out - ''; + installPhase = "install -Dm644 podm.img -t $out"; meta = with stdenv.lib; { inherit (sources.map-podm) description homepage; diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix @@ -1,11 +1,9 @@ { stdenv, sources }: -let - pname = "qtpbfimageplugin-styles"; - date = stdenv.lib.substring 0 10 sources.qtpbfimageplugin-styles.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "qtpbfimageplugin-styles"; + version = stdenv.lib.substring 0 10 sources.qtpbfimageplugin-styles.date; + src = sources.qtpbfimageplugin-styles; dontBuild = true; diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -138,6 +138,7 @@ lib.makeScope newScope ( }; fx-bin = callPackage ./tools/text/fx/bin.nix { }; garmin-uploader = callPackage ./tools/misc/garmin-uploader { }; + gdcv = callPackage ./tools/dict/gdcv { }; gimgtools = callPackage ./tools/geo/gimgtools { }; gloggery = callPackage ./tools/misc/gloggery { }; gmaptool = callPackage ./tools/geo/gmaptool { }; diff --git a/pkgs/development/libraries/foma/default.nix b/pkgs/development/libraries/foma/default.nix @@ -1,11 +1,9 @@ { stdenv, bison, flex, libtool, ncurses, readline, zlib, sources }: -let - pname = "foma"; - date = stdenv.lib.substring 0 10 sources.foma.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "foma-unstable"; + version = stdenv.lib.substring 0 10 sources.foma.date; + src = sources.foma; sourceRoot = "source/foma"; diff --git a/pkgs/development/libraries/gpxlib/default.nix b/pkgs/development/libraries/gpxlib/default.nix @@ -1,11 +1,9 @@ { stdenv, cmake, expat, sources }: -let - pname = "gpxlib"; - date = stdenv.lib.substring 0 10 sources.gpxlib.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "gpxlib-unstable"; + version = stdenv.lib.substring 0 10 sources.gpxlib.date; + src = sources.gpxlib; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/development/libraries/hfst/default.nix @@ -1,11 +1,9 @@ { stdenv, autoreconfHook, bison, flex, sources }: -let - pname = "hfst"; - date = stdenv.lib.substring 0 10 sources.hfst.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "hfst-unstable"; + version = stdenv.lib.substring 0 10 sources.hfst.date; + src = sources.hfst; nativeBuildInputs = [ autoreconfHook bison flex ]; diff --git a/pkgs/development/libraries/libgarmin/default.nix b/pkgs/development/libraries/libgarmin/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "libgarmin"; - version = "unstable-2008-12-27"; + version = "2008-12-27"; src = fetchsvn { url = "https://svn.code.sf.net/p/libgarmin/svn/libgarmin/dev"; diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix @@ -7,13 +7,11 @@ , withDoc ? false , scdoc }: -let - pname = "libshell"; - date = stdenv.lib.substring 0 10 sources.libshell.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "libshell-unstable"; + version = stdenv.lib.substring 0 10 sources.libshell.date; + src = sources.libshell; nativeBuildInputs = [ help2man ]; diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix @@ -1,11 +1,9 @@ { stdenv, cmake, gtest, sources }: -let - pname = "microjson"; - date = stdenv.lib.substring 0 10 sources.microjson.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "microjson-unstable"; + version = stdenv.lib.substring 0 10 sources.microjson.date; + src = sources.microjson; postPatch = '' diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "cheetah3"; - date = lib.substring 0 10 sources.cheetah3.date; - version = "unstable-" + date; -in + python3Packages.buildPythonPackage { - inherit pname version; + pname = "cheetah3-unstable"; + version = lib.substring 0 10 sources.cheetah3.date; + src = sources.cheetah3; checkInputs = with python3Packages; [ pygments markdown ]; diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix @@ -1,10 +1,8 @@ { lib, python3Packages, substituteAll, locale }: -let + +python3Packages.buildPythonPackage rec { pname = "click"; version = "6.7"; -in -python3Packages.buildPythonPackage { - inherit pname version; src = python3Packages.fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix @@ -1,13 +1,11 @@ { lib, python3Packages, fetchurl, sources }: let - pname = "gpxelevations"; - date = lib.substring 0 10 sources.gpxelevations.date; - version = "unstable-" + date; - testdata = import ./testdata.nix { inherit fetchurl; }; in python3Packages.buildPythonApplication { - inherit pname version; + pname = "gpxelevations-unstable"; + version = lib.substring 0 10 sources.gpxelevations.date; + src = sources.gpxelevations; propagatedBuildInputs = with python3Packages; [ requests gpxpy ]; diff --git a/pkgs/development/python-modules/jsonseq/default.nix b/pkgs/development/python-modules/jsonseq/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "jsonseq"; - date = lib.substring 0 10 sources.jsonseq.date; - version = "unstable-" + date; -in + python3Packages.buildPythonPackage { - inherit pname version; + pname = "jsonseq-unstable"; + version = lib.substring 0 10 sources.jsonseq.date; + src = sources.jsonseq; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "mercantile"; - date = lib.substring 0 10 sources.mercantile.date; - version = "unstable-" + date; -in + python3Packages.buildPythonPackage { - inherit pname version; + pname = "mercantile-unstable"; + version = lib.substring 0 10 sources.mercantile.date; + src = sources.mercantile; propagatedBuildInputs = with python3Packages; [ click ]; diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "mikatools"; - date = lib.substring 0 10 sources.mikatools.date; - version = "unstable-" + date; -in + python3Packages.buildPythonPackage { - inherit pname version; + pname = "mikatools-unstable"; + version = lib.substring 0 10 sources.mikatools.date; + src = sources.mikatools; propagatedBuildInputs = with python3Packages; [ requests clint ]; diff --git a/pkgs/development/python-modules/pyephem/default.nix b/pkgs/development/python-modules/pyephem/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "pyephem"; - date = lib.substring 0 10 sources.pyephem.date; - version = "unstable-" + date; -in + python3Packages.buildPythonPackage { - inherit pname version; + pname = "pyephem-unstable"; + version = lib.substring 0 10 sources.pyephem.date; + src = sources.pyephem; meta = with lib; { diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "pymbtiles"; - date = lib.substring 0 10 sources.pymbtiles.date; - version = "unstable-" + date; -in + python3Packages.buildPythonPackage { - inherit pname version; + pname = "pymbtiles-unstable"; + version = lib.substring 0 10 sources.pymbtiles.date; + src = sources.pymbtiles; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/s2sphere/default.nix b/pkgs/development/python-modules/s2sphere/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "s2sphere"; - date = lib.substring 0 10 sources.s2sphere.date; - version = "unstable-" + date; -in + python3Packages.buildPythonPackage { - inherit pname version; + pname = "s2sphere-unstable"; + version = lib.substring 0 10 sources.s2sphere.date; + src = sources.s2sphere; propagatedBuildInputs = with python3Packages; [ future ]; diff --git a/pkgs/development/tools/gef/default.nix b/pkgs/development/tools/gef/default.nix @@ -8,10 +8,6 @@ , gdb }: let - pname = "gef"; - date = stdenv.lib.substring 0 10 sources.gef.date; - version = "unstable-" + date; - initGef = writeScript "init-gef" '' source @out@/share/gef/gef.py ''; @@ -25,7 +21,9 @@ let ); in stdenv.mkDerivation { - inherit pname version; + pname = "gef-unstable"; + version = stdenv.lib.substring 0 10 sources.gef.date; + src = sources.gef; dontBuild = true; diff --git a/pkgs/development/tools/kiln/default.nix b/pkgs/development/tools/kiln/default.nix @@ -2,15 +2,15 @@ buildGoModule { pname = "kiln"; - version = "unstable-2020-11-02"; + version = "2020-11-21"; src = fetchgit { url = "https://git.sr.ht/~adnano/kiln"; - rev = "fbe8122ebde2043de743d189402fa717fbfe0a90"; - sha256 = "121i7fqds8q15bwyld76p0n7rlpspj8kqvfd8pb62hi7897qm4zy"; + rev = "832aed7ff24fb58a1b4a789bdd967ad81155b099"; + sha256 = "0xbcdgvgblvi52synksz3m436ibz4id6f66x83yq87825jsb64p5"; }; - vendorSha256 = "01axixmq1w9k3fh63105z4pxcxjan7l031yj62a9lz4cjlax743i"; + vendorSha256 = "1vqzbw4a2rh043cim17ys0yn33qxk0d7szxr9gkcs5dqlaa8z36y"; meta = with lib; { description = "A simple static site generator for Gemini"; diff --git a/pkgs/development/tools/pvs-studio/default.nix b/pkgs/development/tools/pvs-studio/default.nix @@ -3,16 +3,14 @@ let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - pname = "pvs-studio"; - version = "7.09.42228.74"; - suffix = { x86_64-linux = "x86_64"; x86_64-darwin = "macos"; }.${system} or throwSystem; in -stdenv.mkDerivation { - inherit pname version; +stdenv.mkDerivation rec { + pname = "pvs-studio"; + version = "7.09.42228.74"; src = fetchurl { url = "https://files.viva64.com/pvs-studio-${version}-${suffix}.tgz"; diff --git a/pkgs/development/tools/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/development/tools/pvs-studio/how-to-use-pvs-studio-free.nix @@ -1,11 +1,9 @@ { stdenv, cmake, sources }: -let - pname = "how-to-use-pvs-studio-free"; - date = stdenv.lib.substring 0 10 sources.how-to-use-pvs-studio-free.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "how-to-use-pvs-studio-free-unstable"; + version = stdenv.lib.substring 0 10 sources.how-to-use-pvs-studio-free.date; + src = sources.how-to-use-pvs-studio-free; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/xtr/default.nix b/pkgs/development/tools/xtr/default.nix @@ -1,11 +1,9 @@ { lib, rustPlatform, sources }: -let - pname = "xtr"; - date = lib.substring 0 10 sources.xtr.date; - version = "unstable-" + date; -in + rustPlatform.buildRustPackage { - inherit pname version; + pname = "xtr-unstable"; + version = lib.substring 0 10 sources.xtr.date; + src = sources.xtr; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix @@ -8,13 +8,9 @@ , qemu , unzip , which +, template ? "arm/qemu" }: let - pname = "embox"; - date = stdenv.lib.substring 0 10 sources.embox.date; - version = "unstable-" + date; - template = "arm/qemu"; - cjson = fetchurl { url = "mirror://sourceforge/cjson/cJSONFiles.zip"; sha256 = "19qdsfq4r7gjr39lkjplz418gkl2xg5j5fpdz9phlxlbggnklqhd"; @@ -31,7 +27,9 @@ let ''; in stdenv.mkDerivation { - inherit pname version; + pname = "embox-unstable"; + version = stdenv.lib.substring 0 10 sources.embox.date; + src = sources.embox; patches = [ ./0001-fix-build.patch ]; diff --git a/pkgs/servers/dict2rest/default.nix b/pkgs/servers/dict2rest/default.nix @@ -1,11 +1,9 @@ { lib, buildGoPackage, sources }: -let - pname = "dict2rest"; - date = lib.substring 0 10 sources.dict2rest.date; - version = "unstable-" + date; -in + buildGoPackage { - inherit pname version; + pname = "dict2rest"; + version = lib.substring 0 10 sources.dict2rest.date; + src = sources.dict2rest; goPackagePath = "github.com/felix/go-dict2rest"; diff --git a/pkgs/servers/elevation_server/default.nix b/pkgs/servers/elevation_server/default.nix @@ -1,11 +1,9 @@ { lib, buildGoPackage, lz4, sources }: -let - pname = "elevation-server"; - date = lib.substring 0 10 sources.elevation-server.date; - version = "unstable-" + date; -in + buildGoPackage rec { - inherit pname version; + pname = "elevation-server-unstable"; + version = lib.substring 0 10 sources.elevation-server.date; + src = sources.elevation-server; goPackagePath = "github.com/wladich/elevation_server"; diff --git a/pkgs/servers/geminid/default.nix b/pkgs/servers/geminid/default.nix @@ -1,11 +1,9 @@ { stdenv, libconfig, file, openssl, flex, sources }: -let - pname = "geminid"; - date = stdenv.lib.substring 0 10 sources.geminid.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "geminid"; + version = stdenv.lib.substring 0 10 sources.geminid.date; + src = sources.geminid; nativeBuildInputs = [ flex ]; @@ -14,9 +12,7 @@ stdenv.mkDerivation { makeFlags = [ "geminid" "CC=cc" "LEX=flex" ]; - installPhase = '' - install -Dm755 geminid -t $out/bin - ''; + installPhase = "install -Dm755 geminid -t $out/bin"; meta = with stdenv.lib; { inherit (sources.geminid) description homepage; diff --git a/pkgs/servers/glauth/default.nix b/pkgs/servers/glauth/default.nix @@ -1,11 +1,9 @@ { lib, buildGoModule, go-bindata, sources }: -let - pname = "glauth"; - date = lib.substring 0 10 sources.glauth.date; - version = "unstable-" + date; -in + buildGoModule { - inherit pname version; + pname = "glauth-unstable"; + version = lib.substring 0 10 sources.glauth.date; + src = sources.glauth; vendorSha256 = "18inm0s9mww7c19z9alnvy0g80d3laxh4lwbgzkcc8kf9zg25149"; diff --git a/pkgs/servers/nakarte/default.nix b/pkgs/servers/nakarte/default.nix @@ -1,8 +1,7 @@ { stdenv, mkYarnPackage, sources, secretsConfig ? null }: let pname = "nakarte"; - date = stdenv.lib.substring 0 10 sources.nakarte.date; - version = "unstable-" + date; + version = stdenv.lib.substring 0 10 sources.nakarte.date; in mkYarnPackage { name = "${pname}-${version}"; diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/pg_featureserv/default.nix @@ -1,11 +1,9 @@ { lib, buildGoModule, sources }: -let - pname = "pg_featureserv"; - date = lib.substring 0 10 sources.pg-featureserv.date; - version = "unstable-" + date; -in + buildGoModule { - inherit pname version; + pname = "pg_featureserv-unstable"; + version = lib.substring 0 10 sources.pg-featureserv.date; + src = sources.pg-featureserv; vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r"; diff --git a/pkgs/servers/quark/default.nix b/pkgs/servers/quark/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "quark"; - version = "unstable-2020-09-16"; + version = "2020-11-01"; src = fetchgit { url = "git://git.suckless.org/quark"; - rev = "5d0221dd68c0d2b8796479d06b602be666d0f4c6"; - sha256 = "0glyg36b2mk5iip97h1wh9ybhsz6rqwqvjgyhshqqgiirplq9fva"; + rev = "7d26fc695d548b5a73305a97dce274a313e0f602"; + sha256 = "0308pfbyvbl5gfpl9lq62siz4kf7ki2zkk47p3b9r3j33dlpiszl"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/servers/shavit/default.nix b/pkgs/servers/shavit/default.nix @@ -2,7 +2,7 @@ buildGoModule { pname = "shavit"; - version = "unstable-2020-03-14"; + version = "2020-03-14"; src = fetchgit { url = "https://git.sr.ht/~yotam/shavit"; diff --git a/pkgs/tools/audio/musig/default.nix b/pkgs/tools/audio/musig/default.nix @@ -1,11 +1,9 @@ { lib, buildGoModule, pkgconfig, portaudio, sources }: -let - pname = "musig"; - date = lib.substring 0 10 sources.musig.date; - version = "unstable-" + date; -in -buildGoModule { - inherit pname version; + +buildGoModule rec { + pname = "musig-unstable"; + version = lib.substring 0 10 sources.musig.date; + src = sources.musig; vendorSha256 = "0ha1xjdwibm8543b4bx0xrbigngiiakksdc6mnp0mz5y6ai56pg5"; diff --git a/pkgs/tools/cfiles/default.nix b/pkgs/tools/cfiles/default.nix @@ -1,11 +1,9 @@ { stdenv, pkg-config, ncurses, w3m, ueberzug, sources }: -let - pname = "cfiles"; - date = stdenv.lib.substring 0 10 sources.cfiles.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "cfiles-unstable"; + version = stdenv.lib.substring 0 10 sources.cfiles.date; + src = sources.cfiles; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/dict/gdcv/default.nix b/pkgs/tools/dict/gdcv/default.nix @@ -1,11 +1,9 @@ { stdenv, pkgconfig, emacs, zlib, sources }: -let - pname = "gdcv"; - date = stdenv.lib.substring 0 10 sources.gdcv.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "gdcv"; + version = stdenv.lib.substring 0 10 sources.gdcv.date; + src = sources.gdcv; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/dict/gt-bash-client/default.nix b/pkgs/tools/dict/gt-bash-client/default.nix @@ -1,11 +1,9 @@ { stdenv, sources }: -let - pname = "gt-bash-client"; - date = stdenv.lib.substring 0 10 sources.gt-bash-client.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "gt-bash-client-unstable"; + version = stdenv.lib.substring 0 10 sources.gt-bash-client.date; + src = sources.gt-bash-client; installPhase = '' diff --git a/pkgs/tools/dict/gt4gd/default.nix b/pkgs/tools/dict/gt4gd/default.nix @@ -1,14 +1,13 @@ { lib, python3Packages, sources, withUI ? true }: -let - pname = "gt4gd"; - date = lib.substring 0 10 sources.gt4gd.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "gt4gd-unstable"; + version = lib.substring 0 10 sources.gt4gd.date; + src = sources.gt4gd; - propagatedBuildInputs = with python3Packages; [ requests ] ++ (lib.optional withUI tkinter); + propagatedBuildInputs = with python3Packages; [ requests ] + ++ lib.optional withUI tkinter; postInstall = lib.optionalString withUI '' install -Dm755 googletranslateui.py $out/bin/googletranslateui diff --git a/pkgs/tools/dict/lsdreader/default.nix b/pkgs/tools/dict/lsdreader/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "lsdreader"; - date = lib.substring 0 10 sources.lsdreader.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "lsdreader-unstable"; + version = lib.substring 0 10 sources.lsdreader.date; + src = sources.lsdreader; doCheck = false; diff --git a/pkgs/tools/dict/odict/default.nix b/pkgs/tools/dict/odict/default.nix @@ -1,11 +1,9 @@ { lib, buildGoModule, sources }: -let - pname = "odict"; - date = lib.substring 0 10 sources.odict.date; - version = "unstable-" + date; -in + buildGoModule { - inherit pname version; + pname = "odict-unstable"; + version = lib.substring 0 10 sources.odict.date; + src = sources.odict; vendorSha256 = "083mvrgpv9hyfmi26sankv940qp0bmyr55jm33dx1ivhd2xhkg78"; diff --git a/pkgs/tools/dict/stardict-tools/default.nix b/pkgs/tools/dict/stardict-tools/default.nix @@ -9,13 +9,11 @@ , pcre , sources }: -let - pname = "stardict-tools"; - date = stdenv.lib.substring 0 10 sources.stardict-3.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "stardict-tools"; + version = stdenv.lib.substring 0 10 sources.stardict-3.date; + src = sources.stardict-3; nativeBuildInputs = [ @@ -53,7 +51,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.stardict-3) description homepage; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; broken = stdenv.isDarwin; diff --git a/pkgs/tools/dict/tatoebatools/default.nix b/pkgs/tools/dict/tatoebatools/default.nix @@ -1,11 +1,9 @@ -{ lib, python3Packages, sources }: -let - pname = "tatoebatools"; - date = lib.substring 0 10 sources.tatoebatools.date; - version = "unstable-" + date; -in +{ lib, python3Packages, sources, withCli ? true }: + python3Packages.buildPythonApplication { - inherit pname version; + pname = "tatoebatools-unstable"; + version = lib.substring 0 10 sources.tatoebatools.date; + src = sources.tatoebatools; propagatedBuildInputs = with python3Packages; [ beautifulsoup4 pandas requests tqdm ]; diff --git a/pkgs/tools/dict/zdict/default.nix b/pkgs/tools/dict/zdict/default.nix @@ -1,11 +1,9 @@ { lib, python37Packages, sources }: -let - pname = "zdict"; - date = lib.substring 0 10 sources.zdict.date; - version = "unstable-" + date; -in + python37Packages.buildPythonApplication { - inherit pname version; + pname = "zdict-unstable"; + version = lib.substring 0 10 sources.zdict.date; + src = sources.zdict; propagatedBuildInputs = with python37Packages; [ diff --git a/pkgs/tools/docker-reg-tool/default.nix b/pkgs/tools/docker-reg-tool/default.nix @@ -1,16 +1,12 @@ { stdenv, sources }: -let - pname = "docker-reg-tool"; - date = stdenv.lib.substring 0 10 sources.docker-reg-tool.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "docker-reg-tool"; + version = stdenv.lib.substring 0 10 sources.docker-reg-tool.date; + src = sources.docker-reg-tool; - installPhase = '' - install -Dm755 docker_reg_tool -t $out/bin - ''; + installPhase = "install -Dm755 docker_reg_tool -t $out/bin"; meta = with stdenv.lib; { inherit (sources.docker-reg-tool) description homepage; diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix @@ -1,11 +1,9 @@ { stdenv, libpng, pkg-config, sources }: -let - pname = "datamaps"; - date = stdenv.lib.substring 0 10 sources.datamaps.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "datamaps"; + version = stdenv.lib.substring 0 10 sources.datamaps.date; + src = sources.datamaps; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +14,7 @@ stdenv.mkDerivation { installPhase = '' for tool in encode enumerate merge render; do - install -Dm755 $tool $out/bin/$pname-$tool + install -Dm755 $tool $out/bin/datamaps-$tool done ''; diff --git a/pkgs/tools/geo/elevation/default.nix b/pkgs/tools/geo/elevation/default.nix @@ -8,13 +8,11 @@ , gdal , sources }: -let - pname = "elevation"; - date = lib.substring 0 10 sources.elevation.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "elevation-unstable"; + version = lib.substring 0 10 sources.elevation.date; + src = sources.elevation; propagatedBuildInputs = with python3Packages; [ fasteners appdirs click setuptools ]; diff --git a/pkgs/tools/geo/gimgtools/default.nix b/pkgs/tools/geo/gimgtools/default.nix @@ -1,11 +1,9 @@ { stdenv, sources, libiconv }: -let - pname = "gimgtools"; - date = stdenv.lib.substring 0 10 sources.gimgtools.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "gimgtools-unstable"; + version = stdenv.lib.substring 0 10 sources.gimgtools.date; + src = sources.gimgtools; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/geo/go-staticmaps/default.nix b/pkgs/tools/geo/go-staticmaps/default.nix @@ -1,11 +1,9 @@ { lib, buildGoModule, sources }: -let - pname = "go-staticmaps"; - date = lib.substring 0 10 sources.go-staticmaps.date; - version = "unstable-" + date; -in + buildGoModule { - inherit pname version; + pname = "go-staticmaps"; + version = lib.substring 0 10 sources.go-staticmaps.date; + src = sources.go-staticmaps; vendorSha256 = "13zp6fxjmaxnn2ald8n9gjlx225w9bvq1xwibns1bdsq2c6gyffz"; diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix @@ -1,11 +1,9 @@ { stdenv, buildPerlPackage, shortenPerlShebang, XMLParser, sources }: -let - pname = "gpx-layer"; - date = stdenv.lib.substring 0 10 sources.gpx-layer.date; - version = "unstable-" + date; -in + buildPerlPackage { - inherit pname version; + pname = "gpx-layer"; + version = stdenv.lib.substring 0 10 sources.gpx-layer.date; + src = sources.gpx-layer; outputs = [ "out" ]; diff --git a/pkgs/tools/geo/gpxtrackposter/default.nix b/pkgs/tools/geo/gpxtrackposter/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, s2sphere, sources }: -let - pname = "gpxtrackposter"; - date = lib.substring 0 10 sources.gpxtrackposter.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "gpxtrackposter-unstable"; + version = lib.substring 0 10 sources.gpxtrackposter.date; + src = sources.gpxtrackposter; patches = [ ./fix-localedir.patch ]; diff --git a/pkgs/tools/geo/ocad2img/default.nix b/pkgs/tools/geo/ocad2img/default.nix @@ -2,7 +2,7 @@ buildPerlPackage { pname = "ocad2img"; - version = "unstable-2009-10-11"; + version = "2009-10-11"; src = fetchwebarchive { url = "http://worldofo.com/div/ocad2img.zip"; diff --git a/pkgs/tools/geo/ocad2mp/default.nix b/pkgs/tools/geo/ocad2mp/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchsvn }: stdenv.mkDerivation { - pname = "ocad2mp"; - version = "unstable-2011-01-26"; + pname = "ocad2mp-unstable"; + version = "2011-01-26"; src = fetchsvn { url = "svn://svn.code.sf.net/p/ocad2mp/code/trunk/ocad2mp"; diff --git a/pkgs/tools/geo/openmtbmap/default.nix b/pkgs/tools/geo/openmtbmap/default.nix @@ -1,11 +1,9 @@ { stdenv, gmaptool, mkgmap, p7zip, zsh, sources, substituteAll }: -let - pname = "openmtbmap"; - date = stdenv.lib.substring 0 10 sources.openmtbmap.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "openmtbmap"; + version = stdenv.lib.substring 0 10 sources.openmtbmap.date; + src = sources.openmtbmap; patches = (substituteAll { diff --git a/pkgs/tools/geo/osm2mp/default.nix b/pkgs/tools/geo/osm2mp/default.nix @@ -17,13 +17,11 @@ , TreeR , YAML }: -let - pname = "osm2mp"; - date = stdenv.lib.substring 0 10 sources.osm2mp.date; - version = "unstable-" + date; -in + buildPerlPackage { - inherit pname version; + pname = "osm2mp"; + version = stdenv.lib.substring 0 10 sources.osm2mp.date; + src = sources.osm2mp; outputs = [ "out" ]; diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix @@ -3,13 +3,11 @@ , mercantile , sources }: -let - pname = "supermercado"; - date = lib.substring 0 10 sources.supermercado.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "supermercado-unstable"; + version = lib.substring 0 10 sources.supermercado.date; + src = sources.supermercado; propagatedBuildInputs = with python3Packages; [ click-plugins rasterio mercantile numpy ]; diff --git a/pkgs/tools/geo/taginfo-tools/default.nix b/pkgs/tools/geo/taginfo-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "taginfo-tools"; - version = "unstable-2020-10-28"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "taginfo"; repo = "taginfo-tools"; - rev = "088602ac10d8707d94589c4a0b9d6eff48edf9f2"; - sha256 = "0yx4bh2gmxsmk8jz8qsxv73h3hi5v3hcpzlaaszjixc88aqa3zz3"; + rev = "6b68c4208aef7994d34ef745350ee0ceda850ac2"; + sha256 = "0hk15k6lynq8yskpfrwh79686pfacdyb4jfab7x20m027p5rm3vs"; fetchSubmodules = true; }; diff --git a/pkgs/tools/geo/tilesets-cli/default.nix b/pkgs/tools/geo/tilesets-cli/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, jsonseq, mercantile, supermercado, sources }: -let - pname = "tilesets-cli"; - date = lib.substring 0 10 sources.tilesets-cli.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "tilesets-cli-unstable"; + version = lib.substring 0 10 sources.tilesets-cli.date; + src = sources.tilesets-cli; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, mercantile, pymbtiles, sources }: -let - pname = "tpkutils"; - date = lib.substring 0 10 sources.tpkutils.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "tpkutils-unstable"; + version = lib.substring 0 10 sources.tpkutils.date; + src = sources.tpkutils; propagatedBuildInputs = with python3Packages; [ mercantile pymbtiles setuptools six ]; diff --git a/pkgs/tools/misc/garmin-uploader/default.nix b/pkgs/tools/misc/garmin-uploader/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, mercantile, pymbtiles, sources }: -let - pname = "garmin-uploader"; - date = lib.substring 0 10 sources.gupload.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "garmin-uploader-unstable"; + version = lib.substring 0 10 sources.gupload.date; + src = sources.gupload; propagatedBuildInputs = with python3Packages; [ requests ]; diff --git a/pkgs/tools/misc/gloggery/default.nix b/pkgs/tools/misc/gloggery/default.nix @@ -1,11 +1,9 @@ { stdenv, go, sources }: -let - pname = "gloggery"; - date = stdenv.lib.substring 0 10 sources.gloggery.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "gloggery-unstable"; + version = stdenv.lib.substring 0 10 sources.gloggery.date; + src = sources.gloggery; nativeBuildInputs = [ go ]; diff --git a/pkgs/tools/misc/supload/default.nix b/pkgs/tools/misc/supload/default.nix @@ -1,11 +1,9 @@ { stdenv, curl, file, coreutils, sources }: -let - pname = "supload"; - date = stdenv.lib.substring 0 10 sources.supload.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "supload-unstable"; + version = stdenv.lib.substring 0 10 sources.supload.date; + src = sources.supload; buildInputs = [ curl file ]; @@ -20,9 +18,7 @@ stdenv.mkDerivation { --replace '`which md5sum`' '${coreutils}/bin/md5sum' ''; - installPhase = '' - install -Dm755 supload.sh $out/bin/supload - ''; + installPhase = "install -Dm755 supload.sh $out/bin/supload"; meta = with stdenv.lib; { inherit (sources.supload) description homepage; diff --git a/pkgs/tools/morse-talk/default.nix b/pkgs/tools/morse-talk/default.nix @@ -1,11 +1,9 @@ { lib, python3Packages, sources }: -let - pname = "morse-talk"; - date = lib.substring 0 10 sources.morse-talk.date; - version = "unstable-" + date; -in + python3Packages.buildPythonApplication { - inherit pname version; + pname = "morse-talk-unstable"; + version = lib.substring 0 10 sources.morse-talk.date; + src = sources.morse-talk; propagatedBuildInputs = with python3Packages; [ matplotlib sounddevice tkinter ]; diff --git a/pkgs/tools/networking/gurl/default.nix b/pkgs/tools/networking/gurl/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchFromGitHub, zig }: -let - pname = "gurl"; - version = "unstable-2020-09-19"; -in + stdenv.mkDerivation { - inherit pname version; + pname = "gurl-unstable"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "MasterQ32"; - repo = pname; + repo = "gurl"; rev = "e5a61b2db685a53cdbdfb1c6ac160e938683d4ec"; sha256 = "1y738ip0b6ck0ibybibqw8dlx37mrqamygvm81jv9wqp1sxsi7gb"; fetchSubmodules = true; diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/tools/text/csvquote/default.nix @@ -1,11 +1,9 @@ { stdenv, sources }: -let - pname = "csvquote"; - date = stdenv.lib.substring 0 10 sources.csvquote.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "csvquote"; + version = stdenv.lib.substring 0 10 sources.csvquote.date; + src = sources.csvquote; makeFlags = [ "BINDIR=$(out)/bin" ]; diff --git a/pkgs/tools/text/csvtools/default.nix b/pkgs/tools/text/csvtools/default.nix @@ -1,11 +1,9 @@ { stdenv, pcre, openssl, sources }: -let - pname = "csvtools"; - date = stdenv.lib.substring 0 10 sources.csvtools.date; - version = "unstable-" + date; -in + stdenv.mkDerivation { - inherit pname version; + pname = "csvtools"; + version = stdenv.lib.substring 0 10 sources.csvtools.date; + src = sources.csvtools; buildInputs = [ pcre ];