commit 54647aa31c1a22b46736907c9ee913c35745ca5b parent ec31aa94b683375ade1c792a76397072e7357088 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Thu, 13 Feb 2020 09:55:25 +0300 Refactoring Diffstat:
33 files changed, 195 insertions(+), 247 deletions(-)
diff --git a/default.nix b/default.nix @@ -6,125 +6,17 @@ # commands such as: # nix-build -A mypackage -{ pkgs ? import <nixpkgs> { } }: +{ pkgs ? import <nixpkgs> args +, sources ? import ./nix/sources.nix +, system ? builtins.currentSystem, ... }@args: -with pkgs; +with (import <nixpkgs/lib>).attrsets; -let - sources = import ./nix/sources.nix; - -in stdenv.lib.makeScope pkgs.newScope (self: with self; { +{ # The `lib`, `modules`, and `overlay` names are special - lib = import ./lib { inherit pkgs; }; # functions - modules = import ./modules; # NixOS modules - overlays = import ./overlays; # nixpkgs overlays - - cfiles = callPackage ./pkgs/tools/cfiles { - inherit (sources) cfiles; - }; - cheetah3 = python3Packages.callPackage ./pkgs/development/python-modules/cheetah3 { - inherit (sources) cheetah3; - }; - click = python3Packages.callPackage ./pkgs/development/python-modules/click { }; - csvquote = callPackage ./pkgs/tools/text/csvquote { - inherit (sources) csvquote; - }; - csvtools = callPackage ./pkgs/tools/text/csvtools { - inherit (sources) csvtools; - }; - datamaps = callPackage ./pkgs/tools/datamaps { - inherit (sources) datamaps; - }; - docker-reg-tool = callPackage ./pkgs/tools/docker-reg-tool { - inherit (sources) docker-reg-tool; - }; - elevation = python3Packages.callPackage ./pkgs/tools/elevation { - inherit (sources) elevation; - }; - embox = callPackage ./pkgs/embox { - inherit (sources) embox; - }; - gmaptool = callPackage ./pkgs/tools/gmaptool { }; - goldendict-dark-theme = - callPackage ./pkgs/data/themes/goldendict-themes/dark-theme.nix { }; - gpx-layer = perlPackages.callPackage ./pkgs/tools/gpx-layer { - inherit (sources) gpx-layer; - }; - gpxelevations = python3Packages.callPackage ./pkgs/development/python-modules/gpxelevations { - inherit (sources) gpxelevations; - }; - gpxlab = libsForQt5.callPackage ./pkgs/applications/gpxlab { - inherit (sources) gpxlab; - }; - gpxsee = libsForQt5.callPackage ./pkgs/applications/gpxsee { - inherit (sources) gpxsee; - }; - gpxsee-maps = callPackage ./pkgs/data/maps/gpxsee-maps { - inherit (sources) gpxsee-maps; - }; - gpxtools = callPackage ./pkgs/tools/gpxtools { - inherit (sources) gpxtools; - }; - gt-bash-client = callPackage ./pkgs/tools/gt-bash-client { - inherit (sources) gt-bash-client; - }; - lsdreader = python3Packages.callPackage ./pkgs/tools/lsdreader { - inherit (sources) lsdreader; - }; - gt4gd = python3Packages.callPackage ./pkgs/tools/gt4gd { - inherit (sources) google-translate-for-goldendict; - }; - hiblovgpsmap = callPackage ./pkgs/data/maps/hiblovgpsmap { }; - ish = callPackage ./pkgs/tools/networking/ish { }; - libshell = callPackage ./pkgs/development/libraries/libshell { - inherit (sources) libshell; - }; - mapsoft = callPackage ./pkgs/applications/mapsoft { - inherit (sources) mapsoft; - }; - mbtileserver = callPackage ./pkgs/servers/mbtileserver { - inherit (sources) mbtileserver; - }; - mbutil = python3Packages.callPackage ./pkgs/tools/mbutil { - inherit (sources) mbutil; - }; - mercantile = python3Packages.callPackage ./pkgs/development/python-modules/mercantile { - inherit (sources) mercantile; - }; - openmtbmap_openvelomap_linux = callPackage ./pkgs/tools/openmtbmap_openvelomap_linux { - inherit (sources) openmtbmap_openvelomap_linux; - }; - openorienteering-mapper = libsForQt5.callPackage ./pkgs/applications/openorienteering-mapper { - inherit (sources) mapper; - }; - ptunnel = callPackage ./pkgs/tools/networking/ptunnel { }; - pyephem = python3Packages.callPackage ./pkgs/development/python-modules/pyephem { - inherit (sources) pyephem; - }; - pymbtiles = python3Packages.callPackage ./pkgs/development/python-modules/pymbtiles { - inherit (sources) pymbtiles; - }; - qmapshack-onlinemaps = callPackage ./pkgs/data/maps/qmapshack-onlinemaps { }; - redict = libsForQt5.callPackage ./pkgs/applications/redict { - inherit (sources) redict; - }; - stardict-tools = - # Needed for nixos-19.09 - if pkgs ? libmysql - then callPackage ./pkgs/tools/stardict-tools { - inherit (sources) stardict-3; - libmysqlclient = libmysql; - } - else callPackage ./pkgs/tools/stardict-tools { - inherit (sources) stardict-3; - }; - supermercado = python3Packages.callPackage ./pkgs/tools/supermercado { - inherit (sources) supermercado; - }; - supload = callPackage ./pkgs/tools/supload { - inherit (sources) supload; - }; - tpkutils = python3Packages.callPackage ./pkgs/tools/tpkutils { - inherit (sources) tpkutils; - }; -}) + lib = import ./lib { inherit pkgs; }; # functions + modules = import ./modules; # NixOS modules + overlays = import ./overlays; # nixpkgs overlays +} // (optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs { + inherit sources pkgs; +})) diff --git a/pkgs/applications/gpxlab/default.nix b/pkgs/applications/gpxlab/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, qmake, qtbase, qttools, qttranslations, gpxlab }: +{ mkDerivation, lib, qmake, qtbase, qttools, qttranslations, sources }: mkDerivation rec { pname = "gpxlab"; version = lib.substring 0 7 src.rev; - src = gpxlab; + src = sources.gpxlab; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase qttranslations ]; @@ -15,8 +15,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = gpxlab.description; - homepage = gpxlab.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, qmake, qtbase, qttools, qttranslations, gpxsee }: +{ mkDerivation, lib, qmake, qtbase, qttools, qttranslations, sources }: mkDerivation rec { pname = "gpxsee"; version = lib.substring 0 7 src.rev; - src = gpxsee; + src = sources.gpxsee; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase qttranslations ]; @@ -15,8 +15,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = gpxsee.description; - homepage = gpxsee.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/applications/mapsoft/default.nix b/pkgs/applications/mapsoft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, python2Packages, gimp, mapsoft +{ stdenv, perlPackages, python2Packages, gimp, sources , bc, fig2dev, imagemagick, m4, netpbm, pkgconfig, scons , boost, curl, giflib, gtkmm2, jansson, libjpeg, libpng , libshell, libtiff, libusb1, libxml2, libyaml, libzip @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "mapsoft"; version = stdenv.lib.substring 0 7 src.rev; - src = mapsoft; + src = sources.mapsoft; patches = [ ./0001-fix-build.patch ]; @@ -65,8 +65,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = mapsoft.description; - homepage = mapsoft.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix @@ -1,10 +1,10 @@ { stdenv, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools, qtlocation -, qtsensors, doxygen, cups, wrapQtAppsHook, qtimageformats, mapper }: +, qtsensors, doxygen, cups, wrapQtAppsHook, qtimageformats, sources }: stdenv.mkDerivation rec { pname = "OpenOrienteering-Mapper"; version = stdenv.lib.substring 0 7 src.rev; - src = mapper; + src = sources.mapper; buildInputs = [ gdal @@ -50,8 +50,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = mapper.description; - homepage = mapper.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/redict/default.nix b/pkgs/applications/redict/default.nix @@ -1,10 +1,10 @@ { mkDerivation, lib, pkgconfig, qmake, qtbase, qtmultimedia, qtsvg, qttools -, qtx11extras, libX11, libXext, libXtst, redict }: +, qtx11extras, libX11, libXext, libXtst, sources }: mkDerivation rec { pname = "redict"; version = lib.substring 0 7 src.rev; - src = redict; + src = sources.redict; nativeBuildInputs = [ qmake qttools pkgconfig ]; buildInputs = @@ -24,8 +24,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = redict.description; - homepage = redict.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix @@ -1,9 +1,9 @@ -{ stdenv, gpxsee-maps }: +{ stdenv, sources }: stdenv.mkDerivation rec { pname = "gpxsee-maps"; version = stdenv.lib.substring 0 7 src.rev; - src = gpxsee-maps; + src = sources.gpxsee-maps; installPhase = '' install -dm755 "$out/share/gpxsee/maps" @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = gpxsee-maps.description; - homepage = gpxsee-maps.homepage; + inherit (src) description homepage; license = licenses.unlicense; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -0,0 +1,87 @@ +{ pkgs, sources }: + +let + inherit (pkgs) lib newScope recurseIntoAttrs perlPackages python3Packages libsForQt5; + +in +lib.makeScope newScope (self: with self; { + inherit sources; + + cfiles = callPackage ./tools/cfiles { }; + cheetah3 = python3Packages.callPackage ./development/python-modules/cheetah3 { + inherit sources; + }; + click = python3Packages.callPackage ./development/python-modules/click { }; + csvquote = callPackage ./tools/text/csvquote { }; + csvtools = callPackage ./tools/text/csvtools { }; + datamaps = callPackage ./tools/datamaps { }; + docker-reg-tool = callPackage ./tools/docker-reg-tool { }; + elevation = python3Packages.callPackage ./tools/elevation { + inherit sources click; + }; + embox = callPackage ./embox { }; + gmaptool = callPackage ./tools/gmaptool { }; + goldendict-dark-theme = + callPackage ./data/themes/goldendict-themes/dark-theme.nix { }; + gpx-layer = perlPackages.callPackage ./tools/gpx-layer { + inherit sources; + }; + gpxelevations = python3Packages.callPackage ./development/python-modules/gpxelevations { + inherit sources; + }; + gpxlab = libsForQt5.callPackage ./applications/gpxlab { + inherit sources; + }; + gpxsee = libsForQt5.callPackage ./applications/gpxsee { + inherit sources; + }; + gpxsee-maps = callPackage ./data/maps/gpxsee-maps { }; + gpxtools = callPackage ./tools/gpxtools { }; + gt-bash-client = callPackage ./tools/gt-bash-client { }; + lsdreader = python3Packages.callPackage ./tools/lsdreader { + inherit sources; + }; + gt4gd = python3Packages.callPackage ./tools/gt4gd { + inherit sources; + }; + hiblovgpsmap = callPackage ./data/maps/hiblovgpsmap { }; + ish = callPackage ./tools/networking/ish { }; + libshell = callPackage ./development/libraries/libshell { }; + mapsoft = callPackage ./applications/mapsoft { }; + mbtileserver = callPackage ./servers/mbtileserver { }; + mbutil = python3Packages.callPackage ./tools/mbutil { + inherit sources; + }; + mercantile = python3Packages.callPackage ./development/python-modules/mercantile { + inherit sources; + }; + openmtbmap_openvelomap_linux = callPackage ./tools/openmtbmap_openvelomap_linux { }; + openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper { + inherit sources; + }; + ptunnel = callPackage ./tools/networking/ptunnel { }; + pyephem = python3Packages.callPackage ./development/python-modules/pyephem { + inherit sources; + }; + pymbtiles = python3Packages.callPackage ./development/python-modules/pymbtiles { + inherit sources; + }; + qmapshack-onlinemaps = callPackage ./data/maps/qmapshack-onlinemaps { }; + redict = libsForQt5.callPackage ./applications/redict { + inherit sources; + }; + stardict-tools = + # Needed for nixos-19.09 + if pkgs ? libmysql + then callPackage ./tools/stardict-tools { + libmysqlclient = libmysql; + } + else callPackage ./tools/stardict-tools { }; + supermercado = python3Packages.callPackage ./tools/supermercado { + inherit sources mercantile; + }; + supload = callPackage ./tools/supload { }; + tpkutils = python3Packages.callPackage ./tools/tpkutils { + inherit sources mercantile pymbtiles; + }; +}) diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix @@ -1,9 +1,9 @@ -{ stdenv, dash, help2man, ncurses, scdoc, libshell }: +{ stdenv, dash, help2man, ncurses, scdoc, sources }: stdenv.mkDerivation rec { pname = "libshell"; version = stdenv.lib.substring 0 7 src.rev; - src = libshell; + src = sources.libshell; nativeBuildInputs = [ help2man scdoc ]; buildInputs = [ dash ncurses ]; @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - description = libshell.description; - homepage = libshell.homepage; + inherit (src) description homepage; license = licenses.gpl2; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix @@ -1,15 +1,14 @@ -{ lib, buildPythonPackage, cheetah3 }: +{ lib, buildPythonPackage, sources }: buildPythonPackage rec { pname = "cheetah3"; version = lib.substring 0 7 src.rev; - src = cheetah3; + src = sources.cheetah3; doCheck = false; meta = with lib; { - description = cheetah3.description; - homepage = cheetah3.homepage; + inherit (src) description homepage; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonApplication, python, requests, gpxpy, gpxelevations }: +{ lib, buildPythonApplication, python, requests, gpxpy, sources }: buildPythonApplication rec { pname = "gpxelevations"; version = lib.substring 0 7 src.rev; - src = gpxelevations; + src = sources.gpxelevations; propagatedBuildInputs = [ requests gpxpy ]; @@ -13,8 +13,7 @@ buildPythonApplication rec { #''; meta = with lib; { - description = gpxelevations.description; - homepage = gpxelevations.homepage; + inherit (src) description homepage; license = licenses.asl20; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, click, pytest, mercantile }: +{ lib, buildPythonPackage, click, pytest, sources }: buildPythonPackage rec { pname = "mercantile"; version = lib.substring 0 7 src.rev; - src = mercantile; + src = sources.mercantile; propagatedBuildInputs = [ click ]; @@ -11,8 +11,7 @@ buildPythonPackage rec { checkPhase = "pytest"; meta = with lib; { - description = mercantile.description; - homepage = mercantile.homepage; + inherit (src) description homepage; license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pyephem/default.nix b/pkgs/development/python-modules/pyephem/default.nix @@ -1,13 +1,12 @@ -{ lib, buildPythonPackage, pyephem }: +{ lib, buildPythonPackage, sources }: buildPythonPackage rec { pname = "pyephem"; version = lib.substring 0 7 src.rev; - src = pyephem; + src = sources.pyephem; meta = with lib; { - description = pyephem.description; - homepage = pyephem.homepage; + inherit (src) description homepage; license = licenses.lgpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix @@ -1,16 +1,15 @@ -{ lib, buildPythonPackage, pytest, pymbtiles }: +{ lib, buildPythonPackage, pytest, sources }: buildPythonPackage rec { pname = "pymbtiles"; version = lib.substring 0 7 src.rev; - src = pymbtiles; + src = sources.pymbtiles; checkInputs = [ pytest ]; checkPhase = "pytest"; meta = with lib; { - description = pymbtiles.description; - homepage = pymbtiles.homepage; + inherit (src) description homepage; license = licenses.isc; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, writers, embox +{ stdenv, fetchurl, writers, sources , cpio, gcc-arm-embedded, python, qemu, unzip, which }: stdenv.mkDerivation rec { pname = "embox"; version = stdenv.lib.substring 0 7 src.rev; - src = embox; + src = sources.embox; template = "arm/qemu"; cjson = fetchurl { @@ -52,8 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = embox.description; - homepage = embox.homepage; + inherit (src) description homepage; license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix @@ -1,15 +1,14 @@ -{ lib, buildGoModule, mbtileserver }: +{ lib, buildGoModule, sources }: buildGoModule rec { pname = "mbtileserver"; version = lib.substring 0 7 src.rev; - src = mbtileserver; + src = sources.mbtileserver; modSha256 = "147rpf3dd0md7pm7yfniy139kv3fb3kmyp82slpjrf8xdqgbrpk0"; meta = with lib; { - description = mbtileserver.description; - homepage = mbtileserver.homepage; + inherit (src) description homepage; license = licenses.isc; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/cfiles/default.nix b/pkgs/tools/cfiles/default.nix @@ -1,9 +1,9 @@ -{ stdenv, pkg-config, ncurses, w3m, ueberzug, cfiles }: +{ stdenv, pkg-config, ncurses, w3m, ueberzug, sources }: stdenv.mkDerivation rec { pname = "cfiles"; version = stdenv.lib.substring 0 7 src.rev; - src = cfiles; + src = sources.cfiles; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses w3m ueberzug ]; @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = cfiles.description; - homepage = cfiles.homepage; + inherit (src) description homepage; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/datamaps/default.nix b/pkgs/tools/datamaps/default.nix @@ -1,9 +1,9 @@ -{ stdenv, libpng, pkg-config, datamaps }: +{ stdenv, libpng, pkg-config, sources }: stdenv.mkDerivation rec { pname = "datamaps"; version = stdenv.lib.substring 0 7 src.rev; - src = datamaps; + src = sources.datamaps; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; @@ -18,10 +18,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = datamaps.description; - homepage = datamaps.homepage; + inherit (src) description homepage; license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/docker-reg-tool/default.nix b/pkgs/tools/docker-reg-tool/default.nix @@ -1,17 +1,16 @@ -{ stdenv, docker-reg-tool }: +{ stdenv, sources }: stdenv.mkDerivation rec { pname = "docker-reg-tool"; version = stdenv.lib.substring 0 7 src.rev; - src = docker-reg-tool; + src = sources.docker-reg-tool; installPhase = '' install -Dm755 docker_reg_tool "$out/bin/docker_reg_tool" ''; meta = with stdenv.lib; { - description = docker-reg-tool.description; - homepage = docker-reg-tool.homepage; + inherit (src) description homepage; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/tools/elevation/default.nix b/pkgs/tools/elevation/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonApplication, fasteners, future, appdirs, click , gnumake, curl, unzip, gzip, gdal -, pytest, pytest-mock, elevation }: +, pytest, pytest-mock, sources }: buildPythonApplication rec { pname = "elevation"; version = lib.substring 0 7 src.rev; - src = elevation; + src = sources.elevation; propagatedBuildInputs = [ fasteners future appdirs click ]; @@ -28,8 +28,7 @@ buildPythonApplication rec { checkPhase = "pytest"; meta = with lib; { - description = elevation.description; - homepage = elevation.homepage; + inherit (src) description homepage; license = licenses.asl20; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/gpx-layer/default.nix b/pkgs/tools/gpx-layer/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPerlPackage, XMLParser, gpx-layer }: +{ lib, buildPerlPackage, XMLParser, sources }: buildPerlPackage rec { pname = "gpx-layer"; version = lib.substring 0 7 src.rev; - src = gpx-layer; + src = sources.gpx-layer; outputs = [ "out" ]; @@ -19,8 +19,7 @@ buildPerlPackage rec { ''; meta = with lib; { - description = gpx-layer.description; - homepage = gpx-layer.homepage; + inherit (src) description homepage; license = licenses.free; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/gpxtools/default.nix b/pkgs/tools/gpxtools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, cmake, expat, gpxtools }: +{ stdenv, cmake, expat, sources }: stdenv.mkDerivation rec { pname = "gpxtools"; version = stdenv.lib.substring 0 7 src.rev; - src = gpxtools; + src = sources.gpxtools; nativeBuildInputs = [ cmake ]; buildInputs = [ expat ]; @@ -13,10 +13,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = gpxtools.description; - homepage = gpxtools.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/gt-bash-client/default.nix b/pkgs/tools/gt-bash-client/default.nix @@ -1,17 +1,16 @@ -{ stdenv, gt-bash-client }: +{ stdenv, sources }: stdenv.mkDerivation rec { pname = "gt-bash-client"; version = stdenv.lib.substring 0 7 src.rev; - src = gt-bash-client; + src = sources.gt-bash-client; installPhase = '' install -Dm755 translate.sh "$out/bin/gt-bash-client" ''; meta = with stdenv.lib; { - description = gt-bash-client.description; - homepage = gt-bash-client.homepage; + inherit (src) description homepage; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/tools/gt4gd/default.nix b/pkgs/tools/gt4gd/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonApplication, requests, google-translate-for-goldendict }: +{ lib, buildPythonApplication, requests, sources }: buildPythonApplication rec { pname = "gt4gd"; version = lib.substring 0 7 src.rev; - src = google-translate-for-goldendict; + src = sources.google-translate-for-goldendict; propagatedBuildInputs = [ requests ]; @@ -17,8 +17,7 @@ buildPythonApplication rec { ''; meta = with lib; { - description = google-translate-for-goldendict.description; - homepage = google-translate-for-goldendict.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/lsdreader/default.nix b/pkgs/tools/lsdreader/default.nix @@ -1,15 +1,14 @@ -{ lib, buildPythonApplication, lsdreader }: +{ lib, buildPythonApplication, sources }: buildPythonApplication rec { pname = "lsdreader"; version = lib.substring 0 7 src.rev; - src = lsdreader; + src = sources.lsdreader; doCheck = false; meta = with lib; { - description = lsdreader.description; - homepage = lsdreader.homepage; + inherit (src) description homepage; license = licenses.free; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/mbutil/default.nix b/pkgs/tools/mbutil/default.nix @@ -1,16 +1,15 @@ -{ lib, buildPythonApplication, nose, mbutil }: +{ lib, buildPythonApplication, nose, sources }: buildPythonApplication rec { pname = "mbutil"; version = lib.substring 0 7 src.rev; - src = mbutil; + src = sources.mbutil; checkInputs = [ nose ]; checkPhase = "nosetests"; meta = with lib; { - description = mbutil.description; - homepage = mbutil.homepage; + inherit (src) description homepage; license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/openmtbmap_openvelomap_linux/default.nix b/pkgs/tools/openmtbmap_openvelomap_linux/default.nix @@ -1,9 +1,9 @@ -{ stdenv, gmaptool, mkgmap, p7zip, zsh, openmtbmap_openvelomap_linux }: +{ stdenv, gmaptool, mkgmap, p7zip, zsh, sources }: stdenv.mkDerivation rec { pname = "openmtbmap_openvelomap_linux"; version = stdenv.lib.substring 0 7 src.rev; - src = openmtbmap_openvelomap_linux; + src = sources.openmtbmap_openvelomap_linux; patches = [ ./0001-fix-path.patch ]; @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = openmtbmap_openvelomap_linux.description; - homepage = openmtbmap_openvelomap_linux.homepage; + inherit (src) description homepage; license = licenses.free; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/tools/stardict-tools/default.nix b/pkgs/tools/stardict-tools/default.nix @@ -1,10 +1,10 @@ { stdenv, autoconf, automake, libtool, pkg-config, - gtk3, libmysqlclient, libxml2, pcre, stardict-3 }: + gtk3, libmysqlclient, libxml2, pcre, sources }: stdenv.mkDerivation rec { pname = "stardict-tools"; version = stdenv.lib.substring 0 7 src.rev; - src = stardict-3; + src = sources.stardict-3; nativeBuildInputs = [ autoconf @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = stardict-3.description; - homepage = stardict-3.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/tools/supermercado/default.nix b/pkgs/tools/supermercado/default.nix @@ -1,10 +1,10 @@ { lib, fetchpatch, buildPythonApplication -, click-plugins, rasterio, mercantile, numpy, pytest, supermercado }: +, click-plugins, rasterio, mercantile, numpy, pytest, sources }: buildPythonApplication rec { pname = "supermercado"; version = lib.substring 0 7 src.rev; - src = supermercado; + src = sources.supermercado; patches = [ # Replace np subtract operator https://github.com/mapbox/supermercado/pull/27 @@ -20,8 +20,7 @@ buildPythonApplication rec { checkPhase = "pytest"; meta = with lib; { - description = supermercado.description; - homepage = supermercado.homepage; + inherit (src) description homepage; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/supload/default.nix b/pkgs/tools/supload/default.nix @@ -1,9 +1,9 @@ -{ stdenv, curl, file, coreutils, supload }: +{ stdenv, curl, file, coreutils, sources }: stdenv.mkDerivation rec { pname = "supload"; version = stdenv.lib.substring 0 7 src.rev; - src = supload; + src = sources.supload; buildInputs = [ curl file ]; @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = supload.description; - homepage = supload.homepage; + inherit (src) description homepage; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/tools/text/csvquote/default.nix @@ -1,9 +1,9 @@ -{ stdenv, csvquote }: +{ stdenv, sources }: stdenv.mkDerivation rec { pname = "csvquote"; version = stdenv.lib.substring 0 7 src.rev; - src = csvquote; + src = sources.csvquote; makeFlags = [ "BINDIR=$(out)/bin" ]; @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = csvquote.description; - homepage = csvquote.homepage; + inherit (src) description homepage; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/text/csvtools/default.nix b/pkgs/tools/text/csvtools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, pcre, openssl, csvtools }: +{ stdenv, pcre, openssl, sources }: stdenv.mkDerivation rec { pname = "csvtools"; version = stdenv.lib.substring 0 7 src.rev; - src = csvtools; + src = sources.csvtools; buildInputs = [ pcre ]; @@ -22,10 +22,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = csvtools.description; - homepage = csvtools.homepage; + inherit (src) description homepage; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/tpkutils/default.nix b/pkgs/tools/tpkutils/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonApplication, mercantile, pymbtiles, pytest, setuptools, six, tpkutils }: +{ lib, buildPythonApplication, mercantile, pymbtiles, pytest, setuptools, six, sources }: buildPythonApplication rec { pname = "tpkutils"; version = lib.substring 0 7 src.rev; - src = tpkutils; + src = sources.tpkutils; propagatedBuildInputs = [ mercantile pymbtiles setuptools six ]; @@ -11,8 +11,7 @@ buildPythonApplication rec { checkPhase = "pytest"; meta = with lib; { - description = tpkutils.description; - homepage = tpkutils.homepage; + inherit (src) description homepage; license = licenses.isc; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix;