git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commitef2abc20bc08546fa4dc55a14dab96a3d3f62981 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateMon 18 Jan 2021, 06:42 (6 years ago) parentb7f20dcf9ced01
27 files changed+179−53
nixos/modules/module-list.nix+1 nixos/modules/services/networking/nomad.nix+126 pkgs/applications/misc/gallery-dl/default.nix+2−2 pkgs/development/python-modules/JPype1/default.nix+2−2 pkgs/development/python-modules/ROPGadget/default.nix+2−2 pkgs/development/python-modules/aiowinreg/default.nix+2−2 pkgs/development/python-modules/asyncwhois/default.nix+2−2 pkgs/development/python-modules/authlib/default.nix+2−2 pkgs/development/python-modules/avea/default.nix+2−2 pkgs/development/python-modules/avro/default.nix+2−2 pkgs/development/python-modules/axis/default.nix+2−2 pkgs/development/python-modules/cftime/default.nix+2−2 pkgs/development/python-modules/chalice/default.nix+2−2 pkgs/development/python-modules/check-manifest/default.nix+2−2 pkgs/development/python-modules/databricks-connect/default.nix+2−2 pkgs/development/python-modules/debian/default.nix+2−2 pkgs/development/python-modules/evdev/default.nix+2−2 pkgs/development/python-modules/genpy/default.nix+2−2 pkgs/development/python-modules/google-cloud-bigquery/default.nix+2−2 pkgs/development/python-modules/google-crc32c/default.nix+2−2 pkgs/development/python-modules/identify/default.nix+2−2 pkgs/development/python-modules/isbnlib/default.nix+2−2 pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix+2−2 pkgs/development/python-modules/kerberos/default.nix+2−2 pkgs/development/python-modules/keyrings-alt/default.nix+2−2 pkgs/tools/misc/psw/default.nix−1 pkgs/tools/system/gdu/default.nix+6−6
nixos/modules/module-list.nix+1
@@ -633,6 +633,7 @@
633633 ./services/networking/dnsdist.nix
634634 ./services/networking/dnsmasq.nix
635635 ./services/networking/ncdns.nix
636+ ./services/networking/nomad.nix
636637 ./services/networking/ejabberd.nix
637638 ./services/networking/epmd.nix
638639 ./services/networking/ergo.nix
nixos/modules/services/networking/nomad.nixnew file+126
@@ -0,0 +1,126 @@
1+{ config, lib, pkgs, ... }:
2+with lib;
3+let
4+ cfg = config.services.nomad;
5+ format = pkgs.formats.json { };
6+in
7+{
8+ ##### interface
9+ options = {
10+ services.nomad = {
11+ enable = mkEnableOption "Nomad, a distributed, highly available, datacenter-aware scheduler";
12+
13+ package = mkOption {
14+ type = types.package;
15+ default = pkgs.nomad;
16+ defaultText = "pkgs.nomad";
17+ description = ''
18+ The package used for the Nomad agent and CLI.
19+ '';
20+ };
21+
22+ extraPackages = mkOption {
23+ type = types.listOf types.package;
24+ default = [ ];
25+ description = ''
26+ Extra packages to add to <envar>PATH</envar> for the Nomad agent process.
27+ '';
28+ example = literalExample ''
29+ with pkgs; [ cni-plugins ]
30+ '';
31+ };
32+
33+ dropPrivileges = mkOption {
34+ type = types.bool;
35+ default = true;
36+ description = ''
37+ Whether the nomad agent should be run as a non-root nomad user.
38+ '';
39+ };
40+
41+ enableDocker = mkOption {
42+ type = types.bool;
43+ default = true;
44+ description = ''
45+ Enable Docker support. Needed for Nomad's docker driver.
46+
47+ Note that the docker group membership is effectively equivalent
48+ to being root, see https://github.com/moby/moby/issues/9976.
49+ '';
50+ };
51+
52+ settings = mkOption {
53+ type = format.type;
54+ default = {
55+ # Agrees with `StateDirectory = "nomad"` set below.
56+ data_dir = "/var/lib/nomad";
57+ };
58+ description = ''
59+ Configuration for Nomad. See the <link xlink:href="https://www.nomadproject.io/docs/configuration">documentation</link>
60+ for supported values.
61+ '';
62+ example = literalExample ''
63+ {
64+ # A minimal config example:
65+ server = {
66+ enabled = true;
67+ bootstrap_expect = 1; # for demo; no fault tolerance
68+ };
69+ client = {
70+ enabled = true;
71+ };
72+ }
73+ '';
74+ };
75+ };
76+ };
77+
78+ ##### implementation
79+ config = mkIf cfg.enable {
80+ environment = {
81+ etc."nomad.json".source = format.generate "nomad.json" cfg.settings;
82+ systemPackages = [ cfg.package ];
83+ };
84+
85+ systemd.services.nomad = {
86+ description = "Nomad";
87+ wantedBy = [ "multi-user.target" ];
88+ wants = [ "network-online.target" ];
89+ after = [ "network-online.target" ];
90+ restartTriggers = [ config.environment.etc."nomad.json".source ];
91+
92+ path = cfg.extraPackages ++ (with pkgs; [
93+ # Client mode requires at least the following:
94+ coreutils
95+ iproute
96+ iptables
97+ ]);
98+
99+ serviceConfig = {
100+ DynamicUser = cfg.dropPrivileges;
101+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
102+ ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json";
103+ KillMode = "process";
104+ KillSignal = "SIGINT";
105+ LimitNOFILE = 65536;
106+ LimitNPROC = "infinity";
107+ OOMScoreAdjust = -1000;
108+ Restart = "on-failure";
109+ RestartSec = 2;
110+ # Agrees with the default `data_dir = "/var/lib/nomad"` in `settings` above.
111+ StateDirectory = "nomad";
112+ TasksMax = "infinity";
113+ User = optionalString cfg.dropPrivileges "nomad";
114+ } // (optionalAttrs cfg.enableDocker {
115+ SupplementaryGroups = "docker"; # space-separated string
116+ });
117+ unitConfig = {
118+ StartLimitIntervalSec = 10;
119+ StartLimitBurst = 3;
120+ };
121+ };
122+
123+ # Docker support requires the Docker daemon to be running.
124+ virtualisation.docker.enable = mkIf cfg.enableDocker true;
125+ };
126+}
pkgs/applications/misc/gallery-dl/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonApplication rec {
44 pname = "gallery_dl";
5− version = "1.16.1";
5+ version = "1.16.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "51d789aac43013e25c1fad553f214cb1f43b1ae02e0651b640f102c5b9280aea";
9+ sha256 = "5926794d7a602cb9d4edf0a2094b266b790033db0a62689fa01e5272d7388587";
1010 };
1111
1212 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/JPype1/default.nix+2−2
@@ -9,12 +9,12 @@
99
1010buildPythonPackage rec {
1111 pname = "JPype1";
12− version = "1.2.0";
12+ version = "1.2.1";
1313 disabled = isPy27;
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "62ca03e7f7963ba4ac1065ee48ff661f752b3db3c23549ed8933ab40196a3157";
17+ sha256 = "f210646127d24be73cfc6d807e2cda1c6b2ab39b7a293008e8b46367af6f2204";
1818 };
1919
2020 propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
pkgs/development/python-modules/ROPGadget/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "ROPGadget";
6− version = "6.3";
6+ version = "6.4";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9";
10+ sha256 = "51d7cbdf51ac8b3f3f00bc0d4ae44433ef58d3bf5495efb316ec918654f1e6c3";
1111 };
1212
1313 propagatedBuildInputs = [ capstone ];
pkgs/development/python-modules/aiowinreg/default.nix+2−2
@@ -6,13 +6,13 @@
66
77buildPythonPackage rec {
88 pname = "aiowinreg";
9− version = "0.0.3";
9+ version = "0.0.4";
1010
1111 disabled = pythonOlder "3.6";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "0gxhx9m45yyr1rmgs7f1jchkgxk2zipk9g3s5ix90d267in8hsn9";
15+ sha256 = "956278a90ef6958f9e2392891b2a305273f695b15b14489cd2097197d6cbe155";
1616 };
1717
1818 # Project doesn't have tests
pkgs/development/python-modules/asyncwhois/default.nix+2−2
@@ -9,12 +9,12 @@
99
1010buildPythonPackage rec {
1111 pname = "asyncwhois";
12− version = "0.2.2";
12+ version = "0.2.3";
1313 disabled = pythonOlder "3.6";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "59ed35fbe646491b6c3e1dcf6db9b4870c3d44c6c023a1c3badd6226551d7b7e";
17+ sha256 = "95df90d5be581e3c69398abc6a3ec69a4e568852d9d6df4582bfcc0e22ffb3bb";
1818 };
1919
2020 propagatedBuildInputs = [
pkgs/development/python-modules/authlib/default.nix+2−2
@@ -8,14 +8,14 @@
88}:
99
1010buildPythonPackage rec {
11− version = "0.15.2";
11+ version = "0.15.3";
1212 pname = "authlib";
1313
1414 src = fetchFromGitHub {
1515 owner = "lepture";
1616 repo = "authlib";
1717 rev = "v${version}";
18− sha256 = "0jsqh2nirx3xifsakqdpd3wpdig6czavv3yj4lyqz3wh9xjpvswg";
18+ sha256 = "1lqicv8awyygqh1z8vhwvx38dw619kgbirdn8c9sc3qilagq1rdx";
1919 };
2020
2121 propagatedBuildInputs = [ cryptography requests ];
pkgs/development/python-modules/avea/default.nix+2−2
@@ -6,13 +6,13 @@
66
77buildPythonPackage rec {
88 pname = "avea";
9− version = "1.5.1";
9+ version = "1.5.2";
1010
1111 src = fetchFromGitHub {
1212 owner = "k0rventen";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "13s21dnhbh10dd60xq2cklp5jyv46rpl3nivn1imcswp02930ihz";
15+ sha256 = "1dirf0zdf4hb941w1dvh97vsvcy4h3w9r8jwdgr1ggmhdf9kfx4v";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/avro/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "avro";
5− version = "1.10.0";
5+ version = "1.10.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "bbf9f89fd20b4cf3156f10ec9fbce83579ece3e0403546c305957f9dac0d2f03";
9+ sha256 = "b3a405df5aa8654b992d2aca7b80482b858a1919a44dc0b10a682162e8ee340a";
1010 };
1111
1212 patchPhase = ''
pkgs/development/python-modules/axis/default.nix+2−2
@@ -9,13 +9,13 @@
99
1010buildPythonPackage rec {
1111 pname = "axis";
12− version = "42";
12+ version = "43";
1313
1414 src = fetchFromGitHub {
1515 owner = "Kane610";
1616 repo = pname;
1717 rev = "v${version}";
18− sha256 = "1144zkgyf63qlw4dfn1zqcbgaksmxvjc4115jhzi98z0fkvlk34p";
18+ sha256 = "1p9yfixsrkw7rxbvgybcb653rbqv0x18wzqkh620g193snm9sgm2";
1919 };
2020
2121 propagatedBuildInputs = [
pkgs/development/python-modules/cftime/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "cftime";
13− version = "1.3.0";
13+ version = "1.3.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "8d6a1144f43b9d7a180d7ceb3aa8015b7133c615fbac231bed184a91129f0207";
17+ sha256 = "77fd86e69b234d41fa8634d627e9e9ee0501c2a8a95268c2b524d38e0a33f090";
1818 };
1919
2020 checkInputs = [
pkgs/development/python-modules/chalice/default.nix+2−2
@@ -22,11 +22,11 @@
2222
2323buildPythonPackage rec {
2424 pname = "chalice";
25− version = "1.21.7";
25+ version = "1.21.9";
2626
2727 src = fetchPypi {
2828 inherit pname version;
29− sha256 = "22512bccb9b881b8d5a33bd45c7ad539dee60f2f8685a5ed8afd5000a962b0f8";
29+ sha256 = "312f88838c8ea4b4ac79dce0e5b4ba3125130ca66ea99a4694f535501dca95e3";
3030 };
3131
3232 checkInputs = [ watchdog pytest hypothesis mock ];
pkgs/development/python-modules/check-manifest/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "check-manifest";
5− version = "0.45";
5+ version = "0.46";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "636b65a3b685374ad429ff22fe213966765b145f08bc560c8d033b604c7bee4c";
9+ sha256 = "5895e42a012989bdc51854a02c82c8d6898112a4ab11f2d7878200520b49d428";
1010 };
1111
1212 # Test requires filesystem access
pkgs/development/python-modules/databricks-connect/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "databricks-connect";
5− version = "7.3.5";
5+ version = "7.3.6";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "c720298b05648f5de8f17de03f93d60ffb30c2d55ce2750e63c17c341a8de5e4";
9+ sha256 = "e3f72ba94c8da6b5aae44ca6133a46206e378609ec0aefadfbdc9a3722afd8d1";
1010 };
1111
1212 sourceRoot = ".";
pkgs/development/python-modules/debian/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "python-debian";
6− version = "0.1.38";
6+ version = "0.1.39";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "a352bb5f9ef19b0272078f516ee0ec42b05e90ac85651d87c10e7041550dcc1d";
10+ sha256 = "6cca96239b5981f5203216d2113fea522477628607ed0a8427e15094a792541c";
1111 };
1212
1313 propagatedBuildInputs = [ chardet six ];
pkgs/development/python-modules/evdev/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "evdev";
5− version = "1.3.0";
5+ version = "1.4.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi";
9+ sha256 = "8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1";
1010 };
1111
1212 buildInputs = [ linuxHeaders ];
pkgs/development/python-modules/genpy/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "genpy";
10− version = "2016.1.3";
10+ version = "2021.1";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "1c11726f1e8ace8bbdfc87816403c9a59f53a8c3d45c99187ae17c9725d87a91";
14+ sha256 = "9bc062fa98c5c466ff464d8974be81a6bf67af9247b5e5176215ad1e81a6cdac";
1515 };
1616
1717 propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-bigquery/default.nix+2−2
@@ -16,11 +16,11 @@
1616
1717buildPythonPackage rec {
1818 pname = "google-cloud-bigquery";
19− version = "2.6.1";
19+ version = "2.6.2";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "1vs4im0fixmszh6p77icys9g7fymwmkfc6va0ng9kpjv1h6gv68z";
23+ sha256 = "1c940bf190a681d80b6f6cd7541924ad411de5f0585b2c8c5e420ab750e2024d";
2424 };
2525
2626 propagatedBuildInputs = [
pkgs/development/python-modules/google-crc32c/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "google-crc32c";
5− version = "1.1.0";
5+ version = "1.1.1";
66
77 src = fetchFromGitHub {
88 owner = "googleapis";
99 repo = "python-crc32c";
1010 rev = "v${version}";
11− sha256 = "0vbidg9yrv9k8xvk8rl43lsf4cg3dci4a9k4srwwrchbxivz1gr6";
11+ sha256 = "103lqs42b01p6nydjz4id72x7hsrpjyv7g06vrphm8c5g1wa3zp1";
1212 };
1313
1414 buildInputs = [ crc32c ];
pkgs/development/python-modules/identify/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "identify";
5− version = "1.5.11";
5+ version = "1.5.13";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "b2c71bf9f5c482c389cef816f3a15f1c9d7429ad70f497d4a2e522442d80c6de";
9+ sha256 = "70b638cf4743f33042bebb3b51e25261a0a10e80f978739f17e7fd4837664a66";
1010 };
1111
1212 # Tests not included in PyPI tarball
pkgs/development/python-modules/isbnlib/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "isbnlib";
10− version = "3.10.4";
10+ version = "3.10.5";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "f5bfbc362e2a73dfc82449ac459b59a7f6b20bcebf82f6bd87d773dc45073646";
14+ sha256 = "cb3b400b37a73cf4a0bc698be2ea414e78ff117867baed9313aa8c97596e1b98";
1515 };
1616
1717 checkInputs = [
pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "jupyterhub-systemdspawner";
11− version = "0.14";
11+ version = "0.15.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "080dd9cd9292266dad35d1efc7aa1af0ed6993d15eadc79bd959d1ee273d1923";
15+ sha256 = "b6e2d981657aa5d3794abb89b1650d056524158a3d0f0f706007cae9b6dbeb2b";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/kerberos/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "kerberos";
9− version = "1.3.0";
9+ version = "1.3.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "19663qxmma0i8bfbjc2iwy5hgq0g4pfb75r023v5dps68zfvffgh";
13+ sha256 = "cdd046142a4e0060f96a00eb13d82a5d9ebc0f2d7934393ed559bac773460a2c";
1414 };
1515
1616 nativeBuildInputs = [ kerberos ];
pkgs/development/python-modules/keyrings-alt/default.nix+2−2
@@ -4,12 +4,12 @@
44
55buildPythonPackage rec {
66 pname = "keyrings.alt";
7− version = "4.0.1";
7+ version = "4.0.2";
88 disabled = isPy27;
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "cd23d4c6930b5271134ac815d868164cb6d0d2252ee6dcb07fadfca26caaa230";
12+ sha256 = "cc475635099d6edd7e475c5a479e5b4da5e811a3af04495a1e9ada488d16fe25";
1313 };
1414
1515 postPatch = ''
pkgs/tools/misc/psw/default.nix−1
@@ -21,6 +21,5 @@ rustPlatform.buildRustPackage rec {
2121 homepage = "https://github.com/Wulfsta/psw";
2222 license = with licenses; [ asl20 /* or */ mit ];
2323 maintainers = with maintainers; [ wulfsta ];
24− platforms = platforms.linux;
2524 };
2625}
pkgs/tools/system/gdu/default.nix+6−6
@@ -6,21 +6,21 @@
66
77buildGoModule rec {
88 pname = "gdu";
9− version = "2.3.0";
9+ version = "3.0.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "dundee";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "1dc0z6daxpbid2ilpms0dw76qyyc84gx0bcqsx0b3s5p5p154xzq";
15+ sha256 = "0sfb8bxvdd8r05d0bgfcaw6dpbky7f4fgf0dbly7k7sgl29hkafy";
1616 };
1717
18− vendorSha256 = "18a3qwshz8jmw0j29qvmzarxig0kj1n0fnmlx81qzswsyl85kncv";
18+ vendorSha256 = "0w3k23kly8g9mf8a300xz6bv7g1m2nlp5f112k4viyi9zy6vqbv0";
1919
20− buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ];
20+ buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ];
2121
22− # analyze/dev_test.go: undefined: processMounts
23− doCheck = !stdenv.isDarwin;
22+ # tests fail if the version is set
23+ doCheck = false;
2424
2525 meta = with lib; {
2626 description = "Disk usage analyzer with console interface";