Remove old zim/kiwix and update inputs

flake.lock

@@ -93,11 +93,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1685518550,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682982995,
+        "lastModified": 1686130269,
-        "narHash": "sha256-PK0pSY48JkcLDFphafjpLqeTDs0XUqGMHjsiNuEq5s0=",
+        "narHash": "sha256-3CVQARW+cANIPO9qGDlJ351lOY5qo+FVW2cI/sURvmw=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "c5d7db84c422be515dac8fc26420900c349374e8",
+        "rev": "d3b2fdbd9a0096764ebfd80c2f4bb8bcfbe920ce",
         "type": "github"
       },
       "original": {

overlays/default.nix

@@ -1,7 +1,7 @@
-self: super:
+final: prev:
 
 let
-	cp = super.python3.pkgs.callPackage;
+	cp = prev.python3.pkgs.callPackage;
 
 	myPackages = pypackages: with pypackages; with pkgs.my-py-addons; [
 		black
@@ -21,14 +21,14 @@ let
 		xonsh-direnv
 	];
 
-	myPython = super.python3.withPackages myPackages;
+	myPython = prev.python3.withPackages myPackages;
 	macOver = file: og:
-		if super.stdenv.isDarwin then
+		if prev.stdenv.isDarwin then
-		(super.callPackage file {}) else
+		(prev.callPackage file {}) else
-		super."${og}";
+		prev."${og}";
 
-	buildFirefoxXpiAddon = super.lib.makeOverridable ({ stdenv ? super.stdenv
+	buildFirefoxXpiAddon = prev.lib.makeOverridable ({ stdenv ? prev.stdenv
-	, fetchurl ? super.fetchurl, pname, version, addonId, url, sha256, meta, ...
+	, fetchurl ? prev.fetchurl, pname, version, addonId, url, sha256, meta, ...
 	}:
 	stdenv.mkDerivation {
 		name = "${pname}-${version}";
@@ -48,7 +48,7 @@ let
 	});
 
 in rec {
-	#python3 = self.unstable.python3;
+	#python3 = final.unstable.python3;
 	gregpy = myPython;
 
 	my-py-addons = rec {
@@ -76,22 +76,19 @@ in rec {
 		xonsh-direnv = cp ./xonsh-direnv.nix {};
 	};
 
-	#fcitx-engines = if ! super.stdenv.isDarwin then super.fcitx5 else super.fcitx-engines;
+	#fcitx-engines = if ! prev.stdenv.isDarwin then prev.fcitx5 else prev.fcitx-engines;
-	brew = super.callPackage ./homebrew.nix {};
+	brew = prev.callPackage ./homebrew.nix {};
 
-	enwiki-dump = super.callPackage ./enwiki-dump.nix {};
+	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
-	hms = super.callPackage ./hms.nix {
+	hms = prev.callPackage ./hms.nix {
-		pkgs = self.pkgs;
+		pkgs = final.pkgs;
 	};
-	setup-ssh = super.callPackage ./setup-ssh.nix {
+	setup-ssh = prev.callPackage ./setup-ssh.nix {
-		pkgs = self.pkgs;
+		pkgs = final.pkgs;
 	};
-	kiwix-tools = super.callPackage ./kiwix-tools.nix {};
-	libkiwix = super.callPackage ./libkiwix.nix {};
-	zimlib = super.callPackage ./zimlib.nix {};
 
-	xonsh = super.xonsh.overridePythonAttrs (old: rec{
+	xonsh = prev.xonsh.overridePythonAttrs (old: rec{
-		python3 = self.gregpy;
+		python3 = final.gregpy;
 		propagatedBuildInputs = old.propagatedBuildInputs ++ [ my-py-addons.xonsh-direnv ];
 	});
 

overlays/kiwix-tools.nix

@@ -1,46 +0,0 @@
-{ lib, pkgs, stdenv
- , cmake
- , meson
- , ninja
- , pkg-config
-
- , curl
- , libkiwix
- , libmicrohttpd
- , pugixml
- , zimlib
- , ...}:
-
-stdenv.mkDerivation rec {
-	pname = "kiwix-tools";
-	version = "3.4.0";
-
-	src = pkgs.fetchFromGitHub {
-		owner = "kiwix";
-		repo = pname;
-		rev = version;
-		sha256 = "sha256-r3/aTH/YoDuYpKLPakP4toS3OtiRueTUjmR34rdmr+w=";
-	};
-
-	nativeBuildInputs = [
-		meson
-		ninja
-		pkg-config
-	];
-
-	buildInputs = [
-		curl
-		libkiwix
-		libmicrohttpd
-		pugixml
-		zimlib
-	];
-
-	meta = with lib; {
-		description = "An offline read for Web content tools (HTTP server, search, etc)";
-		homepage = "https://kiwix.org";
-		license = licenses.gpl3Plus;
-		platforms = platforms.all;
-		maintainers = [ "Greg Hellings <greg.hellings@gmail.com>" ];
-	};
-}

overlays/libkiwix.nix

@@ -1,62 +0,0 @@
-{ lib, pkgs, stdenv
- , curl
- , icu
- , pugixml
- , mustache-hpp
- , libmicrohttpd
- , zimlib
- , zlib
-
- , bash
- , gcc
- , gtest
- , meson
- , ninja
- , pkg-config
- , python3
- , ...}:
-
-stdenv.mkDerivation rec {
-	pname = "libkiwix";
-	version = "12.0.0";
-
-	src = pkgs.fetchFromGitHub {
-		owner = "kiwix";
-		repo = pname;
-		rev = version;
-		sha256 = "sha256-4FxLxJxVhqbeNqX4vorHkROUuRURvE6AXlteIZCEBtc=";
-	};
-
-	nativeBuildInputs = [
-		bash
-		gcc
-		gtest
-		meson
-		ninja
-		pkg-config
-		python3
-	];
-
-	buildInputs = [
-		curl
-		icu
-		libmicrohttpd
-		mustache-hpp
-		pugixml
-		zimlib
-		zlib
-	];
-
-	mesonFlags = [ "--debug" "-Dc_args=-I${zimlib}/include/" ];
-
-	# Built-in python script uses /usr/bin/env
-	patchPhase = "patchShebangs --build scripts/*";
-
-	meta = with lib; {
-		description = "Kiwix file library for use by other applications";
-		homepage = "https://kiwix.org";
-		license = licenses.gpl3Plus;
-		platforms = platforms.all;
-		maintainers = [ "Greg Hellings <greg.hellings@gmail.com>" ];
-	};
-}

overlays/zimlib.nix

@@ -1,57 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, meson, ninja, pkg-config
-, python3
-, icu
-, libuuid
-, xapian
-, xz
-, zstd
-, gtest
-}:
-
-stdenv.mkDerivation rec {
-  pname = "zimlib";
-  version = "8.1.0";
-
-  src = fetchFromGitHub {
-    owner = "openzim";
-    repo = "libzim";
-    rev = version;
-    sha256 = "sha256-ab7UUF+I0/xaGChvdjylEQRHLOjmtg/wk+/JEGehGLE=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    pkg-config
-    ninja
-    python3
-  ];
-
-  propagatedBuildInputs = [
-    icu
-    libuuid
-    xapian
-    xz
-    zstd
-  ];
-
-  postPatch = ''
-    patchShebangs scripts
-  '';
-
-  mesonFlags = [ "-Dtest_data_dir=none" ];
-
-  checkInputs = [
-    gtest
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Library for reading and writing ZIM files";
-    homepage =  "https://www.openzim.org/wiki/Zimlib";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ ajs124 ];
-    platforms = platforms.linux;
-  };
-}