nur-packages

commit efb28a36a9b4278d8d8efc382ff9fb94d711b61d
parent 4133c0c4682987106ec8394584a8c98937f63b4c
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Thu, 13 Jan 2022 13:06:20 +0300

Up

Diffstat:
M
flake.lock
 | 
6
+++---
M
pkgs/default.nix
 | 
9
---------
M
pkgs/gpx/gpxtools/default.nix
 | 
6
+++---

3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1641577433,
-        "narHash": "sha256-T7lS8vpbC3dgtrkb2ueC9HWaX4RYUwdP7IEttnvKQ8Y=",
+        "lastModified": 1641969095,
+        "narHash": "sha256-WCiFqG6+E5NmeI6xnw/fxuKHgdsfb8xjL8N9Gxu4/hU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "568e0bc498ee51fdd88e1e94089de05f2fdbd18b",
+        "rev": "b458e5133fba2c873649f071f7a8dfeae52ebd17",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -318,15 +318,6 @@ lib.makeScope newScope (
     maperitive-bin = callPackage ./osm/maperitive/bin.nix { };
     mepo = callPackage ./osm/mepo {
       zig = pkgs.zig_0_8_1;
-      # See https://github.com/libsdl-org/SDL_ttf/issues/152
-      SDL2_ttf = pkgs.SDL2_ttf.overrideAttrs (old: {
-        src = pkgs.fetchFromGitHub {
-          owner = "libsdl-org";
-          repo = "SDL_ttf";
-          rev = "12013b24df59f11394c1761aad08700a4c5099be";
-          hash = "sha256-pOAlxdgfMDQiCER39hC4mDfHNhodouX/yCS+Y/dCA3Y=";
-        };
-      });
     };
     osm-area-tools = callPackage ./osm/osm-area-tools { };
     osm-python-tools = callPackage ./osm/osm-python-tools { };
diff --git a/pkgs/gpx/gpxtools/default.nix b/pkgs/gpx/gpxtools/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation {
   pname = "gpxtools";
-  version = "2020-05-10";
+  version = "2022-01-11";
 
   src = fetchgit {
     url = "https://notabug.org/irdvo/gpxtools.git";
-    rev = "919fb5953af8de1e71f61244eb70dd56b670a429";
-    sha256 = "sha256-GkrdvwzrxQs/hCghqBnALbRE8oSstNzckzpcLaGfCRs=";
+    rev = "45b7b8f5a42d8426f2fc998d017d2f224943f959";
+    sha256 = "sha256-hhvxQ+2jOvY0OVt8iKQ9XcHgRN4ECywV1W1fKV7Q9Mo=";
   };
 
   nativeBuildInputs = [ cmake ];