From 98f026b5d12c3faae9959c0e9ab0bc179243ec93 Mon Sep 17 00:00:00 2001 From: Lux Date: Tue, 14 Dec 2021 19:50:33 +0100 Subject: nanosaur: init at unstable-2021-12-03 Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36a2f96455f..3162a103a64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30492,6 +30492,8 @@ with pkgs; naev = callPackage ../games/naev { }; + nanosaur = callPackage ../games/nanosaur { }; + nethack = callPackage ../games/nethack { }; nethack-qt = callPackage ../games/nethack { -- cgit 1.4.1 From d03a75a45a21d555610ae8cedce9b6249eb89c28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Dec 2021 00:34:43 +0100 Subject: fast-ssh: init at 0.3.1 --- pkgs/tools/networking/fast-ssh/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/fast-ssh/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix new file mode 100644 index 00000000000..912cac75865 --- /dev/null +++ b/pkgs/tools/networking/fast-ssh/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "fast-ssh"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "julien-r44"; + repo = "fast-ssh"; + rev = "v${version}"; + sha256 = "sha256-eHJdMe8RU6Meg/9+NCfIneD5BqNUc2yIiQ8Z5UqUBUI="; + }; + + cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "TUI tool to use the SSH config for connections"; + homepage = "https://github.com/julien-r44/fast-ssh"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65d8b9e9648..72c825c2e32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2990,6 +2990,10 @@ with pkgs; fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { }; + fast-ssh = callPackage ../tools/networking/fast-ssh { + inherit (darwin.apple_sdk.frameworks) Security; + }; + faudio = callPackage ../development/libraries/faudio { }; fd = callPackage ../tools/misc/fd { }; -- cgit 1.4.1 From c033826f3960ee40cb33f09ec3d1c414ab582939 Mon Sep 17 00:00:00 2001 From: cirno-999 Date: Sun, 26 Dec 2021 18:16:02 +0100 Subject: torrent7z: init at 1.3 torrent7z: apply suggestions from code review Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- pkgs/tools/archivers/torrent7z/default.nix | 53 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/archivers/torrent7z/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/tools/archivers/torrent7z/default.nix b/pkgs/tools/archivers/torrent7z/default.nix new file mode 100644 index 00000000000..74eaa4409f7 --- /dev/null +++ b/pkgs/tools/archivers/torrent7z/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses }: + +stdenv.mkDerivation rec { + pname = "torrent7z"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "BubblesInTheTub"; + repo = pname; + rev = version; + sha256 = "Y2tr0+z9uij4Ifi6FfWRN24BwcDXUZKVLkLtKUiVjU4="; + }; + + patches = [ + (fetchpatch { + name = "fix-gcc10-compilation.patch"; # Fix compilation on GCC 10. This patch is included on the latest commit + url = + "https://github.com/paulyc/torrent7z/commit/5958f42a364c430b3ed4ac68911bbbea1f967fc4.patch"; + sha256 = "vJOv1sG9XwTvvxQiWew0H5ALoUb9wIAouzTsTvKHuPI="; + }) + ]; + + buildInputs = [ ncurses ]; + + hardeningDisable = [ "format" ]; + + postPatch = '' + # Remove non-free RAR source code + # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar) + rm -r linux_src/p7zip_4.65/CPP/7zip/Compress/Rar* + find . -name makefile'*' -exec sed -i '/Rar/d' {} + + ''; + + preConfigure = '' + mkdir linux_src/p7zip_4.65/bin + cd linux_src/p7zip_4.65/CPP/7zip/Bundles/Alone + ''; + + installPhase = '' + mkdir -p $out/bin + cp ../../../../bin/t7z $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/BubblesInTheTub/torrent7z"; + description = "A fork of torrent7z, viz a derivative of 7zip that produces invariant .7z archives for torrenting"; + platforms = platforms.linux; + maintainers = with maintainers; [ cirno-999 ]; + mainProgram = "t7z"; + # RAR code is under non-free UnRAR license, but we remove it + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aac5a40e98a..1d95444c9d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10264,6 +10264,8 @@ with pkgs; touchegg = callPackage ../tools/inputmethods/touchegg { }; + torrent7z = callPackage ../tools/archivers/torrent7z { }; + torsocks = callPackage ../tools/security/tor/torsocks.nix { }; toss = callPackage ../tools/networking/toss { }; -- cgit 1.4.1 From 3415b50ab631ef6e665e0e74237e101e933346de Mon Sep 17 00:00:00 2001 From: Aadi Bajpai Date: Sun, 26 Dec 2021 19:39:50 -0600 Subject: aocd: pythonPackages → python3Packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55a480c1cd7..42c57631f74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -186,7 +186,7 @@ with pkgs; antsimulator = callPackage ../games/antsimulator { }; - aocd = with pythonPackages; toPythonApplication aocd; + aocd = with python3Packages; toPythonApplication aocd; astrolog = callPackage ../applications/science/astronomy/astrolog { }; -- cgit 1.4.1