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

index 48d18b302dd432534cf2c5aaba3a366031d1391a..816938d0a990a88348a74d6f84f6d693a6aaa47d 100644

--- a/flake.lock

+++ b/flake.lock

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

{

"nodes": {

• "flake-utils": {

•  "locked": {
  

•    "lastModified": 1638122382,
  

•    "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
  

•    "owner": "numtide",
  

•    "repo": "flake-utils",
  

•    "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
  

•    "type": "github"
  

•  },
  

•  "original": {
  

•    "owner": "numtide",
  

•    "repo": "flake-utils",
  

•    "type": "github"
  

•  }
  

• },

 "nixpkgs": {

   "locked": {

•    "lastModified": 1637186689,
  

•    "narHash": "sha256-NU7BhgnwA/3ibmCeSzFK6xGi+Bari9mPfn+4cBmyEjw=",
  

•    "lastModified": 1638397275,
  

•    "narHash": "sha256-2Jos1CJFTMO9IbulbM4PTKn24nISIDQCAG/AqYQ8rmg=",
  

     "owner": "NixOS",

     "repo": "nixpkgs",

•    "rev": "7fad01d9d5a3f82081c00fb57918d64145dc904c",
  

•    "rev": "391f93a83c3a486475d60eb4a569bb6afbf306ad",
  

     "type": "github"

   },

   "original": {

@@ -18,6 +33,7 @@ }

 },

 "root": {

   "inputs": {

•    "flake-utils": "flake-utils",
  

     "nixpkgs": "nixpkgs"

   }

 }

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

index af8a1a08dfa8df6d33b63d732107b3523e615f28..964d39b7ebae90c7ef3cd2feff72c9a2ea84c73b 100644

--- a/flake.nix

+++ b/flake.nix

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

{

description = "My personal NUR repository";

inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";

• outputs = { self, nixpkgs }: let

• systems = [

•  "x86_64-linux"
  

•  "x86_64-darwin"
  

• ];

• forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);

• in {

• packages = forAllSystems (system: import ./default.nix {

•  pkgs = import nixpkgs { inherit system; };
  

• });

• nixosModules = import ./modules;

• };

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

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

• flake-utils.lib.eachDefaultSystem (system:

•  let pkgs = nixpkgs.legacyPackages.${system};
  

•  in {
  

•    packages = import ./default.nix {
  

•      inherit pkgs;
  

•      inherit system;
  

•    };
  

•    nixosModules = import ./modules;
  

•  });
  

}

diff --git a/pkgs/applications/goldencheetah/bin.nix b/pkgs/applications/goldencheetah/bin.nix

index d0d3ce346e571c5779a20428dfa4c42cc265b936..4b5b5e73f3c962ae881a6987d0375ea2ccfc9f71 100644

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

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

@@ -5,7 +5,6 @@ throwSystem = throw "Unsupported system: ${system}";

pname = "goldencheetah-bin";

version = "3.5";

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

suffix = {

 x86_64-linux = "amd64_Linux.AppImage";

@@ -24,7 +23,7 @@ }.${system} or throwSystem;

};

appimageContents = appimageTools.extract {

• inherit name src;

• inherit pname version src;

};

meta = with lib; {

@@ -37,10 +36,10 @@ skip.ci = true;

};

linux = appimageTools.wrapType2 rec {

• inherit name src meta;

• inherit pname version src meta;

 extraInstallCommands = ''

•  mv $out/bin/{${name},${pname}}
  

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

   install -Dm644 ${appimageContents}/GoldenCheetah.desktop -t $out/share/applications

   install -Dm644 ${appimageContents}/gc.png -t $out/share/icons/hicolor/256x256/apps

 '';

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

index 1a672df81491541802e5cf33b55ac40f09dce981..84e8f4e1f6ef50e4fd868f3edaff164a60b8d3bd 100644

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

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

@@ -5,7 +5,6 @@ throwSystem = throw "Unsupported system: ${system}";

pname = "klogg-bin";

version = "20.12";

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

suffix = {

 x86_64-linux = "x86_64.AppImage";

@@ -24,7 +23,7 @@ }.${system} or throwSystem;

};

appimageContents = appimageTools.extract {

• inherit name src;

• inherit pname version src;

};

meta = with lib; {

@@ -37,10 +36,10 @@ skip.ci = true;

};

linux = appimageTools.wrapType2 rec {

• inherit name src meta;

• inherit pname version src meta;

 extraInstallCommands = ''

•  mv $out/bin/{${name},klogg}
  

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

   install -Dm644 ${appimageContents}/klogg.desktop -t $out/share/applications

   install -Dm644 ${appimageContents}/klogg.svg -t $out/share/icons/hicolor/scalable/apps

 '';

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

index d9b2ba9b344ed5061641523cc627d4bf9ae81cbf..16d36e550d733f351dfc917506880d4d05cc1eea 100644

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

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

@@ -1,25 +1,24 @@

{ lib, stdenv, fetchurl, appimageTools, undmg }:

let

pname = "librewolf";

• version = "88.0.1";

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

• version = "94.0.2";

srcs = {

 x86_64-linux = fetchurl {

•  url = "https://gitlab.com/librewolf-community/browser/appimage/-/jobs/1246930630/artifacts/raw/LibreWolf-${version}-1.x86_64.AppImage";
  

•  hash = "sha256-5W7wO0DJJTbC6B8N+i6hjKImrEvhjUUsVTxkzWQXyOQ=";
  

•  url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${version}-2/LibreWolf.x86_64.AppImage";
  

•  hash = "sha256-ciD0kOVt3mwckuXQwX+wrXyIsxy1cki6S58W8aBABDw=";
  

 };

 aarch64-linux = fetchurl {

•  url = "https://gitlab.com/librewolf-community/browser/appimage/-/jobs/1246930548/artifacts/raw/LibreWolf-${version}-1.aarch64.AppImage";
  

•  hash = "sha256-cHDs5eaPNaS7Eng0GMDvRMaAKYKJxezWfU2QkXanSO4=";
  

•  url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${version}-2/LibreWolf.aarch64.AppImage";
  

•  hash = "sha256-03/JuyoqxuweQ6RsQ59QUG0uKogA+OT1WBgHeR/VBrg=";
  

 };

 x86_64-darwin = fetchurl {

•  url = "https://gitlab.com/librewolf-community/browser/macos/uploads/271c8180431a4e05ad7159626dfba5ec/librewolf-${version}-2_x86.dmg";
  

•  hash = "sha256-0SCQOx350hLklS/HA+IimKD6S0fc6FC5P5MU660ij3Y=";
  

•  url = "https://gitlab.com/librewolf-community/browser/macos/uploads/af4732e68ec6219135288af9fffdd920/librewolf-${version}-1.dmg";
  

•  hash = "sha256-gTlQKHgcGlm/YNXmG5YMrfcwKC+P5Wc0Dmj4rqvguD8=";
  

 };

 aarch64-darwin = fetchurl {

•  url = "https://gitlab.com//librewolf-community/browser/macos/uploads/02461b5e5f59b74c1fdd0e0682a65124/librewolf-${version}-2_aarch64_exp.dmg";
  

•  hash = "sha256-e2rXWNjPiybRK6nw4hOiCxnLQ/z3pLOMZw7zO/mk9Ek";
  

•  url = "https://gitlab.com/librewolf-community/browser/macos/uploads/28eb3a54b3a320cdb09773e848e681d2/librewolf-${version}-1_aarch64_exp.dmg";
  

•  hash = "sha256-iDHS4UODdQWXxHfiyVJi1AO8JbFe0fKrQjryjz4339M=";
  

 };

};

src = srcs.${stdenv.hostPlatform.system};

@@ -34,14 +33,14 @@ skip.ci = true;

};

appimageContents = appimageTools.extract {

• inherit name src;

• inherit pname version src;

};

linux = appimageTools.wrapType2 rec {

• inherit name src meta;

• inherit pname version src meta;

 extraInstallCommands = ''

•  mv $out/bin/{${name},${pname}}
  

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

   install -Dm644 ${appimageContents}/io.gitlab.LibreWolf.desktop -t $out/share/applications

   install -Dm644 ${appimageContents}/librewolf.png -t $out/share/icons/hicolor/256x256/apps

 '';

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

index e2957d59fb502fa217f1c2ea9b94caec75f03557..bdf41b7bba4060fd950f75057d127db8920cc3b5 100644

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

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

@@ -2,11 +2,11 @@ { lib, stdenvNoCC, fetchurl, unzip }:

stdenvNoCC.mkDerivation rec {

pname = "maptourist";

• version = "2021-11-28";

• version = "2021-12-02";

src = fetchurl {

 url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip";

• hash = "sha256-DKIBNW/gfTe2lau7AwmznY4W+6b91BcjkCeUeHmpRhE=";

• hash = "sha256-mIn2N6g0uTtJMTtC9r8Nn4qYlEZi2oTi9GMni+IGYfA=";

};

sourceRoot = ".";

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

index 961705f3cf98fa9613389c2be43e1bbd1a12ab3c..6e7597d9ba2bb9579a5d3326e599bf394c9c1286 100644

--- a/pkgs/osm/mepo/default.nix

+++ b/pkgs/osm/mepo/default.nix

@@ -4,13 +4,13 @@ }:

stdenv.mkDerivation rec {

pname = "mepo";

• version = "2021-11-22";

• version = "2021-12-02";

src = fetchFromSourcehut {

 owner = "~mil";

 repo = pname;

• rev = "c188f27c67c17514656389986defdbce9705ed14";

• hash = "sha256-oshI/Oo6KgOymT/njVc/NgeyB27iox9R2DBwWZdt/0A=";

• rev = "e17efef7646868ec70d181f4e3a20c1a9ea2e54c";

• hash = "sha256-+nwVUgtw9AaATEspG84YJiD8Ec8VSec+Q+qShdMJcM0=";

};

nativeBuildInputs = [ pkg-config zig ];