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

index 7d4834eb0dfa382134eb1ef2a2903e78e9c150ae..f63e0a7f83a639941d86fa0a99803afe49bf7229 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -763,16 +763,6 @@ "type": "tarball",

     "url": "https://github.com/morse-talk/morse-talk/archive/71e09ace0aa554d28cada5ee658e43758305b8fa.tar.gz",

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

 },

• "mtk-suomi": {

•    "builtin": false,
  

•    "description": "Maanmittauslaitoksen peruskartan tasoiset ja näköiset ilmaiset maastokartat",
  

•    "homepage": "https://kartat.hylly.org/",
  

•    "sha256": "07rfp4mgglazm93q1p217f3f14js4ddifg1060zn61l5rcmwsm3b",
  

•    "type": "file",
  

•    "url": "https://kartat-dl.hylly.org/2020-12-26/mtk_suomi.img",
  

•    "url_template": "https://kartat-dl.hylly.org/<version>/mtk_suomi.img",
  

•    "version": "2020-12-26"
  

• },

 "musig": {

     "branch": "master",

     "builtin": false,

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

index cdde95b45e437f6faa80118e1033f1c0a25de344..1660680c3c52a1537573b5c000d57dadf4c1a8fd 100644

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

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

@@ -26,7 +26,7 @@ qmakeFlags = [ "Software/VisualGPSqt/Source/VisualGPSqt.pro" ];

postInstall = if stdenv.isDarwin then ''

 mkdir -p $out/Applications

• mv VisualGPSqt.app $out/Applications

• mv *.app $out/Applications

 wrapQtApp $out/Applications/VisualGPSqt.app/Contents/MacOS/VisualGPSqt

'' else ''

 install -Dm755 VisualGPSqt -t $out/bin

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

index 8107f8eaac90ffeea7043fe6772bea7837ac7d65..89ba998e3251eba1974594940badfae57d0ae653 100644

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

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

@@ -16,11 +16,11 @@ preferLocalBuild = true;

nativeBuildInputs = [ undmg ];

• sourceRoot = "WireGuardStatusbar.app";

• sourceRoot = ".";

installPhase = ''

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

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

• mkdir -p $out/Applications

• cp -r *.app $out/Applications

'';

meta = with lib; {

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

index 62bdf6fe66715a2312717936e351cd5667201388..991a3e2405432e4f3e7649ef6e5585e0d79ff748 100644

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

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

@@ -1,10 +1,13 @@

-{ lib, stdenvNoCC, sources }:

+{ lib, stdenvNoCC, fetchurl }:

-stdenvNoCC.mkDerivation {

+stdenvNoCC.mkDerivation rec {

pname = "mtk-suomi";

• version = sources.mtk-suomi.version;

• version = "2021-02-27";

• src = sources.mtk-suomi;

• src = fetchurl {

• url = "https://kartat-dl.hylly.org/${version}/mtk_suomi.img";

• sha256 = "0xkhxb9bw1vsd5v9kmh48g4srdjmlc4fymvcvnnzdzx7qairak0b";

• };

preferLocalBuild = true;

@@ -13,7 +16,8 @@

installPhase = "install -Dm644 $src $out/mtk_suomi.img";

meta = with lib; {

• inherit (sources.mtk-suomi) description homepage;

• description = "Maanmittauslaitoksen peruskartan tasoiset ja näköiset ilmaiset maastokartat";

• homepage = "https://kartat.hylly.org/";

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.all;

diff --git a/pkgs/gis/qgis/bin.nix b/pkgs/gis/qgis/bin.nix

index 60fb768a6c8e719a1c283ec6b23a20101bea4386..7e87bca604615f4730c2fa1f3eddb43f3f5d0cb8 100644

--- a/pkgs/gis/qgis/bin.nix

+++ b/pkgs/gis/qgis/bin.nix

@@ -5,15 +5,15 @@

stdenv.mkDerivation rec {

pname = "qgis-bin";

version = {

• pr = "3.18.0";

• ltr = "3.16.4";

• pr = "3.18.1";

• ltr = "3.16.5";

}.${releaseType};

src = fetchurl {

 url = "https://qgis.org/downloads/macos/qgis-macos-${releaseType}.dmg";

 sha256 = {

•  pr = "19xan98lzzmlbzs5m2filma1j6mybajzjf0vxhk3q0b7qwk77c2v";
  

•  ltr = "1k2d2lp925rnb3n6xm8drgrddrjyiyiadahi7bhlq4f3wmy5qfi8";
  

•  pr = "04nsxgzi0wc11fvmzakacqmwpi2zqpr70acbkyi407jwg4pb23il";
  

•  ltr = "17y3xia7z5imd1csxiqdxdg9v39ryzl09j9gyfjs8wfqs2rg1yi6";
  

 }.${releaseType};

 name = "QGIS-macOS-${version}.dmg";

};

diff --git a/pkgs/gis/sasplanet/bin.nix b/pkgs/gis/sasplanet/bin.nix

index 296d48bc4235294303a6b2d04e407d7b18cae1f7..fc8154c705da7672160a2aa7622ca2164883f2aa 100644

--- a/pkgs/gis/sasplanet/bin.nix

+++ b/pkgs/gis/sasplanet/bin.nix

@@ -1,4 +1,5 @@

{ lib, stdenv, fetchurl, fetchgit, fetchgdrive, unzip, wine, makeWrapper

+, withMaps ? true

, withExtremum ? true

}:

let

@@ -27,11 +28,12 @@

installPhase = ''

 mkdir -p $out/opt/sasplanet

 cp -r . $out/opt/sasplanet

• cp -r ${maps}/* $out/opt/sasplanet/Maps/sas.maps

 makeWrapper ${wine}/bin/wine $out/bin/sasplanet \

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

   --add-flags "\$HOME/.sasplanet/SASPlanet.exe"

• '' + lib.optionalString withMaps ''

• cp -r ${maps}/* $out/opt/sasplanet/Maps/sas.maps

'' + lib.optionalString withExtremum ''

 unzip ${extremum} -d $out/opt/sasplanet/Maps/sas.maps

'';