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

index e3b8c10ae2b6a52fec1384653d97ceed5fd4261d..017d1403488337428474b506c76446a3645acef8 100644

--- a/ci.nix

+++ b/ci.nix

@@ -9,26 +9,37 @@ #

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;

• isBuildable =

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

isCacheable = p: !(p.preferLocalBuild or false);

shouldRecurseForDerivations = p: isAttrs p && p.recurseForDerivations or false;

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

• nameValuePair = n: v: {

• name = n;

• value = v;

• };

concatMap = builtins.concatMap or (f: xs: concatLists (map f xs));

• flattenPkgs = s:

• flattenPkgs =

• s:

 let

•  f = p:
  

•    if shouldRecurseForDerivations p then flattenPkgs p
  

•    else if isDerivation p then [ p ]
  

•    else [ ];
  

•  f =
  

•    p:
  

•    if shouldRecurseForDerivations p then
  

•      flattenPkgs p
  

•    else if isDerivation p then
  

•      [ p ]
  

•    else
  

•      [ ];
  

 in

 concatMap f (attrValues s);

@@ -36,19 +47,11 @@ 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)
  

•      )
  

•  )
  

• );

• nurPkgs = flattenPkgs (

• listToAttrs (

•  map (n: nameValuePair n nurAttrs.${n}) (filter (n: !isReserved n) (attrNames nurAttrs))
  

• )

• );

in

rec {

buildPkgs = filter isBuildable nurPkgs;

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

index b085f3b6b8d25ed6bcac2ea3caa3643dc58200d1..de70beb46126b03ff5bc31cd9fb9311e962e6b26 100644

--- a/default.nix

+++ b/default.nix

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

commands such as:

nix-build -A mypackage

-{ pkgs ? import { } }:

+{

• pkgs ? import { },

+}:

{

The lib, modules, and overlay names are special

modules = import ./modules; # NixOS modules

-} // (pkgs.lib.optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs {

• inherit pkgs;

}

-)

-)

+// (pkgs.lib.optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs { inherit pkgs; }))

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

index 91db119dd9b3fcfdc492f078ca22b15f78b69f72..b1582827a0bf1d7cab239cfaa91cfeb78aa8729b 100644

--- a/flake.nix

+++ b/flake.nix

@@ -6,30 +6,39 @@ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";

 flake-utils.url = "github:numtide/flake-utils";

};

• outputs = { self, nixpkgs, flake-utils }: {

• overlays.default = final: prev: import ./pkgs { pkgs = prev; };

• nixosModules = import ./modules;

• } // flake-utils.lib.eachDefaultSystem (system:

• let

•  config = {
  

•    permittedInsecurePackages = [ "openssl-1.1.1w" "python-2.7.18.7" "qtwebkit-5.212.0-alpha4" ];
  

•  };
  

•  pkgs = import nixpkgs {
  

•    inherit system config;
  

•  };
  

•  inherit (pkgs) lib;
  

•  packages = flake-utils.lib.filterPackages system (import ./default.nix {
  

•    inherit pkgs;
  

•  });
  

• in

• outputs =

 {

•  inherit packages;
  

•  legacyPackages = import nixpkgs {
  

•    inherit system config;
  

•    overlays = [ self.overlays.default ];
  

•    crossOverlays = [ self.overlays.default ];
  

•  };
  

•  formatter = pkgs.nixpkgs-fmt;
  

•  checks.build = pkgs.linkFarmFromDrvs "sikmir-nur-packages" (lib.attrValues packages);
  

• });

•  self,
  

•  nixpkgs,
  

•  flake-utils,
  

• }:

• {

•  overlays.default = final: prev: import ./pkgs { pkgs = prev; };
  

•  nixosModules = import ./modules;
  

• }

• // flake-utils.lib.eachDefaultSystem (

•  system:
  

•  let
  

•    config = {
  

•      permittedInsecurePackages = [
  

•        "openssl-1.1.1w"
  

•        "python-2.7.18.7"
  

•        "qtwebkit-5.212.0-alpha4"
  

•      ];
  

•    };
  

•    pkgs = import nixpkgs { inherit system config; };
  

•    inherit (pkgs) lib;
  

•    packages = flake-utils.lib.filterPackages system (import ./default.nix { inherit pkgs; });
  

•  in
  

•  {
  

•    inherit packages;
  

•    legacyPackages = import nixpkgs {
  

•      inherit system config;
  

•      overlays = [ self.overlays.default ];
  

•      crossOverlays = [ self.overlays.default ];
  

•    };
  

•    formatter = pkgs.nixfmt-rfc-style;
  

•    checks.build = pkgs.linkFarmFromDrvs "sikmir-nur-packages" (lib.attrValues packages);
  

•  }
  

• );

}

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

index 77242f62516fa608ed43b73ff83a50a57294c818..e6b4e47f87ddf982f15f8b9705a77005dffed9d4 100644

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

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

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

let

@@ -18,9 +23,5 @@ type = types.package;

 };

};

• config = mkIf cfg.enable {

• home.packages = [

•  cfg.package
  

• ];

• };

• config = mkIf cfg.enable { home.packages = [ cfg.package ]; };

}

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

index 2badde1970e94353f4085ddced49b97523f19566..a2f58f1579c763f32537f31bee6e84c89f54fd4c 100644

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

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

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

let

@@ -66,67 +71,45 @@ type = types.nullOr types.package;

 };

};

• config = mkIf cfg.enable (

• mkMerge [

•  {
  

•    home.packages = [ cfg.package ];
  

• config = mkIf cfg.enable (mkMerge [

• {

•  home.packages = [ cfg.package ];
  

•    home.activation.hideToolbar =
  

•      lib.hm.dag.entryAfter [ "writeBoundary" ]
  

•        (
  

•          if pkgs.stdenv.isDarwin then
  

•            "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Settings.toolbar -bool false"
  

•          else
  

•            "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Settings toolbar 0"
  

•        );
  

•  }
  

•  home.activation.hideToolbar = lib.hm.dag.entryAfter [ "writeBoundary" ] (
  

•    if pkgs.stdenv.isDarwin then
  

•      "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Settings.toolbar -bool false"
  

•    else
  

•      "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Settings toolbar 0"
  

•  );
  

• }

•  (
  

•    mkIf pkgs.stdenv.isLinux {
  

•      home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
  

•        $DRY_RUN_CMD mkdir -p ${configDir}
  

•        $DRY_RUN_CMD touch ${configFile}
  

•      '';
  

•    }
  

•  )
  

• (mkIf pkgs.stdenv.isLinux {

•  home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
  

•    $DRY_RUN_CMD mkdir -p ${configDir}
  

•    $DRY_RUN_CMD touch ${configFile}
  

•  '';
  

• })

•  (
  

•    mkIf (cfg.demPackage != null) {
  

•      home.file."${demDir}".source = "${cfg.demPackage}";
  

•    }
  

•  )
  

• (mkIf (cfg.demPackage != null) { home.file."${demDir}".source = "${cfg.demPackage}"; })

•  (
  

•    mkIf (length cfg.mapPackages > 0) {
  

•      home.file = listToAttrs (
  

•        map
  

•          (m: {
  

•            name = "${mapDir}/${m.name}";
  

•            value.source = "${m}";
  

•          })
  

•          cfg.mapPackages
  

•      );
  

•    }
  

•  )
  

• (mkIf (length cfg.mapPackages > 0) {

•  home.file = listToAttrs (
  

•    map (m: {
  

•      name = "${mapDir}/${m.name}";
  

•      value.source = "${m}";
  

•    }) cfg.mapPackages
  

•  );
  

• })

•  (
  

•    mkIf (length cfg.poiPackages > 0) {
  

•      home.file = listToAttrs (
  

•        map
  

•          (p: {
  

•            name = "${poiDir}/${p.name}";
  

•            value.source = "${p}";
  

•          })
  

•          cfg.poiPackages
  

•      );
  

•    }
  

•  )
  

• (mkIf (length cfg.poiPackages > 0) {

•  home.file = listToAttrs (
  

•    map (p: {
  

•      name = "${poiDir}/${p.name}";
  

•      value.source = "${p}";
  

•    }) cfg.poiPackages
  

•  );
  

• })

•  (
  

•    mkIf (cfg.stylePackage != null) {
  

•      home.file."${styleDir}".source = "${cfg.stylePackage}";
  

•    }
  

•  )
  

• ]

• );

• (mkIf (cfg.stylePackage != null) { home.file."${styleDir}".source = "${cfg.stylePackage}"; })

• ]);

}

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

index 9320607ab9742b2e5910071fe75508e6addf97a8..d4dfb7d01855cdd5047d2baeadf3a691985330eb 100644

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

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

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

let

@@ -36,39 +41,33 @@ type = types.str;

 };

};

• config = mkIf cfg.enable (

• mkMerge [

•  {
  

•    home.packages = [ cfg.package ];
  

• config = mkIf cfg.enable (mkMerge [

• {

•  home.packages = [ cfg.package ];
  

•    home.activation.createJOSMConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
  

•      . ${./josm/init-prefs.sh}
  

•      . ${./josm/upsert-tag.sh}
  

•      export PATH=${pkgs.xmlstarlet}/bin:$PATH
  

•      initPrefs ${cfg.package.version} ${configFile}
  

•      upsertTag josm.version ${cfg.package.version} ${configFile}
  

•    '';
  

•  }
  

•  home.activation.createJOSMConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
  

•    . ${./josm/init-prefs.sh}
  

•    . ${./josm/upsert-tag.sh}
  

•    export PATH=${pkgs.xmlstarlet}/bin:$PATH
  

•    initPrefs ${cfg.package.version} ${configFile}
  

•    upsertTag josm.version ${cfg.package.version} ${configFile}
  

•  '';
  

• }

•  (
  

•    mkIf (cfg.accessTokenKey != "") {
  

•      home.activation.setupAccessTokenKey = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
  

•        . ${./josm/upsert-tag.sh}
  

•        export PATH=${pkgs.xmlstarlet}/bin:$PATH
  

•        upsertTag oauth.access-token.key ${cfg.accessTokenKey} ${configFile}
  

•      '';
  

•    }
  

•  )
  

• (mkIf (cfg.accessTokenKey != "") {

•  home.activation.setupAccessTokenKey = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
  

•    . ${./josm/upsert-tag.sh}
  

•    export PATH=${pkgs.xmlstarlet}/bin:$PATH
  

•    upsertTag oauth.access-token.key ${cfg.accessTokenKey} ${configFile}
  

•  '';
  

• })

•  (
  

•    mkIf (cfg.accessTokenSecret != "") {
  

•      home.activation.setupAccessTokenSecret = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
  

•        . ${./josm/upsert-tag.sh}
  

•        export PATH=${pkgs.xmlstarlet}/bin:$PATH
  

•        upsertTag oauth.access-token.secret ${cfg.accessTokenSecret} ${configFile}
  

•      '';
  

•    }
  

•  )
  

• ]

• );

• (mkIf (cfg.accessTokenSecret != "") {

•  home.activation.setupAccessTokenSecret = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
  

•    . ${./josm/upsert-tag.sh}
  

•    export PATH=${pkgs.xmlstarlet}/bin:$PATH
  

•    upsertTag oauth.access-token.secret ${cfg.accessTokenSecret} ${configFile}
  

•  '';
  

• })

• ]);

}

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

index 60c45d73d2033b0fefd4994255dca2bbe4ccbfd8..88ce2d783c48b72c146fd9e7237a871af0e758f3 100644

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

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

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

let

@@ -33,41 +38,35 @@ type = types.str;

 };

};

• config = mkIf cfg.enable (

• mkMerge [

•  {
  

•    home.packages = [ cfg.package ];
  

•  }
  

• config = mkIf cfg.enable (mkMerge [

• { home.packages = [ cfg.package ]; }

•  (
  

•    mkIf pkgs.stdenv.isLinux {
  

•      home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
  

•        $DRY_RUN_CMD mkdir -p ${configDir}
  

•        $DRY_RUN_CMD touch ${configFile}
  

•      '';
  

•    }
  

•  )
  

• (mkIf pkgs.stdenv.isLinux {

•  home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
  

•    $DRY_RUN_CMD mkdir -p ${configDir}
  

•    $DRY_RUN_CMD touch ${configFile}
  

•  '';
  

• })

•  (
  

•    mkIf (cfg.user != "" && cfg.password != "") {
  

•      home.activation.setupCredentials = lib.hm.dag.entryAfter [ "writeBoundary" ]
  

•        (
  

•          if pkgs.stdenv.isDarwin then ''
  

•            $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.url https://api.openstreetmap.org/api
  

•            $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.selected true
  

•            $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.user ${cfg.user}
  

•            $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.password ${cfg.password}
  

•            $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.size 1
  

•          '' else ''
  

•            $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\url https://api.openstreetmap.org/api
  

•            $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\selected true
  

•            $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\user ${cfg.user}
  

•            $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\password ${cfg.password}
  

•            $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers size 1
  

•          ''
  

•        );
  

•    }
  

•  )
  

• ]

• );

• (mkIf (cfg.user != "" && cfg.password != "") {

•  home.activation.setupCredentials = lib.hm.dag.entryAfter [ "writeBoundary" ] (
  

•    if pkgs.stdenv.isDarwin then
  

•      ''
  

•        $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.url https://api.openstreetmap.org/api
  

•        $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.selected true
  

•        $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.user ${cfg.user}
  

•        $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.password ${cfg.password}
  

•        $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.size 1
  

•      ''
  

•    else
  

•      ''
  

•        $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\url https://api.openstreetmap.org/api
  

•        $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\selected true
  

•        $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\user ${cfg.user}
  

•        $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\password ${cfg.password}
  

•        $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers size 1
  

•      ''
  

•  );
  

• })

• ]);

}

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

index 2cd2a13c8afdd48a02136fe7955e00204cbc3175..8deedb9a61cec84b893c0e5f0f13cc787d067fc9 100644

--- a/modules/home-manager/programs/openorienteering-mapper.nix

+++ b/modules/home-manager/programs/openorienteering-mapper.nix

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

let

@@ -22,31 +27,23 @@ type = types.package;

 };

};

• config = mkIf cfg.enable (

• mkMerge [

•  {
  

•    home.packages = [ cfg.package ];
  

•  }
  

• config = mkIf cfg.enable (mkMerge [

• { home.packages = [ cfg.package ]; }

•  (
  

•    mkIf pkgs.stdenv.isLinux {
  

•      home.activation.createConfigFile = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
  

•        $DRY_RUN_CMD mkdir -p ${configDir}
  

•        $DRY_RUN_CMD touch ${configFile}
  

•      '';
  

•    }
  

•  )
  

• (mkIf pkgs.stdenv.isLinux {

•  home.activation.createConfigFile = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
  

•    $DRY_RUN_CMD mkdir -p ${configDir}
  

•    $DRY_RUN_CMD touch ${configFile}
  

•  '';
  

• })

•  {
  

•    home.activation.tipsVisible =
  

•      lib.hm.dag.entryAfter [ "writeBoundary" ]
  

•        (
  

•          if pkgs.stdenv.isDarwin then
  

•            "$DRY_RUN_CMD /usr/bin/defaults write ${domain} HomeScreen.tipsVisible -bool false"
  

•          else
  

•            "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} HomeScreen tipsVisible 0"
  

•        );
  

•  }
  

• ]

• );

• {

•  home.activation.tipsVisible = lib.hm.dag.entryAfter [ "writeBoundary" ] (
  

•    if pkgs.stdenv.isDarwin then
  

•      "$DRY_RUN_CMD /usr/bin/defaults write ${domain} HomeScreen.tipsVisible -bool false"
  

•    else
  

•      "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} HomeScreen tipsVisible 0"
  

•  );
  

• }

• ]);

}

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

index f886c23a4bdfff437f18e4a8c71cb6c2cea36e08..dd7a4c704041b312f87505c82d303f8b744b2aff 100644

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

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

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

let

@@ -46,59 +51,41 @@ type = types.listOf types.package;

 };

};

• config = mkIf cfg.enable (

• mkMerge [

•  {
  

•    home.packages = [ cfg.package ];
  

•  }
  

• config = mkIf cfg.enable (mkMerge [

• { home.packages = [ cfg.package ]; }

•  (
  

•    mkIf pkgs.stdenv.isLinux {
  

•      home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
  

•        $DRY_RUN_CMD mkdir -p ${configDir}
  

•        $DRY_RUN_CMD touch ${configFile}
  

•      '';
  

•    }
  

•  )
  

• (mkIf pkgs.stdenv.isLinux {

•  home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
  

•    $DRY_RUN_CMD mkdir -p ${configDir}
  

•    $DRY_RUN_CMD touch ${configFile}
  

•  '';
  

• })

•  (
  

•    mkIf (length cfg.demPackages > 0) {
  

•      home.activation.setupDemPaths =
  

•        lib.hm.dag.entryAfter [ "writeBoundary" ]
  

•          (
  

•            if pkgs.stdenv.isDarwin then
  

•              "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Canvas.demPaths -array ${toString cfg.demPackages}"
  

•            else
  

•              "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Canvas demPaths ${concatStringsSep "," cfg.demPackages}"
  

•          );
  

•    }
  

•  )
  

• (mkIf (length cfg.demPackages > 0) {

•  home.activation.setupDemPaths = lib.hm.dag.entryAfter [ "writeBoundary" ] (
  

•    if pkgs.stdenv.isDarwin then
  

•      "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Canvas.demPaths -array ${toString cfg.demPackages}"
  

•    else
  

•      "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Canvas demPaths ${concatStringsSep "," cfg.demPackages}"
  

•  );
  

• })

•  (
  

•    mkIf (length cfg.mapPackages > 0) {
  

•      home.activation.setupMapPaths =
  

•        lib.hm.dag.entryAfter [ "writeBoundary" ]
  

•          (
  

•            if pkgs.stdenv.isDarwin then
  

•              "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Canvas.mapPath -array ${toString cfg.mapPackages}"
  

•            else
  

•              "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Canvas mapPath ${concatStringsSep "," cfg.mapPackages}"
  

•          );
  

•    }
  

•  )
  

• (mkIf (length cfg.mapPackages > 0) {

•  home.activation.setupMapPaths = lib.hm.dag.entryAfter [ "writeBoundary" ] (
  

•    if pkgs.stdenv.isDarwin then
  

•      "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Canvas.mapPath -array ${toString cfg.mapPackages}"
  

•    else
  

•      "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Canvas mapPath ${concatStringsSep "," cfg.mapPackages}"
  

•  );
  

• })

•  (
  

•    mkIf (length cfg.routinoPackages > 0) {
  

•      home.activation.setupRoutinoPaths =
  

•        lib.hm.dag.entryAfter [ "writeBoundary" ]
  

•          (
  

•            if pkgs.stdenv.isDarwin then
  

•              "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Route.routino.paths -array ${toString cfg.routinoPackages}"
  

•            else
  

•              "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Route routino\\\\paths ${concatStringsSep "," cfg.routinoPackages}"
  

•          );
  

•    }
  

•  )
  

• ]

• );

• (mkIf (length cfg.routinoPackages > 0) {

•  home.activation.setupRoutinoPaths = lib.hm.dag.entryAfter [ "writeBoundary" ] (
  

•    if pkgs.stdenv.isDarwin then
  

•      "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Route.routino.paths -array ${toString cfg.routinoPackages}"
  

•    else
  

•      "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Route routino\\\\paths ${concatStringsSep "," cfg.routinoPackages}"
  

•  );
  

• })

• ]);

}

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

index cbb6077afe7ead90a81d9508e4c6f55dd2f15568..947297f9091d4c8fbf874a5311df9ad607fb475c 100644

--- a/modules/home-manager/programs/slack-term.nix

+++ b/modules/home-manager/programs/slack-term.nix

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

let

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

index a80a7ab978d0f8e889154904e4692a38c613949e..6d6eb647a87395fb46cedd61823dc25430fcc1fd 100644

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

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

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

let

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

index 7c575593622d84f2456e47be8c72c58c96c34c16..ffd74c38a1ad24db48343a3c822752b40b741c51 100644

--- a/modules/nixos/default.nix

+++ b/modules/nixos/default.nix

@@ -1,3 +1 @@

-{

• mbtileserver = ./services/mbtileserver.nix;

-}

+{ mbtileserver = ./services/mbtileserver.nix; }

diff --git a/modules/nixos/services/mbtileserver.nix b/modules/nixos/services/mbtileserver.nix

index 8830abfdaface33e89ff1599d32222263bd7ff01..4742b81dc3cbd1fe539b026b3586f6cc77349ae7 100644

--- a/modules/nixos/services/mbtileserver.nix

+++ b/modules/nixos/services/mbtileserver.nix

@@ -1,4 +1,9 @@

-{ config, lib, pkgs, ... }:

+{

• config,

• lib,

• pkgs,

• ...

+}:

with lib;

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

index 9a7b64f660f71044bdfc74eb51f99c596edda6af..57231e740826c56d94faed76057a4f6365aa113e 100644

--- a/overlay.nix

+++ b/overlay.nix

@@ -5,13 +5,14 @@

self: super:

let

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

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

• 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/pkgs/applications/goldencheetah/bin.nix b/pkgs/applications/goldencheetah/bin.nix

index 5b07b945e6d1ec3ef7d9e3d29f53fc2dce633be0..8792d70fe01751be6fa6a8844c9f41105360cf9d 100644

--- a/pkgs/applications/goldencheetah/bin.nix

+++ b/pkgs/applications/goldencheetah/bin.nix

@@ -1,4 +1,10 @@

-{ lib, stdenv, fetchfromgh, appimageTools, undmg }:

+{

• lib,

• stdenv,

• fetchfromgh,

• appimageTools,

• undmg,

+}:

let

inherit (stdenv.hostPlatform) system;

throwSystem = throw "Unsupported system: ${system}";

@@ -6,25 +12,27 @@

pname = "goldencheetah-bin";

version = "3.5";

• suffix = {

• x86_64-linux = "amd64_Linux.AppImage";

• x86_64-darwin = "64bit_MacOS.dmg";

• }.${system} or throwSystem;

• suffix =

• {

•  x86_64-linux = "amd64_Linux.AppImage";
  

•  x86_64-darwin = "64bit_MacOS.dmg";
  

• }

• .${system} or throwSystem;

src = fetchfromgh {

 owner = "GoldenCheetah";

 repo = "GoldenCheetah";

 version = "V${version}";

 name = "GoldenCheetah_v${version}_${suffix}";

• sha256 = {

•  x86_64-linux = "07ixivsp5j05a3zsbqx5jf11x7m3rcqaw095qjqrwd0nq0nmmhg8";
  

•  x86_64-darwin = "0alg0a071lpkx0v3qqkqbb93vh1nsb3d7czxl9m15v17akp8nl82";
  

• }.${system} or throwSystem;

• sha256 =

•  {
  

•    x86_64-linux = "07ixivsp5j05a3zsbqx5jf11x7m3rcqaw095qjqrwd0nq0nmmhg8";
  

•    x86_64-darwin = "0alg0a071lpkx0v3qqkqbb93vh1nsb3d7czxl9m15v17akp8nl82";
  

•  }
  

•  .${system} or throwSystem;
  

};

• appimageContents = appimageTools.extract {

• inherit pname version src;

• };

• appimageContents = appimageTools.extract { inherit pname version src; };

meta = with lib; {

 description = "Performance software for cyclists, runners and triathletes";

@@ -32,12 +40,20 @@ homepage = "https://www.goldencheetah.org/";

 sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.gpl3;

 maintainers = [ maintainers.sikmir ];

• platforms = [ "x86_64-linux" "x86_64-darwin" ];

• platforms = [

•  "x86_64-linux"
  

•  "x86_64-darwin"
  

• ];

 skip.ci = true;

};

linux = appimageTools.wrapType2 rec {

• inherit pname version src meta;

• inherit

•  pname
  

•  version
  

•  src
  

•  meta
  

•  ;
  

 extraInstallCommands = ''

   mv $out/bin/{${pname}-${version},goldencheetah}

@@ -59,6 +75,4 @@ cp -r . $out/Applications/GoldenCheetah.app

 '';

};

in

-if stdenv.isDarwin

-then darwin

-else linux

+if stdenv.isDarwin then darwin else linux

diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix

index aca65a1bec10ddfeed6844a829fd75a4461c65a1..bcd70d79b2f839d1e0d20542b166a1b5e179c256 100644

--- a/pkgs/applications/misc/klogg/bin.nix

+++ b/pkgs/applications/misc/klogg/bin.nix

@@ -1,4 +1,10 @@

-{ lib, stdenv, fetchfromgh, appimageTools, undmg }:

+{

• lib,

• stdenv,

• fetchfromgh,

• appimageTools,

• undmg,

+}:

let

inherit (stdenv.hostPlatform) system;

throwSystem = throw "Unsupported system: ${system}";

@@ -6,37 +12,47 @@

pname = "klogg-bin";

version = "22.06";

• suffix = {

• x86_64-linux = "Linux-amd64.AppImage";

• x86_64-darwin = "OSX-Qt5.dmg";

• }.${system} or throwSystem;

• suffix =

• {

•  x86_64-linux = "Linux-amd64.AppImage";
  

•  x86_64-darwin = "OSX-Qt5.dmg";
  

• }

• .${system} or throwSystem;

src = fetchfromgh {

 owner = "variar";

 repo = "klogg";

 version = "v${version}";

 name = "klogg-${version}.0.1289-${suffix}";

• hash = {

•  x86_64-linux = "sha256-XawJ6VOF0XtMrl7iefm13quv83X171k9eKiXClrklZI=";
  

•  x86_64-darwin = "sha256-5d93ItDYUYUt2cw0Sd1C0f7z507dqMINwEs4y4UrD+w=";
  

• }.${system} or throwSystem;

• hash =

•  {
  

•    x86_64-linux = "sha256-XawJ6VOF0XtMrl7iefm13quv83X171k9eKiXClrklZI=";
  

•    x86_64-darwin = "sha256-5d93ItDYUYUt2cw0Sd1C0f7z507dqMINwEs4y4UrD+w=";
  

•  }
  

•  .${system} or throwSystem;
  

};

• appimageContents = appimageTools.extract {

• inherit pname version src;

• };

• appimageContents = appimageTools.extract { inherit pname version src; };

meta = with lib; {

 description = "A fast, advanced log explorer based on glogg project";

 homepage = "https://klogg.filimonov.dev/";

 license = licenses.gpl3Plus;

• platforms = [ "x86_64-linux" "x86_64-darwin" ];

• platforms = [

•  "x86_64-linux"
  

•  "x86_64-darwin"
  

• ];

 maintainers = [ maintainers.sikmir ];

 skip.ci = true;

};

linux = appimageTools.wrapType2 rec {

• inherit pname version src meta;

• inherit

•  pname
  

•  version
  

•  src
  

•  meta
  

•  ;
  

 extraInstallCommands = ''

   mv $out/bin/{${pname}-${version},klogg}

@@ -46,7 +62,12 @@ '';

};

darwin = stdenv.mkDerivation {

• inherit pname version src meta;

• inherit

•  pname
  

•  version
  

•  src
  

•  meta
  

•  ;
  

 nativeBuildInputs = [ undmg ];

@@ -58,6 +79,4 @@ cp -r *.app $out/Applications

 '';

};

in

-if stdenv.isDarwin

-then darwin

-else linux

+if stdenv.isDarwin then darwin else linux

diff --git a/pkgs/applications/misc/klogg/default.nix b/pkgs/applications/misc/klogg/default.nix

index a7042a60ab5ea437df4ede45edf3847d0458bce2..52acc4abc9f8531350404b22fbfa9dd964c6e70b 100644

--- a/pkgs/applications/misc/klogg/default.nix

+++ b/pkgs/applications/misc/klogg/default.nix

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

-{ stdenv

-, lib

-, mkDerivation

-, fetchFromGitHub

-, cmake

-, ninja

-, python3Packages

-, boost

-, ragel

-, useSentry ? stdenv.isLinux

-, useHyperscan ? false

+{

• stdenv,

• lib,

• mkDerivation,

• fetchFromGitHub,

• cmake,

• ninja,

• python3Packages,

• boost,

• ragel,

• useSentry ? stdenv.isLinux,

• useHyperscan ? false,

}:

mkDerivation rec {

@@ -22,9 +23,16 @@ rev = "9fade8bcf354fc6d329facbce07a6c29437597a1";

 hash = "sha256-bim/cDEOfMolHkrBLBEu94YI+1o1opdeA66xeovAwp0=";

};

• nativeBuildInputs = [ cmake ninja python3Packages.python ];

• nativeBuildInputs = [

• cmake

• ninja

• python3Packages.python

• ];

• buildInputs = [ boost ragel ];

• buildInputs = [

• boost

• ragel

• ];

postPatch = lib.optionalString useSentry ''

 patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \

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

index 1bf7c1da29c5f121ab5bb9357ddc8eee4c72a513..95926277e675313b837e6d13f86f8f1a15128d59 100644

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

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

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

-{ lib, stdenv, fetchurl, unzip, wine, makeWrapper, withExLexer ? true }:

+{

• lib,

• stdenv,

• fetchurl,

• unzip,

• wine,

• makeWrapper,

• withExLexer ? true,

+}:

let

exlexer = fetchurl {

 url = "mirror://sourceforge/synwrite-addons/PyPlugins/plugin.Alexey.ExLexer.zip";

@@ -19,18 +27,23 @@ };

sourceRoot = ".";

• nativeBuildInputs = [ unzip makeWrapper ];

• nativeBuildInputs = [

• unzip

• makeWrapper

• ];

• installPhase = ''

• mkdir -p $out/opt/synwrite

• cp -r . $out/opt/synwrite

• installPhase =

• ''

•  mkdir -p $out/opt/synwrite
  

•  cp -r . $out/opt/synwrite
  

• makeWrapper ${wine}/bin/wine $out/bin/synwrite \

•  --run "[ -d \$HOME/.synwrite ] || { cp -r $out/opt/synwrite \$HOME/.synwrite && chmod -R +w \$HOME/.synwrite; }" \
  

•  --add-flags "\$HOME/.synwrite/Syn.exe"
  

• '' + lib.optionalString withExLexer ''

• unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer

• '';

•  makeWrapper ${wine}/bin/wine $out/bin/synwrite \
  

•    --run "[ -d \$HOME/.synwrite ] || { cp -r $out/opt/synwrite \$HOME/.synwrite && chmod -R +w \$HOME/.synwrite; }" \
  

•    --add-flags "\$HOME/.synwrite/Syn.exe"
  

• ''

• • lib.optionalString withExLexer ''

•  unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer
  

• '';

preferLocalBuild = true;

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

index c754399f566c27091922c7235891f218e19244ce..cf46059bb950672bb84463c11e9c5e82d14ef410 100644

--- a/pkgs/build-support/fetchfromgh/default.nix

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

@@ -1,14 +1,28 @@

{ fetchurl }:

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

+{

• owner,

• repo,

• version,

• name,

• ...

+}@args:

let

baseUrl = "https://github.com/${owner}/${repo}";

in

(

• fetchurl

• (

•  {
  

•    url = "${baseUrl}/releases/download/${version}/${name}";
  

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

• ) // { meta.homepage = baseUrl; }

• fetchurl (

• {

•  url = "${baseUrl}/releases/download/${version}/${name}";
  

• }

• // removeAttrs args [

•  "owner"
  

•  "repo"
  

•  "version"
  

•  "name"
  

• ]

• )

• // {

• meta.homepage = baseUrl;

• }

)

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

index eba46d5632876fc0ae30a067a38d98e5b666de07..d7319eedc5077b4c4b6269ad4e74729fb0ceb6a4 100644

--- a/pkgs/build-support/fetchgdrive/default.nix

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

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

{ fetchurl }:

-{ id, ... } @ args:

+{ id, ... }@args:

-(

• fetchurl (

• {

•  url = "https://drive.google.com/uc?export=download&id=${id}";
  

• } // removeAttrs args [ "id" ]

• )

-)

+(fetchurl (

• { url = "https://drive.google.com/uc?export=download&id=${id}"; } // removeAttrs args [ "id" ]

+))

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

index 4b5fbddf4239c4c73b3f31d630e774e3db7c0e7f..13bb080bdfa001aa0c5066fee6494ae21950fd27 100644

--- a/pkgs/build-support/fetchwebarchive/default.nix

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

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

{ fetchurl }:

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

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

-(

• fetchurl (

• {

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

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

• )

-)

+(fetchurl (

• {

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

• }

• // removeAttrs args [

• "timestamp"

• "url"

• ]

+))

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

index 969f1b0e235b28c91a545f9011ef2e48cb88e555..e444c7b9f62d468a0cc43ee81f8810096a6a3559 100644

--- a/pkgs/build-support/fetchymaps/default.nix

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

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

{ fetchurl }:

-{ um, ... } @ args:

+{ um, ... }@args:

-(

• fetchurl (

• {

•  url = "https://yandex.ru/maps/export/usermaps/${um}";
  

• } // removeAttrs args [ "um" ]

• )

-)

+(fetchurl ({ url = "https://yandex.ru/maps/export/usermaps/${um}"; } // removeAttrs args [ "um" ]))

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

index 470fcf59b122946af02c3bee0afb8ac069464b63..5c946ebef679e5797cedad654a124c388b933ea9 100644

--- a/pkgs/darwin/amethyst/default.nix

+++ b/pkgs/darwin/amethyst/default.nix

@@ -1,4 +1,9 @@

-{ lib, stdenv, fetchfromgh, unzip }:

+{

• lib,

• stdenv,

• fetchfromgh,

• unzip,

+}:

stdenv.mkDerivation (finalAttrs: {

pname = "Amethyst";

diff --git a/pkgs/darwin/cudatext/bin.nix b/pkgs/darwin/cudatext/bin.nix

index dfcd887beac08cfed7857e8a41622f6351a53f77..262a87038415c578cf05d494979a682ef5149b04 100644

--- a/pkgs/darwin/cudatext/bin.nix

+++ b/pkgs/darwin/cudatext/bin.nix

@@ -1,24 +1,36 @@

-{ lib, stdenv, fetchurl, _7zz, makeWrapper, cudatext }:

+{

• lib,

• stdenv,

• fetchurl,

• _7zz,

• makeWrapper,

• cudatext,

+}:

stdenv.mkDerivation (finalAttrs: {

pname = "cudatext-bin";

version = "1.214.0.0";

• src = {

• "aarch64-darwin" = fetchurl {

•  url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-aarch64-${finalAttrs.version}.dmg";
  

•  hash = "sha256-DU2QtKjPsHBw8hBb2t7cmYvUQ3UodgcW4Hp9kEyEzBI=";
  

• };

• "x86_64-darwin" = fetchurl {

•  url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-amd64-${finalAttrs.version}.dmg";
  

•  hash = "sha256-oGmUcPmnlqKn4mGVhbnFjM1FJ7H3uUg9Z7MKvt2By2Y=";
  

• };

• }.${stdenv.hostPlatform.system};

• src =

• {

•  "aarch64-darwin" = fetchurl {
  

•    url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-aarch64-${finalAttrs.version}.dmg";
  

•    hash = "sha256-DU2QtKjPsHBw8hBb2t7cmYvUQ3UodgcW4Hp9kEyEzBI=";
  

•  };
  

•  "x86_64-darwin" = fetchurl {
  

•    url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-amd64-${finalAttrs.version}.dmg";
  

•    hash = "sha256-oGmUcPmnlqKn4mGVhbnFjM1FJ7H3uUg9Z7MKvt2By2Y=";
  

•  };
  

• }

• .${stdenv.hostPlatform.system};

sourceRoot = ".";

APFS format is unsupported by undmg

• nativeBuildInputs = [ _7zz makeWrapper ];

• nativeBuildInputs = [

• _7zz

• makeWrapper

• ];

unpackCmd = "7zz x $curSrc";

installPhase = ''

@@ -32,9 +44,17 @@ runHook postInstall

'';

meta = with lib; {

• inherit (cudatext.meta) description homepage changelog license;

• inherit (cudatext.meta)

•  description
  

•  homepage
  

•  changelog
  

•  license
  

•  ;
  

 sourceProvenance = with sourceTypes; [ binaryNativeCode ];

• platforms = [ "aarch64-darwin" "x86_64-darwin" ];

• platforms = [

•  "aarch64-darwin"
  

•  "x86_64-darwin"
  

• ];

 maintainers = [ maintainers.sikmir ];

 skip.ci = true;

};

diff --git a/pkgs/darwin/darktable/bin.nix b/pkgs/darwin/darktable/bin.nix

index 30ce375236601ca9621663c6510b452a92991044..098324260f8866eb843128728d7f21731c7381bf 100644

--- a/pkgs/darwin/darktable/bin.nix

+++ b/pkgs/darwin/darktable/bin.nix

@@ -1,4 +1,10 @@

-{ lib, stdenv, fetchfromgh, undmg, darktable }:

+{

• lib,

• stdenv,

• fetchfromgh,

• undmg,

• darktable,

+}:

stdenv.mkDerivation (finalAttrs: {

pname = "darktable-bin";

@@ -25,8 +31,10 @@

 runHook postInstall

'';

• meta = with lib;

• darktable.meta // {

• meta =

• with lib;

• darktable.meta

• // {

   sourceProvenance = with sourceTypes; [ binaryNativeCode ];

   maintainers = [ maintainers.sikmir ];

   platforms = [ "x86_64-darwin" ];

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

index 7c270b45b8811474e37865121f91dcbb17d2bf39..4e6aebbe89dee522770363342ff5f9133e6e10f2 100644

--- a/pkgs/darwin/finch/default.nix

+++ b/pkgs/darwin/finch/default.nix

@@ -1,29 +1,43 @@

-{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl }:

+{

• lib,

• stdenv,

• buildGoModule,

• fetchFromGitHub,

• fetchurl,

+}:

let

arch = lib.head (lib.splitString "-" stdenv.hostPlatform.system);

Check LIMA_URL in Makefile

• lima = {

• "x86_64-darwin" = fetchurl {

•  url = "https://deps.runfinch.com/${lib.replaceStrings [ "_" ] [ "-" ] arch}/lima-and-qemu.macos-${arch}.1701821611.tar.gz";
  

•  hash = "sha256-mXBQLptj7hpPWGZXMnxDORVq3Zti/yYyW+Udm/FF9UQ=";
  

• };

• "aarch64-darwin" = fetchurl {

•  url = "https://deps.runfinch.com/${lib.replaceStrings [ "_" ] [ "-" ] arch}/lima-and-qemu.macos-${arch}.1701821611.tar.gz";
  

•  hash = "sha256-6Ll2CUwGJKUl8vxgdDx4Xm6O2WMYGJxMX6mLHJSvtT8=";
  

• };

• }.${stdenv.hostPlatform.system};

• lima =

• {

•  "x86_64-darwin" = fetchurl {
  

•    url = "https://deps.runfinch.com/${
  

•      lib.replaceStrings [ "_" ] [ "-" ] arch
  

•    }/lima-and-qemu.macos-${arch}.1701821611.tar.gz";
  

•    hash = "sha256-mXBQLptj7hpPWGZXMnxDORVq3Zti/yYyW+Udm/FF9UQ=";
  

•  };
  

•  "aarch64-darwin" = fetchurl {
  

•    url = "https://deps.runfinch.com/${
  

•      lib.replaceStrings [ "_" ] [ "-" ] arch
  

•    }/lima-and-qemu.macos-${arch}.1701821611.tar.gz";
  

•    hash = "sha256-6Ll2CUwGJKUl8vxgdDx4Xm6O2WMYGJxMX6mLHJSvtT8=";
  

•  };
  

• }

• .${stdenv.hostPlatform.system};

Check FINCH_OS_BASENAME in Makefile

• os = {

• "x86_64-darwin" = fetchurl {

•  url = "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/${arch}/images/Fedora-Cloud-Base-38-1.6.${arch}.qcow2";
  

•  hash = "sha256-0zRnBAH/PVtBKfzGYs9k9ablaCKK9ZB2zESaSUUxhII=";
  

• };

• "aarch64-darwin" = fetchurl {

•  url = "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/${arch}/images/Fedora-Cloud-Base-38-1.6.${arch}.qcow2";
  

•  hash = "sha256-0zRnBAH/PVtBKfzGYs9k9ablaCKK9ZB2zESaSUUxhII=";
  

• };

• }.${stdenv.hostPlatform.system};

• os =

• {

•  "x86_64-darwin" = fetchurl {
  

•    url = "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/${arch}/images/Fedora-Cloud-Base-38-1.6.${arch}.qcow2";
  

•    hash = "sha256-0zRnBAH/PVtBKfzGYs9k9ablaCKK9ZB2zESaSUUxhII=";
  

•  };
  

•  "aarch64-darwin" = fetchurl {
  

•    url = "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/${arch}/images/Fedora-Cloud-Base-38-1.6.${arch}.qcow2";
  

•    hash = "sha256-0zRnBAH/PVtBKfzGYs9k9ablaCKK9ZB2zESaSUUxhII=";
  

•  };
  

• }

• .${stdenv.hostPlatform.system};

in

buildGoModule rec {

pname = "finch";

@@ -41,9 +55,7 @@ vendorHash = "sha256-dyspVMmXuBHtZKk41ibcJwQMrbGNRxQwcPDeRpkr1IU=";

subPackages = [ "cmd/finch" ];

• ldflags = [

• "-X github.com/runfinch/finch/pkg/version.Version=${version}"

• ];

• ldflags = [ "-X github.com/runfinch/finch/pkg/version.Version=${version}" ];

doCheck = false;

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

index 50be49645abc64b788ad8a2a5786354f6280fe5c..fb8d92218e04607ab2d4511a58e7fe78179428ff 100644

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

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

@@ -1,4 +1,9 @@

-{ lib, stdenv, fetchfromgh, unzip }:

+{

• lib,

• stdenv,

• fetchfromgh,

• unzip,

+}:

stdenv.mkDerivation (finalAttrs: {

pname = "MacPass";

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

index 1c02d73266343151e0b9875faceae9a370208bd9..c25beb1ae7616cb1028d1e18bc6f5575ecbe648a 100644

--- a/pkgs/darwin/macsvg/default.nix

+++ b/pkgs/darwin/macsvg/default.nix

@@ -1,4 +1,10 @@

-{ lib, stdenv, fetchfromgh, unzip, makeWrapper }:

+{

• lib,

• stdenv,

• fetchfromgh,

• unzip,

• makeWrapper,

+}:

stdenv.mkDerivation (finalAttrs: {

pname = "macsvg";

@@ -14,12 +20,17 @@ };

sourceRoot = ".";

• nativeBuildInputs = [ unzip makeWrapper ];

• nativeBuildInputs = [

• unzip

• makeWrapper

• ];

installPhase = ''

 runHook preInstall

 mkdir -p $out/Applications

• mv macSVG_v${lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor finalAttrs.version)}/*.app $out/Applications

• mv macSVG_v${

•  lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor finalAttrs.version)
  

• }/*.app $out/Applications

 makeWrapper $out/{Applications/macSVG.app/Contents/MacOS/macSVG,bin/macsvg}

 runHook postInstall

'';

@@ -30,7 +41,10 @@ homepage = "https://macsvg.org/";

 sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

• platforms = [ "aarch64-darwin" "x86_64-darwin" ];

• platforms = [

•  "aarch64-darwin"
  

•  "x86_64-darwin"
  

• ];

 mainProgram = "macsvg";

 skip.ci = true;

};

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

index a691308f531bc26f88230e03a01c06e358edfd52..a407fcf2a37335081d470ef0a4b08a437d18b232 100644

--- a/pkgs/darwin/marta/default.nix

+++ b/pkgs/darwin/marta/default.nix

@@ -1,4 +1,10 @@

-{ lib, stdenvNoCC, fetchurl, undmg, makeWrapper }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

• undmg,

• makeWrapper,

+}:

stdenvNoCC.mkDerivation (finalAttrs: {

pname = "marta";

@@ -9,7 +15,10 @@ url = "https://updates.marta.sh/release/Marta-${finalAttrs.version}.dmg";

 hash = "sha256-DbNkvLCy6q0CN8b4+8oheM4EaaLAQvH3O5zWVYxEyh8=";

};

• nativeBuildInputs = [ undmg makeWrapper ];

• nativeBuildInputs = [

• undmg

• makeWrapper

• ];

sourceRoot = ".";

diff --git a/pkgs/darwin/pinentry-touchid/default.nix b/pkgs/darwin/pinentry-touchid/default.nix

index 7e78c452c33e7b486069f66f2e026df131ed4f47..855dcc233a4ebb3502161c5f103c463503ba7b02 100644

--- a/pkgs/darwin/pinentry-touchid/default.nix

+++ b/pkgs/darwin/pinentry-touchid/default.nix

@@ -1,4 +1,10 @@

-{ lib, stdenv, buildGoModule, fetchFromGitHub, LocalAuthentication }:

+{

• lib,

• stdenv,

• buildGoModule,

• fetchFromGitHub,

• LocalAuthentication,

+}:

buildGoModule rec {

pname = "pinentry-touchid";

diff --git a/pkgs/darwin/podman-desktop/bin.nix b/pkgs/darwin/podman-desktop/bin.nix

index 34574625798a9f7a9a28c3cbf841c52a713f2835..3ed04db8d73a556e10acc88c9047576eeb3187cd 100644

--- a/pkgs/darwin/podman-desktop/bin.nix

+++ b/pkgs/darwin/podman-desktop/bin.nix

@@ -1,14 +1,23 @@

-{ lib, stdenv, fetchfromgh, undmg }:

+{

• lib,

• stdenv,

• fetchfromgh,

• undmg,

+}:

let

• arch = {

• "aarch64-darwin" = "arm64";

• "x86_64-darwin" = "x64";

• }.${stdenv.hostPlatform.system};

• hash = {

• "aarch64-darwin" = "sha256-3+Lib7gWF03UrIKRcyzHw9aX79aebkCQscAPdKAf6z0=";

• "x86_64-darwin" = "sha256-miIw5xsL6GSHC+sX3JNxktfwhY5tkLrLCNdHHUwdtdY=";

• }.${stdenv.hostPlatform.system};

• arch =

• {

•  "aarch64-darwin" = "arm64";
  

•  "x86_64-darwin" = "x64";
  

• }

• .${stdenv.hostPlatform.system};

• hash =

• {

•  "aarch64-darwin" = "sha256-3+Lib7gWF03UrIKRcyzHw9aX79aebkCQscAPdKAf6z0=";
  

•  "x86_64-darwin" = "sha256-miIw5xsL6GSHC+sX3JNxktfwhY5tkLrLCNdHHUwdtdY=";
  

• }

• .${stdenv.hostPlatform.system};

in

stdenv.mkDerivation (finalAttrs: {

pname = "podman-desktop";

@@ -38,7 +47,10 @@ description = "A graphical tool for developing on containers and Kubernetes";

 homepage = "https://podman-desktop.io/";

 sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.asl20;

• platforms = [ "aarch64-darwin" "x86_64-darwin" ];

• platforms = [

•  "aarch64-darwin"
  

•  "x86_64-darwin"
  

• ];

 maintainers = [ maintainers.sikmir ];

 skip.ci = true;

};

diff --git a/pkgs/darwin/qtcreator/bin.nix b/pkgs/darwin/qtcreator/bin.nix

index bb143dd383d0527e823fddc34f54b3f3edecb7b2..bdd8d43d7ccdc26228524ed9977b954a161e6777 100644

--- a/pkgs/darwin/qtcreator/bin.nix

+++ b/pkgs/darwin/qtcreator/bin.nix

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

-{ lib, stdenv, fetchfromgh, p7zip, makeWrapper, qtcreator }:

+{

• lib,

• stdenv,

• fetchfromgh,

• p7zip,

• makeWrapper,

• qtcreator,

+}:

stdenv.mkDerivation (finalAttrs: {

pname = "qtcreator-bin";

@@ -14,7 +21,10 @@ };

sourceRoot = ".";

• nativeBuildInputs = [ p7zip makeWrapper ];

• nativeBuildInputs = [

• p7zip

• makeWrapper

• ];

installPhase = ''

 runHook preInstall

@@ -24,8 +34,10 @@ makeWrapper $out/{Applications/Qt\ Creator.app/Contents/MacOS/Qt\ Creator,bin/qtcreator}

 runHook postInstall

'';

• meta = with lib;

• qtcreator.meta // {

• meta =

• with lib;

• qtcreator.meta

• // {

   sourceProvenance = with sourceTypes; [ binaryNativeCode ];

   maintainers = [ maintainers.sikmir ];

   platforms = [ "x86_64-darwin" ];

diff --git a/pkgs/darwin/qutebrowser/bin.nix b/pkgs/darwin/qutebrowser/bin.nix

index 2d43994de13d43781c78c0c2b7d39cd3eb6905bf..16b1a44ce20fe2be0d71c4aac65745ff2ed3481d 100644

--- a/pkgs/darwin/qutebrowser/bin.nix

+++ b/pkgs/darwin/qutebrowser/bin.nix

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

-{ lib, stdenv, fetchfromgh, undmg, python3Packages, qutebrowser }:

+{

• lib,

• stdenv,

• fetchfromgh,

• undmg,

• python3Packages,

• qutebrowser,

+}:

stdenv.mkDerivation (finalAttrs: {

pname = "qutebrowser-bin";

@@ -14,7 +21,10 @@ };

sourceRoot = ".";

• nativeBuildInputs = [ undmg python3Packages.wrapPython ];

• nativeBuildInputs = [

• undmg

• python3Packages.wrapPython

• ];

installPhase = ''

 runHook preInstall

@@ -36,8 +46,10 @@ '';

passthru.userscripts = "${finalAttrs.finalPackage}/Applications/qutebrowser.app/Contents/Resources/userscripts";

• meta = with lib;

• qutebrowser.meta // {

• meta =

• with lib;

• qutebrowser.meta

• // {

   sourceProvenance = with sourceTypes; [ binaryNativeCode ];

   maintainers = [ maintainers.sikmir ];

   platforms = [ "x86_64-darwin" ];

diff --git a/pkgs/darwin/sequel-ace/default.nix b/pkgs/darwin/sequel-ace/default.nix

index 9f1713b4aadba1c74f25b29ac54a9e162596c20f..cd97789cf2ddc2512e825fcf88f2ea6bb6560938 100644

--- a/pkgs/darwin/sequel-ace/default.nix

+++ b/pkgs/darwin/sequel-ace/default.nix

@@ -1,4 +1,9 @@

-{ lib, stdenvNoCC, fetchfromgh, unzip }:

+{

• lib,

• stdenvNoCC,

• fetchfromgh,

• unzip,

+}:

stdenvNoCC.mkDerivation (finalAttrs: {

pname = "sequel-ace";

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

index 4088f326729c78d48eacbdd88f6bc2630bbdc351..4d020bcdc14ff3ea5594b7b4d83dcf4c25c2ffb9 100644

--- a/pkgs/darwin/zed/default.nix

+++ b/pkgs/darwin/zed/default.nix

@@ -1,4 +1,9 @@

-{ lib, stdenvNoCC, fetchurl, _7zz }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

• _7zz,

+}:

stdenvNoCC.mkDerivation (finalAttrs: {

pname = "zed";

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

index b19fc0852500c3d86dc60d7e93acdd8b31638806..ed9b63a3d606f3f245d188a6c25447921ad2bca5 100644

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

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

@@ -1,4 +1,14 @@

-{ lib, srcOnly, fetchzip, unzip, pname, version, filename, hash, description }:

+{

• lib,

• srcOnly,

• fetchzip,

• unzip,

• pname,

• version,

• filename,

• hash,

• description,

+}:

srcOnly {

inherit pname version;

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

index e2de513af51ec84dbff711262efd6c2d56cf76af..e1a5166c5a62ff6af746ff12119ab7080218ddd6 100644

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

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

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

-{ lib, stdenvNoCC, fetchurl, lang, version, hash }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

• lang,

• version,

• hash,

+}:

stdenvNoCC.mkDerivation {

pname = "freedict-${lang}";

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

index 773d725a9cb2cc7eb2a04621926378704304dacb..1e7f4495ff26246c1f9080d42ada3e0938d794ab 100644

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

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

@@ -1,4 +1,13 @@

-{ lib, srcOnly, fetchwebarchive, pname, version, filename, hash, description }:

+{

• lib,

• srcOnly,

• fetchwebarchive,

• pname,

• version,

• filename,

• hash,

• description,

+}:

srcOnly {

inherit pname version;

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

index ae38fb3cd98cb84fcb602aae470eb1bd31f57325..5729dbbfffece9a852be9b6864736ad340cbc756 100644

--- a/pkgs/data/dicts/it-sanasto/default.nix

+++ b/pkgs/data/dicts/it-sanasto/default.nix

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

-{ lib, stdenvNoCC, fetchFromGitHub, dict, pandoc, stardict-tools }:

+{

• lib,

• stdenvNoCC,

• fetchFromGitHub,

• dict,

• pandoc,

• stardict-tools,

+}:

stdenvNoCC.mkDerivation (finalAttrs: {

pname = "it-sanasto";

@@ -11,7 +18,11 @@ rev = "e31974edd50a50db6ef1b95aab81a18f33800e67";

 hash = "sha256-+YLKG4kqflWkRdrER0A7GRYXluZpuf1TO0zyk3gVzU4=";

};

• nativeBuildInputs = [ dict pandoc stardict-tools ];

• nativeBuildInputs = [

• dict

• pandoc

• stardict-tools

• ];

buildPhase = ''

 for i in *.md; do

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

index 96ab2f1014fc7a478e3e8e4788a38f54e79a7cc4..9d4991e0d65a5e9e538b8f26fb4bb4694c46a8b9 100644

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

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

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

-{ lib, stdenvNoCC, fetchwebarchive, dict, jq, stardict-tools }:

+{

• lib,

• stdenvNoCC,

• fetchwebarchive,

• dict,

• jq,

• stardict-tools,

+}:

stdenvNoCC.mkDerivation {

pname = "komputeko";

@@ -12,7 +19,11 @@ };

dontUnpack = true;

• nativeBuildInputs = [ dict jq stardict-tools ];

• nativeBuildInputs = [

• dict

• jq

• stardict-tools

• ];

buildPhase = ''

 cat $src | \

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

index c51cef37712dbca31320920699378e3559ae6902..112cb85f44d43279a86ae42b16959ce1a9f6f260 100644

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

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

@@ -1,14 +1,17 @@

-{ lib, stdenvNoCC, fetchurl }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

+}:

let

• dicts = lib.mapAttrs

• (name: spec:

•  fetchurl {
  

•    url = "http://libredict.org/dictionaries/${name}/wiktionary_${name}_stardict_${spec.version}.tgz";
  

•    inherit (spec) hash;
  

•  }
  

• )

• (lib.importJSON ./dicts.json);

• dicts = lib.mapAttrs (

• name: spec:

• fetchurl {

•  url = "http://libredict.org/dictionaries/${name}/wiktionary_${name}_stardict_${spec.version}.tgz";
  

•  inherit (spec) hash;
  

• }

• ) (lib.importJSON ./dicts.json);

in

stdenvNoCC.mkDerivation {

pname = "libredict";

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

index 6cc7a69f38c8516d58f8988f3aead78688af70fa..0b475b47e8c586a2e7c11cf99fe09dc348ba644e 100644

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

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

@@ -1,4 +1,13 @@

-{ lib, stdenvNoCC, fetchurl, dict, jq, moreutils, stardict-tools, tatoebatools }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

• dict,

• jq,

• moreutils,

• stardict-tools,

• tatoebatools,

+}:

let

langs = [

 "bel eng"

@@ -40,24 +49,31 @@ version = "2024-05-18";

srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;

• unpackPhase = ''

• echo "{}" > versions.json

• '' + lib.concatMapStringsSep "\n"

• (src: ''

• unpackPhase =

• ''

•  echo "{}" > versions.json
  

• ''

• • lib.concatMapStringsSep "\n" (src: ''

   bzcat ${src} > ${lib.removeSuffix ".bz2" src.name}

   jq '.+{"${lib.removeSuffix ".tsv.bz2" src.name}":"${version} 00:00:00"}' versions.json | \

     sponge versions.json

• '')

• srcs;

• '') srcs;

• nativeBuildInputs = [ dict jq moreutils stardict-tools tatoebatools ];

• nativeBuildInputs = [

• dict

• jq

• moreutils

• stardict-tools

• tatoebatools

• ];

buildPhase =

 let

•  makeDict = lang: with lib; ''
  

•    parallel_corpus ${lang} > tatoeba_${replaceStrings [ " " ] [ "_" ] lang}.tab
  

•    stardict-tabfile tatoeba_${replaceStrings [ " " ] [ "_" ] lang}.tab
  

•  '';
  

•  makeDict =
  

•    lang: with lib; ''
  

•      parallel_corpus ${lang} > tatoeba_${replaceStrings [ " " ] [ "_" ] lang}.tab
  

•      stardict-tabfile tatoeba_${replaceStrings [ " " ] [ "_" ] lang}.tab
  

•    '';
  

 in

 ''

   export XDG_DATA_HOME=$PWD

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

index f78d142d017f21e827a6ece38d375ce3ba5e4e16..a9a5c7bba2bc4576827e67dbc3238e1220a84db7 100644

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

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

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

-{ lib, stdenvNoCC, fetchurl, unzip, gdal, elevation_server }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

• unzip,

• gdal,

• elevation_server,

+}:

let

version = "2014-05-25";

@@ -23,7 +30,10 @@ srcs = lib.mapAttrsToList (name: spec: fetchurl spec) dem1;

 unpackPhase = lib.concatMapStringsSep "\n" (src: "unzip ${src}") srcs;

• nativeBuildInputs = [ unzip gdal ];

• nativeBuildInputs = [

•  unzip
  

•  gdal
  

• ];

 dontFixup = true;

 preferLocalBuild = true;

@@ -43,7 +53,10 @@ srcs = lib.mapAttrsToList (name: spec: fetchurl spec) dem3;

 unpackPhase = lib.concatMapStringsSep "\n" (src: "unzip ${src}") srcs;

• nativeBuildInputs = [ unzip elevation_server ];

• nativeBuildInputs = [

•  unzip
  

•  elevation_server
  

• ];

 dontFixup = true;

 preferLocalBuild = true;

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

index 359078788449db8b647889a2f43fe0758cd18c2d..2994ef128bee0670218c776bb5b048af20ed39c0 100644

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

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

@@ -1,4 +1,10 @@

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

+{

• lib,

• fetchurl,

• unzip,

• country ? "FIN",

• lang ? "en",

+}:

let

pname = "freizeitkarte-osm";

version = "2023-12-09";

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

index 6b21fe80a5f80cbe3434d0fed7db7e8e105e7c53..837d570c83967fa00849adb24fc0abecbdea7001 100644

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

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

@@ -1,13 +1,14 @@

-{ lib

-, stdenvNoCC

-, fetchFromGitHub

-, hereApiKey ? ""

-, mapboxApiKey ? ""

-, maptilerApiKey ? ""

-, mmlApiKey ? ""

-, openrouteserviceApiKey ? ""

-, thunderforestApiKey ? ""

-, mapsList ? [

+{

• lib,

• stdenvNoCC,

• fetchFromGitHub,

• hereApiKey ? "",

• mapboxApiKey ? "",

• maptilerApiKey ? "",

• mmlApiKey ? "",

• openrouteserviceApiKey ? "",

• thunderforestApiKey ? "",

• mapsList ? [

 "World/Asia/nakarte-*.xml"

 "World/Europe/FI/*.xml"

 "World/Europe/RU/*.xml"

@@ -21,7 +22,7 @@ "World/OpenStreetMap.xml"

 "World/heidelberg.xml"

 "World/here-*.xml"

 "World/marshruty.ru.xml"

• ]

• ],

}:

stdenvNoCC.mkDerivation {

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

index a6796b8aac14bb15e374195aa75f99b4d0271a5f..0a14ca9298a7c7f56c4e5e7be5b514cbd33be3c4 100644

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

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

@@ -1,4 +1,9 @@

-{ lib, stdenvNoCC, fetchurl, unzip }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

• unzip,

+}:

stdenvNoCC.mkDerivation rec {

pname = "maptourist";

diff --git a/pkgs/data/maps/meridian/base.nix b/pkgs/data/maps/meridian/base.nix

index 808ebee756d409e30bb1b6e3bc266c739b57625d..526907e13bf74d18d6509da459f40096ae883bc5 100644

--- a/pkgs/data/maps/meridian/base.nix

+++ b/pkgs/data/maps/meridian/base.nix

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

-{ lib, stdenvNoCC, fetchurl, unrar, pname, version, hash }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

• unrar,

• pname,

• version,

• hash,

+}:

stdenvNoCC.mkDerivation {

inherit pname version;

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

index d57bf4983db58e33fe388c2c191be850b6b63be4..f3724451fa66f84a09330c385448f1e477a94131 100644

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

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

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

-{ lib, stdenvNoCC, fetchurl }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

+}:

stdenvNoCC.mkDerivation (finalAttrs: {

pname = "mtk-suomi";

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

index 6662075534ba0facc6eecde147d1f708a3a2d34d..fac0ff379ebb558451b9a857524a368678503048 100644

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

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

@@ -1,4 +1,13 @@

-{ lib, stdenv, fetchFromGitHub, fetchurl, unzip, mkgmap, mkgmap-splitter, osm-extracts }:

+{

• lib,

• stdenv,

• fetchFromGitHub,

• fetchurl,

• unzip,

• mkgmap,

• mkgmap-splitter,

• osm-extracts,

+}:

let

bounds = fetchurl {

 url = "https://www.thkukuk.de/osm/data/bounds-20240126.zip";

@@ -22,7 +31,11 @@ };

sourceRoot = "${finalAttrs.src.name}/garmin";

• nativeBuildInputs = [ mkgmap mkgmap-splitter unzip ];

• nativeBuildInputs = [

• mkgmap

• mkgmap-splitter

• unzip

• ];

postPatch = ''

 unzip ${bounds} -d bounds

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

index fbc8d0cab1166a27594ca51a15a29b7877e44f1d..7ed5e1a9b620c6417b714cc52aa501f5c47f54d5 100644

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

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

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

-{ lib, fetchwebarchive, unzip }:

+{

• lib,

• fetchwebarchive,

• unzip,

+}:

fetchwebarchive {

name = "qmapshack-onlinemaps-2022-09-02";

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

index 1467e1653c2842e78fe9121f42d1623e90b65fdf..3e53cfbb2526d2cc3d6e087522b5255214a317a9 100644

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

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

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

-{ lib, stdenv, fetchFromGitHub, bc, cgpsmapper, gmaptool, mapsoft2 }:

+{

• lib,

• stdenv,

• fetchFromGitHub,

• bc,

• cgpsmapper,

• gmaptool,

• mapsoft2,

+}:

stdenv.mkDerivation {

pname = "slazav-hr";

@@ -11,9 +19,17 @@ rev = "f476649b5ff12fb6fa037e6fb023c1da19639b84";

 sha256 = "0z2782smylf62ank8bpdhnvldqy46xai8ahg87yfyl203zcpp07h";

};

• nativeBuildInputs = [ bc cgpsmapper gmaptool mapsoft2 ];

• nativeBuildInputs = [

• bc

• cgpsmapper

• gmaptool

• mapsoft2

• ];

• buildFlags = [ "directories" "reg_img" ];

• buildFlags = [

• "directories"

• "reg_img"

• ];

installPhase = "install -Dm644 OUT/all_*.img -t $out";

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

index cc95636d0fe00a484c4c1f96ffe69d142a3a930f..f08284efa2e90b07b4b1464b491edb6b9be98b5c 100644

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

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

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

-{ lib, stdenv, fetchurl }:

+{

• lib,

• stdenv,

• fetchurl,

+}:

fetchurl {

name = "slazav-podm-2020-12-03";

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

index f6d3b2a7adba67471d90f54fb11fbf43727ca778..c6ebe37576d1d70e6ce1fe67790daddbdee25d49 100644

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

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

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

-{ lib, stdenv, fetchFromGitHub, bc, cgpsmapper, gmaptool, mapsoft2 }:

+{

• lib,

• stdenv,

• fetchFromGitHub,

• bc,

• cgpsmapper,

• gmaptool,

• mapsoft2,

+}:

stdenv.mkDerivation {

pname = "slazav-podm";

@@ -11,9 +19,17 @@ rev = "c95a381155986f9f621e5d26b21bda041ad8c24f";

 sha256 = "0jsrjzmg23rp3ay5149llqrq6pnr66wf7siphwn7gisz5g60pgpf";

};

• nativeBuildInputs = [ bc cgpsmapper gmaptool mapsoft2 ];

• nativeBuildInputs = [

• bc

• cgpsmapper

• gmaptool

• mapsoft2

• ];

• buildFlags = [ "directories" "reg_img" ];

• buildFlags = [

• "directories"

• "reg_img"

• ];

installPhase = "install -Dm644 OUT/all_*.img -t $out";

diff --git a/pkgs/data/maps/uralla/base.nix b/pkgs/data/maps/uralla/base.nix

index 229d54cb2a6b7d7c1fc62b297ca3821fe1740daa..b1ac25de6eccae155bab996356280208a24a45f8 100644

--- a/pkgs/data/maps/uralla/base.nix

+++ b/pkgs/data/maps/uralla/base.nix

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

-{ lib, stdenvNoCC, fetchurl, pname, version, sha256 }:

+{

• lib,

• stdenvNoCC,

• fetchurl,

• pname,

• version,

• sha256,

+}:

stdenvNoCC.mkDerivation {

inherit pname version;

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

index 2d573bd9d8c8a2ef1863a7d1f6f9ad93c966c9f9..0988ed7ad9828ab2aa155762a187e49396cbe417 100644

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

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

@@ -1,4 +1,9 @@

-{ lib, stdenvNoCC, fetchgdrive, unzip }:

+{

• lib,

• stdenvNoCC,

• fetchgdrive,

• unzip,

+}:

{

hib-lov = stdenvNoCC.mkDerivation rec {

diff --git a/pkgs/data/misc/poi/default.nix b/pkgs/data/misc/poi/default.nix

index 0e047da48e9473025952a9dd912b5faf454c8773..39965648623d99bad12925ab20c2ddbd15a4f5ba 100644

--- a/pkgs/data/misc/poi/default.nix

+++ b/pkgs/data/misc/poi/default.nix

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

-{ lib, fetchurl, fetchymaps, fetchwebarchive, jq, gdal }:

+{

• lib,

• fetchurl,

• fetchymaps,

• fetchwebarchive,

• jq,

• gdal,

+}:

{

geocachingSu = fetchwebarchive {

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

index d7bede6031764f90b2c61a43c1180542ca070d3b..bccf98c514c2ef9541402e3f36b44efdaf593d30 100644

--- a/pkgs/data/osm/osm-extracts/default.nix

+++ b/pkgs/data/osm/osm-extracts/default.nix

@@ -1,4 +1,9 @@

-{ lib, stdenv, fetchurl, osmium-tool }:

+{

• lib,

• stdenv,

• fetchurl,

• osmium-tool,

+}:

stdenv.mkDerivation rec {

pname = "osm-extracts";

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

index 875c4369d3c13eaef949fb546d2dab79797418d5..60e8fe922ae64b5e4d0c61e8b701fa778064f673 100644

--- a/pkgs/data/osm/overpassdb/default.nix

+++ b/pkgs/data/osm/overpassdb/default.nix

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

-{ lib, stdenv, fetchurl, osmctools, osm-3s, osm-extracts }:

+{

• lib,

• stdenv,

• fetchurl,

• osmctools,

• osm-3s,

• osm-extracts,

+}:

stdenv.mkDerivation {

pname = "overpassdb";

@@ -6,7 +13,10 @@ inherit (osm-extracts) version;

dontUnpack = true;

• nativeBuildInputs = [ osmctools osm-3s ];

• nativeBuildInputs = [

• osmctools

• osm-3s

• ];

installPhase = ''

 install -dm755 $out

@@ -23,4 +33,3 @@ platforms = platforms.all;

 skip.ci = true;

};

}

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

index 380bc9645aff000959d9c8245f66bd09bf528889..faf1e13402697dfed8106c3ecff6b4e89c354eb6 100644

--- a/pkgs/data/osm/routinodb/default.nix

+++ b/pkgs/data/osm/routinodb/default.nix

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

-{ lib, stdenv, fetchurl, routino, osm-extracts, prefix ? "Russia-NWFD" }:

+{

• lib,

• stdenv,

• fetchurl,

• routino,

• osm-extracts,

• prefix ? "Russia-NWFD",

+}:

stdenv.mkDerivation {

pname = "routinodb";

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

index 1886b32bbda62a5e305fa2582d8bc31969916f2b..36d2b7999b9f714db298a990987848eab6075826 100644

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

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

@@ -5,7 +5,8 @@ name = "goldendict-arc-dark-theme-2020-04-06";

url = "https://gist.github.com/ManiaciaChao/ddb14a09a12c95f134003bcd552dced4";

rev = "af58374";

sha256 = "0z3rsi87bf6mlb9syqvsz1jg74i3mxf2cxq43jlfr9zkdmnwgj18";

-}) // {

+})

+// {

meta = with lib; {

 description = "GoldenDict Arc Dark Theme";

 homepage = "https://gist.github.com/ManiaciaChao/ddb14a09a12c95f134003bcd552dced4";

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

index d9bf56a83b68a62031dcd749d5d132f76360a4ef..9c27752534ab800b20b46132f18a3043e7124f95 100644

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

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

@@ -5,7 +5,8 @@ name = "goldendict-dark-theme-2018-11-08";

url = "https://gist.github.com/ilius/5a2f35c79775267fbdb249493c041453";

rev = "5c616fa";

sha256 = "1rpkfcjp3dhdnrnf68id956hvm8bn655cp8v4if5s753vx5ni012";

-}) // {

+})

+// {

meta = with lib; {

 description = "GoldenDict Dark Theme";

 homepage = "https://gist.github.com/ilius/5a2f35c79775267fbdb249493c041453";

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

index b7cf05ddc51e544519a786c680eac3cd34a7ade5..72914ef0d80628a7c8b98a880b9e2dd7dcd9e81a 100644

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

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

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

-{ lib, stdenv, fetchFromGitHub }:

+{

• lib,

• stdenv,

• fetchFromGitHub,

+}:

stdenv.mkDerivation (finalAttrs: {

pname = "qtpbfimageplugin-styles";

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

index 7f7f6130d7151b5d9c4813d7bd19f2311d434bba..412b8a1f4c1a1787b2f5ed120789726e10c78fee 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

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

{ pkgs }:

let

• inherit (pkgs) lib newScope recurseIntoAttrs libsForQt5 darwin;

• inherit (pkgs)

• lib

• newScope

• recurseIntoAttrs

• libsForQt5

• darwin

• ;

in

lib.makeScope newScope (

self: with self; {

@@ -28,9 +34,7 @@

 amethyst = callPackage ./darwin/amethyst { };

 cudatext-bin = callPackage ./darwin/cudatext/bin.nix { };

 darktable-bin = callPackage ./darwin/darktable/bin.nix { };

• finch = callPackage ./darwin/finch {

•  buildGoModule = pkgs.buildGo122Module;
  

• };

• finch = callPackage ./darwin/finch { buildGoModule = pkgs.buildGo122Module; };

 macpass = callPackage ./darwin/macpass { };

 macsvg = callPackage ./darwin/macsvg { };

 marta = callPackage ./darwin/marta { };

@@ -73,10 +77,8 @@ osm-extracts = callPackage ./data/osm/osm-extracts { };

 overpassdb = callPackage ./data/osm/overpassdb { };

 routinodb = callPackage ./data/osm/routinodb { };

• goldendict-arc-dark-theme =

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

• goldendict-dark-theme =

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

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

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

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

 ### DEVELOPMENT / LIBRARIES

@@ -89,11 +91,8 @@ libsockcanpp = callPackage ./development/libraries/libsockcanpp { };

 ### DEVELOPMENT / PERL MODULES

• perlPackages = (

•  callPackage ./perl-packages.nix { }
  

• ) // pkgs.perlPackages // {

•  recurseForDerivations = false;
  

• };

• perlPackages =

•  (callPackage ./perl-packages.nix { }) // pkgs.perlPackages // { recurseForDerivations = false; };
  

 ### DEVELOPMENT / PYTHON MODULES

@@ -105,7 +104,8 @@ geotiler = callPackage ./development/python-modules/geotiler { };

 gpxelevations = callPackage ./development/python-modules/gpxelevations { };

 jsonseq = callPackage ./development/python-modules/jsonseq { };

 large-image = callPackage ./development/python-modules/large-image { };

• large-image-source-gdal = (callPackage ./development/python-modules/large-image/sources.nix { }).source-gdal;

• large-image-source-gdal =

•  (callPackage ./development/python-modules/large-image/sources.nix { }).source-gdal;
  

 modbus_tk = callPackage ./development/python-modules/modbus_tk {

   python3Packages = pkgs.python310Packages;

 };

@@ -120,38 +120,36 @@ s2sphere = callPackage ./development/python-modules/s2sphere { };

 ### EMBEDDED

• chdk = callPackage ./embedded/chdk {

•  gcc-arm-embedded = pkgs.gcc-arm-embedded-10;
  

• };

• chdk = callPackage ./embedded/chdk { gcc-arm-embedded = pkgs.gcc-arm-embedded-10; };

 embox-aarch64 = callPackage ./embedded/embox { arch = "aarch64"; };

 embox-arm = callPackage ./embedded/embox { arch = "arm"; };

 embox-ppc = callPackage ./embedded/embox { arch = "ppc"; };

 embox-riscv64 = callPackage ./embedded/embox { arch = "riscv64"; };

• embox-x86 = callPackage ./embedded/embox {

•  stdenv = pkgs.gccMultiStdenv;
  

• };

• embox-x86 = callPackage ./embedded/embox { stdenv = pkgs.gccMultiStdenv; };

 ### GARMIN

 basecamp = callPackage ./garmin/basecamp { };

 cgpsmapper = callPackage ./garmin/cgpsmapper { };

 garmin-uploader = callPackage ./garmin/garmin-uploader { };

• garminimg = libsForQt5.callPackage ./garmin/garminimg {

•  proj = pkgs.proj_7;
  

• };

• garminimg = libsForQt5.callPackage ./garmin/garminimg { proj = pkgs.proj_7; };

 gimgtools = callPackage ./garmin/gimgtools { };

 gmaptool = callPackage ./garmin/gmaptool { };

 imgdecode = callPackage ./garmin/imgdecode { };

• libgarmin = callPackage ./garmin/libgarmin {

•  automake = pkgs.automake111x;
  

• };

• libgarmin = callPackage ./garmin/libgarmin { automake = pkgs.automake111x; };

 ocad2img = perlPackages.callPackage ./garmin/ocad2img {

   inherit cgpsmapper ocad2mp fetchwebarchive;

 };

 ocad2mp = callPackage ./garmin/ocad2mp { };

 openmtbmap = callPackage ./garmin/openmtbmap { };

 osm2mp = perlPackages.callPackage ./garmin/osm2mp {

•  inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR;
  

•  inherit (perlPackages)
  

•    GeoOpenstreetmapParser
  

•    MatchSimple
  

•    MathPolygon
  

•    MathPolygonTree
  

•    TreeR
  

•    ;
  

 };

 sendmap20 = callPackage ./garmin/sendmap20 { };

@@ -160,22 +158,16 @@

 agunua = callPackage ./gemini/agunua { };

 astronaut = callPackage ./gemini/astronaut { };

 comitium = callPackage ./gemini/comitium { };

• eva = callPackage ./gemini/eva {

•  inherit (darwin.apple_sdk.frameworks) Security;
  

• };

• eva = callPackage ./gemini/eva { inherit (darwin.apple_sdk.frameworks) Security; };

 gelim = callPackage ./gemini/gelim { };

 gemcert = callPackage ./gemini/gemcert { };

 gemgen = callPackage ./gemini/gemgen { };

 gemini-ipfs-gateway = callPackage ./gemini/gemini-ipfs-gateway { };

 geminid = callPackage ./gemini/geminid { };

 gemreader = callPackage ./gemini/gemreader { };

• gemserv = callPackage ./gemini/gemserv {

•  inherit (darwin.apple_sdk.frameworks) Security;
  

• };

• gemserv = callPackage ./gemini/gemserv { inherit (darwin.apple_sdk.frameworks) Security; };

 gloggery = callPackage ./gemini/gloggery { };

• gmi2html = callPackage ./gemini/gmi2html {

•  zig = pkgs.zig_0_9;
  

• };

• gmi2html = callPackage ./gemini/gmi2html { zig = pkgs.zig_0_9; };

 gmnhg = callPackage ./gemini/gmnhg { };

 gmnigit = callPackage ./gemini/gmnigit { };

 gplaces = callPackage ./gemini/gplaces { };

@@ -201,9 +193,7 @@ cogeo-mosaic = callPackage ./geospatial/cogeo-mosaic { };

 color-operations = callPackage ./geospatial/color-operations { };

 datamaps = callPackage ./geospatial/datamaps { };

 deegree = callPackage ./geospatial/deegree { };

• elevation = callPackage ./geospatial/elevation {

•  click = click-6-7;
  

• };

• elevation = callPackage ./geospatial/elevation { click = click-6-7; };

 garmindev = callPackage ./geospatial/qlandkartegt/garmindev.nix { };

 geoarrow-c = callPackage ./geospatial/geoarrow-c { };

 geoarrow-pyarrow = callPackage ./geospatial/geoarrow-pyarrow { };

@@ -211,14 +201,10 @@ geojson-pydantic = callPackage ./geospatial/geojson-pydantic { };

 geowebcache = callPackage ./geospatial/geowebcache { };

 go-pmtiles = callPackage ./geospatial/go-pmtiles { };

 go-staticmaps = callPackage ./geospatial/go-staticmaps { };

• hecate = callPackage ./geospatial/hecate {

•  inherit (darwin.apple_sdk.frameworks) Security;
  

• };

• hecate = callPackage ./geospatial/hecate { inherit (darwin.apple_sdk.frameworks) Security; };

 kealib = callPackage ./geospatial/kealib { };

 localtileserver = callPackage ./geospatial/localtileserver { };

• mapsoft = callPackage ./geospatial/mapsoft {

•  proj = pkgs.proj_7;
  

• };

• mapsoft = callPackage ./geospatial/mapsoft { proj = pkgs.proj_7; };

 mapsoft2 = callPackage ./geospatial/mapsoft/2.nix { };

 mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { };

 mbutiles = callPackage ./geospatial/mbutiles { };

@@ -242,9 +228,7 @@ };

   proj = pkgs.proj_7;

   inherit garmindev;

 };

• render_geojson = callPackage ./geospatial/render_geojson {

•  wxGTK = pkgs.wxGTK32;
  

• };

• render_geojson = callPackage ./geospatial/render_geojson { wxGTK = pkgs.wxGTK32; };

 rio-cogeo = callPackage ./geospatial/rio-cogeo { };

 rio-color = callPackage ./geospatial/rio-color { };

 rio-mbtiles = callPackage ./geospatial/rio-mbtiles { };

@@ -334,9 +318,7 @@ pytorchtext = callPackage ./linguistics/pytorchtext { };

 revtok = callPackage ./linguistics/revtok { };

 stardict-tools = callPackage ./linguistics/stardict-tools { };

 tatoebatools = callPackage ./linguistics/tatoebatools { };

• ttb = callPackage ./linguistics/ttb {

•  inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
  

• };

• ttb = callPackage ./linguistics/ttb { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; };

 wikitextprocessor = callPackage ./linguistics/wikitextprocessor { };

 wiktextract = callPackage ./linguistics/wiktextract { };

 wiktfinnish = callPackage ./linguistics/wiktfinnish { };

@@ -383,12 +365,8 @@ messenger-gtk = callPackage ./misc/messenger-gtk { };

 miband4 = callPackage ./misc/miband4 { };

 mitzasql = callPackage ./misc/mitzasql { };

 mjs = callPackage ./misc/mjs { };

• modbus-tools = callPackage ./misc/modbus-tools {

•  inherit (darwin.apple_sdk.frameworks) IOKit;
  

• };

• modbus_sim_cli = callPackage ./misc/modbus_sim_cli {

•  python3Packages = pkgs.python310Packages;
  

• };

• modbus-tools = callPackage ./misc/modbus-tools { inherit (darwin.apple_sdk.frameworks) IOKit; };

• modbus_sim_cli = callPackage ./misc/modbus_sim_cli { python3Packages = pkgs.python310Packages; };

 morse-talk = callPackage ./misc/morse-talk { };

 musig = callPackage ./misc/musig { };

 mysql-to-sqlite3 = callPackage ./misc/mysql-to-sqlite3 { };

@@ -429,9 +407,7 @@ wik = callPackage ./misc/wik { };

 #worm = callPackage ./misc/worm { };

 wptools = callPackage ./misc/wptools { };

 xfractint = callPackage ./misc/xfractint { };

• xtr = callPackage ./misc/xtr {

•  inherit (darwin.apple_sdk.frameworks) Foundation;
  

• };

• xtr = callPackage ./misc/xtr { inherit (darwin.apple_sdk.frameworks) Foundation; };

 youtimetrack = callPackage ./misc/youtimetrack { };

 ### MQTT

@@ -454,26 +430,16 @@ mqtt-shell = callPackage ./mqtt/mqtt-shell { };

 mqtt-to-influxdb = callPackage ./mqtt/mqtt-to-influxdb { };

 mqtt-to-influxdb-forwarder = callPackage ./mqtt/mqtt-to-influxdb-forwarder { };

 nanosdk = callPackage ./mqtt/nanosdk { };

• rumqtt = callPackage ./mqtt/rumqtt {

•  inherit (darwin.apple_sdk.frameworks) Security;
  

• };

• rumqtt = callPackage ./mqtt/rumqtt { inherit (darwin.apple_sdk.frameworks) Security; };

 ### NAKARTE

 elevation_server = callPackage ./nakarte/elevation_server { };

• map-tiler = callPackage ./nakarte/map-tiler {

•  python3Packages = pkgs.python39Packages;
  

• };

• maprec = callPackage ./nakarte/maprec {

•  python3Packages = pkgs.python39Packages;
  

• };

• map-tiler = callPackage ./nakarte/map-tiler { python3Packages = pkgs.python39Packages; };

• maprec = callPackage ./nakarte/maprec { python3Packages = pkgs.python39Packages; };

 #nakarte = callPackage ./nakarte/nakarte { };

• ozi_map = callPackage ./nakarte/ozi_map {

•  python3Packages = pkgs.python39Packages;
  

• };

• pyimagequant = callPackage ./nakarte/pyimagequant {

•  python3Packages = pkgs.python39Packages;
  

• };

• ozi_map = callPackage ./nakarte/ozi_map { python3Packages = pkgs.python39Packages; };

• pyimagequant = callPackage ./nakarte/pyimagequant { python3Packages = pkgs.python39Packages; };

 thinplatespline = callPackage ./nakarte/thinplatespline {

   python3Packages = pkgs.python39Packages;

 };

@@ -507,9 +473,7 @@ pyrobuf = callPackage ./osm/pyrobuf { };

 pyrosm = callPackage ./osm/pyrosm { };

 sdlmap = callPackage ./osm/sdlmap { };

 smopy = callPackage ./osm/smopy { };

• smrender = callPackage ./osm/smrender {

•  inherit (darwin.apple_sdk.frameworks) Foundation;
  

• };

• smrender = callPackage ./osm/smrender { inherit (darwin.apple_sdk.frameworks) Foundation; };

 taginfo-tools = callPackage ./osm/taginfo-tools { };

 tilelog = callPackage ./osm/tilelog { };