git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit4b2ca106c96380adcd036cbc4a604ac2139cac54 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateTue 2 Nov 2021, 06:01 (5 years ago) parentd27dd66cb3a0f5
15 files changed+242−12
maintainers/maintainer-list.nix+6 nixos/modules/services/web-apps/dokuwiki.nix+2 nixos/modules/system/boot/stage-2-init.sh+5−3 nixos/tests/all-tests.nix+1 nixos/tests/plasma5-systemd-start.nix+43 pkgs/desktops/plasma-5/plasma-workspace/0003-startkde-unit-detection.patch+17 pkgs/desktops/plasma-5/plasma-workspace/default.nix+1 pkgs/development/python-modules/entry-points-txt/default.nix+22 pkgs/development/python-modules/headerparser/default.nix+28 pkgs/development/python-modules/jupyter_server/default.nix+2−2 pkgs/development/python-modules/sqlmap/default.nix+2−2 pkgs/development/python-modules/wheel-filename/default.nix+27 pkgs/development/python-modules/wheel-inspect/default.nix+65 pkgs/tools/networking/shadowsocks-rust/default.nix+13−5 pkgs/top-level/python-packages.nix+8
maintainers/maintainer-list.nix+6
@@ -1151,6 +1151,12 @@
11511151 githubId = 56650223;
11521152 name = "Artturi N";
11531153 };
1154+ ayazhafiz = {
1155+ email = "ayaz.hafiz.1@gmail.com";
1156+ github = "ayazhafiz";
1157+ githubId = 262763;
1158+ name = "Ayaz Hafiz";
1159+ };
11541160 b4dm4n = {
11551161 email = "fabianm88@gmail.com";
11561162 github = "B4dM4n";
nixos/modules/services/web-apps/dokuwiki.nix+2
@@ -66,6 +66,8 @@ let
6666 siteOpts = { config, lib, name, ... }:
6767 {
6868 options = {
69+ enable = mkEnableOption "DokuWiki web application.";
70+
6971 package = mkOption {
7072 type = types.package;
7173 default = pkgs.dokuwiki;
nixos/modules/system/boot/stage-2-init.sh+5−3
@@ -62,9 +62,11 @@ chown -f 0:30000 /nix/store
6262chmod -f 1775 /nix/store
6363if [ -n "@readOnlyStore@" ]; then
6464 if ! [[ "$(findmnt --noheadings --output OPTIONS /nix/store)" =~ ro(,|$) ]]; then
65− # FIXME when linux < 4.5 is EOL, switch to atomic bind mounts
66− #mount /nix/store /nix/store -o bind,remount,ro
67− mount --bind /nix/store /nix/store
65+ if [ -z "$container" ]; then
66+ mount --bind /nix/store /nix/store
67+ else
68+ mount --rbind /nix/store /nix/store
69+ fi
6870 mount -o remount,ro,bind /nix/store
6971 fi
7072fi
nixos/tests/all-tests.nix+1
@@ -351,6 +351,7 @@ in
351351 php80 = handleTest ./php { php = pkgs.php80; };
352352 pinnwand = handleTest ./pinnwand.nix {};
353353 plasma5 = handleTest ./plasma5.nix {};
354+ plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {};
354355 plausible = handleTest ./plausible.nix {};
355356 pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {};
356357 plikd = handleTest ./plikd.nix {};
nixos/tests/plasma5-systemd-start.nixnew file+43
@@ -0,0 +1,43 @@
1+import ./make-test-python.nix ({ pkgs, ...} :
2+
3+{
4+ name = "plasma5-systemd-start";
5+ meta = with pkgs.lib.maintainers; {
6+ maintainers = [ oxalica ];
7+ };
8+
9+ machine = { ... }:
10+
11+ {
12+ imports = [ ./common/user-account.nix ];
13+ services.xserver = {
14+ enable = true;
15+ displayManager.sddm.enable = true;
16+ displayManager.defaultSession = "plasma";
17+ desktopManager.plasma5.enable = true;
18+ desktopManager.plasma5.runUsingSystemd = true;
19+ displayManager.autoLogin = {
20+ enable = true;
21+ user = "alice";
22+ };
23+ };
24+ virtualisation.memorySize = 1024;
25+ };
26+
27+ testScript = { nodes, ... }: let
28+ user = nodes.machine.config.users.users.alice;
29+ in ''
30+ with subtest("Wait for login"):
31+ start_all()
32+ machine.wait_for_file("${user.home}/.Xauthority")
33+ machine.succeed("xauth merge ${user.home}/.Xauthority")
34+
35+ with subtest("Check plasmashell started"):
36+ machine.wait_until_succeeds("pgrep plasmashell")
37+ machine.wait_for_window("^Desktop ")
38+
39+ status, result = machine.systemctl('--no-pager show plasma-plasmashell.service', user='alice')
40+ assert status == 0, 'Service not found'
41+ assert 'ActiveState=active' in result.split('\n'), 'Systemd service not active'
42+ '';
43+})
pkgs/desktops/plasma-5/plasma-workspace/0003-startkde-unit-detection.patchnew file+17
@@ -0,0 +1,17 @@
1+diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
2+index a17967b47..6e6141b48 100644
3+--- a/startkde/startplasma.cpp
4++++ b/startkde/startplasma.cpp
5+@@ -431,7 +431,11 @@ bool hasSystemdService(const QString &serviceName)
6+ QStringLiteral("/org/freedesktop/systemd1"),
7+ QStringLiteral("org.freedesktop.systemd1.Manager"),
8+ QStringLiteral("ListUnitFilesByPatterns"));
9+- msg << QStringList({QStringLiteral("enabled"), QStringLiteral("static")}) << QStringList({serviceName});
10++ msg << QStringList({QStringLiteral("enabled"),
11++ QStringLiteral("static"),
12++ QStringLiteral("linked"),
13++ QStringLiteral("linked-runtime")});
14++ msg << QStringList({serviceName});
15+ QDBusReply<QList<QPair<QString, QString>>> reply = QDBusConnection::sessionBus().call(msg);
16+ if (!reply.isValid()) {
17+ return false;
pkgs/desktops/plasma-5/plasma-workspace/default.nix+1
@@ -52,6 +52,7 @@ mkDerivation {
5252 patches = [
5353 ./0001-startkde.patch
5454 ./0002-absolute-wallpaper-install-dir.patch
55+ ./0003-startkde-unit-detection.patch
5556 # Included in 5.23.2
5657 (fetchpatch {
5758 name = "ignore-placeholder-screens";
pkgs/development/python-modules/entry-points-txt/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ lib
2+, buildPythonPackage
3+, fetchurl
4+}:
5+
6+buildPythonPackage rec {
7+ pname = "entry-points-txt";
8+ version = "0.1.0";
9+ format = "wheel";
10+
11+ src = fetchurl {
12+ url = "https://github.com/jwodder/entry-points-txt/releases/download/v0.1.0/entry_points_txt-0.1.0-py3-none-any.whl";
13+ sha256 = "29773bed3d9d337766a394e19d6f7ab0be3ed7d6f3ebb753ff0f7f48f056aa8e";
14+ };
15+
16+ meta = with lib; {
17+ homepage = "https://github.com/jwodder/entry-points-txt";
18+ description = "Read & write entry_points.txt files";
19+ license = with licenses; [ mit ];
20+ maintainers = with lib.maintainers; [ ayazhafiz ];
21+ };
22+}
pkgs/development/python-modules/headerparser/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, entry-points-txt
5+, six
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "headerparser";
10+ version = "0.4.0";
11+
12+ src = fetchPypi{
13+ inherit pname;
14+ inherit version;
15+ sha256 = "b8ceae4c5e6133fda666d022684e93f9b3d45815c2c7881018123c71ff28c5cc";
16+ };
17+
18+ buildInputs = [
19+ six
20+ ];
21+
22+ meta = with lib; {
23+ homepage = "https://github.com/jwodder/headerparser";
24+ description = "argparse for mail-style headers";
25+ license = with licenses; [ mit ];
26+ maintainers = with lib.maintainers; [ ayazhafiz ];
27+ };
28+}
pkgs/development/python-modules/jupyter_server/default.nix+2−2
@@ -26,12 +26,12 @@
2626
2727buildPythonPackage rec {
2828 pname = "jupyter_server";
29− version = "1.11.1";
29+ version = "1.11.2";
3030 disabled = pythonOlder "3.6";
3131
3232 src = fetchPypi {
3333 inherit pname version;
34− sha256 = "ab7ab1cc38512f15026cbcbb96300fb46ec8b24aa162263d9edd00e0a749b1e8";
34+ sha256 = "c1f32e0c1807ab2de37bf70af97a36b4436db0bc8af3124632b1f4441038bf95";
3535 };
3636
3737 propagatedBuildInputs = [
pkgs/development/python-modules/sqlmap/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "sqlmap";
10− version = "1.5.10";
10+ version = "1.5.11";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "925b9b18d2880f7c74ebf53694b4cd8b9e04ca2cc27d57c265acda5f27b0dc89";
14+ sha256 = "196021f0eff1699853675ee80e13bc856c9f1a088d93a0ac023651d2a3f62cf5";
1515 };
1616
1717 postPatch = ''
pkgs/development/python-modules/wheel-filename/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ lib
2+, buildPythonPackage
3+, fetchurl
4+, attrs
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "wheel-filename";
9+ version = "1.3.0";
10+ format = "wheel";
11+
12+ src = fetchurl {
13+ url = "https://github.com/jwodder/wheel-filename/releases/download/v1.1.0/wheel_filename-1.1.0-py3-none-any.whl";
14+ sha256 = "0aee45553f34e3a1b8a5db64aa832326f13c138b7f925a53daf96f984f9e6a38";
15+ };
16+
17+ buildInputs = [
18+ attrs
19+ ];
20+
21+ meta = with lib; {
22+ homepage = "https://github.com/jwodder/wheel-filename";
23+ description = "Parse wheel filenames";
24+ license = with licenses; [ mit ];
25+ maintainers = with lib.maintainers; [ ayazhafiz ];
26+ };
27+}
pkgs/development/python-modules/wheel-inspect/default.nixnew file+65
@@ -0,0 +1,65 @@
1+{ lib
2+, buildPythonPackage
3+, fetchurl
4+, bleach, docutils, pygments, six
5+, attrs, entry-points-txt, headerparser, packaging, wheel-filename
6+}:
7+
8+# wheel-filename is stuck on readme_renderer~=24.0.0, but the upstream is at a
9+# future version.
10+let readme_renderer_24 = buildPythonPackage rec {
11+ pname = "readme_renderer";
12+ version = "24.0.0";
13+ format = "wheel";
14+
15+ src = fetchurl {
16+ url = "https://files.pythonhosted.org/packages/c3/7e/d1aae793900f36b097cbfcc5e70eef82b5b56423a6c52a36dce51fedd8f0/readme_renderer-24.0-py2.py3-none-any.whl";
17+ sha256 = "c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d";
18+ };
19+
20+ doCheck = false;
21+
22+ buildInputs = [
23+ bleach
24+ docutils
25+ pygments
26+ six
27+ ];
28+
29+ meta = with lib; {
30+ description = "Python library for rendering readme descriptions";
31+ homepage = "https://github.com/pypa/readme_renderer";
32+ license = with licenses; [ asl20 ];
33+ maintainers = with lib.maintainers; [ ayazhafiz ];
34+ };
35+};
36+
37+in buildPythonPackage rec {
38+ version = "1.7.0";
39+ pname = "wheel-inspect";
40+ format = "wheel";
41+
42+ src = fetchurl {
43+ url = "https://github.com/jwodder/wheel-inspect/releases/download/v1.7.0/wheel_inspect-1.7.0-py3-none-any.whl";
44+ sha256 = "69b34de1f4464ddfc76280c4563e4afc644de2c88e3ae6882f030afdad3d73e4";
45+ };
46+
47+ propagatedBuildInputs = [
48+ attrs
49+ bleach
50+ docutils
51+ entry-points-txt
52+ headerparser
53+ packaging
54+ pygments
55+ readme_renderer_24
56+ wheel-filename
57+ ];
58+
59+ meta = with lib; {
60+ homepage = "https://github.com/jwodder/wheel-inspect";
61+ description = "Extract information from wheels";
62+ license = with licenses; [ mit ];
63+ maintainers = with lib.maintainers; [ ayazhafiz ];
64+ };
65+}
pkgs/tools/networking/shadowsocks-rust/default.nix+13−5
@@ -2,28 +2,36 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "shadowsocks-rust";
5− version = "1.10.7";
5+ version = "1.11.2";
66
77 src = fetchFromGitHub {
88 rev = "v${version}";
99 owner = "shadowsocks";
1010 repo = pname;
11− sha256 = "08k5j469750bhlq49qc5nwc2jjgmy9qsm58nf2jfwhxlpflv12sc";
11+ sha256 = "0ry3zfwxs5j243jpbp5ymnz14ycyk6gpgb50lcazhn1yy52p8wac";
1212 };
1313
14− cargoSha256 = "1r8w5cdygd26m95q9qpqa85aixx25jr510hpjlllbpfvm7zjpbqk";
14+ cargoSha256 = "1hvrp3zf5h33j6fgqyzn2jvjbyi8c8pyqwrj5wg3lw38h0z5rvaj";
1515
1616 RUSTC_BOOTSTRAP = 1;
1717
1818 buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
1919
20− checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ];
20+ # all of these rely on connecting to www.example.com:80
21+ checkFlags = [
22+ "--skip=http_proxy"
23+ "--skip=tcp_tunnel"
24+ "--skip=udp_tunnel"
25+ "--skip=udp_relay"
26+ "--skip=socks4_relay_connect"
27+ "--skip=socks5_relay_aead"
28+ "--skip=socks5_relay_stream"
29+ ];
2130
2231 meta = with lib; {
2332 homepage = "https://github.com/shadowsocks/shadowsocks-rust";
2433 description = "A Rust port of shadowsocks";
2534 license = licenses.mit;
2635 maintainers = [ maintainers.marsam ];
27− broken = stdenv.isAarch64; # crypto2 crate doesn't build on aarch64
2836 };
2937}
pkgs/top-level/python-packages.nix+8
@@ -2438,6 +2438,8 @@ in {
24382438 routerFeatures = true;
24392439 };
24402440
2441+ entry-points-txt = callPackage ../development/python-modules/entry-points-txt { };
2442+
24412443 entrypoint2 = callPackage ../development/python-modules/entrypoint2 { };
24422444
24432445 entrypoints = callPackage ../development/python-modules/entrypoints { };
@@ -3438,6 +3440,8 @@ in {
34383440
34393441 hdmedians = callPackage ../development/python-modules/hdmedians { };
34403442
3443+ headerparser = callPackage ../development/python-modules/headerparser { };
3444+
34413445 heapdict = callPackage ../development/python-modules/heapdict { };
34423446
34433447 helpdev = callPackage ../development/python-modules/helpdev { };
@@ -9801,6 +9805,10 @@ in {
98019805
98029806 wheel = callPackage ../development/python-modules/wheel { };
98039807
9808+ wheel-filename = callPackage ../development/python-modules/wheel-filename { };
9809+
9810+ wheel-inspect = callPackage ../development/python-modules/wheel-inspect { };
9811+
98049812 whichcraft = callPackage ../development/python-modules/whichcraft { };
98059813
98069814 whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { };