commit 79247a51a15f94b3e1e48bfe18b2eeb30a64457a parent 64fc4af65fcc10879d2c831be5f1f63d6a21f676 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Sat, 11 Jul 2020 00:55:57 +0300 Use commit date for version Diffstat:
47 files changed, 362 insertions(+), 141 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json @@ -2,6 +2,7 @@ "cfiles": { "branch": "master", "builtin": false, + "date": "2020-06-09T05:17:34Z", "description": "A ncurses file manager written in C with vim like keybindings", "homepage": "https://github.com/mananapr/cfiles", "owner": "mananapr", @@ -15,6 +16,7 @@ "cheetah3": { "branch": "master", "builtin": false, + "date": "2020-05-16T18:33:02Z", "description": "Cheetah3 is a free (MIT) and open source template engine for Python", "homepage": "https://cheetahtemplate.org/", "owner": "CheetahTemplate3", @@ -28,6 +30,7 @@ "csvquote": { "branch": "master", "builtin": false, + "date": "2018-05-28T13:43:50Z", "description": "Enables common unix utlities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines", "homepage": "https://github.com/dbro/csvquote", "owner": "dbro", @@ -41,6 +44,7 @@ "csvtools": { "branch": "master", "builtin": false, + "date": "2019-08-03T13:11:03Z", "description": "GNU-alike tools for parsing RFC 4180 CSVs at high speed", "homepage": "https://github.com/DavyLandman/csvtools", "owner": "DavyLandman", @@ -54,6 +58,7 @@ "datamaps": { "branch": "master", "builtin": false, + "date": "2014-08-19T19:28:16Z", "description": "Indexes points and lines and generates map tiles to display them", "homepage": "https://github.com/ericfischer/datamaps", "owner": "ericfischer", @@ -67,6 +72,7 @@ "docker-reg-tool": { "branch": "master", "builtin": false, + "date": "2019-10-13T09:07:48Z", "description": "Docker registry cli tool, primarily for deleting images", "homepage": "https://github.com/byrnedo/docker-reg-tool", "owner": "byrnedo", @@ -80,6 +86,7 @@ "elevation": { "branch": "master", "builtin": false, + "date": "2019-05-27T22:01:34Z", "description": "Python script to download global terrain digital elevation models, SRTM 30m DEM and SRTM 90m DEM", "homepage": "http://elevation.bopen.eu", "owner": "bopen", @@ -93,6 +100,7 @@ "embox": { "branch": "master", "builtin": false, + "date": "2020-02-04T15:17:46Z", "description": "Modular and configurable OS for embedded applications", "homepage": "http://embox.github.io", "owner": "embox", @@ -106,6 +114,7 @@ "foma": { "branch": "master", "builtin": false, + "date": "2020-06-10T20:12:35Z", "description": "xfst-compatible C++ finite-state transducer library", "homepage": "https://github.com/mhulden/foma", "owner": "mhulden", @@ -119,6 +128,7 @@ "gef": { "branch": "dev", "builtin": false, + "date": "2020-06-28T16:20:31Z", "description": "GEF - GDB Enhanced Features for exploit devs & reversers", "homepage": "http://gef.rtfd.io", "owner": "hugsy", @@ -156,6 +166,7 @@ "gimgtools": { "branch": "master", "builtin": false, + "date": "2013-09-19T06:22:45Z", "description": "Garmin Image Tools", "homepage": "https://github.com/wuyongzheng/gimgtools", "owner": "wuyongzheng", @@ -169,6 +180,7 @@ "glauth": { "branch": "master", "builtin": false, + "date": "2020-02-24T15:03:07Z", "description": "A lightweight LDAP server for development, home use, or CI", "homepage": "https://github.com/glauth/glauth", "owner": "glauth", @@ -182,6 +194,7 @@ "gpx-layer": { "branch": "master", "builtin": false, + "date": "2013-09-19T22:24:41Z", "description": "Tools to turn GPX files into a GPS map tracing layer", "homepage": "https://github.com/ericfischer/gpx-layer", "owner": "ericfischer", @@ -195,6 +208,7 @@ "gpxelevations": { "branch": "master", "builtin": false, + "date": "2019-12-18T15:16:42Z", "description": "Geo elevation data parser for \"The Shuttle Radar Topography Mission\" data", "homepage": "https://github.com/tkrajina/srtm.py", "owner": "tkrajina", @@ -208,6 +222,7 @@ "gpxlab": { "branch": "master", "builtin": false, + "date": "2020-05-03T14:00:04Z", "description": "Program to show and manipulate GPS tracks", "homepage": "https://github.com/BourgeoisLab/GPXLab", "owner": "BourgeoisLab", @@ -221,6 +236,7 @@ "gpxsee": { "branch": "master", "builtin": false, + "date": "2020-07-06T21:19:42Z", "description": "GPS log file viewer and analyzer", "homepage": "https://www.gpxsee.org", "owner": "tumic0", @@ -234,6 +250,7 @@ "gpxsee-maps": { "branch": "master", "builtin": false, + "date": "2020-06-26T17:18:06Z", "description": "GPXSee maps", "homepage": "https://tumic0.github.io/GPXSee-maps", "owner": "tumic0", @@ -260,6 +277,7 @@ "gt-bash-client": { "branch": "master", "builtin": false, + "date": "2020-06-09T15:44:09Z", "description": "Get translated text from your terminal! Console Google Translate Script (bash+curl+sed)", "homepage": "https://ophoperhpo.github.io/GT-bash-client/", "owner": "OPHoperHPO", @@ -273,6 +291,7 @@ "gt4gd": { "branch": "master", "builtin": false, + "date": "2020-05-04T07:12:12Z", "description": "Add Google translate to GoldenDict", "homepage": "https://github.com/xinebf/google-translate-for-goldendict", "owner": "xinebf", @@ -286,6 +305,7 @@ "hfst": { "branch": "master", "builtin": false, + "date": "2020-07-04T20:30:59Z", "description": "Helsinki Finite-State Technology (library and application suite)", "homepage": "https://hfst.github.io", "owner": "hfst", @@ -299,6 +319,7 @@ "libshell": { "branch": "master", "builtin": false, + "date": "2020-03-16T17:18:36Z", "description": "A library of shell functions", "homepage": "https://github.com/legionus/libshell", "owner": "legionus", @@ -312,6 +333,7 @@ "lsdreader": { "branch": "master", "builtin": false, + "date": "2018-12-28T12:22:11Z", "description": "decompile Lingvo LSD dictionary to DSL", "homepage": "https://github.com/sv99/lsdreader", "owner": "sv99", @@ -322,9 +344,10 @@ "url": "https://github.com/sv99/lsdreader/archive/c78ab22e794f1fbfbc93ffb3ee7ae481f54dd8c2.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "map_hr": { + "map-hr": { "branch": "master", "builtin": false, + "date": "2019-07-14T23:28:27Z", "description": "Slazav mountains", "homepage": "http://slazav.mccme.ru/maps/", "owner": "slazav", @@ -335,9 +358,10 @@ "url": "https://github.com/slazav/map_hr/archive/1555f0e49e8b26b5991c6b8ce8ea1f0688b26047.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "map_podm": { + "map-podm": { "branch": "master", "builtin": false, + "date": "2019-12-08T17:24:57Z", "description": "Карты Подмосковья в виде номенклатурных листов 1:100000 - исходники в формате mapsoft vmap", "homepage": "http://slazav.mccme.ru/maps/", "owner": "slazav", @@ -351,6 +375,7 @@ "mapper": { "branch": "master", "builtin": false, + "date": "2020-07-03T07:52:55Z", "description": "OpenOrienteering Mapper is a software for creating maps for the orienteering sport", "homepage": "https://www.openorienteering.org/apps/mapper/", "owner": "OpenOrienteering", @@ -364,6 +389,7 @@ "mapsoft": { "branch": "master", "builtin": false, + "date": "2020-01-15T22:56:03Z", "description": "Mapping software for linux", "homepage": "http://slazav.mccme.ru/prog/mapsoft.htm", "owner": "ushakov", @@ -388,6 +414,7 @@ "mbtileserver": { "branch": "master", "builtin": false, + "date": "2020-05-11T18:18:31Z", "description": "Basic Go server for mbtiles", "homepage": "https://github.com/consbio/mbtileserver", "owner": "consbio", @@ -401,6 +428,7 @@ "mercantile": { "branch": "master", "builtin": false, + "date": "2020-06-16T22:49:21Z", "description": "Spherical mercator tile and coordinate utilities", "homepage": "https://github.com/mapbox/mercantile", "owner": "mapbox", @@ -414,6 +442,7 @@ "mikatools": { "branch": "master", "builtin": false, + "date": "2020-02-21T12:09:22Z", "description": "Mikatools provides fast and easy methods for common Python coding tasks", "homepage": "https://github.com/mikahama/mikatools", "owner": "mikahama", @@ -427,6 +456,7 @@ "morse-talk": { "branch": "master", "builtin": false, + "date": "2016-12-25T13:48:00Z", "description": "A Python library written for Morse Code", "homepage": "https://github.com/morse-talk/morse-talk", "owner": "morse-talk", @@ -450,6 +480,7 @@ "musig": { "branch": "master", "builtin": false, + "date": "2020-02-22T23:15:04Z", "description": "A shazam like tool to store musics fingerprints and retrieve them", "homepage": "https://github.com/sfluor/musig", "owner": "sfluor", @@ -463,6 +494,7 @@ "nakarte": { "branch": "master", "builtin": false, + "date": "2020-07-05T15:13:02Z", "description": "Source code of site http://nakarte.me", "homepage": "https://nakarte.me", "owner": "wladich", @@ -476,6 +508,7 @@ "nnn": { "branch": "master", "builtin": false, + "date": "2020-07-08T15:23:35Z", "description": "n³ The missing terminal file manager for X", "homepage": "https://github.com/jarun/nnn", "owner": "jarun", @@ -489,6 +522,7 @@ "odict": { "branch": "master", "builtin": false, + "date": "2020-06-27T00:03:02Z", "description": "A blazingly-fast replacement for Apple Dictionaries, Babylon, StarDict, etc", "homepage": "https://odict.org", "owner": "odict", @@ -502,6 +536,7 @@ "openmtbmap": { "branch": "master", "builtin": false, + "date": "2020-06-10T11:16:05Z", "description": "Linux script to extract and compile garmin *.img map files from openmtbmap.org or openvelomap.org downloads", "homepage": "https://github.com/btittelbach/openmtbmap_openvelomap_linux", "owner": "btittelbach", @@ -515,6 +550,7 @@ "osm2mp": { "branch": "master", "builtin": false, + "date": "2018-08-31T10:45:18Z", "description": "Convert Openstreetmap data to MP format", "homepage": "https://github.com/liosha/osm2mp", "owner": "liosha", @@ -525,9 +561,10 @@ "url": "https://github.com/liosha/osm2mp/archive/748f93792ead174ad0e94a183a173ef3fcacf200.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "pg_tileserv": { + "pg-tileserv": { "branch": "master", "builtin": false, + "date": "2020-06-12T14:56:48Z", "description": "A very thin PostGIS-only tile server in Go. Takes in HTTP tile requests, executes SQL, returns MVT tiles", "homepage": "https://github.com/CrunchyData/pg_tileserv", "owner": "CrunchyData", @@ -541,6 +578,7 @@ "pyephem": { "branch": "master", "builtin": false, + "date": "2020-06-29T14:30:02Z", "description": "Scientific-grade astronomy routines for Python", "homepage": "https://rhodesmill.org/pyephem", "owner": "brandon-rhodes", @@ -554,6 +592,7 @@ "pymbtiles": { "branch": "master", "builtin": false, + "date": "2019-10-16T20:59:08Z", "description": "Python utilities for Mapbox mbtiles files", "homepage": "https://github.com/consbio/pymbtiles", "owner": "consbio", @@ -567,6 +606,7 @@ "qtpbfimageplugin-styles": { "branch": "master", "builtin": false, + "date": "2020-04-10T11:06:10Z", "description": "QtPBFImagePlugin styles", "homepage": "https://github.com/tumic0/QtPBFImagePlugin-styles", "owner": "tumic0", @@ -580,6 +620,7 @@ "redict": { "branch": "master", "builtin": false, + "date": "2019-06-20T23:15:30Z", "description": "A dictionary for Linux, based on C++/Qt development", "homepage": "https://github.com/rekols/redict", "owner": "rekols", @@ -593,6 +634,7 @@ "stardict-3": { "branch": "master", "builtin": false, + "date": "2019-12-09T10:04:43Z", "description": "Automatically exported from code.google.com/p/stardict-3", "homepage": "https://github.com/huzheng001/stardict-3", "owner": "huzheng001", @@ -606,6 +648,7 @@ "supermercado": { "branch": "master", "builtin": false, + "date": "2019-01-02T15:10:23Z", "description": "Supercharger for mercantile", "homepage": "https://github.com/mapbox/supermercado", "owner": "mapbox", @@ -619,6 +662,7 @@ "supload": { "branch": "master", "builtin": false, + "date": "2015-08-04T11:30:01Z", "description": "Bash script for upload file to cloud storage based on OpenStack Swift API", "homepage": "https://github.com/selectel/supload", "owner": "selectel", @@ -632,6 +676,7 @@ "tpkutils": { "branch": "master", "builtin": false, + "date": "2019-10-31T03:05:49Z", "description": "ArcGIS Tile Package Utilities", "homepage": "https://github.com/consbio/tpkutils", "owner": "consbio", diff --git a/pkgs/applications/gpxlab/default.nix b/pkgs/applications/gpxlab/default.nix @@ -9,10 +9,13 @@ , substituteAll , withI18n ? true }: - -mkDerivation { +let pname = "gpxlab"; - version = lib.substring 0 7 sources.gpxlab.rev; + date = lib.substring 0 10 sources.gpxlab.date; + version = "unstable-" + date; +in +mkDerivation { + inherit pname version; src = sources.gpxlab; patches = (substituteAll { diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix @@ -9,10 +9,13 @@ , substituteAll , withI18n ? true }: - -mkDerivation { +let pname = "gpxsee"; - version = lib.substring 0 7 sources.gpxsee.rev; + date = lib.substring 0 10 sources.gpxsee.date; + version = "unstable-" + date; +in +mkDerivation { + inherit pname version; src = sources.gpxsee; patches = (substituteAll { diff --git a/pkgs/applications/mapsoft/default.nix b/pkgs/applications/mapsoft/default.nix @@ -28,10 +28,13 @@ , zlib , getopt }: - -stdenv.mkDerivation { +let pname = "mapsoft"; - version = stdenv.lib.substring 0 7 sources.mapsoft.rev; + date = stdenv.lib.substring 0 10 sources.mapsoft.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.mapsoft; patches = [ ./0001-fix-build.patch ]; diff --git a/pkgs/applications/nnn-plugins/default.nix b/pkgs/applications/nnn-plugins/default.nix @@ -1,8 +1,11 @@ { stdenv, sources }: - -stdenv.mkDerivation { +let pname = "nnn-plugins"; - version = stdenv.lib.substring 0 7 sources.nnn.rev; + date = stdenv.lib.substring 0 10 sources.nnn.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.nnn; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix @@ -18,10 +18,13 @@ , sources , substituteAll }: - -mkDerivation { +let pname = "OpenOrienteering-Mapper"; - version = lib.substring 0 7 sources.mapper.rev; + date = lib.substring 0 10 sources.mapper.date; + version = "unstable-" + date; +in +mkDerivation { + inherit pname version; src = sources.mapper; patches = (substituteAll { diff --git a/pkgs/applications/redict/default.nix b/pkgs/applications/redict/default.nix @@ -14,10 +14,13 @@ , sources , withI18n ? true }: - -mkDerivation { +let pname = "redict"; - version = lib.substring 0 7 sources.redict.rev; + date = lib.substring 0 10 sources.redict.date; + version = "unstable-" + date; +in +mkDerivation { + inherit pname version; src = sources.redict; nativeBuildInputs = [ qmake pkgconfig ] ++ (lib.optional withI18n qttools); diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix @@ -3,10 +3,13 @@ , maptilerApiKey ? "" , mapboxApiKey ? "" }: - -stdenv.mkDerivation { +let pname = "gpxsee-maps"; - version = stdenv.lib.substring 0 7 sources.gpxsee-maps.rev; + date = stdenv.lib.substring 0 10 sources.gpxsee-maps.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.gpxsee-maps; postPatch = '' diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix @@ -1,9 +1,12 @@ { stdenv, cgpsmapper, gmaptool, imagemagick, mapsoft, netpbm, zip, sources }: - -stdenv.mkDerivation { +let pname = "slazav-hr"; - version = stdenv.lib.substring 0 7 sources.map_hr.rev; - src = sources.map_hr; + date = stdenv.lib.substring 0 10 sources.map-hr.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; + src = sources.map-hr; patches = [ ./0001-fix-hr.patch ]; @@ -36,7 +39,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit (sources.map_hr) description homepage; + inherit (sources.map-hr) description homepage; license = licenses.free; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix @@ -1,9 +1,12 @@ { stdenv, cgpsmapper, gmaptool, imagemagick, mapsoft, netpbm, zip, sources }: - -stdenv.mkDerivation { +let pname = "slazav-podm"; - version = stdenv.lib.substring 0 7 sources.map_podm.rev; - src = sources.map_podm; + date = stdenv.lib.substring 0 10 sources.map-podm.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; + src = sources.map-podm; patches = [ ./0001-fix-podm.patch ]; @@ -34,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit (sources.map_podm) description homepage; + inherit (sources.map-podm) description homepage; license = licenses.free; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix @@ -1,8 +1,11 @@ { stdenv, sources }: - -stdenv.mkDerivation { +let pname = "qtpbfimageplugin-styles"; - version = stdenv.lib.substring 0 7 sources.qtpbfimageplugin-styles.rev; + date = stdenv.lib.substring 0 10 sources.qtpbfimageplugin-styles.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.qtpbfimageplugin-styles; dontBuild = true; diff --git a/pkgs/development/libraries/foma/default.nix b/pkgs/development/libraries/foma/default.nix @@ -1,8 +1,11 @@ { stdenv, bison, flex, libtool, ncurses, readline, zlib, sources }: - -stdenv.mkDerivation { +let pname = "foma"; - version = stdenv.lib.substring 0 7 sources.foma.rev; + date = stdenv.lib.substring 0 10 sources.foma.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.foma; sourceRoot = "source/foma"; diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/development/libraries/hfst/default.nix @@ -1,8 +1,11 @@ { stdenv, autoreconfHook, bison, flex, sources }: - -stdenv.mkDerivation { +let pname = "hfst"; - version = stdenv.lib.substring 0 7 sources.hfst.rev; + date = stdenv.lib.substring 0 10 sources.hfst.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.hfst; nativeBuildInputs = [ autoreconfHook bison flex ]; diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix @@ -7,10 +7,13 @@ , withDoc ? false , scdoc }: - -stdenv.mkDerivation { +let pname = "libshell"; - version = stdenv.lib.substring 0 7 sources.libshell.rev; + date = stdenv.lib.substring 0 10 sources.libshell.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.libshell; nativeBuildInputs = [ help2man ]; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonPackage, sources }: - -buildPythonPackage { +let pname = "cheetah3"; - version = lib.substring 0 7 sources.cheetah3.rev; + date = lib.substring 0 10 sources.cheetah3.date; + version = "unstable-" + date; +in +buildPythonPackage { + inherit pname version; src = sources.cheetah3; doCheck = false; diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonApplication, python, requests, gpxpy, sources }: - -buildPythonApplication { +let pname = "gpxelevations"; - version = lib.substring 0 7 sources.gpxelevations.rev; + date = lib.substring 0 10 sources.gpxelevations.date; + version = "unstable-" + date; +in +buildPythonApplication { + inherit pname version; src = sources.gpxelevations; propagatedBuildInputs = [ requests gpxpy ]; diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonPackage, click, pytest, hypothesis, sources }: - -buildPythonPackage { +let pname = "mercantile"; - version = lib.substring 0 7 sources.mercantile.rev; + date = lib.substring 0 10 sources.mercantile.date; + version = "unstable-" + date; +in +buildPythonPackage { + inherit pname version; src = sources.mercantile; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonPackage, requests, clint, sources }: - -buildPythonPackage { +let pname = "mikatools"; - version = lib.substring 0 7 sources.mikatools.rev; + date = lib.substring 0 10 sources.mikatools.date; + version = "unstable-" + date; +in +buildPythonPackage { + inherit pname version; src = sources.mikatools; propagatedBuildInputs = [ requests clint ]; diff --git a/pkgs/development/python-modules/pyephem/default.nix b/pkgs/development/python-modules/pyephem/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonPackage, sources }: - -buildPythonPackage { +let pname = "pyephem"; - version = lib.substring 0 7 sources.pyephem.rev; + date = lib.substring 0 10 sources.pyephem.date; + version = "unstable-" + date; +in +buildPythonPackage { + inherit pname version; 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,8 +1,11 @@ { lib, buildPythonPackage, pytest, sources }: - -buildPythonPackage { +let pname = "pymbtiles"; - version = lib.substring 0 7 sources.pymbtiles.rev; + date = lib.substring 0 10 sources.pymbtiles.date; + version = "unstable-" + date; +in +buildPythonPackage { + inherit pname version; src = sources.pymbtiles; checkInputs = [ pytest ]; diff --git a/pkgs/development/tools/gef/default.nix b/pkgs/development/tools/gef/default.nix @@ -10,6 +10,10 @@ , 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 ''; @@ -23,8 +27,7 @@ let ); in stdenv.mkDerivation { - pname = "gef"; - version = stdenv.lib.substring 0 7 sources.gef.rev; + inherit pname version; src = sources.gef; postPatch = '' diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix @@ -10,6 +10,9 @@ , which }: let + pname = "embox"; + date = stdenv.lib.substring 0 10 sources.embox.date; + version = "unstable-" + date; template = "arm/qemu"; cjson = fetchurl { @@ -28,8 +31,7 @@ let ''; in stdenv.mkDerivation { - pname = "embox"; - version = stdenv.lib.substring 0 7 sources.embox.rev; + inherit pname version; src = sources.embox; patches = [ ./0001-fix-build.patch ]; diff --git a/pkgs/servers/glauth/default.nix b/pkgs/servers/glauth/default.nix @@ -1,8 +1,11 @@ { lib, buildGoModule, go-bindata, sources }: - -buildGoModule { +let pname = "glauth"; - version = lib.substring 0 7 sources.glauth.rev; + date = lib.substring 0 10 sources.glauth.date; + version = "unstable-" + date; +in +buildGoModule { + inherit pname version; src = sources.glauth; vendorSha256 = "18inm0s9mww7c19z9alnvy0g80d3laxh4lwbgzkcc8kf9zg25149"; diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix @@ -1,8 +1,11 @@ { lib, buildGoModule, sources }: - -buildGoModule { +let pname = "mbtileserver"; - version = lib.substring 0 7 sources.mbtileserver.rev; + date = lib.substring 0 10 sources.mbtileserver.date; + version = "unstable-" + date; +in +buildGoModule { + inherit pname version; src = sources.mbtileserver; vendorSha256 = null; diff --git a/pkgs/servers/nakarte/default.nix b/pkgs/servers/nakarte/default.nix @@ -1,9 +1,11 @@ { stdenv, mkYarnPackage, sources, secretsConfig ? null }: let - version = stdenv.lib.substring 0 7 sources.nakarte.rev; + pname = "nakarte"; + date = stdenv.lib.substring 0 10 sources.nakarte.date; + version = "unstable-" + date; in mkYarnPackage { - name = "nakarte-${version}"; + name = "${pname}-${version}"; src = sources.nakarte; postPatch = diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix @@ -1,14 +1,17 @@ { lib, buildGoModule, sources }: - -buildGoModule { +let pname = "pg_tileserv"; - version = lib.substring 0 7 sources.pg_tileserv.rev; - src = sources.pg_tileserv; + date = lib.substring 0 10 sources.pg-tileserv.date; + version = "unstable-" + date; +in +buildGoModule { + inherit pname version; + src = sources.pg-tileserv; vendorSha256 = "1wpzj6par25z7cyyz6p41cxdll4nzb0jjdl1pffgawiy9z7j17vb"; meta = with lib; { - inherit (sources.pg_tileserv) description homepage; + inherit (sources.pg-tileserv) description homepage; license = licenses.asl20; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/audio/musig/default.nix b/pkgs/tools/audio/musig/default.nix @@ -1,10 +1,11 @@ { lib, buildGoModule, pkgconfig, portaudio, sources }: let - version = lib.substring 0 7 sources.musig.rev; + pname = "musig"; + date = lib.substring 0 10 sources.musig.date; + version = "unstable-" + date; in buildGoModule { - pname = "musig"; - inherit version; + inherit pname version; src = sources.musig; vendorSha256 = "0ha1xjdwibm8543b4bx0xrbigngiiakksdc6mnp0mz5y6ai56pg5"; diff --git a/pkgs/tools/cfiles/default.nix b/pkgs/tools/cfiles/default.nix @@ -1,8 +1,11 @@ { stdenv, pkg-config, ncurses, w3m, ueberzug, sources }: - -stdenv.mkDerivation { +let pname = "cfiles"; - version = stdenv.lib.substring 0 7 sources.cfiles.rev; + date = stdenv.lib.substring 0 10 sources.cfiles.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.cfiles; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/dict/gt-bash-client/default.nix b/pkgs/tools/dict/gt-bash-client/default.nix @@ -1,8 +1,11 @@ { stdenv, sources }: - -stdenv.mkDerivation { +let pname = "gt-bash-client"; - version = stdenv.lib.substring 0 7 sources.gt-bash-client.rev; + date = stdenv.lib.substring 0 10 sources.gt-bash-client.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.gt-bash-client; installPhase = '' diff --git a/pkgs/tools/dict/gt4gd/default.nix b/pkgs/tools/dict/gt4gd/default.nix @@ -5,10 +5,13 @@ , withUI ? true , tkinter }: - -buildPythonApplication { +let pname = "gt4gd"; - version = lib.substring 0 7 sources.gt4gd.rev; + date = lib.substring 0 10 sources.gt4gd.date; + version = "unstable-" + date; +in +buildPythonApplication { + inherit pname version; src = sources.gt4gd; propagatedBuildInputs = [ requests ] ++ (lib.optional withUI tkinter); diff --git a/pkgs/tools/dict/lsdreader/default.nix b/pkgs/tools/dict/lsdreader/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonApplication, sources }: - -buildPythonApplication { +let pname = "lsdreader"; - version = lib.substring 0 7 sources.lsdreader.rev; + date = lib.substring 0 10 sources.lsdreader.date; + version = "unstable-" + date; +in +buildPythonApplication { + inherit pname version; src = sources.lsdreader; doCheck = false; diff --git a/pkgs/tools/dict/odict/default.nix b/pkgs/tools/dict/odict/default.nix @@ -1,8 +1,11 @@ { lib, buildGoModule, sources }: - -buildGoModule { +let pname = "odict"; - version = lib.substring 0 7 sources.odict.rev; + date = lib.substring 0 10 sources.odict.date; + version = "unstable-" + date; +in +buildGoModule { + inherit pname version; src = sources.odict; vendorSha256 = "083mvrgpv9hyfmi26sankv940qp0bmyr55jm33dx1ivhd2xhkg78"; diff --git a/pkgs/tools/dict/stardict-tools/default.nix b/pkgs/tools/dict/stardict-tools/default.nix @@ -9,10 +9,13 @@ , pcre , sources }: - -stdenv.mkDerivation { +let pname = "stardict-tools"; - version = stdenv.lib.substring 0 7 sources.stardict-3.rev; + date = stdenv.lib.substring 0 10 sources.stardict-3.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.stardict-3; nativeBuildInputs = [ diff --git a/pkgs/tools/docker-reg-tool/default.nix b/pkgs/tools/docker-reg-tool/default.nix @@ -1,8 +1,11 @@ { stdenv, sources }: - -stdenv.mkDerivation { +let pname = "docker-reg-tool"; - version = stdenv.lib.substring 0 7 sources.docker-reg-tool.rev; + date = stdenv.lib.substring 0 10 sources.docker-reg-tool.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.docker-reg-tool; installPhase = '' diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix @@ -1,8 +1,11 @@ { stdenv, libpng, pkg-config, sources }: - -stdenv.mkDerivation { +let pname = "datamaps"; - version = stdenv.lib.substring 0 7 sources.datamaps.rev; + date = stdenv.lib.substring 0 10 sources.datamaps.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.datamaps; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/geo/elevation/default.nix b/pkgs/tools/geo/elevation/default.nix @@ -13,10 +13,13 @@ , pytest-mock , sources }: - -buildPythonApplication { +let pname = "elevation"; - version = lib.substring 0 7 sources.elevation.rev; + date = lib.substring 0 10 sources.elevation.date; + version = "unstable-" + date; +in +buildPythonApplication { + inherit pname version; src = sources.elevation; propagatedBuildInputs = [ fasteners future appdirs click ]; diff --git a/pkgs/tools/geo/gimgtools/default.nix b/pkgs/tools/geo/gimgtools/default.nix @@ -1,8 +1,11 @@ { stdenv, sources, libiconv }: - -stdenv.mkDerivation { +let pname = "gimgtools"; - version = stdenv.lib.substring 0 7 sources.gimgtools.rev; + date = stdenv.lib.substring 0 10 sources.gimgtools.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.gimgtools; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix @@ -1,8 +1,11 @@ { lib, buildPerlPackage, XMLParser, sources }: - -buildPerlPackage { +let pname = "gpx-layer"; - version = lib.substring 0 7 sources.gpx-layer.rev; + date = lib.substring 0 10 sources.gpx-layer.date; + version = "unstable-" + date; +in +buildPerlPackage { + inherit pname version; src = sources.gpx-layer; outputs = [ "out" ]; diff --git a/pkgs/tools/geo/openmtbmap/default.nix b/pkgs/tools/geo/openmtbmap/default.nix @@ -1,8 +1,11 @@ { stdenv, gmaptool, mkgmap, p7zip, zsh, sources, substituteAll }: - -stdenv.mkDerivation { +let pname = "openmtbmap"; - version = stdenv.lib.substring 0 7 sources.openmtbmap.rev; + date = stdenv.lib.substring 0 10 sources.openmtbmap.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.openmtbmap; patches = (substituteAll { diff --git a/pkgs/tools/geo/osm2mp/default.nix b/pkgs/tools/geo/osm2mp/default.nix @@ -16,10 +16,13 @@ , TreeR , YAML }: - -buildPerlPackage { +let pname = "osm2mp"; - version = lib.substring 0 7 sources.osm2mp.rev; + date = lib.substring 0 10 sources.osm2mp.date; + version = "unstable-" + date; +in +buildPerlPackage { + inherit pname version; src = sources.osm2mp; outputs = [ "out" ]; diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix @@ -8,10 +8,13 @@ , pytest , sources }: - -buildPythonApplication { +let pname = "supermercado"; - version = lib.substring 0 7 sources.supermercado.rev; + date = lib.substring 0 10 sources.supermercado.date; + version = "unstable-" + date; +in +buildPythonApplication { + inherit pname version; src = sources.supermercado; patches = [ diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonApplication, mercantile, pymbtiles, pytest, setuptools, six, sources }: - -buildPythonApplication { +let pname = "tpkutils"; - version = lib.substring 0 7 sources.tpkutils.rev; + date = lib.substring 0 10 sources.tpkutils.date; + version = "unstable-" + date; +in +buildPythonApplication { + inherit pname version; src = sources.tpkutils; propagatedBuildInputs = [ mercantile pymbtiles setuptools six ]; diff --git a/pkgs/tools/morse-talk/default.nix b/pkgs/tools/morse-talk/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonApplication, matplotlib, nose, sounddevice, sources }: - -buildPythonApplication { +let pname = "morse-talk"; - version = lib.substring 0 7 sources.morse-talk.rev; + date = lib.substring 0 10 sources.morse-talk.date; + version = "unstable-" + date; +in +buildPythonApplication { + inherit pname version; src = sources.morse-talk; propagatedBuildInputs = [ matplotlib sounddevice ]; diff --git a/pkgs/tools/supload/default.nix b/pkgs/tools/supload/default.nix @@ -1,8 +1,11 @@ { stdenv, curl, file, coreutils, sources }: - -stdenv.mkDerivation { +let pname = "supload"; - version = stdenv.lib.substring 0 7 sources.supload.rev; + date = stdenv.lib.substring 0 10 sources.supload.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.supload; buildInputs = [ curl file ]; diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/tools/text/csvquote/default.nix @@ -1,8 +1,11 @@ { stdenv, sources }: - -stdenv.mkDerivation { +let pname = "csvquote"; - version = stdenv.lib.substring 0 7 sources.csvquote.rev; + date = stdenv.lib.substring 0 10 sources.csvquote.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.csvquote; makeFlags = [ "BINDIR=$(out)/bin" ]; diff --git a/pkgs/tools/text/csvtools/default.nix b/pkgs/tools/text/csvtools/default.nix @@ -1,8 +1,11 @@ { stdenv, pcre, openssl, sources }: - -stdenv.mkDerivation { +let pname = "csvtools"; - version = stdenv.lib.substring 0 7 sources.csvtools.rev; + date = stdenv.lib.substring 0 10 sources.csvtools.date; + version = "unstable-" + date; +in +stdenv.mkDerivation { + inherit pname version; src = sources.csvtools; buildInputs = [ pcre ]; diff --git a/update-commit-dates.sh b/update-commit-dates.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq moreutils + +# heredoc variables +typeset \ + commit_dates_filter='' \ + commit_dates_query='' \ + + +IFS='' read -r -d '' commit_dates_query <<'EOF' # vim:ft=jq +def repoField($alias): + "\($alias): repository(owner: \(.owner | @json), name: \(.repo | @json)) { " + + "object(expression: \(.rev | @json)) { ...go } }"; + +def build_query: +"fragment go on GitObject { ... on Commit { committedDate } } + +query CommitDates { + " + (map(.key as $alias | .value | + select(has("owner") and has("repo")) | + repoField($alias | gsub("-"; "_")) + ) | join("\n ")) + " +}"; + +{ query: to_entries | build_query } +EOF + +IFS='' read -r -d '' commit_dates_filter <<'EOF' # vim:ft=jq +.data | with_entries( + .key |= gsub("_"; "-") | + .value |= { date: .object.committedDate } +) as $overrides | $sources[] * $overrides +EOF + +set -o errexit -o errtrace -o nounset -o pipefail +shopt -s inherit_errexit + +curl 'https://api.github.com/graphql' \ + -H "Authorization: bearer $GITHUB_TOKEN" \ + --data-binary "$(jq "${commit_dates_query}" nix/sources.json)" | \ + jq -S --indent 4 "${commit_dates_filter}" \ + --slurpfile sources nix/sources.json | \ + sponge nix/sources.json + +# vim:et:ft=sh:sw=2:tw=78