From 0bab87d2428f67aa4a6f0aca4e85aa63e8510dfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Sep 2021 05:01:51 +0000 Subject: [PATCH 1/4] flexget: 3.1.135 -> 3.1.136 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index edf467d51208..dbbcc6596640 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.135"; + version = "3.1.136"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "01qj9pp3b7qxpv1yzak4ql1d95dq6611crpp4y5z44mg5gmbql7g"; + sha256 = "058sja2miwhr6lx5j8r9d97k4ywh6dsxd05nb5w19z6a0sq1vmyb"; }; postPatch = '' From 0c35c72ed4d85da1fa3f953aa2882716bb8d6332 Mon Sep 17 00:00:00 2001 From: Mikael Heino Date: Thu, 2 Sep 2021 13:26:47 +0300 Subject: [PATCH 2/4] ntfs-3g: 2017.3.23 -> 2021.8.22 New version has important security fixes. --- pkgs/tools/filesystems/ntfs-3g/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 89ef27827a19..cc46161a3d86 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ntfs3g"; - version = "2017.3.23"; + version = "2021.8.22"; outputs = [ "out" "dev" "man" "doc" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; - sha256 = "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy"; + sha256 = "55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb"; }; patchPhase = '' From 7ca49a701a7b6a9b90738af132f6b57e4160facd Mon Sep 17 00:00:00 2001 From: Mikael Heino Date: Thu, 2 Sep 2021 13:27:51 +0300 Subject: [PATCH 3/4] ntfs-3g: update homepage --- pkgs/tools/filesystems/ntfs-3g/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index cc46161a3d86..de110f61dd81 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/"; + homepage = "https://github.com/tuxera/ntfs-3g"; description = "FUSE-based NTFS driver with full write support"; maintainers = with maintainers; [ dezgeg ]; platforms = with platforms; darwin ++ linux; From 5f6a5d5c5f52c5accbf109872bb4957c53dc1e7e Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Thu, 2 Sep 2021 00:30:29 -0400 Subject: [PATCH 4/4] ran: init at 0.1.6 --- pkgs/servers/http/ran/default.nix | 47 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/servers/http/ran/default.nix diff --git a/pkgs/servers/http/ran/default.nix b/pkgs/servers/http/ran/default.nix new file mode 100644 index 000000000000..5d58506be3ff --- /dev/null +++ b/pkgs/servers/http/ran/default.nix @@ -0,0 +1,47 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, runCommand +, ran +, curl +}: + +buildGoModule rec { + pname = "ran"; + version = "0.1.6"; + src = fetchFromGitHub { + owner = "m3ng9i"; + repo = "ran"; + rev = "v${version}"; + hash = "sha256-iMvUvzr/jaTNdgHQFuoJNJnnkx2XHIUUlrPWyTlreEw="; + }; + + vendorSha256 = "sha256-ObroruWWNilHIclqNvbEaa7vwk+1zMzDKbjlVs7Fito="; + + CGO_ENABLED = 0; + + ldflags = [ + "-X" "main._version_=v${version}" + "-X" "main._branch_=master" + ]; + + passthru.tests = { + simple = runCommand "ran-test" { } '' + echo hello world > index.html + ${ran}/bin/ran & + # Allow ran to fully initialize + sleep 1 + [ "$(${curl}/bin/curl 127.0.0.1:8080)" == "hello world" ] + kill %1 + ${ran}/bin/ran --version > $out + ''; + }; + + meta = with lib; { + homepage = "https://github.com/m3ng9i/ran"; + description = "Ran is a simple web server for serving static files"; + license = licenses.mit; + maintainers = with maintainers; [ tomberek ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee8b9b9e3d25..cd2f731315d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14368,6 +14368,8 @@ with pkgs; lua = lua5; } // (config.radare or {})); + ran = callPackage ../servers/http/ran { }; + retry = callPackage ../tools/system/retry { }; rizin = pkgs.callPackage ../development/tools/analysis/rizin { };