diff options
| -rw-r--r-- | pkgs/development/python-modules/apache-airflow/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/misc/mapcidr/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/tools/security/scorecard/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 65 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 2d80b6a3984a..2ffe0b137528 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -64,13 +64,13 @@ }: let - version = "2.1.2"; + version = "2.1.4"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "sha256-Q0l2c1tuxcoE65zgdxnv/j1TIoQzaNoEFCYHvqN+Bzk="; + sha256 = "12nxjaz4afkq30s42x3rbsci8jiw2k5zjngsc8i190fasbacbnbs"; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. @@ -193,7 +193,9 @@ buildPythonPackage rec { --replace "sqlalchemy>=1.3.18, <1.4" "sqlalchemy" \ --replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \ --replace "werkzeug~=1.0, >=1.0.1" "werkzeug" \ - --replace "itsdangerous>=1.1.0, <2.0" "itsdangerous" + --replace "itsdangerous>=1.1.0, <2.0" "itsdangerous" \ + --replace "python-slugify>=3.0.0,<5.0" "python-slugify" \ + --replace "colorlog>=4.0.2, <6.0" "colorlog" substituteInPlace tests/core/test_core.py \ --replace "/bin/bash" "${stdenv.shell}" diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix new file mode 100644 index 000000000000..2c8a80b28d0c --- /dev/null +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "mapcidr"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hlMIgSsSqvMx6Y7JnR7L9muTLWPfxDN5raJRezt99G0="; + }; + + vendorSha256 = "sha256-zp+XaSZgSMwJK+EEiTaJKBTPiKYaYpTtArnGBmHUGzE="; + + modRoot = "."; + subPackages = [ + "cmd/mapcidr" + ]; + + meta = with lib; { + description = "Small utility program to perform multiple operations for a given subnet/CIDR ranges"; + longDescription = '' + mapCIDR is developed to ease load distribution for mass scanning + operations, it can be used both as a library and as independent CLI tool. + ''; + homepage = "https://github.com/projectdiscovery/mapcidr"; + license = licenses.mit; + maintainers = with maintainers; [ hanemile ]; + }; +} diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index d0908c359502..0cc94c63c9f0 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -1,16 +1,33 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchgit, installShellFiles }: buildGoModule rec { pname = "scorecard"; - version = "2.2.8"; + version = "3.0.1"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U29NCZFXOhu0xLfDlJ1Q7m8TbAm+C6+ecYFhcI5gg6s="; + sha256 = "sha256-19XDAgv9ARCZ7eNlWUPcsbGNyKA9vYFry8m6D3+vQP8="; + # populate values otherwise taken care of by goreleaser, + # unfortunately these require us to use git. By doing + # this in postFetch we can delete .git afterwards and + # maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + + commit="$(git rev-parse HEAD)" + source_date_epoch=$(git log --date=iso8601-strict -1 --pretty=%ct) + + substituteInPlace "$out/pkg/scorecard_version.go" \ + --replace 'gitCommit = "unknown"' "gitCommit = \"$commit\"" \ + --replace 'buildDate = "unknown"' "buildDate = \"$source_date_epoch\"" + + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; - vendorSha256 = "sha256-hOATCXjBE0doHnY2BaRKZocQ6SIigL0q4m9eEJGKh6Q="; + vendorSha256 = "sha256-ucF26pTEvG8tkzsyC9WNbvl8QCeetKBvBIcQL2NTfjo="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; @@ -20,8 +37,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/ossf/scorecard/v2/pkg.gitVersion=v${version}" - "-X github.com/ossf/scorecard/v2/pkg.gitTreeState=clean" + "-X github.com/ossf/scorecard/v${lib.versions.major version}/pkg.gitVersion=v${version}" + "-X github.com/ossf/scorecard/v${lib.versions.major version}/pkg.gitTreeState=clean" ]; preCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aa076c0bb2b..14031daf5a88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -892,7 +892,7 @@ with pkgs; airfield = callPackage ../tools/networking/airfield { }; - apache-airflow = with python37.pkgs; toPythonApplication apache-airflow; + apache-airflow = with python3.pkgs; toPythonApplication apache-airflow; airsonic = callPackage ../servers/misc/airsonic { }; @@ -3149,6 +3149,8 @@ with pkgs; lynis = callPackage ../tools/security/lynis { }; + mapcidr = callPackage ../tools/misc/mapcidr { }; + mapproxy = callPackage ../applications/misc/mapproxy { }; marl = callPackage ../development/libraries/marl {}; |