Merge master into staging-next
This commit is contained in:
commit
452a7d6c43
|
@ -164,14 +164,6 @@ There are several ways to tweak how Nix handles a package which has been marked
|
||||||
|
|
||||||
Note that `permittedInsecurePackages` is only checked if `allowInsecurePredicate` is not specified.
|
Note that `permittedInsecurePackages` is only checked if `allowInsecurePredicate` is not specified.
|
||||||
|
|
||||||
### `config` Options Reference
|
|
||||||
|
|
||||||
The following attributes can be passed in [`config`](#chap-packageconfig).
|
|
||||||
|
|
||||||
```{=docbook}
|
|
||||||
<include xmlns="http://www.w3.org/2001/XInclude" href="../doc-support/result/config-options.docbook.xml"/>
|
|
||||||
```
|
|
||||||
|
|
||||||
## Modify packages via `packageOverrides` {#sec-modify-via-packageOverrides}
|
## Modify packages via `packageOverrides` {#sec-modify-via-packageOverrides}
|
||||||
|
|
||||||
You can define a function called `packageOverrides` in your local `~/.config/nixpkgs/config.nix` to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages.
|
You can define a function called `packageOverrides` in your local `~/.config/nixpkgs/config.nix` to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages.
|
||||||
|
@ -184,6 +176,15 @@ You can define a function called `packageOverrides` in your local `~/.config/nix
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## `config` Options Reference {#sec-config-options-reference}
|
||||||
|
|
||||||
|
The following attributes can be passed in [`config`](#chap-packageconfig).
|
||||||
|
|
||||||
|
```{=docbook}
|
||||||
|
<include xmlns="http://www.w3.org/2001/XInclude" href="../doc-support/result/config-options.docbook.xml"/>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Declarative Package Management {#sec-declarative-package-management}
|
## Declarative Package Management {#sec-declarative-package-management}
|
||||||
|
|
||||||
### Build an environment {#sec-building-environment}
|
### Build an environment {#sec-building-environment}
|
||||||
|
|
|
@ -87,7 +87,7 @@ let
|
||||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||||
|
|
||||||
# Upstream source
|
# Upstream source
|
||||||
version = "11.0.13";
|
version = "11.0.14";
|
||||||
|
|
||||||
lang = "en-US";
|
lang = "en-US";
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ let
|
||||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||||
];
|
];
|
||||||
sha256 = "03pzwzgikc43pm0lga61jdzg46fanmvd1wsnb2xkq0y1ny8gsqfz";
|
sha256 = "19lsxdxbdismjrv2kmvm10cmr1x5klc2khlmrybycdw2vx7r41mn";
|
||||||
};
|
};
|
||||||
|
|
||||||
i686-linux = fetchurl {
|
i686-linux = fetchurl {
|
||||||
|
@ -107,7 +107,7 @@ let
|
||||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||||
];
|
];
|
||||||
sha256 = "0j8h2g404sagzjxnwf55n8hpvmwk52qhml98nyliajf1xg8v8k19";
|
sha256 = "0hkj4vn5jk3z32mdgzzwmhj5xa4mv5p1nnwqhlsbc3g5b5q8bc7q";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "homebank";
|
pname = "homebank";
|
||||||
version = "5.5.4";
|
version = "5.5.5";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://homebank.free.fr/public/homebank-${version}.tar.gz";
|
url = "http://homebank.free.fr/public/homebank-${version}.tar.gz";
|
||||||
sha256 = "sha256-DQZpvKCZNArlwhPqE8srkyg7/IoOTPelkCwYKTZuV2U=";
|
sha256 = "sha256-vs4F7LUjkhR0JKoeWheTiXd7gr9Gir69c+twsq+cnmc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ fetchFromGitHub
|
{ fetchFromGitHub
|
||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchpatch
|
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, gettext
|
, gettext
|
||||||
|
@ -14,25 +13,17 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "liblouis";
|
pname = "liblouis";
|
||||||
version = "3.21.0";
|
version = "3.22.0";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "man" "info" "doc" ];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "liblouis";
|
owner = "liblouis";
|
||||||
repo = "liblouis";
|
repo = "liblouis";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8=";
|
sha256 = "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "parenthesize-memcpy-calls-clang.patch";
|
|
||||||
url = "https://github.com/liblouis/liblouis/commit/528f38938e9f539a251d9de92ad1c1b90401c4d0.patch";
|
|
||||||
sha256 = "0hlhqsvd5wflg70bd7bmssnchk8znzbr93in0zpspzbyap6xz112";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" "info" "doc" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -71,7 +62,10 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Open-source braille translator and back-translator";
|
description = "Open-source braille translator and back-translator";
|
||||||
homepage = "http://liblouis.org/";
|
homepage = "http://liblouis.org/";
|
||||||
license = licenses.lgpl21;
|
license = with licenses; [
|
||||||
|
lgpl21Plus # library
|
||||||
|
gpl3Plus # tools
|
||||||
|
];
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ jtojnar ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,14 +9,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "atom";
|
pname = "atom";
|
||||||
version = "0.8.0";
|
version = "0.8.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nucleic";
|
owner = "nucleic";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-Xby3QopKw7teShMi80RMG8YdhOOvfQb5vwOuFEUTxHQ=";
|
hash = "sha256-odthydKmgbOXYT8YAIn5MlFfH/BD8MMkuRYaiI8OZD4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ghapi";
|
pname = "ghapi";
|
||||||
version = "0.1.20";
|
version = "0.1.21";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -17,8 +17,8 @@ buildPythonPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fastai";
|
owner = "fastai";
|
||||||
repo = "ghapi";
|
repo = "ghapi";
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "sha256-Pry+qCHCt+c+uwkLaoTVUY1KblESj6kcNtMfGwK1rfk=";
|
sha256 = "sha256-6VcsIcRhIHByd1aPZLIJ+g4o1einHpyJuSamwh1Ag5M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -6,14 +6,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "peaqevcore";
|
pname = "peaqevcore";
|
||||||
version = "1.0.11";
|
version = "1.0.14";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-cY2+H6FiojUEOHuA+wuIubtJKjNQlgten1edWgkoLb0=";
|
hash = "sha256-zHVi950iUultt66amL22d/7INglJtSOHvWCPUSaw5h4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2-core";
|
pname = "pyroute2-core";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pyroute2.core";
|
pname = "pyroute2.core";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-9Odxls1lje7pUCu0UkhfQIgbL2dOZQkiV1J/kgfgxGw=";
|
hash = "sha256-uzb8nlAOHNtNq205/sJPoJtvMoo7uCFfrRQas/rv8p8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# pyroute2 sub-modules have no tests
|
# pyroute2 sub-modules have no tests
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2-ethtool";
|
pname = "pyroute2-ethtool";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pyroute2.ethtool";
|
pname = "pyroute2.ethtool";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-3xFsK50WtnRS8ImEWU4Hke9Ndp1Asm4wPEBfQT1rYXU=";
|
hash = "sha256-MwIRm/DezL7yCN682Yckxd23+iri2V6HCokF4G36apU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2-ipdb";
|
pname = "pyroute2-ipdb";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pyroute2.ipdb";
|
pname = "pyroute2.ipdb";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-UTP5LuZbBukfDpQPJ+N5ZFtKGFJppZfpsISnsm9eabs=";
|
hash = "sha256-hKh5SFFMdhECeMyA3Quzqp7h+iQMMmCYBJEuLEq5dVs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2-ipset";
|
pname = "pyroute2-ipset";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pyroute2.ipset";
|
pname = "pyroute2.ipset";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-uIfclrm1tujUickd5R4uyDHvPExyC2M9mpm5NLF1rts=";
|
hash = "sha256-nvj7b6HF/XhzqmFg6aOQKMFDEFwAcyOnoJXi/coNvG4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2-ndb";
|
pname = "pyroute2-ndb";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pyroute2.ndb";
|
pname = "pyroute2.ndb";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-jz956VgO9Z9ZPlMQobB34wd04Og/XV7IP+J58htdk+Y=";
|
hash = "sha256-Oc+uaqftRH6Dw3Sa2G1rZ3Mx2u81ErKIyz8xhnA1QgI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2-nftables";
|
pname = "pyroute2-nftables";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pyroute2.nftables";
|
pname = "pyroute2.nftables";
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "sha256-2SHAH4HBcXknCa2rdHk1s+ju+IN5ndcLPD8dgSGagqU=";
|
sha256 = "sha256-jy04M73r49LxfbHAuDgSaoFWmkc0O/jPJwdDlW8YCSc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2-nslink";
|
pname = "pyroute2-nslink";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pyroute2.nslink";
|
pname = "pyroute2.nslink";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-R94n1UEceOMmXXbCCkgq6N2JLnp2eqAW4qweIpNI2CI=";
|
hash = "sha256-c66rD7CyHdyYACIiq1Nfu6rmUsIL9YmFp4Z1gxOFik4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2-protocols";
|
pname = "pyroute2-protocols";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pyroute2.protocols";
|
pname = "pyroute2.protocols";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-AnmW9ILlcZh2mwO5fbhY4ZazWSAy2wHJgLp5Anlmxk4=";
|
hash = "sha256-j83UNlQVjxIyKhOqDsx6yhvMZEfAh54gRjniacCpSxY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -15,14 +15,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyroute2";
|
pname = "pyroute2";
|
||||||
version = "0.6.11";
|
version = "0.6.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-E2NGvmbVUuRUHQZ52/+say4SN9/TnuGpUGL4UCRJF70=";
|
hash = "sha256-cnUvmx9R+4oUGgf6LpbMlAadVh/EYcNX1ep88gtPTn4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -1,30 +1,65 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
|
||||||
, requests
|
|
||||||
, oauthlib
|
|
||||||
, requests-oauthlib
|
|
||||||
, pyjwt
|
|
||||||
, cryptography
|
, cryptography
|
||||||
, defusedxml
|
, defusedxml
|
||||||
, python3-openid
|
, fetchFromGitHub
|
||||||
, python-jose
|
|
||||||
, python3-saml
|
|
||||||
, pytestCheckHook
|
|
||||||
, httpretty
|
, httpretty
|
||||||
|
, lxml
|
||||||
|
, oauthlib
|
||||||
|
, pyjwt
|
||||||
|
, pytestCheckHook
|
||||||
|
, python-jose
|
||||||
|
, python3-openid
|
||||||
|
, python3-saml
|
||||||
|
, pythonOlder
|
||||||
|
, requests
|
||||||
|
, requests-oauthlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "social-auth-core";
|
pname = "social-auth-core";
|
||||||
version = "4.2.0";
|
version = "4.3.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "python-social-auth";
|
owner = "python-social-auth";
|
||||||
repo = "social-core";
|
repo = "social-core";
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "sha256-kaL6sfAyQlzxszCEbhW7sns/mcOv0U+QgplmUd6oegQ=";
|
hash = "sha256-P9IWnu1/PWVNl/tZZ4bqz0WnruKu/jXASZBoaWXWeYI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
cryptography
|
||||||
|
defusedxml
|
||||||
|
oauthlib
|
||||||
|
pyjwt
|
||||||
|
python3-openid
|
||||||
|
requests
|
||||||
|
requests-oauthlib
|
||||||
|
];
|
||||||
|
|
||||||
|
passthru.optional-dependencies = {
|
||||||
|
openidconnect = [
|
||||||
|
python-jose
|
||||||
|
];
|
||||||
|
saml = [
|
||||||
|
lxml
|
||||||
|
python3-saml
|
||||||
|
];
|
||||||
|
azuread = [
|
||||||
|
cryptography
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
httpretty
|
||||||
|
] ++ passthru.optional-dependencies.openidconnect
|
||||||
|
++ passthru.optional-dependencies.saml
|
||||||
|
++ passthru.optional-dependencies.azuread;
|
||||||
|
|
||||||
# Disable checking the code coverage
|
# Disable checking the code coverage
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
substituteInPlace social_core/tests/requirements.txt \
|
substituteInPlace social_core/tests/requirements.txt \
|
||||||
|
@ -35,28 +70,13 @@ buildPythonPackage rec {
|
||||||
--replace "{posargs:-v --cov=social_core}" "{posargs:-v}"
|
--replace "{posargs:-v --cov=social_core}" "{posargs:-v}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
pythonImportsCheck = [
|
||||||
requests
|
"social_core"
|
||||||
oauthlib
|
|
||||||
requests-oauthlib
|
|
||||||
pyjwt
|
|
||||||
cryptography
|
|
||||||
defusedxml
|
|
||||||
python3-openid
|
|
||||||
python-jose
|
|
||||||
python3-saml
|
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
|
||||||
pytestCheckHook
|
|
||||||
httpretty
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "social_core" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
description = "Module for social authentication/registration mechanisms";
|
||||||
homepage = "https://github.com/python-social-auth/social-core";
|
homepage = "https://github.com/python-social-auth/social-core";
|
||||||
description = "Python Social Auth - Core";
|
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ n0emis ];
|
maintainers = with maintainers; [ n0emis ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,39 +1,59 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, file, findutils
|
{ lib
|
||||||
, binutils-unwrapped, glibc, coreutils, sysctl, openssl
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, makeWrapper
|
||||||
|
, file
|
||||||
|
, findutils
|
||||||
|
, binutils-unwrapped
|
||||||
|
, glibc
|
||||||
|
, coreutils
|
||||||
|
, sysctl
|
||||||
|
, openssl
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "checksec";
|
pname = "checksec";
|
||||||
version = "2.5.0";
|
version = "2.6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "slimm609";
|
owner = "slimm609";
|
||||||
repo = "checksec.sh";
|
repo = "checksec.sh";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-GxWXocz+GCEssRrIQP6E9hjVIhVh2EmZrefELxQlV1Q=";
|
hash = "sha256-BWtchWXukIDSLJkFX8M/NZBvfi7vUE2j4yFfS0KEZDo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ];
|
patches = [
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
./0001-attempt-to-modprobe-config-before-checking-kernel.patch
|
||||||
|
];
|
||||||
|
|
||||||
installPhase = let
|
nativeBuildInputs = [
|
||||||
path = lib.makeBinPath [
|
makeWrapper
|
||||||
findutils file binutils-unwrapped sysctl openssl
|
];
|
||||||
];
|
|
||||||
in ''
|
installPhase =
|
||||||
mkdir -p $out/bin
|
let
|
||||||
install checksec $out/bin
|
path = lib.makeBinPath [
|
||||||
substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6
|
findutils
|
||||||
substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
|
file
|
||||||
wrapProgram $out/bin/checksec \
|
binutils-unwrapped
|
||||||
--prefix PATH : ${path}
|
sysctl
|
||||||
'';
|
openssl
|
||||||
|
];
|
||||||
|
in
|
||||||
|
''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
install checksec $out/bin
|
||||||
|
substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6
|
||||||
|
substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
|
||||||
|
wrapProgram $out/bin/checksec \
|
||||||
|
--prefix PATH : ${path}
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A tool for checking security bits on executables";
|
description = "Tool for checking security bits on executables";
|
||||||
homepage = "https://www.trapkit.de/tools/checksec/";
|
homepage = "https://www.trapkit.de/tools/checksec/";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ thoughtpolice globin ];
|
maintainers = with maintainers; [ thoughtpolice globin ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hash-slinger";
|
pname = "hash-slinger";
|
||||||
version = "3.1";
|
version = "3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "letoams";
|
owner = "letoams";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-mhMUdZt846QjwRIh2m/4EE+93fUcCKc2FFeoFpzKYvk=";
|
sha256 = "sha256-PfOEGqPMGLixoqHENZnxOv9nK+dYMqe6P0k+ZiJMik0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonPath = with python3.pkgs; [
|
pythonPath = with python3.pkgs; [
|
||||||
|
|
|
@ -1,14 +1,17 @@
|
||||||
{ lib, stdenv, fetchFromGitHub }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "haveged";
|
pname = "haveged";
|
||||||
version = "1.9.17";
|
version = "1.9.18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jirka-h";
|
owner = "jirka-h";
|
||||||
repo = "haveged";
|
repo = "haveged";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-uVl+TZVMsf+9aRATQndYMK4l4JfOBvstd1O2nTHyMYU=";
|
hash = "sha256-fyL/J2A13ap582j4gdC8u63Ah67Old+BaO/CLyEeN/g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
40
pkgs/tools/security/ldapmonitor/default.nix
Normal file
40
pkgs/tools/security/ldapmonitor/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{ lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, python3
|
||||||
|
}:
|
||||||
|
|
||||||
|
python3.pkgs.buildPythonApplication rec {
|
||||||
|
pname = "ldapmonitor";
|
||||||
|
version = "1.3";
|
||||||
|
format = "other";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "p0dalirius";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-lwTXvrnOVodCUQtR8FmCXiPuZ1Wx1ySfDKghpLXNuI4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
sourceRoot = "${src.name}/python";
|
||||||
|
|
||||||
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
impacket
|
||||||
|
ldap
|
||||||
|
ldap3
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
install -vD pyLDAPmonitor.py $out/bin/ldapmonitor
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Tool to monitor creation, deletion and changes to LDAP objects";
|
||||||
|
homepage = "https://github.com/p0dalirius/LDAPmonitor";
|
||||||
|
license = with licenses; [ gpl3Only ];
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -7933,6 +7933,8 @@ with pkgs;
|
||||||
|
|
||||||
lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { };
|
lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { };
|
||||||
|
|
||||||
|
ldapmonitor = callPackage ../tools/security/ldapmonitor { };
|
||||||
|
|
||||||
ldapvi = callPackage ../tools/misc/ldapvi { };
|
ldapvi = callPackage ../tools/misc/ldapvi { };
|
||||||
|
|
||||||
ldeep = python3Packages.callPackage ../tools/security/ldeep { };
|
ldeep = python3Packages.callPackage ../tools/security/ldeep { };
|
||||||
|
|
Loading…
Reference in a new issue