From fbc5e23ebd2f5717c36bd07c5217f72d752198de Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sat, 4 Nov 2023 11:01:13 +0100
Subject: sqlite3-to-mysql: 2.0.3 -> 2.1.1

Changelog: https://github.com/techouse/sqlite3-to-mysql/blob/master/CHANGELOG.md

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/tools/misc/sqlite3-to-mysql/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools/misc')

diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix
index b8fc4fce50c..412d29c3307 100644
--- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix
+++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix
@@ -10,16 +10,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sqlite3-to-mysql";
-  version = "2.0.3";
+  version = "2.1.1";
   format = "pyproject";
 
-  disabled = python3Packages.pythonOlder "3.7";
+  disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "techouse";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-rlKJKthop9BQnqjTUq1hZM/NP69gPdEFTq1rU+CbpWA=";
+    hash = "sha256-g3W6ts5Mk//l6E4Yg49rf9dmu+yzgH+mCjz+vPW9ZRQ=";
   };
 
   nativeBuildInputs = with python3Packages; [
-- 
cgit 1.4.1


From 2ea5992e2e04fa39fc3f1f01544cc5d38fdc4089 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 1 Nov 2023 09:45:42 +0000
Subject: nncp: 8.9.0 -> 8.10.0

---
 pkgs/by-name/nn/nncp/package.nix | 77 ++++++++++++++++++++++++++++++++++++++++
 pkgs/tools/misc/nncp/default.nix | 77 ----------------------------------------
 pkgs/top-level/all-packages.nix  |  2 --
 3 files changed, 77 insertions(+), 79 deletions(-)
 create mode 100644 pkgs/by-name/nn/nncp/package.nix
 delete mode 100644 pkgs/tools/misc/nncp/default.nix

(limited to 'pkgs/tools/misc')

diff --git a/pkgs/by-name/nn/nncp/package.nix b/pkgs/by-name/nn/nncp/package.nix
new file mode 100644
index 00000000000..902b78272da
--- /dev/null
+++ b/pkgs/by-name/nn/nncp/package.nix
@@ -0,0 +1,77 @@
+{ cfgPath ? "/etc/nncp.hjson"
+, curl
+, fetchurl
+, lib
+, genericUpdater
+, go
+, perl
+, stdenv
+, writeShellScript
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nncp";
+  version = "8.10.0";
+  outputs = [ "out" "doc" "info" ];
+
+  src = fetchurl {
+    url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz";
+    sha256 = "154e13ba15c0ea93f54525793b0699e496b2db7281e1555f08d785a528f3f7fc";
+  };
+
+  nativeBuildInputs = [
+    go
+  ];
+
+  # Build parameters
+  CFGPATH = cfgPath;
+  SENDMAIL = "sendmail";
+
+  preConfigure = "export GOCACHE=$NIX_BUILD_TOP/gocache";
+
+  buildPhase = ''
+    runHook preBuild
+    ./bin/build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    PREFIX=$out ./install
+    runHook postInstall
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.updateScript = genericUpdater {
+    versionLister = writeShellScript "nncp-versionLister" ''
+      ${curl}/bin/curl -s ${finalAttrs.meta.downloadPage} | ${perl}/bin/perl -lne 'print $1 if /Release.*>([0-9.]+)</'
+    '';
+  };
+
+  meta = {
+    broken = stdenv.isDarwin;
+    changelog = "http://www.nncpgo.org/News.html";
+    description = "Secure UUCP-like store-and-forward exchanging";
+    downloadPage = "http://www.nncpgo.org/Tarballs.html";
+    homepage = "http://www.nncpgo.org/";
+    license = lib.licenses.gpl3Only;
+    longDescription = ''
+      This utilities are intended to help build up small size (dozens of
+      nodes) ad-hoc friend-to-friend (F2F) statically routed darknet
+      delay-tolerant networks for fire-and-forget secure reliable files,
+      file requests, Internet mail and commands transmission. All
+      packets are integrity checked, end-to-end encrypted, explicitly
+      authenticated by known participants public keys. Onion encryption
+      is applied to relayed packets. Each node acts both as a client and
+      server, can use push and poll behaviour model.
+
+      Out-of-box offline sneakernet/floppynet, dead drops, sequential
+      and append-only CD-ROM/tape storages, air-gapped computers
+      support. But online TCP daemon with full-duplex resumable data
+      transmission exists.
+    '';
+    maintainers = with lib.maintainers; [ ehmry woffs ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix
deleted file mode 100644
index eb929c9923b..00000000000
--- a/pkgs/tools/misc/nncp/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ cfgPath ? "/etc/nncp.hjson"
-, curl
-, fetchurl
-, lib
-, genericUpdater
-, go
-, perl
-, stdenv
-, writeShellScript
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "nncp";
-  version = "8.9.0";
-  outputs = [ "out" "doc" "info" ];
-
-  src = fetchurl {
-    url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JZ+svDNU7cwW58ZOJ4qszbR/+j7Cr+oLNig/RqqCS10=";
-  };
-
-  nativeBuildInputs = [
-    go
-  ];
-
-  # Build parameters
-  CFGPATH = cfgPath;
-  SENDMAIL = "sendmail";
-
-  preConfigure = "export GOCACHE=$NIX_BUILD_TOP/gocache";
-
-  buildPhase = ''
-    runHook preBuild
-    ./bin/build
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    PREFIX=$out ./install
-    runHook postInstall
-  '';
-
-  enableParallelBuilding = true;
-
-  passthru.updateScript = genericUpdater {
-    versionLister = writeShellScript "nncp-versionLister" ''
-      ${curl}/bin/curl -s ${finalAttrs.meta.downloadPage} | ${perl}/bin/perl -lne 'print $1 if /Release.*>([0-9.]+)</'
-    '';
-  };
-
-  meta = {
-    broken = stdenv.isDarwin;
-    changelog = "http://www.nncpgo.org/News.html";
-    description = "Secure UUCP-like store-and-forward exchanging";
-    downloadPage = "http://www.nncpgo.org/Tarballs.html";
-    homepage = "http://www.nncpgo.org/";
-    license = lib.licenses.gpl3Only;
-    longDescription = ''
-      This utilities are intended to help build up small size (dozens of
-      nodes) ad-hoc friend-to-friend (F2F) statically routed darknet
-      delay-tolerant networks for fire-and-forget secure reliable files,
-      file requests, Internet mail and commands transmission. All
-      packets are integrity checked, end-to-end encrypted, explicitly
-      authenticated by known participants public keys. Onion encryption
-      is applied to relayed packets. Each node acts both as a client and
-      server, can use push and poll behaviour model.
-
-      Out-of-box offline sneakernet/floppynet, dead drops, sequential
-      and append-only CD-ROM/tape storages, air-gapped computers
-      support. But online TCP daemon with full-duplex resumable data
-      transmission exists.
-    '';
-    maintainers = with lib.maintainers; [ ehmry woffs ];
-    platforms = lib.platforms.all;
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67b62f9e2e1..cd9a1b9315e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34026,8 +34026,6 @@ with pkgs;
 
   ninjas2 = callPackage ../applications/audio/ninjas2 { };
 
-  nncp = darwin.apple_sdk_11_0.callPackage ../tools/misc/nncp { };
-
   nootka = qt5.callPackage ../applications/audio/nootka { };
 
   novnc = callPackage ../applications/networking/novnc { };
-- 
cgit 1.4.1