diff --git a/ci.nix b/ci.nix

index e35aed05edcc34699a9bf4d089857adae09b5800..2911f4481a2866202e3d8be8c32f643ba59e9222 100644

--- a/ci.nix

+++ b/ci.nix

@@ -9,12 +9,10 @@ #

then your CI will be able to build and cache only those packages for

which this is possible.

-{ pkgs ? import {} }:

+{ pkgs ? import { } }:

with builtins;

let

isReserved = n: n == "lib" || n == "overlays" || n == "modules";

isDerivation = p: isAttrs p && p ? type && p.type == "derivation";

isBuildable = p: !(p.meta.broken or false) && !(p.meta.skip.ci or false) && p.meta.license.free or true;

@@ -29,24 +27,29 @@ flattenPkgs = s:

 let

   f = p:

     if shouldRecurseForDerivations p then flattenPkgs p

•    else if isDerivation p then [p]
  

•    else [];
  

•    else if isDerivation p then [ p ]
  

•    else [ ];
  

 in

•  concatMap f (attrValues s);
  

• concatMap f (attrValues s);

outputsOf = p: map (o: p.${o}) p.outputs;

nurAttrs = import ./default.nix { inherit pkgs; };

nurPkgs =

• flattenPkgs

• (listToAttrs

• (map (n: nameValuePair n nurAttrs.${n})

• (filter (n: !isReserved n)

• (attrNames nurAttrs))));

• flattenPkgs (

•  listToAttrs (
  

•    map
  

•      (n: nameValuePair n nurAttrs.${n})
  

•      (
  

•        filter
  

•          (n: !isReserved n)
  

•          (attrNames nurAttrs)
  

•      )
  

•  )
  

• );

in

rec {

buildPkgs = filter isBuildable nurPkgs;

cachePkgs = filter isCacheable buildPkgs;

diff --git a/default.nix b/default.nix

index 161f60604ee8b34f5be0c741d355c157eb6c2e63..2f7382e929c5dd55a4a016730e4b35773e49118c 100644

--- a/default.nix

+++ b/default.nix

@@ -6,17 +6,21 @@ # Having pkgs default to is fine though, and it lets you use short

commands such as:

nix-build -A mypackage

-{ pkgs ? import args

+{ pkgs ? import args

, sources ? import ./nix/sources.nix

-, system ? builtins.currentSystem, ... }@args:

+, system ? builtins.currentSystem

+, ...

+}@args:

with (import <nixpkgs/lib>).attrsets;

{

The lib, modules, and overlay names are special

• lib = import ./lib { inherit pkgs; }; # functions

• modules = import ./modules; # NixOS modules

• overlays = import ./overlays; # nixpkgs overlays

• 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/lib/default.nix b/lib/default.nix

index 53d6abe26e7c7a60e5e24d137a795b305197cbdc..a7fab1d2be536ab904a73a62194297419e60fdb4 100644

--- a/lib/default.nix

+++ b/lib/default.nix

@@ -5,4 +5,3 @@ # Add your library functions here

hexint = x: hexvals.${toLower x};

}

diff --git a/modules/default.nix b/modules/default.nix

index 6e3824a489dc59218b7db4b0bff8a6a46e7429da..f86ba36707f5ae13ca137edc89c3a298520a1476 100644

--- a/modules/default.nix

+++ b/modules/default.nix

@@ -11,4 +11,3 @@ slack-term = ./home-manager/programs/slack-term.nix;

 };

};

}

diff --git a/modules/home-manager/programs/aerc.nix b/modules/home-manager/programs/aerc.nix

index c6971b4041fe0022884fe656fe2c8f7259e318e8..93048d78dab8972653501dc59278b72f7a6c782c 100644

--- a/modules/home-manager/programs/aerc.nix

+++ b/modules/home-manager/programs/aerc.nix

@@ -4,20 +4,22 @@ with lib;

let

cfg = config.programs.aerc;

• accountConfFile = with cfg; generators.toINI {} {

• Personal = {

•  source = "imaps://${gUsername}:${gPassword}@imap.gmail.com:993";
  

•  outgoing = "smtp+plain://${gUsername}:${gPassword}@smtp.gmail.com:587";
  

•  default = "INBOX";
  

•  smtp-starttls = "yes";
  

•  from =
  

•    if fullName != "" then
  

•      "${fullName} <${gUsername}@gmail.com>"
  

•    else
  

•      "${gUsername}@gmail.com";
  

•  copy-to = "Sent";
  

• accountConfFile = with cfg;

• generators.toINI

•  { } {
  

•  Personal = {
  

•    source = "imaps://${gUsername}:${gPassword}@imap.gmail.com:993";
  

•    outgoing = "smtp+plain://${gUsername}:${gPassword}@smtp.gmail.com:587";
  

•    default = "INBOX";
  

•    smtp-starttls = "yes";
  

•    from =
  

•      if fullName != "" then
  

•        "${fullName} <${gUsername}@gmail.com>"
  

•      else
  

•        "${gUsername}@gmail.com";
  

•    copy-to = "Sent";
  

•  };
  

 };

• };

activationScript = with config.xdg; ''

 $DRY_RUN_CMD install -Dm644 ${pkgs.aerc}/share/aerc/aerc.conf -t ${configHome}/aerc

diff --git a/modules/home-manager/programs/goldendict.nix b/modules/home-manager/programs/goldendict.nix

index e01c78e1eff8dd460d75bb3696fe5d8530a968a0..91b1210e27e804cd3f51ee76c5a3c0b72942fde3 100644

--- a/modules/home-manager/programs/goldendict.nix

+++ b/modules/home-manager/programs/goldendict.nix

@@ -21,7 +21,6 @@

config = mkIf cfg.enable {

 home.packages = [

   cfg.package

•  goldendict-dark-theme
  

 ];

};

}

diff --git a/modules/home-manager/programs/gpxsee.nix b/modules/home-manager/programs/gpxsee.nix

index 6f9fa7d2bc3709e039b5755f4fb6d05e576d33ae..07ef6e168a9980a370cc70f4ff3b9983fcc0070f 100644

--- a/modules/home-manager/programs/gpxsee.nix

+++ b/modules/home-manager/programs/gpxsee.nix

@@ -40,7 +40,7 @@ type = types.nullOr types.package;

 };

 poiPackages = mkOption {

•  default = [];
  

•  default = [ ];
  

   description = "GPXSee POI packages to install.";

   type = types.listOf types.package;

 };

@@ -52,7 +52,7 @@ type = types.nullOr types.package;

 };

 maps = mkOption {

•  default = [];
  

•  default = [ ];
  

   description = "";

   type = types.listOf types.str;

 };

@@ -83,7 +83,8 @@ mapXml = map: {

         name = "${mapDir}/${map}";

         value.source = "${cfg.mapsPackage}/share/gpxsee/maps/${map}";

       };

•    in mkIf (cfg.mapsPackage != null && cfg.maps != []) {
  

•    in
  

•    mkIf (cfg.mapsPackage != null && cfg.maps != [ ]) {
  

       home.file = listToAttrs (map mapXml cfg.maps);

     }

   )

@@ -94,7 +95,8 @@ mapPoi = poi: {

         name = "${poiDir}/${poi.name}";

         value.source = "${poi}/share/gpxsee/POI";

       };

•    in mkIf (cfg.poiPackages != []) {
  

•    in
  

•    mkIf (cfg.poiPackages != [ ]) {
  

       home.file = listToAttrs (map mapPoi cfg.poiPackages);

     }

   )

diff --git a/nix/sources.json b/nix/sources.json

index 5b495d5a906b0acc267b7ed65669d00e09ad6d10..592bb3989c8fb7c2f114ba373395796b4d1fa359 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -166,19 +166,6 @@ "type": "tarball",

     "url": "https://github.com/wuyongzheng/gimgtools/archive/92d015749e105c5fb8eb704ae503a5c7e51af2bd.tar.gz",

     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

 },

• "google-translate-for-goldendict": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "description": "Add Google translate to GoldenDict",
  

•    "homepage": "https://github.com/xinebf/google-translate-for-goldendict",
  

•    "owner": "xinebf",
  

•    "repo": "google-translate-for-goldendict",
  

•    "rev": "31a1628136302f6fbedf9468f1dae3521a174731",
  

•    "sha256": "1w8h2wibwgi7z03fqj0pkh5p0s9czi0ymj2v8ra5xvb2hrdw2g3j",
  

•    "type": "tarball",
  

•    "url": "https://github.com/xinebf/google-translate-for-goldendict/archive/31a1628136302f6fbedf9468f1dae3521a174731.tar.gz",
  

•    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
  

• },

 "gpx-layer": {

     "branch": "master",

     "builtin": false,

@@ -268,6 +255,19 @@ "rev": "215c1ce8b5a99c117e152300e32d0899cd63755c",

     "sha256": "0j2xz9va6zhacjasck55yx1sc996iknm17d6x93lrx05kfwp0nvm",

     "type": "tarball",

     "url": "https://github.com/OPHoperHPO/GT-bash-client/archive/215c1ce8b5a99c117e152300e32d0899cd63755c.tar.gz",

•    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
  

• },

• "gt4gd": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "description": "Add Google translate to GoldenDict",
  

•    "homepage": "https://github.com/xinebf/google-translate-for-goldendict",
  

•    "owner": "xinebf",
  

•    "repo": "google-translate-for-goldendict",
  

•    "rev": "31a1628136302f6fbedf9468f1dae3521a174731",
  

•    "sha256": "1w8h2wibwgi7z03fqj0pkh5p0s9czi0ymj2v8ra5xvb2hrdw2g3j",
  

•    "type": "tarball",
  

•    "url": "https://github.com/xinebf/google-translate-for-goldendict/archive/31a1628136302f6fbedf9468f1dae3521a174731.tar.gz",
  

     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

 },

 "hfst": {

@@ -486,7 +486,7 @@ "type": "tarball",

     "url": "https://github.com/odict/odict/archive/0a0a6e6a592ccca3f304fcb4bd4ab7c25e181185.tar.gz",

     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

 },

• "openmtbmap_openvelomap_linux": {

• "openmtbmap": {

     "branch": "master",

     "builtin": false,

     "description": "Linux script to extract and compile garmin *.img map files from openmtbmap.org or openvelomap.org downloads",

diff --git a/nix/sources.nix b/nix/sources.nix

index 8a725cb4e7f02a9618e915f2b23245df6e5e1e13..03676ae9a376b9b9b5d1774036fc78351b4006db 100644

--- a/nix/sources.nix

+++ b/nix/sources.nix

@@ -1,7 +1,5 @@

This file has been generated by Niv.

let

The fetchers. fetch_ fetches specs of type .

@@ -51,20 +49,20 @@ # The set of packages used when specs are fetched using non-builtins.

mkPkgs = sources:

 let

   sourcesNixpkgs =

•    import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
  

•    import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { };
  

   hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;

   hasThisAsNixpkgsPath = <nixpkgs> == ./.;

 in

•  if builtins.hasAttr "nixpkgs" sources
  

•  then sourcesNixpkgs
  

•  else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
  

•    import <nixpkgs> {}
  

•  else
  

•    abort
  

•      ''
  

•        Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
  

•        add a package called "nixpkgs" to your sources.json.
  

•      '';
  

• if builtins.hasAttr "nixpkgs" sources

• then sourcesNixpkgs

• else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then

•  import <nixpkgs> { }
  

• else

•  abort
  

•    ''
  

•      Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
  

•      add a package called "nixpkgs" to your sources.json.
  

•    '';
  

The actual fetching function.

fetch = pkgs: name: spec:

@@ -92,31 +90,33 @@ builtins_fetchTarball = { url, sha256 }@attrs:

 let

   inherit (builtins) lessThan nixVersion fetchTarball;

 in

•  if lessThan nixVersion "1.12" then
  

•    fetchTarball { inherit url; }
  

•  else
  

•    fetchTarball attrs;
  

• if lessThan nixVersion "1.12" then

•  fetchTarball { inherit url; }
  

• else

•  fetchTarball attrs;
  

fetchurl version that is compatible between all the versions of Nix

builtins_fetchurl = { url, sha256 }@attrs:

 let

   inherit (builtins) lessThan nixVersion fetchurl;

 in

•  if lessThan nixVersion "1.12" then
  

•    fetchurl { inherit url; }
  

•  else
  

•    fetchurl attrs;
  

• if lessThan nixVersion "1.12" then

•  fetchurl { inherit url; }
  

• else

•  fetchurl attrs;
  

Create the final "sources" from the config

mkSources = config:

• mapAttrs (

•  name: spec:
  

•    if builtins.hasAttr "outPath" spec
  

•    then abort
  

•      "The values in sources.json should not have an 'outPath' attribute"
  

•    else
  

•      spec // { outPath = fetch config.pkgs name spec; }
  

• ) config.sources;

• mapAttrs

•  (
  

•    name: spec:
  

•      if builtins.hasAttr "outPath" spec
  

•      then abort
  

•        "The values in sources.json should not have an 'outPath' attribute"
  

•      else
  

•        spec // { outPath = fetch config.pkgs name spec; }
  

•  )
  

•  config.sources;
  

The "config" used by the fetchers

mkConfig =

@@ -131,4 +131,4 @@ # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers

   inherit pkgs;

 };

in

-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

+mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }

diff --git a/overlay.nix b/overlay.nix

index 499a3a9a62b7342a98b7a2108cbe5c5abc85e3b0..9a7b64f660f71044bdfc74eb51f99c596edda6af 100644

--- a/overlay.nix

+++ b/overlay.nix

@@ -3,13 +3,15 @@ # case where you don't want to add the whole NUR namespace to your

configuration.

self: super:

let

isReserved = n: n == "lib" || n == "overlays" || n == "modules";

nameValuePair = n: v: { name = n; value = v; };

nurAttrs = import ./default.nix { pkgs = super; };

in

• builtins.listToAttrs

• (map (n: nameValuePair n nurAttrs.${n})

• (builtins.filter (n: !isReserved n)

• (builtins.attrNames nurAttrs)))

+builtins.listToAttrs (map

• (n: nameValuePair n nurAttrs.${n})

• (builtins.filter

• (n: !isReserved n)

• (builtins.attrNames nurAttrs)

• )

+)

diff --git a/overlays/default.nix b/overlays/default.nix

index 642fefaf88cb74d6275a9b9f7d9355f06f383f4e..0c2d870dddf36697ed50cda0acee515a8e9b994f 100644

--- a/overlays/default.nix

+++ b/overlays/default.nix

@@ -3,4 +3,3 @@ # Add your overlays here

my-overlay = import ./my-overlay;

}

diff --git a/pkgs/applications/gpxlab/default.nix b/pkgs/applications/gpxlab/default.nix

index cae3a707847388f9a04e72f68263246ff5096d76..598f3c0c7a9011c69040c27b6b40ab9dcc7d0b74 100644

--- a/pkgs/applications/gpxlab/default.nix

+++ b/pkgs/applications/gpxlab/default.nix

@@ -6,26 +6,23 @@ , qtbase

, qttools

, qttranslations

, sources

+, substituteAll

, withI18n ? true

}:

-mkDerivation rec {

+mkDerivation {

pname = "gpxlab";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.gpxlab.rev;

src = sources.gpxlab;

• patches = [

• patches = (substituteAll {

 # See https://github.com/NixOS/nixpkgs/issues/86054

• ./fix-qttranslations-path.diff

• ];

• src = ./fix-qttranslations-path.patch;

• inherit qttranslations;

• });

nativeBuildInputs = [ qmake ] ++ (lib.optional withI18n qttools);

buildInputs = [ qtbase ];

• postPatch = ''

• substituteInPlace GPXLab/main.cpp \

•  --subst-var-by qttranslations ${qttranslations}
  

• '';

preConfigure = lib.optionalString withI18n ''

 lrelease GPXLab/locale/*.ts

diff --git a/pkgs/applications/gpxlab/fix-qttranslations-path.diff b/pkgs/applications/gpxlab/fix-qttranslations-path.patch

rename from pkgs/applications/gpxlab/fix-qttranslations-path.diff

rename to pkgs/applications/gpxlab/fix-qttranslations-path.patch

diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix

index c601d6ee57c1b2ce18bbf570578874360ab7da74..075598ca81dd6d8b590e1d321b9335d445170011 100644

--- a/pkgs/applications/gpxsee/default.nix

+++ b/pkgs/applications/gpxsee/default.nix

@@ -6,26 +6,23 @@ , qtbase

, qttools

, qttranslations

, sources

+, substituteAll

, withI18n ? true

}:

-mkDerivation rec {

+mkDerivation {

pname = "gpxsee";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.gpxsee.rev;

src = sources.gpxsee;

• patches = [

• patches = (substituteAll {

 # See https://github.com/NixOS/nixpkgs/issues/86054

• ./fix-qttranslations-path.diff

• ];

• src = ./fix-qttranslations-path.patch;

• inherit qttranslations;

• });

nativeBuildInputs = [ qmake ] ++ (lib.optional withI18n qttools);

buildInputs = [ qtbase ];

• postPatch = ''

• substituteInPlace src/GUI/app.cpp \

•  --subst-var-by qttranslations ${qttranslations}
  

• '';

preConfigure = lib.optionalString withI18n ''

 lrelease gpxsee.pro

diff --git a/pkgs/applications/gpxsee/fix-qttranslations-path.diff b/pkgs/applications/gpxsee/fix-qttranslations-path.patch

rename from pkgs/applications/gpxsee/fix-qttranslations-path.diff

rename to pkgs/applications/gpxsee/fix-qttranslations-path.patch

diff --git a/pkgs/applications/librewolf/default.nix b/pkgs/applications/librewolf/default.nix

index 10077826ca5c06ba0b981f4a5ea7694d82728d77..9d96224597dfa506587879cf4e4c38e2c9ba4e30 100644

--- a/pkgs/applications/librewolf/default.nix

+++ b/pkgs/applications/librewolf/default.nix

@@ -1,19 +1,21 @@

{ stdenv, fetchgit, fetchurl }:

+let

• version = "78.0";

-stdenv.mkDerivation rec {

• firefox = fetchurl {

• url = "https://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/mac/en-US/Firefox%20${version}.dmg";

• sha256 = "17pl2hm04mvcn0r7s3am2y2xxj8aks2x6gsy1i6k3k0lk09sx839";

• name = "Firefox.dmg";

• };

+in

+stdenv.mkDerivation {

pname = "librewolf";

• version = "78.0";

• inherit version;

src = fetchgit {

 url = "https://gitlab.com/librewolf-community/browser/macos";

 rev = "3fcf44663ff1fb4e180fb3cdb26620abe7284b53";

 sha256 = "0p517ixkgp3sl7b26mdjr9mwv6155xx8ah85fgpwqnpryr64xs3d";

• };

• firefox = fetchurl {

• url = "https://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/mac/en-US/Firefox%20${version}.dmg";

• sha256 = "17pl2hm04mvcn0r7s3am2y2xxj8aks2x6gsy1i6k3k0lk09sx839";

• name = "Firefox.dmg";

};

postPatch = ''

diff --git a/pkgs/applications/macpass/default.nix b/pkgs/applications/macpass/default.nix

index ea7f0cdbf2784a393aba9cf5f8f8f7fe8d77c7a0..d7bd71f5a1fe8bd557aa2c9db184c8f4cc353408 100644

--- a/pkgs/applications/macpass/default.nix

+++ b/pkgs/applications/macpass/default.nix

@@ -1,12 +1,17 @@

-{ stdenv, fetchurl, unzip }:

-stdenv.mkDerivation rec {

+{ stdenv, fetchfromgh, unzip }:

+let

• version = "0.7.12";

• sha256 = "1gikixbrz1pvyjspp62msdmhjdy1rfkx8jhy7rajjr8bzm8pzpmc";

+in

+stdenv.mkDerivation {

pname = "MacPass";

• version = "0.7.12";

• inherit version;

• src = fetchurl {

• url = "https://github.com/MacPass/MacPass/releases/download/${version}/${pname}-${version}.zip";

• sha256 = "1gikixbrz1pvyjspp62msdmhjdy1rfkx8jhy7rajjr8bzm8pzpmc";

• src = fetchfromgh {

• owner = "MacPass";

• repo = "MacPass";

• name = "MacPass-${version}.zip";

• inherit version sha256;

};

unpackPhase = "${unzip}/bin/unzip $src";

diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix

index b4c4a19fd0d22a42119af698524ff18bfebaed3d..fe84b4c4055d068024b1dd24a7d2a9cf85658cc4 100644

--- a/pkgs/applications/mapsoft/2.nix

+++ b/pkgs/applications/mapsoft/2.nix

@@ -20,13 +20,13 @@ , shapelib

, unzip

}:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "mapsoft2";

• version = "2020-06-22";

• version = "unstable-2020-06-22";

src = fetchFromGitHub {

 owner = "slazav";

• repo = pname;

• repo = "mapsoft2";

 rev = "3966f2bcb48fdb3a6b17af82dcd89276ee38f6d9";

 sha256 = "0fk41wvpv7z99j0s7lh4aja8gn1wfm8qnmdwjh4592iz0009pjh3";

 fetchSubmodules = true;

diff --git a/pkgs/applications/mapsoft/default.nix b/pkgs/applications/mapsoft/default.nix

index 3d8cce8c0d6cd4154b221fc413cf7b705c6dad12..dfc84b39dac094d4c1a5026c6f34d40164e8106b 100644

--- a/pkgs/applications/mapsoft/default.nix

+++ b/pkgs/applications/mapsoft/default.nix

@@ -29,9 +29,9 @@ , zlib

, getopt

}:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "mapsoft";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.mapsoft.rev;

src = sources.mapsoft;

patches = [ ./0001-fix-build.patch ];

diff --git a/pkgs/applications/nnn-plugins/default.nix b/pkgs/applications/nnn-plugins/default.nix

index 7e9d14291424a0f272fa05ea632b79a113472980..9fdfe750096b86be3cd7b3ec1d5401a049ccd658 100644

--- a/pkgs/applications/nnn-plugins/default.nix

+++ b/pkgs/applications/nnn-plugins/default.nix

@@ -1,8 +1,8 @@

{ stdenv, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "nnn-plugins";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.nnn.rev;

src = sources.nnn;

phases = [ "installPhase" "fixupPhase" ];

diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix

index c527ab1556bb1e8b0e06e32c3ad80e57b948b265..ec92a454239624a6f3a99eb2734e2e953ea3072d 100644

--- a/pkgs/applications/openorienteering-mapper/default.nix

+++ b/pkgs/applications/openorienteering-mapper/default.nix

@@ -16,17 +16,19 @@ , cups

, wrapQtAppsHook

, qtimageformats

, sources

+, substituteAll

}:

-mkDerivation rec {

+mkDerivation {

pname = "OpenOrienteering-Mapper";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.mapper.rev;

src = sources.mapper;

• patches = [

• patches = (substituteAll {

 # See https://github.com/NixOS/nixpkgs/issues/86054

• ./fix-qttranslations-path.diff

• ];

• src = ./fix-qttranslations-path.patch;

• inherit qttranslations;

• });

buildInputs = [

 gdal

@@ -40,11 +42,6 @@ cups

];

nativeBuildInputs = [ cmake doxygen ninja qttools ];

• postPatch = ''

• substituteInPlace src/util/translation_util.cpp \

•  --subst-var-by qttranslations ${qttranslations}
  

• '';

cmakeFlags = [

 # Building the manual and bundling licenses fails

diff --git a/pkgs/applications/openorienteering-mapper/fix-qttranslations-path.diff b/pkgs/applications/openorienteering-mapper/fix-qttranslations-path.patch

rename from pkgs/applications/openorienteering-mapper/fix-qttranslations-path.diff

rename to pkgs/applications/openorienteering-mapper/fix-qttranslations-path.patch

diff --git a/pkgs/applications/redict/default.nix b/pkgs/applications/redict/default.nix

index df8ae6550fee6222ff76004a321904ddba766aa8..ad6cf2053c175d8d7c212e478905da4b628cc4df 100644

--- a/pkgs/applications/redict/default.nix

+++ b/pkgs/applications/redict/default.nix

@@ -15,9 +15,9 @@ , sources

, withI18n ? true

}:

-mkDerivation rec {

+mkDerivation {

pname = "redict";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.redict.rev;

src = sources.redict;

nativeBuildInputs = [ qmake pkgconfig ] ++ (lib.optional withI18n qttools);

diff --git a/pkgs/applications/wireguard-statusbar/default.nix b/pkgs/applications/wireguard-statusbar/default.nix

index a68060d1bfe3fae6ef67d7db04b7b4c4ee622af3..841c804a31f34a8679e74c7cfe946c80f7fcae67 100644

--- a/pkgs/applications/wireguard-statusbar/default.nix

+++ b/pkgs/applications/wireguard-statusbar/default.nix

@@ -1,12 +1,17 @@

-{ stdenv, fetchurl, undmg }:

-stdenv.mkDerivation rec {

+{ stdenv, fetchfromgh, undmg }:

+let

• version = "1.24";

+in

+stdenv.mkDerivation {

pname = "wireguard-statusbar";

• version = "1.24";

• inherit version;

• src = fetchurl {

• url = "https://github.com/aequitas/macos-menubar-wireguard/releases/download/${version}/WireGuardStatusbar-${version}-117.dmg";

• src = fetchfromgh {

• owner = "aequitas";

• repo = "macos-menubar-wireguard";

• name = "WireGuardStatusbar-${version}-117.dmg";

 sha256 = "0zwd4wfxilify660vrcnniyxd0mr1df78n46xbij5mx2nyca2pbj";

• inherit version;

};

preferLocalBuild = true;

@@ -14,8 +19,8 @@

buildInputs = [ undmg ];

installPhase = ''

• mkdir -p "$out/Applications/WireGuardStatusbar.app"

• cp -R . "$out/Applications/WireGuardStatusbar.app"

• mkdir -p $out/Applications/WireGuardStatusbar.app

• cp -R . $out/Applications/WireGuardStatusbar.app

'';

meta = with stdenv.lib; {

diff --git a/pkgs/build-support/fetchfromgh/default.nix b/pkgs/build-support/fetchfromgh/default.nix

new file mode 100644

index 0000000000000000000000000000000000000000..ebf0f0be17f34a979967a115361f1aac7fdd54d8

--- /dev/null

+++ b/pkgs/build-support/fetchfromgh/default.nix

@@ -0,0 +1,11 @@

+{ fetchurl }:

+{ owner, repo, version, name, ... } @ args:

+(

• fetchurl (

• {

•  url = "https://github.com/${owner}/${repo}/releases/download/${version}/${name}";
  

• } // removeAttrs args [ "owner" "repo" "version" "name" ]

• )

+)

diff --git a/pkgs/build-support/fetchwebarchive/default.nix b/pkgs/build-support/fetchwebarchive/default.nix

new file mode 100644

index 0000000000000000000000000000000000000000..4b5fbddf4239c4c73b3f31d630e774e3db7c0e7f

--- /dev/null

+++ b/pkgs/build-support/fetchwebarchive/default.nix

@@ -0,0 +1,11 @@

+{ fetchurl }:

+{ timestamp, url, ... } @ args:

+(

• fetchurl (

• {

•  url = "https://web.archive.org/web/${timestamp}/${url}";
  

• } // removeAttrs args [ "timestamp" "url" ]

• )

+)

diff --git a/pkgs/data/dicts/huzheng/base.nix b/pkgs/data/dicts/huzheng/base.nix

index a7539dd306cf3ed70ddd024d4a5650919d736bc3..188db9baf9f45f1f361038449ce926ed5c0ee197 100644

--- a/pkgs/data/dicts/huzheng/base.nix

+++ b/pkgs/data/dicts/huzheng/base.nix

@@ -1,6 +1,6 @@

{ stdenv, fetchurl, pname, version, filename, sha256, description }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

inherit pname version;

src = fetchurl {

@@ -9,8 +9,8 @@ inherit sha256;

};

installPhase = ''

• install -dm755 "$out/share/goldendict/dictionaries/${pname}"

• cp -a . "$out/share/goldendict/dictionaries/${pname}"

• install -dm755 $out/share/goldendict/dictionaries/${pname}

• cp -a . $out/share/goldendict/dictionaries/${pname}

'';

preferLocalBuild = true;

diff --git a/pkgs/data/dicts/huzheng/default.nix b/pkgs/data/dicts/huzheng/default.nix

index f4638f505dda5ccb4b0051c9bad95f265411fef8..0437860f66ae099c281ca1c00201088b82e66c44 100644

--- a/pkgs/data/dicts/huzheng/default.nix

+++ b/pkgs/data/dicts/huzheng/default.nix

@@ -1,25 +1,27 @@

{ callPackage }:

+let

• version = "2.4.2";

+in

{

• cambridge = callPackage ./base.nix rec {

• cambridge = callPackage ./base.nix {

 pname = "cambridge";

• version = "2.4.2";

• inherit version;

 filename = "stardict-Cambridge_Advanced_Learners_Dictionary_3th_Ed-${version}.tar.bz2";

 description = "Cambridge Advanced Learners Dictionary 3th Ed. (En-En)";

 sha256 = "0mqrf5fr6hx3bjy1brsggmkrii2xf497jkaj6zf1hjxnp0ijswgr";

};

• macmillan = callPackage ./base.nix rec {

• macmillan = callPackage ./base.nix {

 pname = "macmillan";

• version = "2.4.2";

• inherit version;

 filename = "stardict-Macmillan_English_Dictionary-${version}.tar.bz2";

 description = "Macmillan English Dictionary (En-En)";

 sha256 = "1xg4xvxnni5vc371sd0bvskl1vly6p62q3c8r36bd2069ln7jy8r";

};

• webster = callPackage ./base.nix rec {

• webster = callPackage ./base.nix {

 pname = "webster";

• version = "2.4.2";

• inherit version;

 filename = "stardict-Webster_s_Unabridged_3-${version}.tar.bz2";

 description = "Webster's Third New International Dictionary, Unabridged (En-En)";

 sha256 = "1gj33px44d4ywhnxv7x5hxvh43f8m7skwmhvc62ld0c50blrqi7a";

diff --git a/pkgs/data/dicts/wiktionary/base.nix b/pkgs/data/dicts/wiktionary/base.nix

index 4ab4e4a91b5443ce53483c91b162c443ef425c4b..9e0c47e1a5779ee0471ecb0cf0afa20241c6cb58 100644

--- a/pkgs/data/dicts/wiktionary/base.nix

+++ b/pkgs/data/dicts/wiktionary/base.nix

@@ -1,6 +1,6 @@

{ stdenv, fetchurl, lang, version, sha256 }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "wiktionary-${lang}";

inherit version;

@@ -10,7 +10,7 @@ inherit sha256;

};

installPhase = ''

• install -Dm644 *.{dict,idx,ifo} -t "$out/share/goldendict/dictionaries/wiktionary"

• install -Dm644 *.{dict,idx,ifo} -t $out/share/goldendict/dictionaries/wiktionary

'';

preferLocalBuild = true;

diff --git a/pkgs/data/maps/freizeitkarte-osm/default.nix b/pkgs/data/maps/freizeitkarte-osm/default.nix

index 1776b05b55739528c12f0d76b9043efab4f6efa0..871655994510fd961cbc7b7356c07ceebd07eadc 100644

--- a/pkgs/data/maps/freizeitkarte-osm/default.nix

+++ b/pkgs/data/maps/freizeitkarte-osm/default.nix

@@ -1,6 +1,6 @@

{ stdenv, fetchurl, unzip, country ? "FIN", lang ? "en" }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "freizeitkarte-osm";

version = "2020-04-06";

@@ -9,9 +9,7 @@ url = "http://download.freizeitkarte-osm.de/garmin/latest/${country}_${lang}_gmapsupp.img.zip";

 sha256 = "0wnfxb02n7niaa4ma6w6gxkfqfg5w7achkq1l5cyjpnhgjzlsw94";

};

• nativeBuildInputs = [ unzip ];

• unpackPhase = "unzip $src";

• unpackPhase = "${unzip}/bin/unzip $src";

dontConfigure = true;

dontBuild = true;

@@ -19,7 +17,7 @@

preferLocalBuild = true;

installPhase = ''

• install -Dm644 *.img -t "$out/share/qmapshack/Maps"

• install -Dm644 *.img -t $out/share/qmapshack/Maps

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/maps/gpxsee-dem/default.nix b/pkgs/data/maps/gpxsee-dem/default.nix

index 68d4e4b2321018193fda8178cbe11ba0cdb8175b..1eb409052c5fe8982680d4c13093112e5aa7aacc 100644

--- a/pkgs/data/maps/gpxsee-dem/default.nix

+++ b/pkgs/data/maps/gpxsee-dem/default.nix

@@ -1,6 +1,6 @@

{ stdenv, fetchurl, unzip }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "gpxsee-dem";

version = "2014-05-25";

diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix

index 16b91915e2057a2be3b50828ece13260bc42a6c1..d1084a5acc5051cc0b6792cbfe92b2ac382301a1 100644

--- a/pkgs/data/maps/gpxsee-maps/default.nix

+++ b/pkgs/data/maps/gpxsee-maps/default.nix

@@ -4,9 +4,9 @@ , maptilerApiKey ? ""

, mapboxApiKey ? ""

}:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "gpxsee-maps";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.gpxsee-maps.rev;

src = sources.gpxsee-maps;

postPatch = ''

@@ -17,8 +17,8 @@ --replace "insert-your-apikey-here" "${mapboxApiKey}"

'';

installPhase = ''

• install -dm755 "$out/share/gpxsee/maps"

• cp -r World "$out/share/gpxsee/maps"

• install -dm755 $out/share/gpxsee/maps

• cp -r World $out/share/gpxsee/maps

 find $out -name "*.tpl" | xargs rm

'';

diff --git a/pkgs/data/maps/hiblovgpsmap/default.nix b/pkgs/data/maps/hiblovgpsmap/default.nix

index e2172def5df818f72be1001d63507362b33e5b91..8237d309ca1f1d0e0cb8b46a077cd6ea893e1ff5 100644

--- a/pkgs/data/maps/hiblovgpsmap/default.nix

+++ b/pkgs/data/maps/hiblovgpsmap/default.nix

@@ -1,18 +1,19 @@

{ stdenv, fetchgdrive, unzip }:

-stdenv.mkDerivation rec {

+let

• version = "2019-10-28";

• filename = "OV-Hib-Lov-${stdenv.lib.replaceStrings [ "-" ] [ "" ] version}-1.02.zip";

+in

+stdenv.mkDerivation {

pname = "hiblovgpsmap";

• version = "2019-10-28";

• inherit version;

src = fetchgdrive {

 id = "10aAOKY8U7TQvFvuWBkwTei9iP3-cUvoE";

 sha256 = "1079bn8rkdfsbqivxkm3zi327k2i4k5p20rr2jw7gacfsvdk4954";

• name = "OV-Hib-Lov-${stdenv.lib.replaceStrings [ "-" ] [ "" ] version}-1.02.zip";

• name = filename;

};

• nativeBuildInputs = [ unzip ];

• unpackPhase = "unzip $src";

• unpackPhase = "${unzip}/bin/unzip $src";

dontConfigure = true;

dontBuild = true;

@@ -20,7 +21,7 @@

preferLocalBuild = true;

installPhase = ''

• install -Dm644 *.img -t "$out/share/gpxsee/maps"

• install -Dm644 *.img -t $out/share/gpxsee/maps

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix

index 64d079c0a8f2d3daf4681eae6e18bbc491e3e9ea..d7a9eadb50434981d9692060b0508e2937941974 100644

--- a/pkgs/data/maps/maptourist/default.nix

+++ b/pkgs/data/maps/maptourist/default.nix

@@ -1,6 +1,6 @@

{ stdenv, sources, unzip }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "maptourist";

version = sources.maptourist.version;

src = sources.maptourist;

diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix

index a0cc6d1101c3c490f33c23e626bee3243e0855be..6c2b3e8a108d284ae3ee8590ad1e43714d390b90 100644

--- a/pkgs/data/maps/mtk-suomi/default.nix

+++ b/pkgs/data/maps/mtk-suomi/default.nix

@@ -1,6 +1,6 @@

{ stdenv, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "mtk-suomi";

version = sources.mtk-suomi.version;

src = sources.mtk-suomi;

diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix

index f04d0d6a3e3a5d8a93f6387489dec6d9699c5454..4d9be7970d7bce1b91a992a80f8dd9bcf94c765f 100644

--- a/pkgs/data/maps/opentopomap/default.nix

+++ b/pkgs/data/maps/opentopomap/default.nix

@@ -1,6 +1,6 @@

{ stdenv, fetchurl, unzip }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "opentopomap";

version = "2020-05-15";

@@ -9,9 +9,7 @@ url = "http://garmin.opentopomap.org/data/russia-european-part/russia-european-part_garmin.zip";

 sha256 = "130h349ja358qmdszq8lhfi0flskhrjcf65z1f9v4vmhf67wj719";

};

• nativeBuildInputs = [ unzip ];

• unpackPhase = "unzip $src";

• unpackPhase = "${unzip}/bin/unzip $src";

dontConfigure = true;

dontBuild = true;

@@ -19,7 +17,7 @@

preferLocalBuild = true;

installPhase = ''

• install -Dm644 *.img -t "$out/share/qmapshack/Maps"

• install -Dm644 *.img -t $out/share/qmapshack/Maps

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/maps/qmapshack-dem/default.nix b/pkgs/data/maps/qmapshack-dem/default.nix

index 7870cac670a13300c3ba34fe5aa4aa1b9ea2d0cd..6b94b55fd5b49c8eedd81e727c02f7aaadb8c755 100644

--- a/pkgs/data/maps/qmapshack-dem/default.nix

+++ b/pkgs/data/maps/qmapshack-dem/default.nix

@@ -1,6 +1,6 @@

{ stdenv, fetchurl, unzip, gdal }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "qmapshack-dem";

version = "2014-05-25";

diff --git a/pkgs/data/maps/qmapshack-onlinemaps/default.nix b/pkgs/data/maps/qmapshack-onlinemaps/default.nix

index 1f18146e7004b0e970c547866da55c92fcdd8381..0ea8119e7dc52aa76ed423bcf0f7c8563e0daee6 100644

--- a/pkgs/data/maps/qmapshack-onlinemaps/default.nix

+++ b/pkgs/data/maps/qmapshack-onlinemaps/default.nix

@@ -1,6 +1,6 @@

{ stdenv, fetchzip }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "qmapshack-onlinemaps";

version = "2019-12-26";

@@ -11,8 +11,8 @@ stripRoot = false;

};

installPhase = ''

• install -dm755 "$out/share/qmapshack/Maps"

• cp -r $src/* "$out/share/qmapshack/Maps"

• install -dm755 $out/share/qmapshack/Maps

• cp -r $src/* $out/share/qmapshack/Maps

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/maps/qmapshack-routinodb/default.nix b/pkgs/data/maps/qmapshack-routinodb/default.nix

index 0d65f369ad458367a9a542a71beaf89d7526d57e..9206433e716e6cf081c367f5ba18c2f3a77a35ef 100644

--- a/pkgs/data/maps/qmapshack-routinodb/default.nix

+++ b/pkgs/data/maps/qmapshack-routinodb/default.nix

@@ -1,6 +1,6 @@

{ stdenv, sources, routino }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "qmapshack-routinodb";

version = sources.geofabrik-russia-nwfd.version;

srcs = [

@@ -14,7 +14,7 @@

dontUnpack = true;

installPhase = ''

• install -dm755 "$out/share/qmapshack/Routino"

• install -dm755 $out/share/qmapshack/Routino

 for src in $srcs; do

   ${routino}/bin/planetsplitter \

diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix

index 138387dc662863e9846f18c6dcd2188f8c244749..0088be6e9bb5dbfb570b34060acfe606c087fb14 100644

--- a/pkgs/data/maps/slazav/hr.nix

+++ b/pkgs/data/maps/slazav/hr.nix

@@ -1,8 +1,8 @@

{ stdenv, cgpsmapper, gmaptool, imagemagick, mapsoft, netpbm, zip, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "slazav-hr";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.map_hr.rev;

src = sources.map_hr;

patches = [ ./0001-fix-hr.patch ];

@@ -34,7 +34,7 @@

preferLocalBuild = true;

installPhase = ''

• install -Dm644 hr.img -t "$out/share/gpxsee/maps"

• install -Dm644 hr.img -t $out/share/gpxsee/maps

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix

index aa9dee73dbc3484bcc1ce18e9e811b67f9f4995a..0b54b3189b285e933d26fc7359842986f2fbba70 100644

--- a/pkgs/data/maps/slazav/podm.nix

+++ b/pkgs/data/maps/slazav/podm.nix

@@ -1,8 +1,8 @@

{ stdenv, cgpsmapper, gmaptool, imagemagick, mapsoft, netpbm, zip, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "slazav-podm";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.map_podm.rev;

src = sources.map_podm;

patches = [ ./0001-fix-podm.patch ];

@@ -32,7 +32,7 @@

preferLocalBuild = true;

installPhase = ''

• install -Dm644 podm.img -t "$out/share/gpxsee/maps"

• install -Dm644 podm.img -t $out/share/gpxsee/maps

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/themes/goldendict-themes/dark-theme.nix b/pkgs/data/themes/goldendict-themes/dark-theme.nix

index 2b04119360ac809edc80a915394fb469b319d962..d34d5300364718e8b9d41d4fc0bb64bb55a671a4 100644

--- a/pkgs/data/themes/goldendict-themes/dark-theme.nix

+++ b/pkgs/data/themes/goldendict-themes/dark-theme.nix

@@ -1,6 +1,6 @@

{ stdenv, fetchgit }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "goldendict-dark-theme";

version = "2018-11-08";

@@ -13,8 +13,8 @@

dontBuild = true;

installPhase = ''

• install -Dm644 article-style.css $out/share/goldendict/styles/dark-theme/article-style.css

• install -Dm644 qt-style.css $out/share/goldendict/styles/dark-theme/qt-style.css

• install -Dm644 article-style.css -t $out/share/goldendict/styles/dark-theme

• install -Dm644 qt-style.css -t $out/share/goldendict/styles/dark-theme

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix

index 935a9a168b248e235ed411ba9539b79f5a618569..46d4d3377371d4dbf3230b623aece65c9881e4cd 100644

--- a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix

+++ b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix

@@ -1,15 +1,15 @@

{ stdenv, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "qtpbfimageplugin-styles";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.qtpbfimageplugin-styles.rev;

src = sources.qtpbfimageplugin-styles;

dontBuild = true;

installPhase = ''

• install -dm755 "$out/share/gpxsee/style"

• cp -r Mapbox OpenMapTiles Tilezen "$out/share/gpxsee/style"

• install -dm755 $out/share/gpxsee/style

• cp -r Mapbox OpenMapTiles Tilezen $out/share/gpxsee/style

'';

meta = with stdenv.lib; {

diff --git a/pkgs/default.nix b/pkgs/default.nix

index e6ecbc809bbd0a447aff3bff1ffb386b784d8211..6cac94d048574d92c00c02b225b23ea1c0686c09 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -14,68 +14,70 @@ };

 gpxsee = libsForQt5.callPackage ./applications/gpxsee {

   inherit sources;

 };

• librewolf = callPackage ./applications/librewolf {};

• macpass = callPackage ./applications/macpass {};

• mapsoft = callPackage ./applications/mapsoft {};

• mapsoft2 = callPackage ./applications/mapsoft/2.nix {};

• nnn-plugins = callPackage ./applications/nnn-plugins {};

• librewolf = callPackage ./applications/librewolf { };

• macpass = callPackage ./applications/macpass { };

• mapsoft = callPackage ./applications/mapsoft { };

• mapsoft2 = callPackage ./applications/mapsoft/2.nix { };

• nnn-plugins = callPackage ./applications/nnn-plugins { };

 openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper {

   inherit sources;

 };

 redict = libsForQt5.callPackage ./applications/redict {

   inherit sources;

 };

• wireguard-statusbar = callPackage ./applications/wireguard-statusbar {};

• wireguard-statusbar = callPackage ./applications/wireguard-statusbar { };

 ### BUILD SUPPORT

• fetchgdrive = callPackage ./build-support/fetchgdrive {};

• fetchfromgh = callPackage ./build-support/fetchfromgh { };

• fetchgdrive = callPackage ./build-support/fetchgdrive { };

• fetchwebarchive = callPackage ./build-support/fetchwebarchive { };

 ### DATA

• huzheng = callPackage ./data/dicts/huzheng {};

• wiktionary = callPackage ./data/dicts/wiktionary {};

• huzheng = callPackage ./data/dicts/huzheng { };

• wiktionary = callPackage ./data/dicts/wiktionary { };

• gpsmap64 = callPackage ./data/firmwares/gpsmap64 {};

• gpsmap64 = callPackage ./data/firmwares/gpsmap64 { };

• freizeitkarte-osm = callPackage ./data/maps/freizeitkarte-osm {};

• gpxsee-dem = callPackage ./data/maps/gpxsee-dem {};

• gpxsee-maps = callPackage ./data/maps/gpxsee-maps {};

• gpxsee-poi = callPackage ./data/maps/gpxsee-poi {};

• hiblovgpsmap = callPackage ./data/maps/hiblovgpsmap {};

• maptourist = callPackage ./data/maps/maptourist {};

• mtk-suomi = callPackage ./data/maps/mtk-suomi {};

• opentopomap = callPackage ./data/maps/opentopomap {};

• qmapshack-onlinemaps = callPackage ./data/maps/qmapshack-onlinemaps {};

• qmapshack-routinodb = callPackage ./data/maps/qmapshack-routinodb {};

• qmapshack-dem = callPackage ./data/maps/qmapshack-dem {};

• slazav-hr = callPackage ./data/maps/slazav/hr.nix {};

• slazav-podm = callPackage ./data/maps/slazav/podm.nix {};

• freizeitkarte-osm = callPackage ./data/maps/freizeitkarte-osm { };

• gpxsee-dem = callPackage ./data/maps/gpxsee-dem { };

• gpxsee-maps = callPackage ./data/maps/gpxsee-maps { };

• gpxsee-poi = callPackage ./data/maps/gpxsee-poi { };

• hiblovgpsmap = callPackage ./data/maps/hiblovgpsmap { };

• maptourist = callPackage ./data/maps/maptourist { };

• mtk-suomi = callPackage ./data/maps/mtk-suomi { };

• opentopomap = callPackage ./data/maps/opentopomap { };

• qmapshack-onlinemaps = callPackage ./data/maps/qmapshack-onlinemaps { };

• qmapshack-routinodb = callPackage ./data/maps/qmapshack-routinodb { };

• qmapshack-dem = callPackage ./data/maps/qmapshack-dem { };

• slazav-hr = callPackage ./data/maps/slazav/hr.nix { };

• slazav-podm = callPackage ./data/maps/slazav/podm.nix { };

 goldendict-dark-theme =

•  callPackage ./data/themes/goldendict-themes/dark-theme.nix {};
  

• qtpbfimageplugin-styles = callPackage ./data/themes/qtpbfimageplugin-styles {};

•  callPackage ./data/themes/goldendict-themes/dark-theme.nix { };
  

• qtpbfimageplugin-styles = callPackage ./data/themes/qtpbfimageplugin-styles { };

 ### DEVELOPMENT / TOOLS

• gef = callPackage ./development/tools/gef {};

• gef = callPackage ./development/tools/gef { };

 ### DEVELOPMENT / LIBRARIES

 foma = callPackage ./development/libraries/foma {

   libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;

 };

• geographiclib = callPackage ./development/libraries/geographiclib {};

• hfst = callPackage ./development/libraries/hfst {};

• geographiclib = callPackage ./development/libraries/geographiclib { };

• hfst = callPackage ./development/libraries/hfst { };

 libgarmin = callPackage ./development/libraries/libgarmin {

   automake = pkgs.automake111x;

 };

• libshell = callPackage ./development/libraries/libshell {};

• libshell = callPackage ./development/libraries/libshell { };

 ### DEVELOPMENT / PERL MODULES

 perlPackages = (

•  callPackage ./perl-packages.nix {}
  

•  callPackage ./perl-packages.nix { }
  

 ) // pkgs.perlPackages // {

   recurseForDerivations = false;

 };

@@ -85,7 +87,7 @@

 cheetah3 = python3Packages.callPackage ./development/python-modules/cheetah3 {

   inherit sources;

 };

• click = python3Packages.callPackage ./development/python-modules/click {};

• click-6-7 = python3Packages.callPackage ./development/python-modules/click { };

 gpxelevations = python3Packages.callPackage ./development/python-modules/gpxelevations {

   inherit sources;

 };

@@ -107,71 +109,72 @@ };

 ### TOOLS

• cfiles = callPackage ./tools/cfiles {};

• cgpsmapper = callPackage ./tools/geo/cgpsmapper {};

• csvquote = callPackage ./tools/text/csvquote {};

• csvtools = callPackage ./tools/text/csvtools {};

• datamaps = callPackage ./tools/geo/datamaps {};

• docker-reg-tool = callPackage ./tools/docker-reg-tool {};

• cfiles = callPackage ./tools/cfiles { };

• cgpsmapper = callPackage ./tools/geo/cgpsmapper { };

• csvquote = callPackage ./tools/text/csvquote { };

• csvtools = callPackage ./tools/text/csvtools { };

• datamaps = callPackage ./tools/geo/datamaps { };

• docker-reg-tool = callPackage ./tools/docker-reg-tool { };

 elevation = python3Packages.callPackage ./tools/geo/elevation {

•  inherit sources click;
  

•  inherit sources;
  

•  click = click-6-7;
  

 };

• gimgtools = callPackage ./tools/geo/gimgtools {};

• gmaptool = callPackage ./tools/geo/gmaptool {};

• gimgtools = callPackage ./tools/geo/gimgtools { };

• gmaptool = callPackage ./tools/geo/gmaptool { };

 gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer {

   inherit sources;

 };

• gpxtools = callPackage ./tools/geo/gpxtools {};

• gt-bash-client = callPackage ./tools/dict/gt-bash-client {};

• lsdreader = python3Packages.callPackage ./tools/dict/lsdreader {

• gpxtools = callPackage ./tools/geo/gpxtools { };

• gt-bash-client = callPackage ./tools/dict/gt-bash-client { };

• gt4gd = python3Packages.callPackage ./tools/dict/gt4gd {

   inherit sources;

 };

• gt4gd = python3Packages.callPackage ./tools/dict/gt4gd {

• i18n-editor = callPackage ./tools/i18n-editor { jre = pkgs.jdk11; };

• imgdecode = callPackage ./tools/geo/imgdecode { };

• ish = callPackage ./tools/networking/ish { };

• lsdreader = python3Packages.callPackage ./tools/dict/lsdreader {

   inherit sources;

 };

• i18n-editor = callPackage ./tools/i18n-editor { jre = pkgs.jdk11; };

• imgdecode = callPackage ./tools/geo/imgdecode {};

• ish = callPackage ./tools/networking/ish {};

 morse-talk = python3Packages.callPackage ./tools/morse-talk {

   inherit sources;

 };

• musig = callPackage ./tools/audio/musig {};

• musig = callPackage ./tools/audio/musig { };

 ocad2img = perlPackages.callPackage ./tools/geo/ocad2img {

   inherit cgpsmapper ocad2mp;

 };

• ocad2mp = callPackage ./tools/geo/ocad2mp {};

• odict = callPackage ./tools/dict/odict {};

• openmtbmap_openvelomap_linux = callPackage ./tools/geo/openmtbmap_openvelomap_linux {};

• ocad2mp = callPackage ./tools/geo/ocad2mp { };

• odict = callPackage ./tools/dict/odict { };

• openmtbmap = callPackage ./tools/geo/openmtbmap { };

 osm2mp = perlPackages.callPackage ./tools/geo/osm2mp {

   inherit sources;

   inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR;

 };

• ptunnel = callPackage ./tools/networking/ptunnel {};

• sendmap20 = callPackage ./tools/geo/sendmap20 {};

• ptunnel = callPackage ./tools/networking/ptunnel { };

• sendmap20 = callPackage ./tools/geo/sendmap20 { };

 stardict-tools =

   # Needed for nixos-19.09

   if pkgs ? libmysql

   then callPackage ./tools/dict/stardict-tools {

     libmysqlclient = libmysql;

   }

•  else callPackage ./tools/dict/stardict-tools {};
  

•  else callPackage ./tools/dict/stardict-tools { };
  

 supermercado = python3Packages.callPackage ./tools/geo/supermercado {

   inherit sources mercantile;

 };

• supload = callPackage ./tools/supload {};

• supload = callPackage ./tools/supload { };

 tpkutils = python3Packages.callPackage ./tools/geo/tpkutils {

   inherit sources mercantile pymbtiles;

 };

• xfractint = callPackage ./tools/xfractint {};

• xfractint = callPackage ./tools/xfractint { };

 ### SERVERS

• mbtileserver = callPackage ./servers/mbtileserver {};

• nakarte = callPackage ./servers/nakarte {};

• shavit = callPackage ./servers/shavit {};

• mbtileserver = callPackage ./servers/mbtileserver { };

• nakarte = callPackage ./servers/nakarte { };

• shavit = callPackage ./servers/shavit { };

 ### MISC

• embox = callPackage ./embox {};

• embox = callPackage ./embox { };

}

)

diff --git a/pkgs/development/libraries/foma/default.nix b/pkgs/development/libraries/foma/default.nix

index 66a38bac6dade842e6280f8f78384d827affe835..8af086ec06a8c0eea5f2445773ef08826b1c7d5d 100644

--- a/pkgs/development/libraries/foma/default.nix

+++ b/pkgs/development/libraries/foma/default.nix

@@ -1,8 +1,8 @@

{ stdenv, bison, flex, libtool, ncurses, readline, zlib, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "foma";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.foma.rev;

src = sources.foma;

sourceRoot = "source/foma";

diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix

index 3c8e7094e1fac3430f6e5a8370bf25c4a171d656..c20fc01162762dc6b32eae4da172be6e9a7b73c9 100644

--- a/pkgs/development/libraries/geographiclib/default.nix

+++ b/pkgs/development/libraries/geographiclib/default.nix

@@ -1,8 +1,10 @@

{ stdenv, fetchurl }:

-stdenv.mkDerivation rec {

• pname = "geographiclib";

+let

version = "1.50.1";

+in

+stdenv.mkDerivation {

• pname = "geographiclib";

• inherit version;

src = fetchurl {

 url = "mirror://sourceforge/geographiclib/GeographicLib-${version}.tar.gz";

diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/development/libraries/hfst/default.nix

index ad8b94d3fcb4988a49fbf03853bb42889651c98d..3cb2aed4596ffe24251453162252cca917370158 100644

--- a/pkgs/development/libraries/hfst/default.nix

+++ b/pkgs/development/libraries/hfst/default.nix

@@ -1,8 +1,8 @@

{ stdenv, autoreconfHook, bison, flex, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "hfst";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.hfst.rev;

src = sources.hfst;

nativeBuildInputs = [ autoreconfHook bison flex ];

diff --git a/pkgs/development/libraries/libgarmin/default.nix b/pkgs/development/libraries/libgarmin/default.nix

index 2eac66d1ac69e9165c77b9976ffe4843fea33fce..5efdb80c4847f05b7b1016ed788ada7d62ab6da7 100644

--- a/pkgs/development/libraries/libgarmin/default.nix

+++ b/pkgs/development/libraries/libgarmin/default.nix

@@ -1,8 +1,8 @@

{ stdenv, fetchsvn, autoconf, automake, libtool }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "libgarmin";

• version = "2008-12-27";

• version = "unstable-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

index ab89437567932ac393b9bae928f6b8a2796d0f9c..2c0edf029c5a808ca9f59aa92673249a85c7eca4 100644

--- a/pkgs/development/libraries/libshell/default.nix

+++ b/pkgs/development/libraries/libshell/default.nix

@@ -8,9 +8,9 @@ , withDoc ? false

, scdoc

}:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "libshell";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.libshell.rev;

src = sources.libshell;

nativeBuildInputs = [ help2man ];

diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix

index 92e8f532f90b57fed16a3bc19fb4f38c8a956dcc..c428923e54ed1defc83b072ff2889b7ed500a39b 100644

--- a/pkgs/development/python-modules/cheetah3/default.nix

+++ b/pkgs/development/python-modules/cheetah3/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonPackage, sources }:

-buildPythonPackage rec {

+buildPythonPackage {

pname = "cheetah3";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.cheetah3.rev;

src = sources.cheetah3;

doCheck = false;

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix

index 9c3d51f63af6ee0d36a46b6fffe24109465a4b13..2f8f6462a0cfb6c46963ba19ea628b4c9d7858db 100644

--- a/pkgs/development/python-modules/click/default.nix

+++ b/pkgs/development/python-modules/click/default.nix

@@ -1,8 +1,10 @@

{ stdenv, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }:

-buildPythonPackage rec {

+let

pname = "click";

version = "6.7";

+in

+buildPythonPackage {

• inherit pname version;

src = fetchPypi {

 inherit pname version;

@@ -18,15 +20,13 @@ );

buildInputs = [ pytest ];

• checkPhase = ''

• py.test tests

• '';

• checkPhase = "py.test tests";

https://github.com/pallets/click/issues/823

doCheck = false;

meta = with stdenv.lib; {

• homepage = http://click.pocoo.org/;

• homepage = "http://click.pocoo.org/";

 description = "Create beautiful command line interfaces in Python";

 license = licenses.bsd3;

};

diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix

index 6fc73c559dc0cc66063a9d38804294436a4c3058..96f9c22c9b58871fb8d4a134240fbd535267b6d3 100644

--- a/pkgs/development/python-modules/gpxelevations/default.nix

+++ b/pkgs/development/python-modules/gpxelevations/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonApplication, python, requests, gpxpy, sources }:

-buildPythonApplication rec {

+buildPythonApplication {

pname = "gpxelevations";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.gpxelevations.rev;

src = sources.gpxelevations;

propagatedBuildInputs = [ requests gpxpy ];

diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix

index f0e54cb1cb33fa7a7cc457d52b04089a7241e9bc..feb1cf3e5986fb5963ea5c7453d4ab4d4d56ffa8 100644

--- a/pkgs/development/python-modules/mercantile/default.nix

+++ b/pkgs/development/python-modules/mercantile/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonPackage, click, pytest, hypothesis, sources }:

-buildPythonPackage rec {

+buildPythonPackage {

pname = "mercantile";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.mercantile.rev;

src = sources.mercantile;

propagatedBuildInputs = [ click ];

diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix

index 37d20d1cffdff68a6d202a35a8aa9a80a8c3aaa7..7f5d4f39fa061025706f919471b7c40c60878262 100644

--- a/pkgs/development/python-modules/mikatools/default.nix

+++ b/pkgs/development/python-modules/mikatools/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonPackage, requests, clint, sources }:

-buildPythonPackage rec {

+buildPythonPackage {

pname = "mikatools";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.mikatools.rev;

src = sources.mikatools;

propagatedBuildInputs = [ requests clint ];

diff --git a/pkgs/development/python-modules/pyephem/default.nix b/pkgs/development/python-modules/pyephem/default.nix

index 5d303b1f134c7d15849699c8e1086854ba0738c9..e8202798e64ec2e30b11931a6301d6abe337ffb5 100644

--- a/pkgs/development/python-modules/pyephem/default.nix

+++ b/pkgs/development/python-modules/pyephem/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonPackage, sources }:

-buildPythonPackage rec {

+buildPythonPackage {

pname = "pyephem";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.pyephem.rev;

src = sources.pyephem;

meta = with lib; {

diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix

index b25de035a26dfd29bc642ac48e491d4a897f9caa..93267768de6cf77a3205eda7e07acd4280e2d3e7 100644

--- a/pkgs/development/python-modules/pymbtiles/default.nix

+++ b/pkgs/development/python-modules/pymbtiles/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonPackage, pytest, sources }:

-buildPythonPackage rec {

+buildPythonPackage {

pname = "pymbtiles";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.pymbtiles.rev;

src = sources.pymbtiles;

checkInputs = [ pytest ];

diff --git a/pkgs/development/python-modules/python-hfst/default.nix b/pkgs/development/python-modules/python-hfst/default.nix

index 5c6df444bc911858816646a1339c0a84d9ea9843..28dc16a01d1ce1dd1d534e9cc04736648c61af59 100644

--- a/pkgs/development/python-modules/python-hfst/default.nix

+++ b/pkgs/development/python-modules/python-hfst/default.nix

@@ -1,6 +1,6 @@

{ lib, buildPythonPackage, hfst, swig }:

-buildPythonPackage rec {

+buildPythonPackage {

pname = "python-hfst";

inherit (hfst) src version;

diff --git a/pkgs/development/tools/gef/default.nix b/pkgs/development/tools/gef/default.nix

index 3718b71f2ee977a11f1acb36e5556f1610b52afe..0b72426e2ad99674dc3853dafb94b759c59b3810 100644

--- a/pkgs/development/tools/gef/default.nix

+++ b/pkgs/development/tools/gef/default.nix

@@ -9,10 +9,22 @@ , bash

, python3

, gdb

}:

+let

• initGef = writeScript "init-gef" ''

• source @out@/share/gef/gef.py

• '';

-stdenv.mkDerivation rec {

• gdbGef = writeScript "gdb-gef" (

• with stdenv.lib; ''

•  #!${runtimeShell}
  

•  export PATH="${makeBinPath [ procps binutils-unwrapped ]}:$PATH"
  

•  ${gdb}/bin/gdb -x @out@/share/gef/init-gef "$@"
  

• ''

• );

+in

+stdenv.mkDerivation {

pname = "gef";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.gef.rev;

src = sources.gef;

postPatch = ''

@@ -24,18 +36,6 @@ '';

dontBuild = true;

doCheck = false;

• initGef = writeScript "init-gef" ''

• source @out@/share/gef/gef.py

• '';

• gdbGef = writeScript "gdb-gef" (

• with stdenv.lib; ''

•  #!${runtimeShell}
  

•  export PATH="${makeBinPath [ procps binutils-unwrapped ]}:$PATH"
  

•  ${gdb}/bin/gdb -x @out@/share/gef/init-gef "$@"
  

• ''

• );

installPhase = ''

 install -Dm644 gef.py -t $out/share/gef

diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix

index a84e85d7797f33e5840e330415d4cdec7f08500e..95c0a5defc198a6b0252f89789fc05132d5d3c6c 100644

--- a/pkgs/embox/default.nix

+++ b/pkgs/embox/default.nix

@@ -9,18 +9,29 @@ , qemu

, unzip

, which

}:

-stdenv.mkDerivation rec {

• pname = "embox";

• version = stdenv.lib.substring 0 7 src.rev;

• src = sources.embox;

+let

template = "arm/qemu";

cjson = fetchurl {

• url = "http://download.embox.rocks/cJSONFiles.zip";

• url = "mirror://sourceforge/cjson/cJSONFiles.zip";

 sha256 = "19qdsfq4r7gjr39lkjplz418gkl2xg5j5fpdz9phlxlbggnklqhd";

};

• runScript = writers.writeBash "run-embox" ''

• ${qemu}/bin/qemu-system-arm \

•  -M integratorcp \
  

•  -kernel @out@/share/embox/images/embox.img \
  

•  -m 256 \
  

•  -net nic,netdev=n0,model=smc91c111,macaddr=AA:BB:CC:DD:EE:02 \
  

•  -netdev tap,script=@out@/share/embox/scripts/qemu_start,downscript=@out@/share/embox/scripts/qemu_stop,,id=n0 \
  

•  -nographic
  

• '';

+in

+stdenv.mkDerivation {

• pname = "embox";

• version = stdenv.lib.substring 0 7 sources.embox.rev;

• src = sources.embox;

patches = [ ./0001-fix-build.patch ];

nativeBuildInputs = [

@@ -41,17 +52,7 @@ configurePhase = "make confload-${template}";

preferLocalBuild = true;

• installPhase = let

• runScript = writers.writeBash "run-embox" ''

•  ${qemu}/bin/qemu-system-arm \
  

•    -M integratorcp \
  

•    -kernel @out@/share/embox/images/embox.img \
  

•    -m 256 \
  

•    -net nic,netdev=n0,model=smc91c111,macaddr=AA:BB:CC:DD:EE:02 \
  

•    -netdev tap,script=@out@/share/embox/scripts/qemu_start,downscript=@out@/share/embox/scripts/qemu_stop,,id=n0 \
  

•    -nographic
  

• '';

• in ''

• installPhase = ''

 mkdir -p $out/bin

 substitute ${runScript} $out/bin/run-embox --subst-var out

 chmod +x $out/bin/run-embox

diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix

index 338b6c4ae5ad17df0e9053e81c4289fc7f82edf6..1de5cbae076c5ada0d6f5a02eb5b657dfc8dd41c 100644

--- a/pkgs/servers/mbtileserver/default.nix

+++ b/pkgs/servers/mbtileserver/default.nix

@@ -1,8 +1,8 @@

{ lib, buildGoModule, sources }:

-buildGoModule rec {

+buildGoModule {

pname = "mbtileserver";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.mbtileserver.rev;

src = sources.mbtileserver;

vendorSha256 = null;

diff --git a/pkgs/servers/nakarte/default.nix b/pkgs/servers/nakarte/default.nix

index 2e1f33ef20121bbe25fadfbf6796dfcad92931ab..23a7175bf88baea5e780cb493578f8e9bfac48b1 100644

--- a/pkgs/servers/nakarte/default.nix

+++ b/pkgs/servers/nakarte/default.nix

@@ -1,7 +1,9 @@

{ stdenv, mkYarnPackage, sources, secretsConfig ? null }:

-mkYarnPackage rec {

• name = "nakarte-${stdenv.lib.substring 0 7 src.rev}";

+let

• version = stdenv.lib.substring 0 7 sources.nakarte.rev;

+in

+mkYarnPackage {

• name = "nakarte-${version}";

src = sources.nakarte;

postPatch =

@@ -20,7 +22,7 @@

distPhase = "true";

meta = with stdenv.lib; {

• inherit (src) description homepage;

• inherit (sources.nakarte) description homepage;

 license = licenses.mit;

 maintainers = with maintainers; [ sikmir ];

 platforms = platforms.all;

diff --git a/pkgs/servers/shavit/default.nix b/pkgs/servers/shavit/default.nix

index 8983857c3f25080227e1eb5523ca4441d6f1ea79..23c6db8a63510cc10f88bacb9e5f5c216676a8ec 100644

--- a/pkgs/servers/shavit/default.nix

+++ b/pkgs/servers/shavit/default.nix

@@ -1,8 +1,8 @@

{ lib, buildGoModule, fetchgit, sources }:

-buildGoModule rec {

+buildGoModule {

pname = "shavit";

• version = "2020-03-14";

• version = "unstable-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

index bd42e88ccee1abe071180434436c4e7f5bc0ea36..5a360f65fe516afb757db27eae394795868818b9 100644

--- a/pkgs/tools/audio/musig/default.nix

+++ b/pkgs/tools/audio/musig/default.nix

@@ -1,8 +1,10 @@

{ lib, buildGoModule, pkgconfig, portaudio, sources }:

-buildGoModule rec {

+let

• version = lib.substring 0 7 sources.musig.rev;

+in

+buildGoModule {

pname = "musig";

• version = lib.substring 0 7 src.rev;

• inherit version;

src = sources.musig;

vendorSha256 = "0ha1xjdwibm8543b4bx0xrbigngiiakksdc6mnp0mz5y6ai56pg5";

diff --git a/pkgs/tools/cfiles/default.nix b/pkgs/tools/cfiles/default.nix

index 7780eca138580490eb9fcde9b5c5f1d616ecf7a7..9590cf0e496d01c0471cde8e6e0d14ada485226a 100644

--- a/pkgs/tools/cfiles/default.nix

+++ b/pkgs/tools/cfiles/default.nix

@@ -1,8 +1,8 @@

{ stdenv, pkg-config, ncurses, w3m, ueberzug, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "cfiles";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.cfiles.rev;

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

index 79b01990daab660a20704eb5b01e78e137f2d51c..621ac507a54a8549f1764c81ec7a714acc94d2d6 100644

--- a/pkgs/tools/dict/gt-bash-client/default.nix

+++ b/pkgs/tools/dict/gt-bash-client/default.nix

@@ -1,12 +1,12 @@

{ stdenv, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "gt-bash-client";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.gt-bash-client.rev;

src = sources.gt-bash-client;

installPhase = ''

• install -Dm755 translate.sh "$out/bin/gt-bash-client"

• install -Dm755 translate.sh $out/bin/gt-bash-client

'';

meta = with stdenv.lib; {

diff --git a/pkgs/tools/dict/gt4gd/default.nix b/pkgs/tools/dict/gt4gd/default.nix

index fe21d3d85f143e93b1e99d3285d8dadbbcb6f77d..11a83f160c30e0ee9c98ffaf7ef1db59f84502cc 100644

--- a/pkgs/tools/dict/gt4gd/default.nix

+++ b/pkgs/tools/dict/gt4gd/default.nix

@@ -1,10 +1,15 @@

-{ lib, buildPythonApplication, requests, sources

-, withUI ? true, tkinter }:

+{ lib

+, buildPythonApplication

+, requests

+, sources

+, withUI ? true

+, tkinter

+}:

-buildPythonApplication rec {

+buildPythonApplication {

pname = "gt4gd";

• version = lib.substring 0 7 src.rev;

• src = sources.google-translate-for-goldendict;

• version = lib.substring 0 7 sources.gt4gd.rev;

• 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

index 9811ff3568be187e2b6b7698f200b45612a7eee7..894ab48b7ed719b4d1eaae40ea72b808cc43e1a8 100644

--- a/pkgs/tools/dict/lsdreader/default.nix

+++ b/pkgs/tools/dict/lsdreader/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonApplication, sources }:

-buildPythonApplication rec {

+buildPythonApplication {

pname = "lsdreader";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.lsdreader.rev;

src = sources.lsdreader;

doCheck = false;

diff --git a/pkgs/tools/dict/odict/default.nix b/pkgs/tools/dict/odict/default.nix

index c24d8e4908f47cf8c14601075b67363bf4e548d8..3987885caa58a00b6b579c83799bcbe38fd3d8de 100644

--- a/pkgs/tools/dict/odict/default.nix

+++ b/pkgs/tools/dict/odict/default.nix

@@ -1,8 +1,8 @@

{ lib, buildGoModule, sources }:

-buildGoModule rec {

+buildGoModule {

pname = "odict";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.odict.rev;

src = sources.odict;

vendorSha256 = "083mvrgpv9hyfmi26sankv940qp0bmyr55jm33dx1ivhd2xhkg78";

diff --git a/pkgs/tools/dict/stardict-tools/default.nix b/pkgs/tools/dict/stardict-tools/default.nix

index 47146b396c64f7a219c23ad9f7d0a3357fc7cb46..9a9ec9f84c874595a5cf1cfbe692167b373cdc1d 100644

--- a/pkgs/tools/dict/stardict-tools/default.nix

+++ b/pkgs/tools/dict/stardict-tools/default.nix

@@ -10,9 +10,9 @@ , pcre

, sources

}:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "stardict-tools";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.stardict-3.rev;

src = sources.stardict-3;

nativeBuildInputs = [

diff --git a/pkgs/tools/docker-reg-tool/default.nix b/pkgs/tools/docker-reg-tool/default.nix

index 1f80cd6470adec02d886a5aef7198bc39473e630..789e4d5d24c6bb1d1cc09f4be5e271541ecd7e0b 100644

--- a/pkgs/tools/docker-reg-tool/default.nix

+++ b/pkgs/tools/docker-reg-tool/default.nix

@@ -1,12 +1,12 @@

{ stdenv, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "docker-reg-tool";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.docker-reg-tool.rev;

src = sources.docker-reg-tool;

installPhase = ''

• install -Dm755 docker_reg_tool "$out/bin/docker_reg_tool"

• install -Dm755 docker_reg_tool -t $out/bin

'';

meta = with stdenv.lib; {

diff --git a/pkgs/tools/geo/cgpsmapper/default.nix b/pkgs/tools/geo/cgpsmapper/default.nix

index 106ef6f53533a246676d2f6b14d759a2f6788502..1f1dee735d3e4c40c09095d688189756177ff849 100644

--- a/pkgs/tools/geo/cgpsmapper/default.nix

+++ b/pkgs/tools/geo/cgpsmapper/default.nix

@@ -1,21 +1,22 @@

-{ stdenv, fetchurl }:

+{ stdenv, fetchwebarchive }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "cgpsmapper";

version = "0093c";

• src = fetchurl {

• url = "https://web.archive.org/web/20160620102839if_/http://www.cgpsmapper.com/download/${pname}-static.gz";

• src = fetchwebarchive {

• url = "http://cgpsmapper.com/download/cgpsmapper-static.gz";

• timestamp = "20160817191046";

 sha256 = "0h2xjkzkg566bgvg8gbl1hmjjimv2xbhv2csd54naq1vqphqjchx";

};

sourceRoot = ".";

• unpackCmd = "gunzip -c $curSrc > ${pname}-static";

• unpackCmd = "gunzip -c $curSrc > cgpsmapper-static";

dontBuild = true;

dontFixup = true;

• installPhase = "install -Dm755 ${pname}-static -t $out/bin";

• installPhase = "install -Dm755 cgpsmapper-static -t $out/bin";

meta = with stdenv.lib; {

 description = "GIS converter into GARMIN compatible format maps";

diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix

index e4ccb9cde9721267ea464b406fdb4fd0c8f20cc6..b14174d2b1fb1036c845b0591e23db18576b117a 100644

--- a/pkgs/tools/geo/datamaps/default.nix

+++ b/pkgs/tools/geo/datamaps/default.nix

@@ -1,8 +1,8 @@

{ stdenv, libpng, pkg-config, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "datamaps";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.datamaps.rev;

src = sources.datamaps;

nativeBuildInputs = [ pkg-config ];

diff --git a/pkgs/tools/geo/elevation/default.nix b/pkgs/tools/geo/elevation/default.nix

index 21c951b7af2dda81e5147278be7337f0d790a40d..aff604458c1acd4c292bc71fd9cc5fb639fa5c57 100644

--- a/pkgs/tools/geo/elevation/default.nix

+++ b/pkgs/tools/geo/elevation/default.nix

@@ -14,9 +14,9 @@ , pytest-mock

, sources

}:

-buildPythonApplication rec {

+buildPythonApplication {

pname = "elevation";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.elevation.rev;

src = sources.elevation;

propagatedBuildInputs = [ fasteners future appdirs click ];

diff --git a/pkgs/tools/geo/gimgtools/default.nix b/pkgs/tools/geo/gimgtools/default.nix

index 0936aceb3af1558dc7aa329601e1491c7f5226eb..6dd9ec4aa54fbfdf0b772556b37d565a7746e1a5 100644

--- a/pkgs/tools/geo/gimgtools/default.nix

+++ b/pkgs/tools/geo/gimgtools/default.nix

@@ -1,8 +1,8 @@

{ stdenv, sources, libiconv }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "gimgtools";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.gimgtools.rev;

src = sources.gimgtools;

buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;

@@ -14,7 +14,7 @@ '';

installPhase = ''

 for tool in gimginfo gimgfixcmd gimgxor gimgunlock gimgch gimgextract cmdc; do

•  install -Dm755 $tool $out/bin/$tool
  

•  install -Dm755 $tool -t $out/bin
  

 done

'';

diff --git a/pkgs/tools/geo/gmaptool/default.nix b/pkgs/tools/geo/gmaptool/default.nix

index ef72b0379d33d0f52389ce052a8b9b8f08b8f13c..59d861a78fac0cb318ae1d144bf45d9e3a41dadf 100644

--- a/pkgs/tools/geo/gmaptool/default.nix

+++ b/pkgs/tools/geo/gmaptool/default.nix

@@ -1,11 +1,14 @@

{ stdenv, fetchzip }:

-stdenv.mkDerivation rec {

+let

• version = "0.8.220";

• filename = "lgmt${stdenv.lib.replaceStrings [ "." ] [ "" ] version}.zip";

+in

+stdenv.mkDerivation {

pname = "gmaptool";

• version = "0.8.220";

• inherit version;

src = fetchzip {

• url = "https://www.gmaptool.eu/sites/default/files/lgmt${stdenv.lib.replaceStrings [ "." ] [ "" ] version}.zip";

• url = "https://www.gmaptool.eu/sites/default/files/${filename}";

 sha256 = "0wf9ys52slf2hzmfl81d8754alfqiylsk7g5af3lxsiivd5284gy";

 stripRoot = false;

};

diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix

index 8e371db7802da5bbe9cd5fbd1ee602dc72e787ed..24fe8573f256d39f015e9c0d78dbfd195a575329 100644

--- a/pkgs/tools/geo/gpx-layer/default.nix

+++ b/pkgs/tools/geo/gpx-layer/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPerlPackage, XMLParser, sources }:

-buildPerlPackage rec {

+buildPerlPackage {

pname = "gpx-layer";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.gpx-layer.rev;

src = sources.gpx-layer;

outputs = [ "out" ];

diff --git a/pkgs/tools/geo/gpxtools/default.nix b/pkgs/tools/geo/gpxtools/default.nix

index 95c67930da658f27bb2d3c64abe7356b7fe315dc..4339bea2d52a1ec431207e5064c9b07d33e1058e 100644

--- a/pkgs/tools/geo/gpxtools/default.nix

+++ b/pkgs/tools/geo/gpxtools/default.nix

@@ -1,8 +1,8 @@

{ stdenv, cmake, expat, exiv2, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "gpxtools";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.gpxtools.rev;

src = sources.gpxtools;

nativeBuildInputs = [ cmake ];

diff --git a/pkgs/tools/geo/imgdecode/default.nix b/pkgs/tools/geo/imgdecode/default.nix

index 0175bf896b6949af7efe4dfa3be02fb7ab70a38d..036b4217dfce377484bf4fa68269502469a6c3c9 100644

--- a/pkgs/tools/geo/imgdecode/default.nix

+++ b/pkgs/tools/geo/imgdecode/default.nix

@@ -1,11 +1,13 @@

{ stdenv, fetchurl }:

-stdenv.mkDerivation rec {

• pname = "imgdecode";

+let

version = "1.1";

+in

+stdenv.mkDerivation {

• pname = "imgdecode";

• inherit version;

src = fetchurl {

• url = "mirror://sourceforge/garmin-img/${pname}-${version}.tar.gz";

• url = "mirror://sourceforge/garmin-img/imgdecode-${version}.tar.gz";

 sha256 = "0rxrzvbpw6cbgq0fab7hy8n9jhp98x5y48i69jijxdhfyjivs02m";

};

@@ -17,7 +19,7 @@

configurePhase = "./configure || true";

installPhase = ''

• install -Dm755 imgdecode -t "$out/bin"

• install -Dm755 imgdecode -t $out/bin

'';

meta = with stdenv.lib; {

diff --git a/pkgs/tools/geo/ocad2img/default.nix b/pkgs/tools/geo/ocad2img/default.nix

index e7c52c91d387af3175a330c369a7874f47aa0bb7..2bd5a4d620a5e922159a8aa2ba6dd925a21dfa89 100644

--- a/pkgs/tools/geo/ocad2img/default.nix

+++ b/pkgs/tools/geo/ocad2img/default.nix

@@ -1,11 +1,11 @@

{ lib, buildPerlPackage, fetchzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }:

-buildPerlPackage rec {

+buildPerlPackage {

pname = "ocad2img";

• version = "2009-10-11";

• version = "unstable-2009-10-11";

src = fetchzip {

• url = "http://worldofo.com/div/${pname}.zip";

• url = "http://worldofo.com/div/ocad2img.zip";

 sha256 = "0d5aryahl5662w65fpqa5camq1c0wlyrnxgsdqb7xsgmk1sivvmz";

 stripRoot = false;

};

diff --git a/pkgs/tools/geo/ocad2mp/default.nix b/pkgs/tools/geo/ocad2mp/default.nix

index f02a7901a1626084f45395eff32df380ca00460c..4002b524ae5f00ebc22d2fcda4b092b11324ef98 100644

--- a/pkgs/tools/geo/ocad2mp/default.nix

+++ b/pkgs/tools/geo/ocad2mp/default.nix

@@ -1,11 +1,11 @@

{ stdenv, fetchsvn }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "ocad2mp";

• version = "2011-01-26";

• version = "unstable-2011-01-26";

src = fetchsvn {

• url = "svn://svn.code.sf.net/p/${pname}/code/trunk/${pname}";

• url = "svn://svn.code.sf.net/p/ocad2mp/code/trunk/ocad2mp";

 rev = "269";

 sha256 = "1700apfsjd27q9jsvvr94mk7rd0x24ib3bkn4y8hak0zvknib563";

};

@@ -30,7 +30,7 @@ "TARGET_ARCH_BITS=64"

];

installPhase = ''

• install -Dm755 Release/ocad2mp -t "$out/bin"

• install -Dm755 Release/ocad2mp -t $out/bin

 install -Dm644 SYM.TXT $out/share/ocad2mp/sym.txt

'';

diff --git a/pkgs/tools/geo/openmtbmap/default.nix b/pkgs/tools/geo/openmtbmap/default.nix

new file mode 100644

index 0000000000000000000000000000000000000000..cda608ad8dad39d9ea9e030c8c2fa1f4d9c978a9

--- /dev/null

+++ b/pkgs/tools/geo/openmtbmap/default.nix

@@ -0,0 +1,26 @@

+{ stdenv, gmaptool, mkgmap, p7zip, zsh, sources, substituteAll }:

+stdenv.mkDerivation {

• pname = "openmtbmap";

• version = stdenv.lib.substring 0 7 sources.openmtbmap.rev;

• src = sources.openmtbmap;

• patches = (substituteAll {

• src = ./0001-fix-path.patch;

• inherit gmaptool mkgmap p7zip;

• });

• buildInputs = [ zsh ];

• installPhase = ''

• install -Dm755 create_omtb_garmin_img.sh $out/bin/create_omtb_garmin_img

• '';

• meta = with stdenv.lib; {

• inherit (src) description homepage;

• license = licenses.free;

• maintainers = with maintainers; [ sikmir ];

• platforms = platforms.all;

• skip.ci = true;

• };

+}

diff --git a/pkgs/tools/geo/openmtbmap_openvelomap_linux/0001-fix-path.patch b/pkgs/tools/geo/openmtbmap/0001-fix-path.patch

rename from pkgs/tools/geo/openmtbmap_openvelomap_linux/0001-fix-path.patch

rename to pkgs/tools/geo/openmtbmap/0001-fix-path.patch

index b081a5dc5565af5b1e32ee72dda31a558698cd7a..a5ea1a6f460990d0d9ca13bed05b5b98a832a85f 100644

--- a/pkgs/tools/geo/openmtbmap_openvelomap_linux/0001-fix-path.patch

+++ b/pkgs/tools/geo/openmtbmap/0001-fix-path.patch

@@ -7,7 +7,7 @@ usage

fi

-GMT_CMD=( ${ARGS_A[-g]}(.N,@-.) ${^path}/gmt(.N,@-.) )

-+GMT_CMD=( ${ARGS_A[-g]}(.N,@-.) %gmaptool%/bin/gmt(.N,@-.) )

++GMT_CMD=( ${ARGS_A[-g]}(.N,@-.) @gmaptool@/bin/gmt(.N,@-.) )

GMT_CMD="${GMT_CMD[1]:a}"

if wine exists, this expands into e.g. /usr/bin/wine, otherwhise it will remain as string =wine

advantage over which wine is, that it outputs only one result, namely the executable that a call to wine on the CL would actually use

@@ -15,7 +15,7 @@ WINE_EXE==wine

NB: If mkgmap is not found, we fall back to using gmt later.

-MKGMAP=( ${ARGS_A[-m]}(.N,@-.) /usr/share/mkgmap/mkgmap.jar(.N,@-.) /usr/local/share/mkgmap/mkgmap.jar(.N,@-.) /usr/share/java/mkgmap.jar(.N,@-.) /usr/share/java/mkgmap/mkgmap.jar(.N,@-.) ${^path}/mkgmap.jar(.N,@-.) )

-+MKGMAP=( ${ARGS_A[-m]}(.N,@-.) %mkgmap%/bin/mkgmap(.N,@-.) )

++MKGMAP=( ${ARGS_A[-m]}(.N,@-.) @mkgmap@/bin/mkgmap(.N,@-.) )

MKGMAP="${MKGMAP[1]:a}"

-if ! [[ -x =7z ]]; then

@@ -43,7 +43,7 @@ FIMG_a=(${TMPDIR}/6<->.img(N[1]))

if [[ -z $FIMG_a ]] ; then

  print "Extracting $OMTB_EXE ..."

• 7z e -y -o$TMPDIR ${OMTB_EXE} &>/dev/null || exit 1

-+ %7z% e -y -o$TMPDIR ${OMTB_EXE} &>/dev/null || exit 1

++ @p7zip@/bin/7z e -y -o$TMPDIR ${OMTB_EXE} &>/dev/null || exit 1

  #Check if extraction files are there

  FIMG_a=(${TMPDIR}/6<->.img(N[1]))

  [[ -z $FIMG_a ]] && {print "\nERROR: Could not find 6*.img file after extracting $OMTB_EXE" >/dev/stderr ; exit 1}

diff --git a/pkgs/tools/geo/openmtbmap_openvelomap_linux/default.nix b/pkgs/tools/geo/openmtbmap_openvelomap_linux/default.nix

deleted file mode 100644

index 3e912ebae37ab0510068d33af222c036c4fc5314..0000000000000000000000000000000000000000

--- a/pkgs/tools/geo/openmtbmap_openvelomap_linux/default.nix

+++ /dev/null

@@ -1,30 +0,0 @@

-{ stdenv, gmaptool, mkgmap, p7zip, zsh, sources }:

-stdenv.mkDerivation rec {

• pname = "openmtbmap_openvelomap_linux";

• version = stdenv.lib.substring 0 7 src.rev;

• src = sources.openmtbmap_openvelomap_linux;

• patches = [ ./0001-fix-path.patch ];

• buildInputs = [ gmaptool mkgmap p7zip zsh ];

• postPatch = ''

• substituteInPlace create_omtb_garmin_img.sh \

•  --replace "%gmaptool%" "${gmaptool}" \
  

•  --replace "%mkgmap%" "${mkgmap}" \
  

•  --replace "%7z%" "${p7zip}/bin/7z"
  

• '';

• installPhase = ''

• install -Dm755 create_omtb_garmin_img.sh "$out/bin/create_omtb_garmin_img"

• '';

• meta = with stdenv.lib; {

• inherit (src) description homepage;

• license = licenses.free;

• maintainers = with maintainers; [ sikmir ];

• platforms = platforms.all;

• skip.ci = true;

• };

-}

diff --git a/pkgs/tools/geo/osm2mp/default.nix b/pkgs/tools/geo/osm2mp/default.nix

index e09620f62c96fb11a21119abf5396a4f1fc420b2..40706be2ff1fe589021c68750749889703868d98 100644

--- a/pkgs/tools/geo/osm2mp/default.nix

+++ b/pkgs/tools/geo/osm2mp/default.nix

@@ -17,9 +17,9 @@ , TreeR

, YAML

}:

-buildPerlPackage rec {

+buildPerlPackage {

pname = "osm2mp";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.osm2mp.rev;

src = sources.osm2mp;

outputs = [ "out" ];

diff --git a/pkgs/tools/geo/sendmap20/default.nix b/pkgs/tools/geo/sendmap20/default.nix

index b3ebd641a2c358567f95bb7dadaf69530f38c628..f4b9f886971b5db7632219c4fd3219f2e82be65b 100644

--- a/pkgs/tools/geo/sendmap20/default.nix

+++ b/pkgs/tools/geo/sendmap20/default.nix

@@ -1,11 +1,12 @@

-{ stdenv, fetchurl }:

+{ stdenv, fetchwebarchive }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "sendmap20";

version = "4.2";

• src = fetchurl {

• url = "https://web.archive.org/web/20160622234550if_/http://cgpsmapper.com/download/${pname}.gz";

• src = fetchwebarchive {

• url = "http://cgpsmapper.com/download/sendmap20.gz";

• timestamp = "20160622234550";

 sha256 = "08fm3q3qpirxd2l6rwffs2h997vk04bl4jvq8fbjlymrsmdlqx4s";

};

diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix

index fd3839f12f90231c4b381a5814f43973972d5169..d04b9f0ea6cf608526c773132a149fde662b6fc1 100644

--- a/pkgs/tools/geo/supermercado/default.nix

+++ b/pkgs/tools/geo/supermercado/default.nix

@@ -9,9 +9,9 @@ , pytest

, sources

}:

-buildPythonApplication rec {

+buildPythonApplication {

pname = "supermercado";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.supermercado.rev;

src = sources.supermercado;

patches = [

diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix

index 27465d6f829a532d35c0a94e6e36e0326ea32227..4cd50e6b6436741cfb9ec95672744674a43de9ad 100644

--- a/pkgs/tools/geo/tpkutils/default.nix

+++ b/pkgs/tools/geo/tpkutils/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonApplication, mercantile, pymbtiles, pytest, setuptools, six, sources }:

-buildPythonApplication rec {

+buildPythonApplication {

pname = "tpkutils";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.tpkutils.rev;

src = sources.tpkutils;

propagatedBuildInputs = [ mercantile pymbtiles setuptools six ];

diff --git a/pkgs/tools/i18n-editor/default.nix b/pkgs/tools/i18n-editor/default.nix

index 8b77f442627a6f49121d0e9a7204e5b57875a236..d3d795786e1032637c2149e39974c55e5f374cca 100644

--- a/pkgs/tools/i18n-editor/default.nix

+++ b/pkgs/tools/i18n-editor/default.nix

@@ -1,14 +1,20 @@

-{ stdenv, fetchzip, jre, makeWrapper }:

-stdenv.mkDerivation rec {

+{ stdenv, fetchfromgh, unzip, jre, makeWrapper }:

+let

• version = "2.0.0-beta.1";

+in

+stdenv.mkDerivation {

pname = "i18n-editor";

• version = "2.0.0-beta.1";

• inherit version;

• src = fetchzip {

• url = "https://github.com/jcbvm/i18n-editor/releases/download/${version}/${pname}-${version}.zip";

• sha256 = "0hkxgmna22qwm72rwaj4l1rxnx1x93z4v843sz58fdfiqmiqjfy3";

• stripRoot = false;

• src = fetchfromgh {

• owner = "jcbvm";

• repo = "i18n-editor";

• name = "i18n-editor-${version}.zip";

• sha256 = "19p9p6h4kfv468frdsl88w4x3z4bnhlcnll21zw63xhccw55v0lj";

• inherit version;

};

• unpackPhase = "${unzip}/bin/unzip $src";

buildInputs = [ jre makeWrapper ];

diff --git a/pkgs/tools/morse-talk/default.nix b/pkgs/tools/morse-talk/default.nix

index 8f6cef34ff5f79470e22ec9f951dd526475dd9dc..d8f9de9fab181fd89d3802e0f6eb8e012abdf10e 100644

--- a/pkgs/tools/morse-talk/default.nix

+++ b/pkgs/tools/morse-talk/default.nix

@@ -1,8 +1,8 @@

{ lib, buildPythonApplication, matplotlib, nose, sounddevice, sources }:

-buildPythonApplication rec {

+buildPythonApplication {

pname = "morse-talk";

• version = lib.substring 0 7 src.rev;

• version = lib.substring 0 7 sources.morse-talk.rev;

src = sources.morse-talk;

propagatedBuildInputs = [ matplotlib sounddevice ];

diff --git a/pkgs/tools/networking/ish/default.nix b/pkgs/tools/networking/ish/default.nix

index 610b81999dfb2d7ca18d9609a489a0316ce1863d..38dc3475512a6e3f62d42ffbcab5f99b18256de7 100644

--- a/pkgs/tools/networking/ish/default.nix

+++ b/pkgs/tools/networking/ish/default.nix

@@ -1,11 +1,13 @@

{ stdenv, fetchurl }:

-stdenv.mkDerivation rec {

• pname = "ish";

+let

version = "0.2";

+in

+stdenv.mkDerivation {

• pname = "ish";

• inherit version;

src = fetchurl {

• url = "mirror://sourceforge/icmpshell/${pname}-v${version}.tar.gz";

• url = "mirror://sourceforge/icmpshell/ish-v${version}.tar.gz";

 sha256 = "10jp7l0in91n5prc83ykma14r8wd6gyd1amzfi8jysw1jprc92qb";

};

@@ -16,7 +18,7 @@

makeFlags = [ "linux" ];

installPhase = ''

• install -Dm755 ish ishd -t "$out/bin"

• install -Dm755 ish ishd -t $out/bin

'';

meta = with stdenv.lib; {

diff --git a/pkgs/tools/networking/ptunnel/default.nix b/pkgs/tools/networking/ptunnel/default.nix

index c5b47753cafe56d452a95d09d17bcbc124e7a690..e1210f3cf57f79d043aeecd3204ff132efce4342 100644

--- a/pkgs/tools/networking/ptunnel/default.nix

+++ b/pkgs/tools/networking/ptunnel/default.nix

@@ -1,8 +1,10 @@

{ stdenv, fetchurl, libpcap }:

-stdenv.mkDerivation rec {

• pname = "ptunnel";

+let

version = "0.72";

+in

+stdenv.mkDerivation {

• pname = "ptunnel";

• inherit version;

src = fetchurl {

 url = "https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${version}.tar.gz";

diff --git a/pkgs/tools/supload/default.nix b/pkgs/tools/supload/default.nix

index 1c4679ca5e8ca708afb114ad031c4478f2590a7d..e5699e0d3e64d5444994362332f54140bf7c04e0 100644

--- a/pkgs/tools/supload/default.nix

+++ b/pkgs/tools/supload/default.nix

@@ -1,8 +1,8 @@

{ stdenv, curl, file, coreutils, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "supload";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.supload.rev;

src = sources.supload;

buildInputs = [ curl file ];

diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/tools/text/csvquote/default.nix

index d017a36ebd3bec730f7cfd21889e79aca85b505d..23aee3714684a4c278b2eaa404cdf76ecdcc925f 100644

--- a/pkgs/tools/text/csvquote/default.nix

+++ b/pkgs/tools/text/csvquote/default.nix

@@ -1,15 +1,13 @@

{ stdenv, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "csvquote";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.csvquote.rev;

src = sources.csvquote;

makeFlags = [ "BINDIR=$(out)/bin" ];

• preInstall = ''

• mkdir -p "$out/bin"

• '';

• preInstall = "mkdir -p $out/bin";

meta = with stdenv.lib; {

 inherit (src) description homepage;

diff --git a/pkgs/tools/text/csvtools/default.nix b/pkgs/tools/text/csvtools/default.nix

index d786f9752c72818e37de026e4eef0bad5bc4a913..04e1435d78d0ed25786e832367cfee36284563d6 100644

--- a/pkgs/tools/text/csvtools/default.nix

+++ b/pkgs/tools/text/csvtools/default.nix

@@ -1,8 +1,8 @@

{ stdenv, pcre, openssl, sources }:

-stdenv.mkDerivation rec {

+stdenv.mkDerivation {

pname = "csvtools";

• version = stdenv.lib.substring 0 7 src.rev;

• version = stdenv.lib.substring 0 7 sources.csvtools.rev;

src = sources.csvtools;

buildInputs = [ pcre ];

@@ -13,13 +13,9 @@

doCheck = true;

checkInputs = [ openssl ];

• preCheck = ''

• patchShebangs .

• '';

• preCheck = "patchShebangs .";

• preInstall = ''

• mkdir -p "$out/bin"

• '';

• preInstall = "mkdir -p $out/bin";

meta = with stdenv.lib; {

 inherit (src) description homepage;

diff --git a/pkgs/tools/xfractint/default.nix b/pkgs/tools/xfractint/default.nix

index a9df8ac8ed0066a7e4df435c675e57e909f773cf..06a0469ee08f315930d8c6756606b25c725beefd 100644

--- a/pkgs/tools/xfractint/default.nix

+++ b/pkgs/tools/xfractint/default.nix

@@ -1,11 +1,13 @@

{ stdenv, fetchurl, xlibsWrapper }:

-stdenv.mkDerivation rec {

• pname = "xfractint";

+let

version = "20.04p14";

+in

+stdenv.mkDerivation {

• pname = "xfractint";

• inherit version;

src = fetchurl {

• url = "https://fractint.org/ftp/current/linux/${pname}-${version}.tar.gz";

• url = "https://fractint.org/ftp/current/linux/xfractint-${version}.tar.gz";

 sha256 = "0jdqr639z862qrswwk5srmv4fj5d7rl8kcscpn6mlkx4jvjmca0f";

};