diff options
-rw-r--r-- | nixos/modules/programs/iay.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/physics/thepeg/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/etebase/default.nix | 35 | ||||
-rw-r--r-- | pkgs/servers/roon-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/nuclei/default.nix | 6 |
7 files changed, 39 insertions, 24 deletions
diff --git a/nixos/modules/programs/iay.nix b/nixos/modules/programs/iay.nix index 1fa00e43795ad..9164f5cb64862 100644 --- a/nixos/modules/programs/iay.nix +++ b/nixos/modules/programs/iay.nix @@ -2,11 +2,11 @@ let cfg = config.programs.iay; - inherit (lib) mkEnableOption mkIf mkOption mkPackageOption optionalString types; + inherit (lib) mkEnableOption mkIf mkOption mkPackageOptionMD optionalString types; in { options.programs.iay = { enable = mkEnableOption (lib.mdDoc "iay"); - package = mkPackageOption pkgs "iay" {}; + package = mkPackageOptionMD pkgs "iay" {}; minimalPrompt = mkOption { type = types.bool; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 3ff88b615e452..7f2e97814f050 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { pname = "thepeg"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { hash = "sha256-8hRzGXp2H8MpF7CKjSTSv6+T/1fzRB/WBdqZrJ3l1Qs="; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; configureFlags = [ @@ -25,7 +27,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix index 73e997b9cd4a0..0634165fb5144 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-dbfs"; - version = "2.0.3"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vMF0bAsICikvDtxn+wXujo8bY4DQ/xxXJmUePMQ+7Ak="; + hash = "sha256-taevteFOSJMXGLBkw0oTMF7YzpfRxZTRSlrRtcwFa78="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index e8ef83d98fb6b..33380342178b6 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.47.0"; + version = "8.48.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4NcobMGamIhBnACEQJ9Kvdvj9k4XjJx/Urx38nslAa8="; + hash = "sha256-iyywuAYDf3bY5He2rVgyjQcrD2MH123H6ham4xTAnXM="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index e84a3b45ce94c..079b87fe9a73e 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -1,18 +1,29 @@ -{ lib, fetchFromGitHub, buildPythonPackage, aiofiles, django_3 -, fastapi, msgpack, pynacl, redis, typing-extensions -, withLdap ? true, python-ldap -, withPostgres ? true, psycopg2 }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, aiofiles +, django_3 +, fastapi +, msgpack +, pynacl +, redis +, typing-extensions +, withLdap ? true +, python-ldap +, withPostgres ? true +, psycopg2 +}: buildPythonPackage rec { pname = "etebase-server"; - version = "0.10.0"; + version = "0.11.0"; format = "other"; src = fetchFromGitHub { owner = "etesync"; repo = "server"; - rev = "v${version}"; - sha256 = "sha256-z6aiXSWdLcDfOpqC5epsclXWxJq59MqWDQOnnFqGwz4="; + rev = "refs/tags/${version}"; + hash = "sha256-+MSNX+CFmIQII+SFjM2TQKCgRMOTdsOIVAP8ur4WjQY="; }; patches = [ ./secret.patch ]; @@ -25,8 +36,11 @@ buildPythonPackage rec { pynacl redis typing-extensions - ] ++ lib.optional withLdap python-ldap - ++ lib.optional withPostgres psycopg2; + ] ++ lib.optional withLdap [ + python-ldap + ] ++ lib.optional withPostgres [ + psycopg2 + ]; installPhase = '' mkdir -p $out/bin $out/lib @@ -38,7 +52,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/etesync/server"; - description = "An Etebase (EteSync 2.0) server so you can run your own."; + description = "An Etebase (EteSync 2.0) server so you can run your own"; + changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md"; license = licenses.agpl3Only; maintainers = with maintainers; [ felschr ]; }; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index a1ce5c876d364..8cd89c2afcf52 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1169"; + version = "2.0-1182"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-5XOE0XYKwlAuSgZ4iRISp2QcEN54LvYfL1OTZl3eWm0="; + hash = "sha256-2mo45+cbOyej5stJ8DFobvqECTTMLandcoPFnD4nY7s="; }; dontConfigure = true; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 67f627c28a112..6163dd091fc54 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-yh7bKJBj8Y73wT8MXZp6CYZ2y0gLebYZk9Pif8BC2a0="; + hash = "sha256-Fxf2AKB4soWkBRJHbP0IWPGSuoI3b3S7wyR7pmRreL8="; }; - vendorHash = "sha256-snBbte1TNDRcFwzq4QtixmqHarvQJ7E8euYPEYFlXe0="; + vendorHash = "sha256-2nVsEHMdz5sn9VeKG40an4q8Ke4xedj1yhF+BsHZ/qQ="; modRoot = "./v2"; subPackages = [ |