git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'master' into staging-next
commit30fae2883e655c170e76d0827bcd9f396e9658af authorJan Tojnar <jtojnar@gmail.com> dateTue 3 Dec 2019, 16:51 (7 years ago) parentf239319d2da320
144 files changed+1469−933
maintainers/maintainer-list.nix+16 nixos/doc/manual/installation/installing.xml+4−1 nixos/doc/manual/release-notes/rl-2003.xml+21 nixos/modules/misc/version.nix+1−1 nixos/modules/module-list.nix+1 nixos/modules/services/hardware/bluetooth.nix+1−1 nixos/modules/services/networking/v2ray.nix+81 nixos/modules/services/x11/desktop-managers/pantheon.nix+1−1 nixos/modules/services/x11/desktop-managers/plasma5.nix+1−1 nixos/tests/matomo.nix+11−6 nixos/tests/mediawiki.nix+6−4 nixos/tests/openarena.nix+10−5 nixos/tests/radicale.nix+52−36 nixos/tests/xrdp.nix+19−17 pkgs/applications/audio/lollypop/default.nix+3−3 pkgs/applications/audio/snd/default.nix+2−2 pkgs/applications/editors/nano/default.nix+2−2 pkgs/applications/graphics/gscan2pdf/default.nix+1−1 pkgs/applications/graphics/inkscape/default.nix+10 pkgs/applications/graphics/k3d/default.nix+2−2 pkgs/applications/misc/buku/default.nix+1 pkgs/applications/misc/dbeaver/default.nix+2−2 pkgs/applications/misc/gummi/default.nix+2−2 pkgs/applications/misc/prusa-slicer/default.nix+2−3 pkgs/applications/misc/stretchly/default.nix+94−46 pkgs/applications/networking/cluster/kops/default.nix+5 pkgs/applications/networking/cluster/terraform/default.nix+2−2 pkgs/applications/networking/ssb/patchwork/default.nix+4−4 pkgs/applications/office/bookworm/default.nix+2−2 pkgs/applications/office/wpsoffice/default.nix+51−33 pkgs/applications/radio/dump1090/default.nix+20−10 pkgs/applications/science/logic/coq/default.nix+1 pkgs/applications/version-management/yadm/default.nix+2−2 pkgs/applications/virtualization/docker/distribution.nix+2−2 pkgs/applications/window-managers/i3/blocks.nix+5−5 pkgs/desktops/pantheon/apps/elementary-calculator/default.nix+2−2 pkgs/desktops/pantheon/apps/elementary-calendar/default.nix+3−4 pkgs/desktops/pantheon/apps/elementary-videos/default.nix+2−2 pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix+3−11 pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch−76 pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix+2−10 pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch−39 pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix+2−13 pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch−20 pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix+1−9 pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch−33 pkgs/desktops/pantheon/apps/switchboard/wrapper.nix+16−5 pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix+11−10 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix+4−7 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch+24 pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix+2−4 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+2−2 pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix+2−4 pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix+2−4 pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix+2−4 pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix+18−7 pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix+2−2 pkgs/desktops/pantheon/update.sh+20−1 pkgs/development/compilers/crystal/default.nix+28−14 pkgs/development/compilers/cudatoolkit/common.nix+220 pkgs/development/compilers/cudatoolkit/default.nix+9−204 pkgs/development/haskell-modules/configuration-common.nix+1 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+1 pkgs/development/interpreters/python/default.nix+1−1 pkgs/development/libraries/boost/generic.nix+3−1 pkgs/development/libraries/libgcrypt/default.nix+2−1 pkgs/development/libraries/libusb1/default.nix+2−7 pkgs/development/libraries/live555/default.nix+2−2 pkgs/development/libraries/poppler/default.nix+2−2 pkgs/development/libraries/tepl/default.nix+2−2 pkgs/development/ocaml-modules/alcotest/default.nix+5−3 pkgs/development/ocaml-modules/asn1-combinators/default.nix+2−1 pkgs/development/ocaml-modules/bos/default.nix+2−1 pkgs/development/ocaml-modules/cmdliner/default.nix+2−2 pkgs/development/ocaml-modules/cpuid/default.nix+10−12 pkgs/development/ocaml-modules/fmt/default.nix+2−1 pkgs/development/ocaml-modules/jsonm/default.nix+2−1 pkgs/development/ocaml-modules/logs/default.nix+2−1 pkgs/development/ocaml-modules/magic-mime/default.nix+3−1 pkgs/development/ocaml-modules/mtime/default.nix+2−1 pkgs/development/ocaml-modules/nocrypto/default.nix+13−4 pkgs/development/ocaml-modules/num/default.nix+5−3 pkgs/development/ocaml-modules/num/enable-static.patch+12 pkgs/development/ocaml-modules/ocamlgraph/default.nix+3−2 pkgs/development/ocaml-modules/opam-file-format/default.nix+2 pkgs/development/ocaml-modules/opam-file-format/optional-static.patch+13 pkgs/development/ocaml-modules/ounit/default.nix+3−1 pkgs/development/ocaml-modules/ppx_tools/default.nix+1 pkgs/development/ocaml-modules/ptime/default.nix+2−1 pkgs/development/ocaml-modules/tls/default.nix+2−1 pkgs/development/ocaml-modules/topkg/default.nix+1−1 pkgs/development/ocaml-modules/uchar/default.nix+5−3 pkgs/development/ocaml-modules/uuidm/default.nix+3−1 pkgs/development/ocaml-modules/uutf/default.nix+2−1 pkgs/development/ocaml-modules/yojson/default.nix+5−4 pkgs/development/ocaml-modules/zarith/default.nix+5−6 pkgs/development/python-modules/azure-loganalytics/default.nix+7−1 pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-kusto/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-monitor/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix+2−2 pkgs/development/python-modules/curio/default.nix+2 pkgs/development/python-modules/deprecated/default.nix−5 pkgs/development/python-modules/dotnetcore2/default.nix+1−1 pkgs/development/python-modules/fido2/default.nix+12−7 pkgs/development/python-modules/gpapi/default.nix+2−2 pkgs/development/python-modules/nose-exclude/default.nix+6−2 pkgs/development/python-modules/pyfxa/default.nix+6−2 pkgs/development/python-modules/spectral-cube/default.nix+9−8 pkgs/development/tools/analysis/flow/default.nix+2−2 pkgs/development/tools/lazygit/default.nix+3−3 pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix+4−3 pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix+4−2 pkgs/development/tools/rubocop/Gemfile.lock+3−3 pkgs/development/tools/rubocop/gemset.nix+6−6 pkgs/os-specific/linux/cpupower/default.nix+5−1 pkgs/os-specific/linux/kernel-headers/default.nix+1−1 pkgs/os-specific/linux/kmod/default.nix+5−3 pkgs/os-specific/linux/kmod/enable-static.patch+12 pkgs/servers/amqp/qpid-cpp/default.nix+2−2 pkgs/servers/caddy/default.nix+5−5 pkgs/servers/caddy/v2.nix+25 pkgs/servers/monitoring/zabbix/versions.nix+4−9 pkgs/servers/tautulli/default.nix+2−2 pkgs/shells/bash/bash-completion/default.nix+10 pkgs/tools/admin/azure-cli/default.nix+6−4 pkgs/tools/admin/azure-cli/python-packages.nix+28−27 pkgs/tools/misc/chezmoi/default.nix+3−3 pkgs/tools/misc/multitime/default.nix+39 pkgs/tools/misc/youtube-dl/default.nix+2−2 pkgs/tools/networking/sslsplit/default.nix+31 pkgs/tools/networking/v2ray/default.nix+36 pkgs/tools/networking/v2ray/generic.nix+50 pkgs/tools/networking/v2ray/update.sh+53 pkgs/tools/package-management/emplace/default.nix+23 pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch−41 pkgs/tools/text/amber/default.nix+3−3 pkgs/tools/typesetting/pdf2djvu/default.nix+13−1 pkgs/tools/typesetting/tex/texlive/bin.nix+35−15 pkgs/top-level/all-packages.nix+13−3 pkgs/top-level/coq-packages.nix+1−1 pkgs/top-level/static.nix+41
maintainers/maintainer-list.nix+16
@@ -6121,6 +6121,16 @@
61216121 githubId = 307899;
61226122 name = "Gurkan Gur";
61236123 };
6124+ servalcatty = {
6125+ email = "servalcat@pm.me";
6126+ github = "servalcatty";
6127+ githubid = 51969817;
6128+ name = "Serval";
6129+ keys = [{
6130+ longkeyid = "rsa4096/0x4A2AAAA382F8294C";
6131+ fingerprint = "A317 37B3 693C 921B 480C C629 4A2A AAA3 82F8 294C";
6132+ }];
6133+ };
61246134 sfrijters = {
61256135 email = "sfrijters@gmail.com";
61266136 github = "sfrijters";
@@ -7664,6 +7674,12 @@
76647674 githubId = 50867187;
76657675 name = "Rakesh Gupta";
76667676 };
7677+ mlatus = {
7678+ email = "wqseleven@gmail.com";
7679+ github = "Ninlives";
7680+ githubId = 17873203;
7681+ name = "mlatus";
7682+ };
76677683 waiting-for-dev = {
76687684 email = "marc@lamarciana.com";
76697685 github = "waiting-for-dev";
nixos/doc/manual/installation/installing.xml+4−1
@@ -380,7 +380,10 @@
380380 </para>
381381 <para>
382382 If you need to configure networking for your machine the configuration
383− options are described in <xref linkend="sec-networking"/>.
383+ options are described in <xref linkend="sec-networking"/>. In particular,
384+ while wifi is supported on the installation image, it is not enabled by
385+ default in the configuration generated by
386+ <command>nixos-generate-config</command>.
384387 </para>
385388 <para>
386389 Another critical option is <option>fileSystems</option>, specifying the
nixos/doc/manual/release-notes/rl-2003.xml+21
@@ -199,6 +199,21 @@
199199 This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output.
200200 </para>
201201 </listitem>
202+ <listitem>
203+ <para>
204+ The packages <literal>openobex</literal> and <literal>obexftp</literal>
205+ are no loger installed when enabling bluetooth via
206+ <option>hardware.bluetooth.enable</option>.
207+ </para>
208+ </listitem>
209+ <listitem>
210+ <para>
211+ The <literal>dump1090</literal> derivation has been changed to use FlightAware's dump1090
212+ as its upstream. However, this version does not have an internal webserver anymore. The
213+ assets in the <literal>share/dump1090</literal> directory of the derivation can be used
214+ in conjunction with an external webserver to replace this functionality.
215+ </para>
216+ </listitem>
202217 </itemizedlist>
203218 </section>
204219
@@ -221,6 +236,12 @@
221236 release announcement</link> for more information.
222237 </para>
223238 </listitem>
239+ <listitem>
240+ <para>
241+ <literal>PRETTY_NAME</literal> in <literal>/etc/os-release</literal>
242+ now uses the short rather than full version string.
243+ </para>
244+ </listitem>
224245 </itemizedlist>
225246 </section>
226247</section>
nixos/modules/misc/version.nix+1−1
@@ -92,7 +92,7 @@ in
9292 VERSION="${cfg.version} (${cfg.codeName})"
9393 VERSION_CODENAME=${toLower cfg.codeName}
9494 VERSION_ID="${cfg.version}"
95− PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
95+ PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})"
9696 LOGO="nix-snowflake"
9797 HOME_URL="https://nixos.org/"
9898 DOCUMENTATION_URL="https://nixos.org/nixos/manual/index.html"
nixos/modules/module-list.nix+1
@@ -722,6 +722,7 @@
722722 ./services/networking/tvheadend.nix
723723 ./services/networking/unbound.nix
724724 ./services/networking/unifi.nix
725+ ./services/networking/v2ray.nix
725726 ./services/networking/vsftpd.nix
726727 ./services/networking/wakeonlan.nix
727728 ./services/networking/websockify.nix
nixos/modules/services/hardware/bluetooth.nix+1−1
@@ -72,7 +72,7 @@ in {
7272 };
7373 };
7474
75− environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
75+ environment.systemPackages = [ bluez-bluetooth ];
7676
7777 environment.etc = singleton {
7878 source = pkgs.writeText "main.conf" (generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig);
nixos/modules/services/networking/v2ray.nixnew file+81
@@ -0,0 +1,81 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+{
6+ options = {
7+
8+ services.v2ray = {
9+ enable = mkOption {
10+ type = types.bool;
11+ default = false;
12+ description = ''
13+ Whether to run v2ray server.
14+
15+ Either <literal>configFile</literal> or <literal>config</literal> must be specified.
16+ '';
17+ };
18+
19+ configFile = mkOption {
20+ type = types.nullOr types.str;
21+ default = null;
22+ example = "/etc/v2ray/config.json";
23+ description = ''
24+ The absolute path to the configuration file.
25+
26+ Either <literal>configFile</literal> or <literal>config</literal> must be specified.
27+
28+ See <link xlink:href="https://v2ray.com/en/configuration/overview.html"/>.
29+ '';
30+ };
31+
32+ config = mkOption {
33+ type = types.nullOr (types.attrsOf types.unspecified);
34+ default = null;
35+ example = {
36+ inbounds = [{
37+ port = 1080;
38+ listen = "127.0.0.1";
39+ protocol = "http";
40+ }];
41+ outbounds = [{
42+ protocol = "freedom";
43+ }];
44+ };
45+ description = ''
46+ The configuration object.
47+
48+ Either `configFile` or `config` must be specified.
49+
50+ See <link xlink:href="https://v2ray.com/en/configuration/overview.html"/>.
51+ '';
52+ };
53+ };
54+
55+ };
56+
57+ config = let
58+ cfg = config.services.v2ray;
59+ configFile = if cfg.configFile != null
60+ then cfg.configFile
61+ else (pkgs.writeText "v2ray.json" (builtins.toJSON cfg.config));
62+
63+ in mkIf cfg.enable {
64+ assertions = [
65+ {
66+ assertion = (cfg.configFile == null) != (cfg.config == null);
67+ message = "Either but not both `configFile` and `config` should be specified for v2ray.";
68+ }
69+ ];
70+
71+ systemd.services.v2ray = {
72+ description = "v2ray Daemon";
73+ after = [ "network.target" ];
74+ wantedBy = [ "multi-user.target" ];
75+ path = [ pkgs.v2ray ];
76+ script = ''
77+ exec v2ray -config ${configFile}
78+ '';
79+ };
80+ };
81+}
nixos/modules/services/x11/desktop-managers/pantheon.nix+1−1
@@ -159,7 +159,7 @@ in
159159 # Override GSettings schemas
160160 environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
161161
162− environment.sessionVariables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
162+ environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
163163
164164 # Settings from elementary-default-settings
165165 environment.sessionVariables.GTK_CSD = "1";
nixos/modules/services/x11/desktop-managers/plasma5.nix+1−1
@@ -169,7 +169,7 @@ in
169169 ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc
170170
171171 # Optional hardware support features
172− ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ]
172+ ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ]
173173 ++ lib.optional config.networking.networkmanager.enable plasma-nm
174174 ++ lib.optional config.hardware.pulseaudio.enable plasma-pa
175175 ++ lib.optional config.powerManagement.enable powerdevil
nixos/tests/matomo.nix+11−6
@@ -1,7 +1,7 @@
11{ system ? builtins.currentSystem, config ? { }
22, pkgs ? import ../.. { inherit system config; } }:
33
4−with import ../lib/testing.nix { inherit system pkgs; };
4+with import ../lib/testing-python.nix { inherit system pkgs; };
55with pkgs.lib;
66
77let
@@ -24,11 +24,16 @@ let
2424 };
2525
2626 testScript = ''
27− startAll;
28− $machine->waitForUnit("mysql.service");
29− $machine->waitForUnit("phpfpm-matomo.service");
30− $machine->waitForUnit("nginx.service");
31− $machine->succeed("curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'");
27+ start_all()
28+ machine.wait_for_unit("mysql.service")
29+ machine.wait_for_unit("phpfpm-matomo.service")
30+ machine.wait_for_unit("nginx.service")
31+
32+ # without the grep the command does not produce valid utf-8 for some reason
33+ with subtest("welcome screen loads"):
34+ machine.succeed(
35+ "curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'"
36+ )
3237 '';
3338 };
3439in {
nixos/tests/mediawiki.nix+6−4
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ pkgs, lib, ... }: {
1+import ./make-test-python.nix ({ pkgs, lib, ... }: {
22 name = "mediawiki";
33 meta.maintainers = [ lib.maintainers.aanderse ];
44
@@ -11,9 +11,11 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
1111 };
1212
1313 testScript = ''
14− startAll;
14+ start_all()
1515
16− $machine->waitForUnit('phpfpm-mediawiki.service');
17− $machine->succeed('curl -L http://localhost/') =~ /MediaWiki has been installed/ or die;
16+ machine.wait_for_unit("phpfpm-mediawiki.service")
17+
18+ page = machine.succeed("curl -L http://localhost/")
19+ assert "MediaWiki has been installed" in page
1820 '';
1921})
nixos/tests/openarena.nix+10−5
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ pkgs, ...} : {
1+import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "openarena";
33 meta = with pkgs.stdenv.lib.maintainers; {
44 maintainers = [ tomfitzhenry ];
@@ -23,14 +23,19 @@ import ./make-test.nix ({ pkgs, ...} : {
2323
2424 testScript =
2525 ''
26− $machine->waitForUnit("openarena.service");
27− $machine->waitUntilSucceeds("ss --numeric --udp --listening | grep -q 27960");
26+ machine.wait_for_unit("openarena.service")
27+ machine.wait_until_succeeds("ss --numeric --udp --listening | grep -q 27960")
2828
2929 # The log line containing 'resolve address' is last and only message that occurs after
3030 # the server starts accepting clients.
31− $machine->waitUntilSucceeds("journalctl -u openarena.service | grep 'resolve address: dpmaster.deathmask.net'");
31+ machine.wait_until_succeeds(
32+ "journalctl -u openarena.service | grep 'resolve address: dpmaster.deathmask.net'"
33+ )
3234
3335 # Check it's possible to join the server.
34− $machine->succeed("echo -n -e '\\xff\\xff\\xff\\xffgetchallenge' | socat - UDP4-DATAGRAM:127.0.0.1:27960 | grep -q challengeResponse");
36+ # Can't use substring match instead of grep because the output is not utf-8
37+ machine.succeed(
38+ "echo -n -e '\\xff\\xff\\xff\\xffgetchallenge' | socat - UDP4-DATAGRAM:127.0.0.1:27960 | grep -q challengeResponse"
39+ )
3540 '';
3641})
nixos/tests/radicale.nix+52−36
@@ -28,7 +28,7 @@ let
2828
2929in
3030
31− import ./make-test.nix ({ lib, ... }@args: {
31+ import ./make-test-python.nix ({ lib, ... }@args: {
3232 name = "radicale";
3333 meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];
3434
@@ -64,43 +64,59 @@ in
6464 newSystem = nodes.${nodeName}.config.system.build.toplevel;
6565 in "${newSystem}/bin/switch-to-configuration test";
6666 in ''
67− # Check Radicale 1 functionality
68− $radicale->succeed('${switchToConfig "radicale1"} >&2');
69− $radicale->waitForUnit('radicale.service');
70− $radicale->waitForOpenPort(${port});
71− $radicale->succeed('curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/');
67+ with subtest("Check Radicale 1 functionality"):
68+ radicale.succeed(
69+ "${switchToConfig "radicale1"} >&2"
70+ )
71+ radicale.wait_for_unit("radicale.service")
72+ radicale.wait_for_open_port(${port})
73+ radicale.succeed(
74+ "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/"
75+ )
7276
73− # Export data in Radicale 2 format
74− $radicale->succeed('systemctl stop radicale');
75− $radicale->succeed('ls -al /tmp/collections');
76− $radicale->fail('ls -al /tmp/collections-new');
77− # Radicale exits immediately after exporting storage
78− $radicale->succeed('${switchToConfig "radicale1_export"} >&2');
79− $radicale->waitUntilFails('systemctl status radicale');
80− $radicale->succeed('ls -al /tmp/collections');
81− $radicale->succeed('ls -al /tmp/collections-new');
77+ with subtest("Export data in Radicale 2 format"):
78+ radicale.succeed("systemctl stop radicale")
79+ radicale.succeed("ls -al /tmp/collections")
80+ radicale.fail("ls -al /tmp/collections-new")
8281
83− # Verify data in Radicale 2 format
84− $radicale->succeed('rm -r /tmp/collections/${user}');
85− $radicale->succeed('mv /tmp/collections-new/collection-root /tmp/collections');
86− $radicale->succeed('${switchToConfig "radicale2_verify"} >&2');
87− $radicale->waitUntilFails('systemctl status radicale');
88− my ($retcode, $logs) = $radicale->execute('journalctl -u radicale -n 10');
89− if ($retcode != 0 || index($logs, 'Verifying storage') == -1) {
90− die "Radicale 2 didn't verify storage"
91− }
92− if (index($logs, 'failed') != -1 || index($logs, 'exception') != -1) {
93− die "storage verification failed"
94− }
82+ with subtest("Radicale exits immediately after exporting storage"):
83+ radicale.succeed(
84+ "${switchToConfig "radicale1_export"} >&2"
85+ )
86+ radicale.wait_until_fails("systemctl status radicale")
87+ radicale.succeed("ls -al /tmp/collections")
88+ radicale.succeed("ls -al /tmp/collections-new")
9589
96− # Check Radicale 2 functionality
97− $radicale->succeed('${switchToConfig "radicale2"} >&2');
98− $radicale->waitForUnit('radicale.service');
99− $radicale->waitForOpenPort(${port});
100− my ($retcode, $output) = $radicale->execute('curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/');
101− if ($retcode != 0 || index($output, 'VCALENDAR') == -1) {
102− die "Could not read calendar from Radicale 2"
103− }
104− $radicale->succeed('curl --fail http://${user}:${password}@localhost:${port}/.web/');
90+ with subtest("Verify data in Radicale 2 format"):
91+ radicale.succeed("rm -r /tmp/collections/${user}")
92+ radicale.succeed("mv /tmp/collections-new/collection-root /tmp/collections")
93+ radicale.succeed(
94+ "${switchToConfig "radicale2_verify"} >&2"
95+ )
96+ radicale.wait_until_fails("systemctl status radicale")
97+
98+ (retcode, logs) = radicale.execute("journalctl -u radicale -n 10")
99+ assert (
100+ retcode == 0 and "Verifying storage" in logs
101+ ), "Radicale 2 didn't verify storage"
102+ assert (
103+ "failed" not in logs and "exception" not in logs
104+ ), "storage verification failed"
105+
106+ with subtest("Check Radicale 2 functionality"):
107+ radicale.succeed(
108+ "${switchToConfig "radicale2"} >&2"
109+ )
110+ radicale.wait_for_unit("radicale.service")
111+ radicale.wait_for_open_port(${port})
112+
113+ (retcode, output) = radicale.execute(
114+ "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/"
115+ )
116+ assert (
117+ retcode == 0 and "VCALENDAR" in output
118+ ), "Could not read calendar from Radicale 2"
119+
120+ radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/")
105121 '';
106122})
nixos/tests/xrdp.nix+19−17
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ pkgs, ...} : {
1+import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "xrdp";
33 meta = with pkgs.stdenv.lib.maintainers; {
44 maintainers = [ volth ];
@@ -21,25 +21,27 @@ import ./make-test.nix ({ pkgs, ...} : {
2121 };
2222 };
2323
24− testScript = { ... }: ''
25− startAll;
24+ testScript = { nodes, ... }: let
25+ user = nodes.client.config.users.users.alice;
26+ in ''
27+ start_all()
2628
27− $client->waitForX;
28− $client->waitForFile("/home/alice/.Xauthority");
29− $client->succeed("xauth merge ~alice/.Xauthority");
29+ client.wait_for_x()
30+ client.wait_for_file("${user.home}/.Xauthority")
31+ client.succeed("xauth merge ${user.home}/.Xauthority")
3032
31− $client->sleep(5);
33+ client.sleep(5)
3234
33− $client->execute("xterm &");
34− $client->sleep(1);
35− $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:alice /p:foobar\n");
36− $client->sleep(5);
37− $client->screenshot("localrdp");
35+ client.execute("xterm &")
36+ client.sleep(1)
37+ client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:${user.name} /p:${user.password}\n")
38+ client.sleep(5)
39+ client.screenshot("localrdp")
3840
39− $client->execute("xterm &");
40− $client->sleep(1);
41− $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:alice /p:foobar\n");
42− $client->sleep(5);
43− $client->screenshot("remoterdp");
41+ client.execute("xterm &")
42+ client.sleep(1)
43+ client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:${user.name} /p:${user.password}\n")
44+ client.sleep(5)
45+ client.screenshot("remoterdp")
4446 '';
4547})
pkgs/applications/audio/lollypop/default.nix+3−3
@@ -19,7 +19,7 @@
1919
2020python3.pkgs.buildPythonApplication rec {
2121 pname = "lollypop";
22− version = "1.2.5";
22+ version = "1.2.16";
2323
2424 format = "other";
2525 doCheck = false;
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
2828 url = "https://gitlab.gnome.org/World/lollypop";
2929 rev = "refs/tags/${version}";
3030 fetchSubmodules = true;
31− sha256 = "148p3ab7nnfz13hgjkx1cf2ahq9mgl72csrl35xy6d0nkfqbfr8r";
31+ sha256 = "0rl4a5npjh5sm3kih11cs2j7ik894nlygllbw4j5pn9n9v66x51w";
3232 };
3333
3434 nativeBuildInputs = [
@@ -84,10 +84,10 @@ python3.pkgs.buildPythonApplication rec {
8484 ];
8585
8686 meta = with lib; {
87+ changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";
8788 description = "A modern music player for GNOME";
8889 homepage = https://wiki.gnome.org/Apps/Lollypop;
8990 license = licenses.gpl3Plus;
90− changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";
9191 maintainers = with maintainers; [ worldofpeace ];
9292 platforms = platforms.linux;
9393 };
pkgs/applications/audio/snd/default.nix+2−2
@@ -4,11 +4,11 @@
44}:
55
66stdenv.mkDerivation rec {
7− name = "snd-19.8";
7+ name = "snd-19.9";
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/snd/${name}.tar.gz";
11− sha256 = "0cdf3940cjvf5kls5l1zjll9wgg152xzlxs0jmpsq1kml12qa67b";
11+ sha256 = "13s8fahpsjygjdrcwmprcrz23ny3klaj2rh2xzdv3bfs69gxvhys";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig ];
pkgs/applications/editors/nano/default.nix+2−2
@@ -20,11 +20,11 @@ let
2020
2121in stdenv.mkDerivation rec {
2222 pname = "nano";
23− version = "4.5";
23+ version = "4.6";
2424
2525 src = fetchurl {
2626 url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
27− sha256 = "0czmz1yq8s5qcxcmfjdxzg9nkhbmlc9q1nz04jvf57fdbs7w7mfy";
27+ sha256 = "1s98jsvkfar6qmd5n5l1n1k59623dnc93ciyvlhxjkvpad0kmb4v";
2828 };
2929
3030 nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
pkgs/applications/graphics/gscan2pdf/default.nix+1−1
@@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec {
3838 ListMoreUtils
3939 HTMLParser
4040 ProcProcessTable
41− Log4Perl
41+ LogLog4perl
4242 TryTiny
4343 DataUUID
4444 DateCalc
pkgs/applications/graphics/inkscape/default.nix+10
@@ -25,6 +25,16 @@ stdenv.mkDerivation rec {
2525 url = "https://gitlab.com/inkscape/inkscape/commit/e831b034746f8dc3c3c1b88372751f6dcb974831.diff";
2626 sha256 = "096rdyi6ppjq1h9jwwsm9hb99nggfrfinik8rm23jkn4h2zl01zf";
2727 })
28+ (fetchpatch {
29+ name = "inkscape-poppler_0_82_compat.patch";
30+ url = "https://gitlab.com/inkscape/inkscape/commit/835b6bb62be565efab986d5a3f30a672ad56c7eb.patch";
31+ sha256 = "02c6sxi2w52b885vr3pgani6kvxp9gdqqk2jgiykkdzv70hhrnm7";
32+ })
33+ (fetchpatch {
34+ name = "inkscape-poppler_0_83_compat.patch";
35+ url = "https://gitlab.com/inkscape/inkscape/commit/b5360a807b12d4e8318475ffd0464b84882788b5.patch";
36+ sha256 = "1p44rr2q2i3zkd1y1j7xgdcbgx8yvlq6hq92im8s0bkjby6p5cpz";
37+ })
2838 ];
2939
3040 # Inkscape hits the ARGMAX when linking on macOS. It appears to be
pkgs/applications/graphics/k3d/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
22, cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
3−, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
3+, libpng, boost, doxygen, cairomm, pkgconfig, libjpeg, libtiff
44, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
55
66stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333
3434 buildInputs = [
3535 libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng
36− boost cairomm imagemagick libjpeg libtiff
36+ boost cairomm libjpeg libtiff
3737 ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu
3838 ];
3939
pkgs/applications/misc/buku/default.nix+1
@@ -27,6 +27,7 @@ with python3.pkgs; buildPythonApplication rec {
2727 requests
2828 urllib3
2929 flask
30+ flask-admin
3031 flask-api
3132 flask-bootstrap
3233 flask-paginate
pkgs/applications/misc/dbeaver/default.nix+2−2
@@ -7,7 +7,7 @@
77
88stdenv.mkDerivation rec {
99 pname = "dbeaver-ce";
10− version = "6.2.5";
10+ version = "6.3.0";
1111
1212 desktopItem = makeDesktopItem {
1313 name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030
3131 src = fetchurl {
3232 url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
33− sha256 = "1bg5cq7ivf263mjr8g9qwdhp9x0gm04nqiya4fyw0k33yiab85zn";
33+ sha256 = "07j2r2kfjhfv8zzzzp5qj3ppx4vv7llpx4lwip6bnjfkh80ny22a";
3434 };
3535
3636 installPhase = ''
pkgs/applications/misc/gummi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, pkgs, makeWrapper
1+{ stdenv, pkgs, makeWrapper, pango
22, glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler
33, pkgconfig, intltool, autoreconfHook, wrapGAppsHook
44}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 pkgconfig intltool autoreconfHook makeWrapper wrapGAppsHook
1919 ];
2020 buildInputs = [
21− glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler
21+ glib gnome2.gtksourceview pango gtk2-x11 gtkspell2 poppler
2222 gnome3.adwaita-icon-theme
2323 ];
2424
pkgs/applications/misc/prusa-slicer/default.nix+2−3
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig
2−, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK30
2+, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31
33, gtest, nlopt, xorg, makeDesktopItem
44}:
55let
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 glew
2929 libpng
3030 tbb
31− wxGTK30
31+ wxGTK31
3232 xorg.libX11
3333 ] ++ checkInputs;
3434
@@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
6565
6666 cmakeFlags = [
6767 "-DSLIC3R_FHS=1"
68− "-DSLIC3R_WX_STABLE=1" # necessary when compiling against wxGTK 3.0
6968 ];
7069
7170 postInstall = ''
pkgs/applications/misc/stretchly/default.nix+94−46
@@ -1,8 +1,12 @@
11{ GConf
22, alsaLib
33, at-spi2-atk
4+, at-spi2-core
45, atk
6+, buildFHSUserEnv
57, cairo
8+, common-updater-scripts
9+, coreutils
610, cups
711, dbus
812, expat
@@ -29,15 +33,19 @@
2933, libnotify
3034, libpciaccess
3135, libpng12
36+, libuuid
3237, libxcb
3338, nspr
3439, nss
3540, pango
3641, pciutils
3742, pulseaudio
43+, runtimeShell
3844, stdenv
3945, udev
4046, wrapGAppsHook
47+, writeScript
48+, file
4149}:
4250
4351let
@@ -45,6 +53,7 @@ let
4553 GConf
4654 alsaLib
4755 at-spi2-atk
56+ at-spi2-core
4857 atk
4958 cairo
5059 cups
@@ -71,6 +80,7 @@ let
7180 libnotify
7281 libpciaccess
7382 libpng12
83+ libuuid
7484 libxcb
7585 nspr
7686 nss
@@ -82,58 +92,96 @@ let
8292 ];
8393
8494 libPath = lib.makeLibraryPath libs;
95+
96+ stretchly =
97+ stdenv.mkDerivation rec {
98+ pname = "stretchly";
99+ version = "0.21.0";
100+
101+ src = fetchurl {
102+ url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
103+ sha256 = "1gyyr22xq8s4miiacs8wqhp7lxnwvkvlwhngnq8671l62s6iyjzl";
104+ };
105+
106+ nativeBuildInputs = [
107+ wrapGAppsHook
108+ coreutils
109+ ];
110+
111+ buildInputs = libs;
112+
113+ dontPatchELF = true;
114+ dontBuild = true;
115+ dontConfigure = true;
116+
117+ installPhase = ''
118+ mkdir -p $out/bin $out/lib/stretchly
119+ cp -r ./* $out/lib/stretchly/
120+ ln -s $out/lib/stretchly/stretchly $out/bin/
121+ '';
122+
123+ preFixup = ''
124+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/libffmpeg.so
125+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/libEGL.so
126+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/libGLESv2.so
127+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/swiftshader/libEGL.so
128+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/swiftshader/libGLESv2.so
129+
130+ patchelf \
131+ --set-rpath "$out/lib/stretchly:${libPath}" \
132+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
133+ $out/lib/stretchly/stretchly
134+
135+ patchelf \
136+ --set-rpath "$out/lib/stretchly:${libPath}" \
137+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
138+ $out/lib/stretchly/chrome-sandbox
139+ '';
140+
141+ meta = with stdenv.lib; {
142+ description = "A break time reminder app";
143+ longDescription = ''
144+ stretchly is a cross-platform electron app that reminds you to take
145+ breaks when working on your computer. By default, it runs in your tray
146+ and displays a reminder window containing an idea for a microbreak for 20
147+ seconds every 10 minutes. Every 30 minutes, it displays a window
148+ containing an idea for a longer 5 minute break.
149+ '';
150+ homepage = https://hovancik.net/stretchly;
151+ downloadPage = https://hovancik.net/stretchly/downloads/;
152+ license = licenses.bsd2;
153+ maintainers = with maintainers; [ cdepillabout ];
154+ platforms = platforms.linux;
155+ };
156+ };
157+
85158in
86159
87−stdenv.mkDerivation rec {
88− pname = "stretchly";
89− version = "0.19.1";
160+buildFHSUserEnv {
161+ inherit (stretchly) meta;
90162
91− src = fetchurl {
92− url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
93− sha256 = "1q2wxfqs8qv9b1rfh5lhmyp3rrgdl05m6ihsgkxlgp0yzi07afz8";
94− };
163+ name = "stretchly";
95164
96− nativeBuildInputs = [
97− wrapGAppsHook
165+ targetPkgs = pkgs: [
166+ stretchly
98167 ];
99168
100− buildInputs = libs;
101−
102− dontPatchELF = true;
103− dontBuild = true;
104− dontConfigure = true;
105−
106− installPhase = ''
107− mkdir -p $out/bin $out/lib/stretchly
108− cp -r ./* $out/lib/stretchly/
109− ln -s $out/lib/stretchly/libffmpeg.so $out/lib/
110− ln -s $out/lib/stretchly/libnode.so $out/lib/
111− ln -s $out/lib/stretchly/stretchly $out/bin/
112− '';
113−
114− preFixup = ''
115− patchelf --set-rpath "${libPath}" $out/lib/stretchly/libffmpeg.so
116− patchelf --set-rpath "${libPath}" $out/lib/stretchly/libnode.so
117−
118− patchelf \
119− --set-rpath "$out/lib/stretchly:${libPath}" \
120− --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
121− $out/lib/stretchly/stretchly
122− '';
123−
124− meta = with stdenv.lib; {
125− description = "A break time reminder app";
126− longDescription = ''
127− stretchly is a cross-platform electron app that reminds you to take
128− breaks when working on your computer. By default, it runs in your tray
129− and displays a reminder window containing an idea for a microbreak for 20
130− seconds every 10 minutes. Every 30 minutes, it displays a window
131− containing an idea for a longer 5 minute break.
169+ runScript = "stretchly";
170+
171+ passthru = {
172+ updateScript = writeScript "update-stretchly" ''
173+ #!${runtimeShell}
174+
175+ set -eu -o pipefail
176+
177+ # get the latest release version
178+ latest_version=$(curl -s https://api.github.com/repos/hovancik/stretchly/releases/latest | jq --raw-output .tag_name | sed -e 's/^v//')
179+
180+ echo "updating to $latest_version..."
181+
182+ ${common-updater-scripts}/bin/update-source-version stretchly.passthru.stretchlyWrapped "$latest_version"
132183 '';
133− homepage = https://hovancik.net/stretchly;
134− downloadPage = https://hovancik.net/stretchly/downloads/;
135− license = licenses.bsd2;
136− maintainers = with maintainers; [ cdepillabout ];
137− platforms = platforms.linux;
184+
185+ stretchlyWrapped = stretchly;
138186 };
139187}
pkgs/applications/networking/cluster/kops/default.nix+5
@@ -65,4 +65,9 @@ in rec {
6565 version = "1.14.1";
6666 sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n";
6767 };
68+
69+ kops_1_15 = mkKops {
70+ version = "1.15.0";
71+ sha256 = "0sjas8pn0njl767b1y15g7cci2q3kxkxwmgr0wvs7vi3n1s1sf9d";
72+ };
6873}
pkgs/applications/networking/cluster/terraform/default.nix+2−2
@@ -112,8 +112,8 @@ in rec {
112112 terraform_0_11-full = terraform_0_11.full;
113113
114114 terraform_0_12 = pluggable (generic {
115− version = "0.12.16";
116− sha256 = "10r9vra4d3lyms9cvl0g1ij6ldcfi3vjrqsmd52isrmlmjdzm8nk";
115+ version = "0.12.17";
116+ sha256 = "1pmvjbmzws5qjzz34dw0fcb6p36vafqs0h8i87g7lmhckb9bqihv";
117117 patches = [ ./provider-path.patch ];
118118 passthru = { inherit plugins; };
119119 });
pkgs/applications/networking/ssb/patchwork/default.nix+4−4
@@ -2,12 +2,12 @@
22
33let
44 pname = "ssb-patchwork";
5− version = "3.16.2";
6− name = "${pname}-${version}";
5+ version = "3.17.1";
6+ name = "Patchwork-${version}";
77
88 src = fetchurl {
9− url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";
10− sha256 = "0hi9ysmwhiiww82a3mqdd2b1anj7qa41b46f6zb3q9d0b8nmvlz4";
9+ url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage";
10+ sha256 = "06wcgdcagmh80nr8nyrnz83wgq7j8r96hn3ccka7nmn02pdgvp3k";
1111 };
1212
1313 binary = appimageTools.wrapType2 {
pkgs/applications/office/bookworm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk
1+{ stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee
22, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 pantheon.elementary-icon-theme
2929 pantheon.granite
3030 glib
31− gnome3.libgee
31+ libgee
3232 gtk3
3333 html2text
3434 poppler
pkgs/applications/office/wpsoffice/default.nix+51−33
@@ -1,23 +1,22 @@
11{ stdenv, fetchurl
22, libX11, glib, xorg, fontconfig, freetype
3−, zlib, libpng12, libICE, libXrender, cups }:
3+, zlib, libpng12, libICE, libXrender, cups
4+, alsaLib, atk, cairo, dbus, expat
5+, gdk-pixbuf, gtk2-x11, lzma, pango, zotero
6+, sqlite, libuuid, qt5, dpkg }:
47
5−let
6− bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64"
7− else "x86";
8−
9− version = "10.1.0.5672";
10−in stdenv.mkDerivation rec{
8+stdenv.mkDerivation rec{
119 pname = "wpsoffice";
12− inherit version;
10+ version = "11.1.0.8865";
1311
1412 src = fetchurl {
15− name = "${pname}-${version}.tar.xz";
16− url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz";
17− sha256 = if bits == "x86_64" then
18− "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else
19− "1dk400ap5qwdhjvn8lnk602f5akayr391fkljxdkrpn5xac01m97";
13+ url = "https://wdl1.cache.wps.cn/wps/download/ep/Linux2019/8865/wps-office_11.1.0.8865_amd64.deb";
14+ sha256 = "0pxx3j02cm8d08iakg30azjvl3a50y4avyrf08ddgaavqnvkypfj";
2015 };
16+ unpackCmd = "dpkg -x $src .";
17+ sourceRoot = ".";
18+
19+ nativeBuildInputs = [ qt5.wrapQtAppsHook dpkg ];
2120
2221 meta = {
2322 description = "Office program originally named Kingsoft Office";
@@ -25,20 +24,44 @@ in stdenv.mkDerivation rec{
2524 platforms = [ "i686-linux" "x86_64-linux" ];
2625 hydraPlatforms = [];
2726 license = stdenv.lib.licenses.unfreeRedistributable;
27+ maintainers = [ stdenv.lib.maintainers.mlatus ];
2828 };
2929
30− libPath = stdenv.lib.makeLibraryPath [
30+ libPath = with xorg; stdenv.lib.makeLibraryPath [
3131 libX11
3232 libpng12
3333 glib
34− xorg.libSM
35− xorg.libXext
34+ libSM
35+ libXext
3636 fontconfig
3737 zlib
3838 freetype
3939 libICE
4040 cups
4141 libXrender
42+ libxcb
43+
44+ alsaLib
45+ atk
46+ cairo
47+ dbus.daemon.lib
48+ expat
49+ fontconfig.lib
50+ gdk-pixbuf
51+ gtk2-x11
52+ lzma
53+ pango
54+ zotero
55+ sqlite
56+ libuuid
57+ libXcomposite
58+ libXcursor
59+ libXdamage
60+ libXfixes
61+ libXi
62+ libXrandr
63+ libXScrnSaver
64+ libXtst
4265 ];
4366
4467 dontPatchELF = true;
@@ -49,32 +72,27 @@ in stdenv.mkDerivation rec{
4972
5073 installPhase = ''
5174 prefix=$out/opt/kingsoft/wps-office
52− mkdir -p $prefix
53− cp -r . $prefix
75+ mkdir -p $out
76+ cp -r opt $out
77+ cp -r usr/* $out
5478
5579 # Avoid forbidden reference error due use of patchelf
56− rm -r $PWD
80+ rm -r *
5781
58− mkdir $out/bin
59− for i in wps wpp et; do
82+ for i in wps wpp et wpspdf; do
6083 patchelf \
6184 --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
62− --force-rpath --set-rpath "$prefix/office6:$libPath" \
85+ --force-rpath --set-rpath "$(patchelf --print-rpath $prefix/office6/$i):${stdenv.cc.cc.lib}/lib64:${libPath}" \
6386 $prefix/office6/$i
6487
65− substitute $prefix/$i $out/bin/$i \
88+ substituteInPlace $out/bin/$i \
6689 --replace /opt/kingsoft/wps-office $prefix
67− chmod +x $out/bin/$i
68−
69− substituteInPlace $prefix/resource/applications/wps-office-$i.desktop \
70− --replace /usr/bin $out/bin
7190 done
7291
73− # China fonts
74− mkdir -p $prefix/resource/fonts/wps-office $out/etc/fonts/conf.d
75− ln -s $prefix/fonts/* $prefix/resource/fonts/wps-office
76− ln -s $prefix/fontconfig/*.conf $out/etc/fonts/conf.d
77−
78− ln -s $prefix/resource $out/share
92+ for i in $out/share/applications/*;do
93+ substituteInPlace $i \
94+ --replace /usr/bin $out/bin \
95+ --replace /opt/kingsoft/wps-office $prefix
96+ done
7997 '';
8098}
pkgs/applications/radio/dump1090/default.nix+20−10
@@ -1,21 +1,31 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }:
1+{ stdenv
2+, fetchFromGitHub
3+, pkgconfig
4+, libbladeRF
5+, libusb
6+, ncurses
7+, rtl-sdr
8+}:
29
310stdenv.mkDerivation rec {
411 pname = "dump1090";
5− version = "2014-10-31";
12+ version = "3.7.2";
613
714 src = fetchFromGitHub {
8− owner = "MalcolmRobb";
15+ owner = "flightaware";
916 repo = pname;
10− rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe";
11− sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy";
17+ rev = "v${version}";
18+ sha256 = "0vlv9bd805kid202xxkrnl51rh02cyrl055gbcqlqgk51j5rrq8w";
1219 };
1320
1421 nativeBuildInputs = [ pkgconfig ];
1522
16− buildInputs = [ libusb rtl-sdr ];
17−
18− makeFlags = [ "PREFIX=$(out)" ];
23+ buildInputs = [
24+ libbladeRF
25+ libusb
26+ ncurses
27+ rtl-sdr
28+ ];
1929
2030 installPhase = ''
2131 mkdir -p $out/bin $out/share
@@ -25,8 +35,8 @@ stdenv.mkDerivation rec {
2535
2636 meta = with stdenv.lib; {
2737 description = "A simple Mode S decoder for RTLSDR devices";
28− homepage = https://github.com/MalcolmRobb/dump1090;
29− license = licenses.bsd3;
38+ homepage = "https://github.com/flightaware/dump1090";
39+ license = licenses.gpl2Plus;
3040 platforms = platforms.linux;
3141 maintainers = with maintainers; [ earldouglas ];
3242 };
pkgs/applications/science/logic/coq/default.nix+1
@@ -31,6 +31,7 @@ let
3131 "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
3232 "8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg";
3333 "8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4";
34+ "8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz";
3435 }.${version};
3536 coq-version = stdenv.lib.versions.majorMinor version;
3637 versionAtLeast = stdenv.lib.versionAtLeast coq-version;
pkgs/applications/version-management/yadm/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, git, gnupg }:
22
3−let version = "1.12.0"; in
3+let version = "2.0.1"; in
44stdenv.mkDerivation {
55 pname = "yadm";
66 inherit version;
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 owner = "TheLocehiliosan";
1212 repo = "yadm";
1313 rev = version;
14− sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6";
14+ sha256 = "0knz2p0xyid65z6gdmjqfcqljqilxhqi02v4n6n4akl2i12kk193";
1515 };
1616
1717 dontConfigure = true;
pkgs/applications/virtualization/docker/distribution.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 pname = "distribution";
5− version = "2.6.2";
5+ version = "2.7.1";
66 rev = "v${version}";
77
88 goPackagePath = "github.com/docker/distribution";
@@ -11,7 +11,7 @@ buildGoPackage rec {
1111 owner = "docker";
1212 repo = "distribution";
1313 inherit rev;
14− sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
14+ sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";
1515 };
1616
1717 meta = with stdenv.lib; {
pkgs/applications/window-managers/i3/blocks.nix+5−5
@@ -1,16 +1,16 @@
1−{ fetchFromGitHub, fetchpatch, stdenv, autoreconfHook }:
1+{ fetchFromGitHub, fetchpatch, stdenv, autoreconfHook, pkg-config }:
22
33with stdenv.lib;
44
55stdenv.mkDerivation {
66 pname = "i3blocks";
7− version = "unstable-2019-02-07";
7+ version = "1.5";
88
99 src = fetchFromGitHub {
1010 owner = "vivien";
1111 repo = "i3blocks";
12− rev = "ec050e79ad8489a6f8deb37d4c20ab10729c25c3";
13− sha256 = "1fx4230lmqa5rpzph68dwnpcjfaaqv5gfkradcr85hd1z8d1qp1b";
12+ rev = "3417602a2d8322bc866861297f535e1ef80b8cb0";
13+ sha256 = "0v8mwnm8qzpv6xnqvrk43s4b9iyld4naqzbaxk4ldq1qkhai0wsv";
1414 };
1515
1616 patches = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
2222 })
2323 ];
2424
25− nativeBuildInputs = [ autoreconfHook ];
25+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2626
2727 meta = {
2828 description = "A flexible scheduler for your i3bar blocks";
pkgs/desktops/pantheon/apps/elementary-calculator/default.nix+2−2
@@ -18,7 +18,7 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "elementary-calculator";
21− version = "1.5.3";
21+ version = "1.5.4";
2222
2323 repoName = "calculator";
2424
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 owner = "elementary";
2727 repo = repoName;
2828 rev = version;
29− sha256 = "0ibnj3zm93p8ghiy8gbbm0vlig9mnqjsvvp1cpw62dnap0qixdcg";
29+ sha256 = "0053bdzn5viqlni6qg6q39nma6bsddmhnafa0mzggiv8l4qasbrx";
3030 };
3131
3232 passthru = {
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix+3−4
@@ -25,22 +25,21 @@
2525
2626stdenv.mkDerivation rec {
2727 pname = "elementary-calendar";
28− version = "unstable-2019-10-29";
28+ version = "5.0.3";
2929
3030 repoName = "calendar";
3131
3232 src = fetchFromGitHub {
3333 owner = "elementary";
3434 repo = repoName;
35− rev = "7d201fc5ea9e8dc25c46427397594fcab2016ed6"; # needed for libical 2.0 compat
36− sha256 = "11bqf3nxrj1sfd0qq5h0jsmimc6mwkd2g7q9ycizn9x5ak2gb8xi";
35+ rev = version;
36+ sha256 = "1dqcmh585fjib4m8bs7qy23fv429s7q9nbcqnn0vvmy1n36fic4m";
3737 };
3838
3939 passthru = {
4040 updateScript = pantheon.updateScript {
4141 inherit repoName;
4242 attrPath = pname;
43− versionPolicy = "master";
4443 };
4544 };
4645
pkgs/desktops/pantheon/apps/elementary-videos/default.nix+2−2
@@ -19,7 +19,7 @@
1919
2020stdenv.mkDerivation rec {
2121 pname = "elementary-videos";
22− version = "2.6.3";
22+ version = "2.7.0";
2323
2424 repoName = "videos";
2525
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 owner = "elementary";
2828 repo = repoName;
2929 rev = version;
30− sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx";
30+ sha256 = "1b6dqqmxa83fwlh9r0v918ikxd3mnwk0j5xssw1wk5l7q72s43w7";
3131 };
3232
3333 passthru = {
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix+3−11
@@ -15,24 +15,15 @@
1515
1616stdenv.mkDerivation rec {
1717 pname = "switchboard-plug-mouse-touchpad";
18− version = "2.3.0";
18+ version = "2.3.1";
1919
2020 src = fetchFromGitHub {
2121 owner = "elementary";
2222 repo = pname;
2323 rev = version;
24− sha256 = "1cg69nbdf4mcr16mi71aw9j8877lyj8yxjfk9bd3sml8f4fh7mmr";
24+ sha256 = "1974zdr5w3xd882gi95fp7axgilfni1sclsr750qm32yhl7d9bfn";
2525 };
2626
27− patches = [
28− ./hardcode-settings-daemon-gsettings.patch
29− ];
30−
31− postPatch = ''
32− substituteInPlace src/Views/Clicking.vala \
33− --subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon}
34− '';
35−
3627 passthru = {
3728 updateScript = pantheon.updateScript {
3829 repoName = pname;
@@ -51,6 +42,7 @@ stdenv.mkDerivation rec {
5142 granite
5243 gtk3
5344 libgee
45+ elementary-settings-daemon
5446 switchboard
5547 ];
5648
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patchdeleted−76
@@ -1,76 +0,0 @@
1−diff --git a/src/Views/Clicking.vala b/src/Views/Clicking.vala
2−index cc4431b..d12ddfe 100644
3−--- a/src/Views/Clicking.vala
4−+++ b/src/Views/Clicking.vala
5−@@ -123,42 +123,39 @@ public class MouseTouchpad.ClickingView : Granite.SimpleSettingsPage {
6− content_area.attach (hold_scale, 3, 3);
7− content_area. attach (hold_help, 1, 4, 3);
8−
9−- var xsettings_schema = SettingsSchemaSource.get_default ().lookup (
10−- "org.gnome.settings-daemon.plugins.xsettings",
11−- true
12−- );
13−-
14−- if (xsettings_schema != null) {
15−- var primary_paste_switch = new Gtk.Switch ();
16−- primary_paste_switch.halign = Gtk.Align.START;
17−+ SettingsSchemaSource daemon_schema_source = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS@", null, true);
18−+ SettingsSchema xsettings_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.plugins.xsettings", false);
19−
20−- var primary_paste_help = new Gtk.Label (
21−- _("Middle or three-finger clicking on an input will paste any selected text")
22−- );
23−- primary_paste_help.margin_bottom = 18;
24−- primary_paste_help.wrap = true;
25−- primary_paste_help.xalign = 0;
26−- primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
27−-
28−- content_area.attach (new SettingLabel (_("Middle click paste:")), 0, 5);
29−- content_area.attach (primary_paste_switch, 1, 5);
30−- content_area.attach (primary_paste_help, 1, 6, 3);
31−-
32−- var xsettings = new GLib.Settings ("org.gnome.settings-daemon.plugins.xsettings");
33−- primary_paste_switch.notify["active"].connect (() => {
34−- on_primary_paste_switch_changed (primary_paste_switch, xsettings);
35−- });
36−+ var primary_paste_switch = new Gtk.Switch ();
37−+ primary_paste_switch.halign = Gtk.Align.START;
38−
39−- var current_value = xsettings.get_value ("overrides").lookup_value (
40−- "Gtk/EnablePrimaryPaste",
41−- VariantType.INT32
42−- );
43−- if (current_value != null) {
44−- primary_paste_switch.active = current_value.get_int32 () == 1;
45−- }
46−+ var primary_paste_help = new Gtk.Label (
47−+ _("Middle or three-finger clicking on an input will paste any selected text")
48−+ );
49−+ primary_paste_help.margin_bottom = 18;
50−+ primary_paste_help.wrap = true;
51−+ primary_paste_help.xalign = 0;
52−+ primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
53−+
54−+ content_area.attach (new SettingLabel (_("Middle click paste:")), 0, 5);
55−+ content_area.attach (primary_paste_switch, 1, 5);
56−+ content_area.attach (primary_paste_help, 1, 6, 3);
57−+
58−+ var xsettings = new GLib.Settings.full (xsettings_schema, null, null);
59−+ primary_paste_switch.notify["active"].connect (() => {
60−+ on_primary_paste_switch_changed (primary_paste_switch, xsettings);
61−+ });
62−+
63−+ var current_value = xsettings.get_value ("overrides").lookup_value (
64−+ "Gtk/EnablePrimaryPaste",
65−+ VariantType.INT32
66−+ );
67−+ if (current_value != null) {
68−+ primary_paste_switch.active = current_value.get_int32 () == 1;
69− }
70−
71−- var daemon_settings = new GLib.Settings ("org.gnome.settings-daemon.peripherals.mouse");
72−+ SettingsSchema daemon_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.peripherals.mouse", false);
73−+ var daemon_settings = new GLib.Settings.full (daemon_schema, null, null);
74− daemon_settings.bind ("double-click", double_click_speed_adjustment, "value", SettingsBindFlags.DEFAULT);
75−
76− var a11y_mouse_settings = new GLib.Settings ("org.gnome.desktop.a11y.mouse");
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix+2−10
@@ -36,24 +36,16 @@ stdenv.mkDerivation rec {
3636 granite
3737 gtk3
3838 libgee
39+ gala
40+ wingpanel
3941 plank
4042 switchboard
4143 ];
4244
4345 patches = [
4446 ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
45− ./hardcode-gsettings.patch
4647 ];
4748
48− postPatch = ''
49− substituteInPlace src/Views/Appearance.vala \
50− --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
51− substituteInPlace src/Views/HotCorners.vala \
52− --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
53− substituteInPlace src/Views/Appearance.vala \
54− --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel}
55− '';
56−
5749 meta = with stdenv.lib; {
5850 description = "Switchboard Desktop Plug";
5951 homepage = https://github.com/elementary/switchboard-plug-pantheon-shell;
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patchdeleted−39
@@ -1,39 +0,0 @@
1−diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala
2−index c8300cc..fc48a0e 100644
3−--- a/src/Views/Appearance.vala
4−+++ b/src/Views/Appearance.vala
5−@@ -66,10 +66,16 @@ public class Appearance : Gtk.Grid {
6− attach (text_size_label, 0, 2);
7− attach (text_size_modebutton, 1, 2);
8−
9−- var animations_settings = new Settings (ANIMATIONS_SCHEMA);
10−+ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
11−+ SettingsSchema animations_schema = gala_schema_source.lookup (ANIMATIONS_SCHEMA, false);
12−+
13−+ var animations_settings = new Settings.full (animations_schema, null, null);
14− animations_settings.bind (ANIMATIONS_KEY, animations_switch, "active", SettingsBindFlags.DEFAULT);
15−
16−- var panel_settings = new Settings (PANEL_SCHEMA);
17−+ SettingsSchemaSource panel_schema_source = new SettingsSchemaSource.from_directory ("@WINGPANEL_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
18−+ SettingsSchema panel_schema = panel_schema_source.lookup (PANEL_SCHEMA, false);
19−+
20−+ var panel_settings = new GLib.Settings.full (panel_schema, null, null);
21− panel_settings.bind (TRANSLUCENCY_KEY, translucency_switch, "active", SettingsBindFlags.DEFAULT);
22−
23− var interface_settings = new Settings (INTERFACE_SCHEMA);
24−diff --git a/src/Views/HotCorners.vala b/src/Views/HotCorners.vala
25−index 481e7c5..d102d03 100644
26−--- a/src/Views/HotCorners.vala
27−+++ b/src/Views/HotCorners.vala
28−@@ -30,7 +30,10 @@ public class HotCorners : Gtk.Grid {
29− row_spacing = 24;
30− halign = Gtk.Align.CENTER;
31−
32−- behavior_settings = new GLib.Settings ("org.pantheon.desktop.gala.behavior");
33−+
34−+ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
35−+ SettingsSchema behavior_schema = gala_schema_source.lookup ("org.pantheon.desktop.gala.behavior", false);
36−+ behavior_settings = new GLib.Settings.full (behavior_schema, null, null);
37−
38− custom_command_revealer = new Gtk.Revealer ();
39−
pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix+2−13
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
4343
4444 buildInputs = [
4545 dbus
46+ elementary-dpms-helper
47+ elementary-settings-daemon
4648 glib
4749 granite
4850 gtk3
@@ -56,21 +58,8 @@ stdenv.mkDerivation rec {
5658 src = ./dpms-helper-exec.patch;
5759 elementary_dpms_helper = elementary-dpms-helper;
5860 })
59− ./hardcode-gsettings.patch
6061 ];
6162
62− postPatch = ''
63− substituteInPlace src/MainView.vala \
64− --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${glib.getSchemaPath elementary-dpms-helper}
65− substituteInPlace src/MainView.vala \
66− --subst-var-by GSD_GSETTINGS_PATH ${glib.getSchemaPath elementary-settings-daemon}
67− '';
68−
69− PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
70− PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services";
71− PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc";
72− PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
73−
7463 meta = with stdenv.lib; {
7564 description = "Switchboard Power Plug";
7665 homepage = https://github.com/elementary/switchboard-plug-power;
pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patchdeleted−20
@@ -1,20 +0,0 @@
1−diff --git a/src/MainView.vala b/src/MainView.vala
2−index 1654e68..ad8fed9 100644
3−--- a/src/MainView.vala
4−+++ b/src/MainView.vala
5−@@ -46,8 +46,13 @@ public class Power.MainView : Gtk.Grid {
6−
7− var label_size = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
8−
9−- settings = new GLib.Settings ("org.gnome.settings-daemon.plugins.power");
10−- elementary_dpms_settings = new GLib.Settings ("io.elementary.dpms");
11−+ SettingsSchemaSource gsd_sss = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS_PATH@", null, true);
12−+ SettingsSchema gsd_schema = gsd_sss.lookup ("org.gnome.settings-daemon.plugins.power", false);
13−+ settings = new GLib.Settings.full (gsd_schema, null, null);
14−+
15−+ SettingsSchemaSource dpms_sss = new SettingsSchemaSource.from_directory ("@DPMS_HELPER_GSETTINGS_PATH@", null, true);
16−+ SettingsSchema elementary_dpms_schema = dpms_sss.lookup ("io.elementary.dpms", false);
17−+ elementary_dpms_settings = new GLib.Settings.full (elementary_dpms_schema, null, null);
18−
19− battery = new Battery ();
20− power_supply = new PowerSupply ();
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix+1−9
@@ -48,21 +48,13 @@ stdenv.mkDerivation rec {
4848 libgee
4949 polkit
5050 switchboard
51+ lightlocker
5152 zeitgeist
5253 ];
5354
54− patches = [
55− ./hardcode-gsettings.patch
56− ];
57−
5855 postPatch = ''
5956 chmod +x meson/post_install.py
6057 patchShebangs meson/post_install.py
61−
62− substituteInPlace src/Views/LockPanel.vala \
63− --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${glib.getSchemaPath lightlocker}
64− substituteInPlace src/Views/FirewallPanel.vala \
65− --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
6658 '';
6759
6860 meta = with stdenv.lib; {
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patchdeleted−33
@@ -1,33 +0,0 @@
1−diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala
2−index 0335c29..481b1c8 100644
3−--- a/src/Views/FirewallPanel.vala
4−+++ b/src/Views/FirewallPanel.vala
5−@@ -49,7 +49,11 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
6− }
7−
8− construct {
9−- settings = new Settings ("io.elementary.switchboard.security-privacy");
10−+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
11−+ SettingsSchema security_privacy_schema = sss.lookup ("io.elementary.switchboard.security-privacy", false);
12−+
13−+ settings = new Settings.full (security_privacy_schema, null, null);
14−+
15− disabled_rules = new Gee.HashMap<string, UFWHelpers.Rule> ();
16− load_disabled_rules ();
17−
18−diff --git a/src/Views/LockPanel.vala b/src/Views/LockPanel.vala
19−index 4f523f9..7135a83 100644
20−--- a/src/Views/LockPanel.vala
21−+++ b/src/Views/LockPanel.vala
22−@@ -30,7 +30,10 @@ public class SecurityPrivacy.LockPanel : Granite.SimpleSettingsPage {
23− }
24−
25− construct {
26−- locker = new Settings ("apps.light-locker");
27−+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@LIGHTLOCKER_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
28−+ SettingsSchema locker_schema = sss.lookup ("apps.light-locker", false);
29−+
30−+ locker = new Settings.full (locker_schema, null, null);
31−
32− var lock_suspend_label = new Gtk.Label (_("Lock on suspend:"));
33− var lock_suspend_switch = new Gtk.Switch ();
pkgs/desktops/pantheon/apps/switchboard/wrapper.nix+16−5
@@ -1,4 +1,6 @@
1−{ makeWrapper
1+{ wrapGAppsHook
2+, glib
3+, lib
24, symlinkJoin
35, switchboard
46, switchboardPlugs
@@ -11,13 +13,22 @@ in
1113symlinkJoin {
1214 name = "${switchboard.name}-with-plugs";
1315
14− paths = [ switchboard ] ++ selectedPlugs;
16+ paths = [
17+ switchboard
18+ ] ++ selectedPlugs;
1519
16− buildInputs = [ makeWrapper ];
20+ buildInputs = [
21+ wrapGAppsHook
22+ glib
23+ ] ++ (lib.forEach selectedPlugs (x: x.buildInputs))
24+ ++ selectedPlugs;
1725
1826 postBuild = ''
19− wrapProgram $out/bin/io.elementary.switchboard \
20− --set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard"
27+ make_glib_find_gsettings_schemas
28+
29+ gappsWrapperArgs+=(--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard")
30+
31+ wrapGAppsHook
2132 '';
2233
2334 inherit (switchboard) meta;
pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix+11−10
@@ -1,11 +1,14 @@
11{ stdenv
22, fetchFromGitHub
33, pantheon
4+, meson
5+, ninja
6+, gettext
47}:
58
69stdenv.mkDerivation rec {
710 pname = "elementary-wallpapers";
8− version = "5.4";
11+ version = "5.5.0";
912
1013 repoName = "wallpapers";
1114
@@ -13,9 +16,15 @@ stdenv.mkDerivation rec {
1316 owner = "elementary";
1417 repo = repoName;
1518 rev = version;
16− sha256 = "1ihvv9v8m5f2n2v3bgg769l52wbg241zgp3d45q6phk7p8s1gz3s";
19+ sha256 = "0c63nds2ylqgcp39s13mfwhipgyw8cirn0bhybp291l5g86ii6s3";
1720 };
1821
22+ nativeBuildInputs = [
23+ gettext
24+ meson
25+ ninja
26+ ];
27+
1928 passthru = {
2029 updateScript = pantheon.updateScript {
2130 inherit repoName;
@@ -23,14 +32,6 @@ stdenv.mkDerivation rec {
2332 };
2433 };
2534
26− dontBuild = true;
27− dontConfigure = true;
28−
29− installPhase = ''
30− mkdir -p $out/share/backgrounds/elementary
31− cp -av *.jpg $out/share/backgrounds/elementary
32− '';
33−
3435 meta = with stdenv.lib; {
3536 description = "Collection of wallpapers for elementary";
3637 homepage = https://github.com/elementary/wallpapers;
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix+4−7
@@ -26,7 +26,7 @@
2626
2727stdenv.mkDerivation rec {
2828 pname = "wingpanel-applications-menu";
29− version = "2.4.4";
29+ version = "2.5.0";
3030
3131 repoName = "applications-menu";
3232
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 owner = "elementary";
3535 repo = repoName;
3636 rev = version;
37− sha256 = "09ssxn264v6nzrxgk529kpdxq5j3b14z8mbwq0gni1bgjcla773d";
37+ sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d";
3838 };
3939
4040 passthru = {
@@ -73,13 +73,10 @@ stdenv.mkDerivation rec {
7373 "--sysconfdir=${placeholder "out"}/etc"
7474 ];
7575
76− PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
77− PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
78−
7976 patches = [
8077 (substituteAll {
81− src = ./bc.patch;
82− exec = "${bc}/bin/bc";
78+ src = ./fix-paths.patch;
79+ bc = "${bc}/bin/bc";
8380 })
8481 ];
8582
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patchnew file+24
@@ -0,0 +1,24 @@
1+diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala
2+index 18ca3af..f5d1076 100644
3+--- a/src/synapse-plugins/calculator-plugin.vala
4++++ b/src/synapse-plugins/calculator-plugin.vala
5+@@ -44,9 +44,7 @@ namespace Synapse {
6+ _("Calculator"),
7+ _("Calculate basic expressions."),
8+ "accessories-calculator",
9+- register_plugin,
10+- Environment.find_program_in_path ("bc") != null,
11+- _("bc is not installed")
12++ register_plugin
13+ );
14+ }
15+
16+@@ -87,7 +85,7 @@ namespace Synapse {
17+ if (matched) {
18+ Pid pid;
19+ int read_fd, write_fd;
20+- string[] argv = {"bc", "-l"};
21++ string[] argv = {"@bc@", "-l"};
22+ string? solution = null;
23+
24+ try {
pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix+2−4
@@ -16,13 +16,13 @@
1616
1717stdenv.mkDerivation rec {
1818 pname = "wingpanel-indicator-bluetooth";
19− version = "2.1.3";
19+ version = "2.1.4";
2020
2121 src = fetchFromGitHub {
2222 owner = "elementary";
2323 repo = pname;
2424 rev = version;
25− sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9";
25+ sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1";
2626 };
2727
2828 passthru = {
@@ -48,8 +48,6 @@ stdenv.mkDerivation rec {
4848 wingpanel
4949 ];
5050
51− PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
52−
5351 postPatch = ''
5452 chmod +x meson/post_install.py
5553 patchShebangs meson/post_install.py
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+2−2
@@ -35,13 +35,13 @@ in
3535
3636stdenv.mkDerivation rec {
3737 pname = "wingpanel-indicator-datetime";
38− version = "2.2.0";
38+ version = "2.2.1";
3939
4040 src = fetchFromGitHub {
4141 owner = "elementary";
4242 repo = pname;
4343 rev = version;
44− sha256 = "1whdx0vgm0qbbzsw8dg2liz3cbh3ad5ybkriy4lmx5ynyhpbz0sx";
44+ sha256 = "0y8lfrrkzcj8nw94jqawbxr4jz41ac0z539kkr3n3x0qmx72md2y";
4545 };
4646
4747 passthru = {
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix+2−4
@@ -14,13 +14,13 @@
1414
1515stdenv.mkDerivation rec {
1616 pname = "wingpanel-indicator-notifications";
17− version = "2.1.2";
17+ version = "2.1.3";
1818
1919 src = fetchFromGitHub {
2020 owner = "elementary";
2121 repo = pname;
2222 rev = version;
23− sha256 = "1960s3xcsx6yjlnk0csf1m66s1z1sj5rym9b2fy7pm2nan47z3ld";
23+ sha256 = "1lx023z7xxlgwh0br48fw5w7xw673p2sqxwl1gz9f54xx7rv81py";
2424 };
2525
2626 passthru = {
@@ -44,8 +44,6 @@ stdenv.mkDerivation rec {
4444 wingpanel
4545 ];
4646
47− PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
48−
4947 meta = with stdenv.lib; {
5048 description = "Notifications Indicator for Wingpanel";
5149 homepage = https://github.com/elementary/wingpanel-indicator-notifications;
pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix+2−4
@@ -14,13 +14,13 @@
1414
1515stdenv.mkDerivation rec {
1616 pname = "wingpanel-indicator-session";
17− version = "2.2.5";
17+ version = "2.2.6";
1818
1919 src = fetchFromGitHub {
2020 owner = "elementary";
2121 repo = pname;
2222 rev = version;
23− sha256 = "0lqh9g6qq09m744gncspm79lbwx1vjl1d6j2szwcq9f0jdm01pm5";
23+ sha256 = "0pzknbm0hg4kf2izfg1mcmyildfzwyq1hh0xhlq16gsmakq4ld26";
2424 };
2525
2626 passthru = {
@@ -44,8 +44,6 @@ stdenv.mkDerivation rec {
4444 wingpanel
4545 ];
4646
47− PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
48−
4947 meta = with stdenv.lib; {
5048 description = "Session Indicator for Wingpanel";
5149 homepage = https://github.com/elementary/wingpanel-indicator-session;
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix+2−4
@@ -18,13 +18,13 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "wingpanel-indicator-sound";
21− version = "2.1.3";
21+ version = "2.1.4";
2222
2323 src = fetchFromGitHub {
2424 owner = "elementary";
2525 repo = pname;
2626 rev = version;
27− sha256 = "0lgjl969c7s31nszh6d4pr1vsxfdsizplsihvd8r02mm1mlxmsda";
27+ sha256 = "00r3dqkyp7k34xwn12l0dbzfmz70084lblxchykmk77pgzid2a0b";
2828 };
2929
3030 passthru = {
@@ -52,8 +52,6 @@ stdenv.mkDerivation rec {
5252 wingpanel
5353 ];
5454
55− PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
56−
5755 postPatch = ''
5856 chmod +x meson/post_install.py
5957 patchShebangs meson/post_install.py
pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix+18−7
@@ -1,5 +1,6 @@
11{ lib
2−, makeWrapper
2+, wrapGAppsHook
3+, glib
34, symlinkJoin
45, wingpanel
56, wingpanelIndicators
@@ -13,17 +14,27 @@ in
1314symlinkJoin {
1415 name = "${wingpanel.name}-with-indicators";
1516
16− paths = [ wingpanel ] ++ selectedIndicators;
17+ paths = [
18+ wingpanel
19+ ] ++ selectedIndicators;
1720
18− buildInputs = [ makeWrapper ];
21+ buildInputs = [
22+ glib
23+ wrapGAppsHook
24+ ] ++ (lib.forEach selectedIndicators (x: x.buildInputs))
25+ ++ selectedIndicators;
1926
2027 # We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu
2128 # has a plugin to search switchboard settings
2229 postBuild = ''
23− wrapProgram $out/bin/wingpanel \
24− --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" \
25− --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" \
26− --suffix XDG_DATA_DIRS : ${lib.concatMapStringsSep ":" (indicator: ''${indicator}/share/gsettings-schemas/${indicator.name}'') selectedIndicators}
30+ make_glib_find_gsettings_schemas
31+
32+ gappsWrapperArgs+=(
33+ --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
34+ --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard"
35+ )
36+
37+ wrapGAppsHook
2738 '';
2839
2940 inherit (wingpanel) meta;
pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix+2−2
@@ -17,7 +17,7 @@
1717
1818stdenv.mkDerivation rec {
1919 pname = "elementary-capnet-assist";
20− version = "2.2.3";
20+ version = "2.2.4";
2121
2222 repoName = "capnet-assist";
2323
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 owner = "elementary";
2626 repo = repoName;
2727 rev = version;
28− sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji";
28+ sha256 = "0yz827gs1qv6csgv4v993rjmqzc6dbymbvznsy45ghlh19l4l7j1";
2929 };
3030
3131 passthru = {
pkgs/desktops/pantheon/update.sh+20−1
@@ -114,7 +114,26 @@ EOF
114114 function get_latest_tag ( ) {
115115 repo_name="$1"
116116
117− curl --silent --show-error --fail -X GET "https://api.github.com/repos/elementary/$repo_name/releases/latest" | jq -r '.tag_name'
117+ OAUTH_TOKEN=$(printenv OAUTH_TOKEN)
118+
119+ if [ -n "$OAUTH_TOKEN" ]; then
120+ curl \
121+ --silent \
122+ --show-error \
123+ --fail \
124+ -X GET \
125+ --header "Authorization: token $OAUTH_TOKEN" \
126+ "https://api.github.com/repos/elementary/$repo_name/releases/latest" \
127+ | jq -r '.tag_name'
128+ else
129+ curl \
130+ --silent \
131+ --show-error \
132+ --fail \
133+ -X GET \
134+ "https://api.github.com/repos/elementary/$repo_name/releases/latest" \
135+ | jq -r '.tag_name'
136+ fi
118137 }
119138
120139#
pkgs/development/compilers/crystal/default.nix+28−14
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
22, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml
3−, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib
3+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig
44, callPackage }:
55
66# We need multiple binaries as a given binary isn't always able to build
@@ -38,8 +38,14 @@ let
3838 '';
3939 };
4040
41− generic = { version, sha256, binary, doCheck ? true }:
42− let compiler = stdenv.mkDerivation rec {
41+ commonBuildInputs = extraBuildInputs: [
42+ boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl_1_0_2
43+ ] ++ extraBuildInputs
44+ ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
45+
46+
47+ generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [] }:
48+ lib.fix (compiler: stdenv.mkDerivation {
4349 pname = "crystal";
4450 inherit doCheck version;
4551
@@ -72,14 +78,9 @@ let
7278 --replace '`hostname`' '`${nettools}/bin/hostname`'
7379 '';
7480
75− buildInputs = [
76− boehmgc libatomic_ops pcre libevent libyaml
77− llvm zlib openssl_1_0_2
78− ] ++ stdenv.lib.optionals stdenv.isDarwin [
79− libiconv
80− ];
81+ buildInputs = commonBuildInputs extraBuildInputs;
8182
82− nativeBuildInputs = [ binary makeWrapper which ];
83+ nativeBuildInputs = [ binary makeWrapper which pkgconfig llvm ];
8384
8485 makeFlags = [
8586 "CRYSTAL_CONFIG_VERSION=${version}"
@@ -91,10 +92,13 @@ let
9192
9293 FLAGS = [
9394 "--release"
94− "--no-debug"
9595 "--single-module" # needed for deterministic builds
9696 ];
9797
98+ # This makes sure we don't keep depending on the previous version of
99+ # crystal used to build this one.
100+ CRYSTAL_LIBRARY_PATH = "${placeholder "out"}/lib/crystal";
101+
98102 # We *have* to add `which` to the PATH or crystal is unable to build stuff
99103 # later if which is not available.
100104 installPhase = ''
@@ -102,9 +106,11 @@ let
102106
103107 install -Dm755 .build/crystal $out/bin/crystal
104108 wrapProgram $out/bin/crystal \
105− --suffix PATH : ${lib.makeBinPath [ clang which ]} \
109+ --suffix PATH : ${lib.makeBinPath [ pkgconfig clang which ]} \
106110 --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
107− --suffix LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}
111+ --suffix CRYSTAL_LIBRARY_PATH : ${
112+ lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
113+ }
108114 install -dm755 $out/lib/crystal
109115 cp -r src/* $out/lib/crystal/
110116
@@ -147,7 +153,7 @@ let
147153 maintainers = with maintainers; [ manveru david50407 peterhoeg ];
148154 platforms = builtins.attrNames archs;
149155 };
150− }; in compiler;
156+ }));
151157
152158in rec {
153159 binaryCrystal_0_26 = genericBinary {
@@ -219,6 +225,14 @@ in rec {
219225 binary = crystal_0_30;
220226 };
221227
228+ crystal_0_32 = generic {
229+ version = "255bfc5fa925b95b72e34b26ad997fb2b3f83059";
230+ sha256 = "1dgk36cj5lwhs1c4zp0s1c9hjk0h3vljq6zwhlnzkl1xs7cgzim1";
231+ doCheck = false; # 5 checks are failing now
232+ binary = crystal_0_31;
233+ extraBuildInputs = [ readline ];
234+ };
235+
222236 crystal = crystal_0_31;
223237
224238 crystal2nix = callPackage ./crystal2nix.nix {};
pkgs/development/compilers/cudatoolkit/common.nixnew file+220
@@ -0,0 +1,220 @@
1+args@
2+{ version
3+, sha256
4+, url ? ""
5+, name ? ""
6+, developerProgram ? false
7+, runPatches ? []
8+, addOpenGLRunpath
9+, alsaLib
10+, expat
11+, fetchurl
12+, fontconfig
13+, freetype
14+, gcc
15+, gdk-pixbuf
16+, glib
17+, glibc
18+, gtk2
19+, lib
20+, makeWrapper
21+, ncurses5
22+, perl
23+, python27
24+, requireFile
25+, stdenv
26+, unixODBC
27+, xorg
28+, zlib
29+}:
30+
31+stdenv.mkDerivation rec {
32+ pname = "cudatoolkit";
33+ inherit version runPatches;
34+
35+ dontPatchELF = true;
36+ dontStrip = true;
37+
38+ src =
39+ if developerProgram then
40+ requireFile {
41+ message = ''
42+ This nix expression requires that ${args.name} is already part of the store.
43+ Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit
44+ at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory:
45+ nix-prefetch-url file://\$PWD/${args.name}
46+ '';
47+ inherit (args) name sha256;
48+ }
49+ else
50+ fetchurl {
51+ inherit (args) url sha256;
52+ };
53+
54+ outputs = [ "out" "lib" "doc" ];
55+
56+ nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
57+ buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
58+ runtimeDependencies = [
59+ ncurses5 expat python27 zlib glibc
60+ xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
61+ gtk2 glib fontconfig freetype unixODBC alsaLib
62+ ];
63+
64+ rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
65+
66+ unpackPhase = ''
67+ sh $src --keep --noexec
68+
69+ ${lib.optionalString (lib.versionOlder version "10.1") ''
70+ cd pkg/run_files
71+ sh cuda-linux*.run --keep --noexec
72+ sh cuda-samples*.run --keep --noexec
73+ mv pkg ../../$(basename $src)
74+ cd ../..
75+ rm -rf pkg
76+
77+ for patch in $runPatches; do
78+ sh $patch --keep --noexec
79+ mv pkg $(basename $patch)
80+ done
81+ ''}
82+ '';
83+
84+ installPhase = ''
85+ runHook preInstall
86+ mkdir $out
87+ ${lib.optionalString (lib.versionOlder version "10.1") ''
88+ cd $(basename $src)
89+ export PERL5LIB=.
90+ perl ./install-linux.pl --prefix="$out"
91+ cd ..
92+ for patch in $runPatches; do
93+ cd $(basename $patch)
94+ perl ./install_patch.pl --silent --accept-eula --installdir="$out"
95+ cd ..
96+ done
97+ ''}
98+ ${lib.optionalString (lib.versionAtLeast version "10.1") ''
99+ cd pkg/builds/cuda-toolkit
100+ mv * $out/
101+ ''}
102+
103+ rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
104+
105+ ${lib.optionalString (lib.versionOlder version "10.1") ''
106+ # let's remove the 32-bit libraries, they confuse the lib64->lib mover
107+ rm -rf $out/lib
108+ ''}
109+
110+ # Remove some cruft.
111+ ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1"))
112+ "rm $out/bin/uninstall*"}
113+
114+ # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
115+ if [ -d "$out"/cuda-samples ]; then
116+ mv "$out"/cuda-samples "$out"/samples
117+ fi
118+
119+ # Change the #error on GCC > 4.9 to a #warning.
120+ sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
121+
122+ # Fix builds with newer glibc version
123+ sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
124+
125+ # Ensure that cmake can find CUDA.
126+ mkdir -p $out/nix-support
127+ echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
128+
129+ # Move some libraries to the lib output so that programs that
130+ # depend on them don't pull in this entire monstrosity.
131+ mkdir -p $lib/lib
132+ mv -v $out/lib64/libcudart* $lib/lib/
133+
134+ # Remove OpenCL libraries as they are provided by ocl-icd and driver.
135+ rm -f $out/lib64/libOpenCL*
136+ ${lib.optionalString (lib.versionAtLeast version "10.1") ''
137+ mv $out/lib64 $out/lib
138+ ''}
139+
140+ # Set compiler for NVCC.
141+ wrapProgram $out/bin/nvcc \
142+ --prefix PATH : ${gcc}/bin
143+
144+ # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
145+ wrapProgram $out/bin/nvprof \
146+ --prefix LD_LIBRARY_PATH : $out/lib
147+ '' + lib.optionalString (lib.versionOlder version "8.0") ''
148+ # Hack to fix building against recent Glibc/GCC.
149+ echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
150+ '' + ''
151+ runHook postInstall
152+ '';
153+
154+ postInstall = ''
155+ for b in nvvp nsight; do
156+ wrapProgram "$out/bin/$b" \
157+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
158+ done
159+ '';
160+
161+ preFixup = ''
162+ while IFS= read -r -d ''$'\0' i; do
163+ if ! isELF "$i"; then continue; fi
164+ echo "patching $i..."
165+ if [[ ! $i =~ \.so ]]; then
166+ patchelf \
167+ --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
168+ fi
169+ if [[ $i =~ libcudart ]]; then
170+ rpath2=
171+ else
172+ rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
173+ fi
174+ patchelf --set-rpath "$rpath2" --force-rpath $i
175+ done < <(find $out $lib $doc -type f -print0)
176+ '';
177+
178+ # Set RPATH so that libcuda and other libraries in
179+ # /run/opengl-driver(-32)/lib can be found. See the explanation in
180+ # addOpenGLRunpath. Don't try to figure out which libraries really need
181+ # it, just patch all (but not the stubs libraries). Note that
182+ # --force-rpath prevents changing RPATH (set above) to RUNPATH.
183+ postFixup = ''
184+ addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so
185+ '';
186+
187+ # cuda-gdb doesn't run correctly when not using sandboxing, so
188+ # temporarily disabling the install check. This should be set to true
189+ # when we figure out how to get `cuda-gdb --version` to run correctly
190+ # when not using sandboxing.
191+ doInstallCheck = false;
192+ postInstallCheck = let
193+ in ''
194+ # Smoke test binaries
195+ pushd $out/bin
196+ for f in *; do
197+ case $f in
198+ crt) continue;;
199+ nvcc.profile) continue;;
200+ nsight_ee_plugins_manage.sh) continue;;
201+ uninstall_cuda_toolkit_6.5.pl) continue;;
202+ computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version"
203+ *) echo "Executing '$f --version':"; ./$f --version;;
204+ esac
205+ done
206+ popd
207+ '';
208+ passthru = {
209+ cc = gcc;
210+ majorVersion = lib.versions.majorMinor version;
211+ };
212+
213+ meta = with stdenv.lib; {
214+ description = "A compiler for NVIDIA GPUs, math libraries, and tools";
215+ homepage = "https://developer.nvidia.com/cuda-toolkit";
216+ platforms = [ "x86_64-linux" ];
217+ license = licenses.unfree;
218+ };
219+}
220+
pkgs/development/compilers/cudatoolkit/default.nix+9−204
@@ -1,210 +1,15 @@
1−{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib
2−, gcc48, gcc49, gcc5, gcc6, gcc7
3−, xorg, gtk2, gdk-pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
4−, addOpenGLRunpath
1+{ lib
2+, callPackage
3+, fetchurl
4+, gcc48
5+, gcc49
6+, gcc5
7+, gcc6
8+, gcc7
59}:
610
711let
8−
9− common =
10− args@{ gcc, version, sha256
11− , url ? ""
12− , name ? ""
13− , developerProgram ? false
14− , python ? python27
15− , runPatches ? []
16− }:
17−
18− stdenv.mkDerivation rec {
19− pname = "cudatoolkit";
20− inherit version runPatches;
21−
22− dontPatchELF = true;
23− dontStrip = true;
24−
25− src =
26− if developerProgram then
27− requireFile {
28− message = ''
29− This nix expression requires that ${args.name} is already part of the store.
30− Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit
31− at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory:
32− nix-prefetch-url file://\$PWD/${args.name}
33− '';
34− inherit (args) name sha256;
35− }
36− else
37− fetchurl {
38− inherit (args) url sha256;
39− };
40−
41− outputs = [ "out" "lib" "doc" ];
42−
43− nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
44− buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
45− runtimeDependencies = [
46− ncurses5 expat python zlib glibc
47− xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
48− gtk2 glib fontconfig freetype unixODBC alsaLib
49− ];
50−
51− rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
52−
53− unpackPhase = ''
54− sh $src --keep --noexec
55−
56− ${lib.optionalString (lib.versionOlder version "10.1") ''
57− cd pkg/run_files
58− sh cuda-linux*.run --keep --noexec
59− sh cuda-samples*.run --keep --noexec
60− mv pkg ../../$(basename $src)
61− cd ../..
62− rm -rf pkg
63−
64− for patch in $runPatches; do
65− sh $patch --keep --noexec
66− mv pkg $(basename $patch)
67− done
68− ''}
69− '';
70−
71− installPhase = ''
72− runHook preInstall
73− mkdir $out
74− ${lib.optionalString (lib.versionOlder version "10.1") ''
75− cd $(basename $src)
76− export PERL5LIB=.
77− perl ./install-linux.pl --prefix="$out"
78− cd ..
79− for patch in $runPatches; do
80− cd $(basename $patch)
81− perl ./install_patch.pl --silent --accept-eula --installdir="$out"
82− cd ..
83− done
84− ''}
85− ${lib.optionalString (lib.versionAtLeast version "10.1") ''
86− cd pkg/builds/cuda-toolkit
87− mv * $out/
88− ''}
89−
90− rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
91−
92− ${lib.optionalString (lib.versionOlder version "10.1") ''
93− # let's remove the 32-bit libraries, they confuse the lib64->lib mover
94− rm -rf $out/lib
95− ''}
96−
97− # Remove some cruft.
98− ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1"))
99− "rm $out/bin/uninstall*"}
100−
101− # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
102− if [ -d "$out"/cuda-samples ]; then
103− mv "$out"/cuda-samples "$out"/samples
104− fi
105−
106− # Change the #error on GCC > 4.9 to a #warning.
107− sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
108−
109− # Fix builds with newer glibc version
110− sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
111−
112− # Ensure that cmake can find CUDA.
113− mkdir -p $out/nix-support
114− echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
115−
116− # Move some libraries to the lib output so that programs that
117− # depend on them don't pull in this entire monstrosity.
118− mkdir -p $lib/lib
119− mv -v $out/lib64/libcudart* $lib/lib/
120−
121− # Remove OpenCL libraries as they are provided by ocl-icd and driver.
122− rm -f $out/lib64/libOpenCL*
123− ${lib.optionalString (lib.versionAtLeast version "10.1") ''
124− mv $out/lib64 $out/lib
125− ''}
126−
127− # Set compiler for NVCC.
128− wrapProgram $out/bin/nvcc \
129− --prefix PATH : ${gcc}/bin
130−
131− # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
132− wrapProgram $out/bin/nvprof \
133− --prefix LD_LIBRARY_PATH : $out/lib
134− '' + lib.optionalString (lib.versionOlder version "8.0") ''
135− # Hack to fix building against recent Glibc/GCC.
136− echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
137− '' + ''
138− runHook postInstall
139− '';
140−
141− postInstall = ''
142− for b in nvvp nsight; do
143− wrapProgram "$out/bin/$b" \
144− --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
145− done
146− '';
147−
148− preFixup = ''
149− while IFS= read -r -d ''$'\0' i; do
150− if ! isELF "$i"; then continue; fi
151− echo "patching $i..."
152− if [[ ! $i =~ \.so ]]; then
153− patchelf \
154− --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
155− fi
156− if [[ $i =~ libcudart ]]; then
157− rpath2=
158− else
159− rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
160− fi
161− patchelf --set-rpath "$rpath2" --force-rpath $i
162− done < <(find $out $lib $doc -type f -print0)
163− '';
164−
165− # Set RPATH so that libcuda and other libraries in
166− # /run/opengl-driver(-32)/lib can be found. See the explanation in
167− # addOpenGLRunpath. Don't try to figure out which libraries really need
168− # it, just patch all (but not the stubs libraries). Note that
169− # --force-rpath prevents changing RPATH (set above) to RUNPATH.
170− postFixup = ''
171− addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so
172− '';
173−
174− # cuda-gdb doesn't run correctly when not using sandboxing, so
175− # temporarily disabling the install check. This should be set to true
176− # when we figure out how to get `cuda-gdb --version` to run correctly
177− # when not using sandboxing.
178− doInstallCheck = false;
179− postInstallCheck = let
180− in ''
181− # Smoke test binaries
182− pushd $out/bin
183− for f in *; do
184− case $f in
185− crt) continue;;
186− nvcc.profile) continue;;
187− nsight_ee_plugins_manage.sh) continue;;
188− uninstall_cuda_toolkit_6.5.pl) continue;;
189− computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version"
190− *) echo "Executing '$f --version':"; ./$f --version;;
191− esac
192− done
193− popd
194− '';
195− passthru = {
196− cc = gcc;
197− majorVersion = lib.versions.majorMinor version;
198− };
199−
200− meta = with stdenv.lib; {
201− description = "A compiler for NVIDIA GPUs, math libraries, and tools";
202− homepage = "https://developer.nvidia.com/cuda-toolkit";
203− platforms = [ "x86_64-linux" ];
204− license = licenses.unfree;
205− };
206− };
207−
12+ common = callPackage ./common.nix;
20813in rec {
20914 cudatoolkit_6 = common {
21015 version = "6.0.37";
pkgs/development/haskell-modules/configuration-common.nix+1
@@ -1080,6 +1080,7 @@ self: super: {
10801080
10811081 # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
10821082 haddock-library = doJailbreak (dontCheck super.haddock-library);
1083+ haddock-library_1_8_0 = doJailbreak super.haddock-library_1_8_0;
10831084
10841085 # Generate shell completion.
10851086 cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+1
@@ -80,6 +80,7 @@ self: super: {
8080 optparse-applicative = self.optparse-applicative_0_15_1_0;
8181 pandoc = self.pandoc_2_8_0_1;
8282 pandoc-types = self.pandoc-types_1_20;
83+ prettyprinter = self.prettyprinter_1_5_1;
8384 primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion
8485 regex-base = self.regex-base_0_94_0_0;
8586 regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43;
pkgs/development/interpreters/python/default.nix+1−1
@@ -46,7 +46,7 @@ with pkgs;
4646 inherit hasDistutilsCxxPatch pythonForBuild;
4747 };
4848
49−in rec {
49+in {
5050
5151 python27 = callPackage ./cpython/2.7 {
5252 self = python27;
pkgs/development/libraries/boost/generic.nix+3−1
@@ -14,6 +14,7 @@
1414, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
1515, patches ? []
1616, mpi ? null
17+, extraB2Args ? []
1718
1819# Attributes inherit from specific versions
1920, version, src
@@ -92,7 +93,8 @@ let
9293 ++ optional (mpi != null || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam"
9394 ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [
9495 "threadapi=win32"
95− ]);
96+ ] ++ extraB2Args
97+ );
9698
9799in
98100
pkgs/development/libraries/libgcrypt/default.nix+2−1
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
2727 ++ stdenv.lib.optional stdenv.isDarwin gettext
2828 ++ stdenv.lib.optional enableCapabilities libcap;
2929
30− configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
30+ configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
31+ ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
3132
3233 # Make sure libraries are correct for .pc and .la files
3334 # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
pkgs/development/libraries/libusb1/default.nix+2−7
@@ -28,13 +28,8 @@ stdenv.mkDerivation (rec {
2828
2929 NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
3030
31− configureFlags =
32− # We use `isLinux` here only to avoid mass rebuilds for Darwin, where
33− # disabling udev happens automatically. Remove `isLinux` at next big change!
34− stdenv.lib.optional (stdenv.isLinux && !enableSystemd) "--disable-udev";
35−
36− preFixup = stdenv.lib.optionalString enableSystemd ''
37− sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
31+ preFixup = stdenv.lib.optionalString stdenv.isLinux ''
32+ sed 's,-ludev,-L${stdenv.lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
3833 '';
3934
4035 meta = with stdenv.lib; {
pkgs/development/libraries/live555/default.nix+2−2
@@ -3,14 +3,14 @@
33# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
44stdenv.mkDerivation rec {
55 pname = "live555";
6− version = "2019.10.20";
6+ version = "2019.11.22";
77
88 src = fetchurl { # the upstream doesn't provide a stable URL
99 urls = [
1010 "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
1111 "https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
1212 ];
13− sha256 = "085csq31s4kak0sym5y170f82wp542bg1ff3kycanvs8w4d4n9j4";
13+ sha256 = "144y2wsfpaclkj7srx85f3y3parzn7vbjmzc2afc62wdsb9gn46d";
1414 };
1515
1616 postPatch = ''
pkgs/development/libraries/poppler/default.nix+2−2
@@ -12,11 +12,11 @@ let
1212in
1313stdenv.mkDerivation rec {
1414 name = "poppler-${suffix}-${version}";
15− version = "0.81.0"; # beware: updates often break cups-filters build
15+ version = "0.83.0"; # beware: updates often break cups-filters build
1616
1717 src = fetchurl {
1818 url = "${meta.homepage}/poppler-${version}.tar.xz";
19− sha256 = "00pykc7nym3xg0wc60awv0i35zwdfyn0igb6jrnb6rsv0c5h4b91";
19+ sha256 = "16vr1g5qsqwyxfnyikqw37i04x9zpp45far2x90c7qbijw6nap38";
2020 };
2121
2222 outputs = [ "out" "dev" ];
pkgs/development/libraries/tepl/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchurl
22, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
33let
4− version = "4.2.0";
4+ version = "4.2.1";
55 pname = "tepl";
66in stdenv.mkDerivation {
77 name = "${pname}-${version}";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1kcwcr72dv3xwi2ni579c9raa0cnbazfnmy6mgapzn6dir1d8fc8";
11+ sha256 = "0vib1ljgqwy2fhiwq8z3pcd68qy7v72l4f35p1d1w1k9z8sy677k";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/development/ocaml-modules/alcotest/default.nix+5−3
@@ -6,14 +6,15 @@ let param =
66 if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
77 version = "0.8.5";
88 sha256 = "1mhckvdcxkikbzgvy24kjz4265l15b86a6swz7m3ynbgvqdcfzqn";
9− buildInputs = [ dune ];
9+ nativeBuildInputs = [ dune ];
1010 propagatedBuildInputs = [ uuidm ];
1111 buildPhase = "dune build -p alcotest";
1212 inherit (dune) installPhase;
1313 } else {
1414 version = "0.7.2";
1515 sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";
16− buildInputs = [ ocamlbuild topkg ];
16+ buildInputs = [ topkg ];
17+ nativeBuildInputs = [ ocamlbuild ];
1718 inherit (topkg) buildPhase installPhase;
1819 };
1920in
@@ -27,7 +28,8 @@ stdenv.mkDerivation rec {
2728 inherit (param) sha256;
2829 };
2930
30− buildInputs = [ ocaml findlib ] ++ param.buildInputs;
31+ nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []);
32+ buildInputs = [ findlib ] ++ (param.buildInputs or []);
3133
3234 propagatedBuildInputs = [ cmdliner astring fmt result ]
3335 ++ (param.propagatedBuildInputs or []);
pkgs/development/ocaml-modules/asn1-combinators/default.nix+2−1
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
2525 inherit (param) sha256;
2626 };
2727
28− buildInputs = [ ocaml findlib ocamlbuild ounit topkg ];
28+ buildInputs = [ findlib ounit topkg ];
29+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
2930 propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs;
3031
3132 buildPhase = "${topkg.run} build --tests true";
pkgs/development/ocaml-modules/bos/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
1010 sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
1111 };
1212
13− buildInputs = [ ocaml findlib ocamlbuild topkg ];
13+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
14+ buildInputs = [ findlib topkg ];
1415 propagatedBuildInputs = [ astring fmt fpath logs rresult ];
1516
1617 inherit (topkg) buildPhase installPhase;
pkgs/development/ocaml-modules/cmdliner/default.nix+2−2
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
2525 inherit (param) sha256;
2626 };
2727
28− nativeBuildInputs = [ ocamlbuild topkg ];
29− buildInputs = [ ocaml findlib ];
28+ nativeBuildInputs = [ ocaml ocamlbuild findlib ];
29+ buildInputs = [ topkg ];
3030 propagatedBuildInputs = [ result ];
3131
3232 inherit (topkg) buildPhase installPhase;
pkgs/development/ocaml-modules/cpuid/default.nix+10−12
@@ -1,22 +1,20 @@
1−{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr }:
1+{ lib, fetchurl, buildDunePackage }:
22
3−stdenv.mkDerivation {
4− name = "ocaml${ocaml.version}-cpuid-0.1.0";
3+buildDunePackage rec {
4+ pname = "cpuid";
5+ version = "0.1.2";
6+
7+ minimumOCamlVersion = "4.03";
58
69 src = fetchurl {
7− url = https://github.com/pqwy/cpuid/releases/download/v0.1.0/cpuid-0.1.0.tbz;
8− sha256 = "08k2558a3dnxn8msgpz8c93sfn0y027ganfdi2yvql0fp1ixv97p";
10+ url = "https://github.com/pqwy/cpuid/releases/download/v${version}/cpuid-v${version}.tbz";
11+ sha256 = "08ng4mva6qblb5ipkrxbr0my7ndkc4qwcbswkqgbgir864s74m93";
912 };
1013
11− buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ];
12−
13− inherit (topkg) buildPhase installPhase;
14−
1514 meta = {
1615 homepage = https://github.com/pqwy/cpuid;
1716 description = "Detect CPU features from OCaml";
18− license = stdenv.lib.licenses.isc;
19− maintainers = [ stdenv.lib.maintainers.vbgl ];
20− inherit (ocaml.meta) platforms;
17+ license = lib.licenses.isc;
18+ maintainers = [ lib.maintainers.vbgl ];
2119 };
2220}
pkgs/development/ocaml-modules/fmt/default.nix+2−1
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
88 sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060";
99 };
1010
11− buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
11+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
12+ buildInputs = [ findlib topkg cmdliner ];
1213 propagatedBuildInputs = [ result uchar ];
1314
1415 inherit (topkg) buildPhase installPhase;
pkgs/development/ocaml-modules/jsonm/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
1010 sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w";
1111 };
1212
13− buildInputs = [ ocaml findlib ocamlbuild topkg ];
13+ buildInputs = [ findlib topkg ];
14+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
1415 propagatedBuildInputs = [ uutf ];
1516
1617 inherit (topkg) buildPhase installPhase;
pkgs/development/ocaml-modules/logs/default.nix+2−1
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
1818 sha256 = "1lkhr7i44xw4kpfbhgj3rbqy3dv5bfm4kyrbl8a9rfafddcxlwss";
1919 };
2020
21− buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ];
21+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
22+ buildInputs = [ findlib topkg fmt cmdliner lwt ];
2223 propagatedBuildInputs = [ result ];
2324
2425 buildPhase = "${topkg.run} build --with-js_of_ocaml false";
pkgs/development/ocaml-modules/magic-mime/default.nix+3−1
@@ -11,7 +11,9 @@ stdenv.mkDerivation {
1111 sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v";
1212 };
1313
14− buildInputs = [ ocaml findlib ocamlbuild ];
14+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
15+ buildInputs = [ findlib ];
16+ configurePlatforms = [];
1517
1618 createFindlibDestdir = true;
1719
pkgs/development/ocaml-modules/mtime/default.nix+2−1
@@ -23,7 +23,8 @@ stdenv.mkDerivation {
2323 inherit (param) sha256;
2424 };
2525
26− buildInputs = [ ocaml findlib ocamlbuild topkg ]
26+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
27+ buildInputs = [ findlib topkg ]
2728 ++ stdenv.lib.optional jsooSupport js_of_ocaml;
2829
2930 buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}";
pkgs/development/ocaml-modules/nocrypto/default.nix+13−4
@@ -1,11 +1,19 @@
11{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
22, cpuid, ocb-stubblr, sexplib
3−, cstruct, zarith, ppx_sexp_conv, ppx_deriving
3+, cstruct, zarith, ppx_sexp_conv, ppx_deriving, writeScriptBin
44, cstruct-lwt ? null
55}:
66
77with stdenv.lib;
8−let withLwt = cstruct-lwt != null; in
8+let
9+ withLwt = cstruct-lwt != null;
10+ # the build system will call 'cc' with no way to override
11+ # this is wrong when we're cross-compiling, so insert a wrapper
12+ cc-wrapper = writeScriptBin "cc" ''
13+ set -e
14+ $CC "$@"
15+ '';
16+in
917
1018stdenv.mkDerivation rec {
1119 name = "ocaml${ocaml.version}-nocrypto-${version}";
@@ -43,8 +51,9 @@ stdenv.mkDerivation rec {
4351 })
4452 ];
4553
46− buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ];
47− propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt;
54+ nativeBuildInputs = [ ocaml findlib ocamlbuild cc-wrapper ];
55+ buildInputs = [ ocamlbuild findlib topkg cpuid ocb-stubblr ppx_deriving ];
56+ propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt;
4857
4958 buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}";
5059 inherit (topkg) installPhase;
pkgs/development/ocaml-modules/num/default.nix+5−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib }:
1+{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }:
22
33stdenv.mkDerivation rec {
44 version = "1.1";
@@ -14,12 +14,14 @@ stdenv.mkDerivation rec {
1414 url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
1515 sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
1616 })
17− ];
17+ ] ++ lib.optional withStatic ./enable-static.patch;
1818
19− buildInputs = [ ocaml findlib ];
19+ nativeBuildInputs = [ ocaml findlib ];
20+ buildInputs = [ ocaml findlib ];
2021
2122 createFindlibDestdir = true;
2223
24+
2325 meta = {
2426 description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
2527 license = stdenv.lib.licenses.lgpl21;
pkgs/development/ocaml-modules/num/enable-static.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -u a/src/Makefile b/src/Makefile
2+--- a/src/Makefile
3++++ b/src/Makefile
4+@@ -45,7 +45,7 @@
5+ endif
6+
7+ libnums.$(A): $(COBJS)
8+- $(OCAMLMKLIB) -oc nums $(COBJS)
9++ $(OCAMLMKLIB) -custom -oc nums $(COBJS)
10+
11+ nums.cma: $(CMOS)
12+ $(OCAMLMKLIB) -o nums -oc nums -linkall $(CMOS)
pkgs/development/ocaml-modules/ocamlgraph/default.nix+3−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, ocaml, findlib, lablgtk}:
1+{stdenv, fetchurl, ocaml, findlib, lablgtk ? null}:
22
33stdenv.mkDerivation rec {
44 pname = "ocamlgraph";
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
1616 postPatch = ''
1717 sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
1818 sed -i 's@OCAMLFINDDEST := -destdir $(DESTDIR)@@' Makefile.in
19− sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
19+ ${stdenv.lib.optionalString (lablgtk != null)
20+ "sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile"}
2021 '';
2122
2223 createFindlibDestdir = true;
pkgs/development/ocaml-modules/opam-file-format/default.nix+2
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515
1616 installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
1717
18+ patches = [ ./optional-static.patch ];
19+
1820 meta = {
1921 description = "Parser and printer for the opam file syntax";
2022 license = stdenv.lib.licenses.lgpl21;
pkgs/development/ocaml-modules/opam-file-format/optional-static.patchnew file+13
@@ -0,0 +1,13 @@
1+diff -u a/Makefile b/Makefile
2+--- a/Makefile
3++++ b/Makefile
4+@@ -1,1 +1,5 @@
5+-TARGETS = opam-file-format.cma opam-file-format.cmxa opam-file-format.cmxs
6++TARGETS = opam-file-format.cma opam-file-format.cmxa
7++
8++ifeq "$(NATDYNLINK)" "true"
9++TARGETS = $(TARGETS) opam-file-format.cmxs
10++endif
11+
12+all: $(TARGETS)
13+
pkgs/development/ocaml-modules/ounit/default.nix+3−1
@@ -14,7 +14,9 @@ stdenv.mkDerivation {
1414 sha256 = "0hbd2sqdz75lv5ax82yhsfdk1dlcvq12xpys6n85ysmrl0c3d3lk";
1515 });
1616
17− buildInputs = [ ocaml findlib ocamlbuild ];
17+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
18+ buildInputs = [ findlib ];
19+ configurePlatforms = [];
1820
1921 dontAddPrefix = true;
2022
pkgs/development/ocaml-modules/ppx_tools/default.nix+1
@@ -37,6 +37,7 @@ in
3737 inherit (param) sha256;
3838 };
3939
40+ nativeBuildInputs = [ ocaml findlib ];
4041 buildInputs = [ ocaml findlib ];
4142
4243 createFindlibDestdir = true;
pkgs/development/ocaml-modules/ptime/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27";
1010 };
1111
12− buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ];
12+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
13+ buildInputs = [ findlib topkg js_of_ocaml ];
1314
1415 propagatedBuildInputs = [ result ];
1516
pkgs/development/ocaml-modules/tls/default.nix+2−1
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
2121 sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g";
2222 };
2323
24− buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_cstruct ]
24+ nativeBuildInputs = [ ocaml ocamlbuild findlib ];
25+ buildInputs = [ findlib topkg ppx_sexp_conv ppx_cstruct ]
2526 ++ optionals doCheck [ ounit cstruct-unix ];
2627 propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++
2728 optional withLwt lwt;
pkgs/development/ocaml-modules/topkg/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 sha256 = "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw";
3030 };
3131
32− buildInputs = [ ocaml findlib ocamlbuild ];
32+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
3333 propagatedBuildInputs = [ result ];
3434
3535 buildPhase = "${run} build";
pkgs/development/ocaml-modules/uchar/default.nix+5−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
1+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline, withShared ? true }:
22
33stdenv.mkDerivation {
44 name = "ocaml${ocaml.version}-uchar-0.0.2";
@@ -8,9 +8,11 @@ stdenv.mkDerivation {
88 sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7";
99 };
1010
11− buildInputs = [ ocaml ocamlbuild findlib opaline ];
12− buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
11+ nativeBuildInputs = [ ocaml ocamlbuild findlib opaline ];
12+ buildInputs = [ findlib ocaml ocamlbuild opaline ];
13+ buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${if withShared then "true" else "false"}";
1314 installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";
15+ configurePlatforms = [];
1416
1517 meta = {
1618 description = "Compatibility library for OCaml’s Uchar module";
pkgs/development/ocaml-modules/uuidm/default.nix+3−1
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
88 sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8";
99 };
1010
11− buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
11+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
12+ configurePlatforms = [];
13+ buildInputs = [ topkg cmdliner ];
1214
1315 inherit (topkg) buildPhase installPhase;
1416
pkgs/development/ocaml-modules/uutf/default.nix+2−1
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
1313 sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6";
1414 };
1515
16− buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
16+ nativeBuildInputs = [ ocaml ocamlbuild findlib ];
17+ buildInputs = [ findlib topkg cmdliner ];
1718 propagatedBuildInputs = [ uchar ];
1819
1920 inherit (topkg) buildPhase installPhase;
pkgs/development/ocaml-modules/yojson/default.nix+5−4
@@ -6,7 +6,7 @@ let
66 version = "1.7.0";
77 url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
88 sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd";
9− buildInputs = [ dune ];
9+ nativeBuildInputs = [ dune ];
1010 extra = { inherit (dune) installPhase; };
1111 } else rec {
1212 version = "1.2.3";
@@ -29,9 +29,10 @@ stdenv.mkDerivation ({
2929 inherit (param) url sha256;
3030 };
3131
32− buildInputs = [ ocaml findlib ] ++ (param.buildInputs or []);
33−
34− propagatedBuildInputs = [ cppo easy-format biniou ];
32+ nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []);
33+ propagatedNativeBuildInputs = [ cppo ];
34+ propagatedBuildInputs = [ easy-format biniou ];
35+ configurePlatforms = [];
3536
3637 meta = with stdenv.lib; {
3738 description = "An optimized parsing and printing library for the JSON format";
pkgs/development/ocaml-modules/zarith/default.nix+5−6
@@ -6,9 +6,9 @@
66let source =
77 if stdenv.lib.versionAtLeast ocaml.version "4.02"
88 then {
9− version = "1.9.1";
10− url = https://github.com/ocaml/Zarith/archive/release-1.9.1.tar.gz;
11− sha256 = "0pfa271476dic5pvn6kxz3dfswxs6kqm2cxmhdx5xq2ayca05gj9";
9+ version = "1.9";
10+ url = https://github.com/ocaml/Zarith/archive/release-1.9.tar.gz;
11+ sha256 = "1xrqcaj5gp52xp4ybpnblw8ciwlgrr0zi7rg7hnk8x83isjkpmwx";
1212 } else {
1313 version = "1.3";
1414 url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz;
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
2626 propagatedBuildInputs = [ gmp ];
2727
2828 patchPhase = "patchShebangs ./z_pp.pl";
29− configurePhase = ''
30− ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib
31− '';
29+ dontAddPrefix = true;
30+ configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ];
3231
3332 preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
3433
pkgs/development/python-modules/azure-loganalytics/default.nix+7−1
@@ -1,6 +1,8 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, python
5+, isPy3k
46, msrest
57, azure-common
68}:
@@ -20,6 +22,10 @@ buildPythonPackage rec {
2022 azure-common
2123 ];
2224
25+ postInstall = lib.optionalString isPy3k ''
26+ rm -rf $out/${python.sitePackages}/azure/__init__.py
27+ '';
28+
2329 # has no tests
2430 doCheck = false;
2531
@@ -27,6 +33,6 @@ buildPythonPackage rec {
2733 description = "This is the Microsoft Azure Log Analytics Client Library";
2834 homepage = "https://github.com/Azure/azure-sdk-for-python";
2935 license = licenses.mit;
30− maintainers = with maintainers; [ mwilsoninsight ];
36+ maintainers = with maintainers; [ mwilsoninsight jonringer ];
3137 };
3238}
pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix+2−2
@@ -5,13 +5,13 @@
55}:
66
77buildPythonPackage rec {
8− version = "0.1.0";
8+ version = "0.3.0";
99 pname = "azure-mgmt-appconfiguration";
1010 disabled = isPy27;
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "0z2f0rbv7drdxihny479bv80bnhgvx8gb2pr0jvbaslll6d6rxig";
14+ sha256 = "1igl3ikdwcz7d2zcja5nm2qjysjh53vgwzcc96lylypmq6z4aq1s";
1515 extension = "zip";
1616 };
1717
pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−2
@@ -7,13 +7,13 @@
77}:
88
99buildPythonPackage rec {
10− version = "9.0.0";
10+ version = "10.0.0";
1111 pname = "azure-mgmt-compute";
1212
1313 src = fetchPypi {
1414 inherit pname version;
1515 extension = "zip";
16− sha256 = "06795ccb7377eaa3864819a1c63b9bfe9957a58814c65025aef89e9cd81190fc";
16+ sha256 = "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg";
1717 };
1818
1919 postInstall = if isPy3k then "" else ''
pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix+2−2
@@ -5,13 +5,13 @@
55}:
66
77buildPythonPackage rec {
8− version = "0.2.1";
8+ version = "0.3.0";
99 pname = "azure-mgmt-imagebuilder";
1010 disabled = isPy27;
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky";
14+ sha256 = "0r4sxr3pbcci5qif1ip1lrix3cryj0b3asqch3zds4q705jiakc4";
1515 extension = "zip";
1616 };
1717
pkgs/development/python-modules/azure-mgmt-kusto/default.nix+2−2
@@ -5,13 +5,13 @@
55}:
66
77buildPythonPackage rec {
8− version = "0.4.0";
8+ version = "0.5.0";
99 pname = "azure-mgmt-kusto";
1010 disabled = isPy27;
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "1sx8f98206wccj0mbmb75c4wyhf57g3pnkhl9wn70lqzi9n4mk0b";
14+ sha256 = "0r6j3yp7ys0zgszqdjm6y90nigsapni4xhfpfgyk5c5qbgdpl93w";
1515 extension = "zip";
1616 };
1717
pkgs/development/python-modules/azure-mgmt-monitor/default.nix+2−2
@@ -28,8 +28,8 @@ buildPythonPackage rec {
2828 ];
2929
3030 postInstall = lib.optionalString isPy3k ''
31− rm $out/${python.sitePackages}/azure/__init__.py
32− rm $out/${python.sitePackages}/azure/mgmt/__init__.py
31+ rm -rf $out/${python.sitePackages}/azure/__init__.py
32+ rm -rf $out/${python.sitePackages}/azure/mgmt/__init__.py
3333 '';
3434
3535 # has no tests
pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix+2−2
@@ -5,13 +5,13 @@
55}:
66
77buildPythonPackage rec {
8− version = "0.4.0";
8+ version = "0.5.0";
99 pname = "azure-mgmt-sqlvirtualmachine";
1010 disabled = isPy27;
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "1jxmikjvyxkwr8c9kn6xw8gvj9pajlk7y8111rq8fgkivwjq8wcm";
14+ sha256 = "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm";
1515 extension = "zip";
1616 };
1717
pkgs/development/python-modules/curio/default.nix+2
@@ -19,6 +19,8 @@ buildPythonPackage rec {
1919
2020 checkInputs = [ pytest sphinx ];
2121
22+ __darwinAllowLocalNetworking = true;
23+
2224 # test_aside_basic times out,
2325 # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest
2426 checkPhase = ''
pkgs/development/python-modules/deprecated/default.nix−5
@@ -10,11 +10,6 @@ buildPythonPackage rec {
1010 sha256 = "408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308";
1111 };
1212
13− postPatch = ''
14− # odd broken tests, don't appear in GitHub repo
15− rm tests/demo_classic_usage*.py
16− '';
17−
1813 propagatedBuildInputs = [ wrapt ];
1914 checkInputs = [ pytest ];
2015 meta = with stdenv.lib; {
pkgs/development/python-modules/dotnetcore2/default.nix+1−1
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515 inherit pname version format;
1616 python = "py3";
1717 platform = "manylinux1_x86_64";
18− sha256 = "a335fb0abdaaeee7ba128b81b5350adfc5d2b2adf6a64cbc4d1a3b7cdf8560da";
18+ sha256 = "0qhp94bjz4icz2f0fnhgck875chiqzy4lvsp6lwhj5jd0zsv2bb3";
1919 };
2020
2121 nativeBuildInputs = [ unzip ];
pkgs/development/python-modules/fido2/default.nix+12−7
@@ -1,15 +1,19 @@
1−{ lib, buildPythonPackage, fetchPypi
2−, six, cryptography
3−, mock, pyfakefs
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, six
5+, cryptography
6+, mock
7+, pyfakefs
48}:
59
610buildPythonPackage rec {
711 pname = "fido2";
8− version = "0.7.3";
12+ version = "0.8.1";
913
1014 src = fetchPypi {
1115 inherit pname version;
12− sha256 = "8b592ec0e51348f29636706fe3266423a0e41c35c9df63a259a91488450c1285";
16+ sha256 = "1hzprnd407g2xh9kyv8j8pq949hwr1snmg3fp65pqfbghzv6i424";
1317 };
1418
1519 propagatedBuildInputs = [ six cryptography ];
@@ -18,7 +22,8 @@ buildPythonPackage rec {
1822
1923 meta = with lib; {
2024 description = "Provides library functionality for FIDO 2.0, including communication with a device over USB.";
21− homepage = https://github.com/Yubico/python-fido2;
22− license = licenses.mpl20;
25+ homepage = "https://github.com/Yubico/python-fido2";
26+ license = licenses.bsd2;
27+ maintainers = with maintainers; [ prusnak ];
2328 };
2429}
pkgs/development/python-modules/gpapi/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, buildPythonPackage, fetchPypi, requests, protobuf, pycryptodome }:
22
33buildPythonPackage rec {
4− version = "0.4.3";
4+ version = "0.4.4";
55 pname = "gpapi";
66
77 src = fetchPypi {
88 inherit version pname;
9− sha256 = "9fd1351eb29c4da92d3a0ed2cd4e3c1634ea16afddbca133f6acc54766d61b02";
9+ sha256 = "0ampvsv97r3hy1cakif4kmyk1ynf3scbvh4fbk02x7xrxn4kl38w";
1010 };
1111
1212 propagatedBuildInputs = [ requests protobuf pycryptodome ];
pkgs/development/python-modules/nose-exclude/default.nix+6−2
@@ -1,4 +1,5 @@
1−{ lib
1+{ stdenv
2+, lib
23, buildPythonPackage
34, fetchPypi
45, nose
@@ -15,10 +16,13 @@ buildPythonPackage rec {
1516
1617 propagatedBuildInputs = [ nose ];
1718
19+ # "OSError: AF_UNIX path too long" for darwin
20+ doCheck = !stdenv.isDarwin;
21+
1822 meta = {
1923 license = lib.licenses.lgpl21;
2024 description = "Exclude specific directories from nosetests runs";
2125 homepage = https://github.com/kgrandis/nose-exclude;
2226 maintainers = with lib.maintainers; [ fridh ];
2327 };
24−}
28+}
pkgs/development/python-modules/pyfxa/default.nix+6−2
@@ -1,6 +1,6 @@
11{ lib, buildPythonPackage, fetchPypi
22, requests, cryptography, pybrowserid, hawkauthlib, six
3−, grequests, mock, responses, unittest2 }:
3+, grequests, mock, responses, pytest }:
44
55buildPythonPackage rec {
66 pname = "PyFxA";
@@ -21,9 +21,13 @@ buildPythonPackage rec {
2121 ];
2222
2323 checkInputs = [
24− grequests mock responses unittest2
24+ grequests mock responses pytest
2525 ];
2626
27+ checkPhase = ''
28+ pytest
29+ '';
30+
2731 meta = with lib; {
2832 description = "Firefox Accounts client library for Python";
2933 homepage = https://github.com/mozilla/PyFxA;
pkgs/development/python-modules/spectral-cube/default.nix+9−8
@@ -1,5 +1,5 @@
11{ lib
2−, fetchPypi
2+, fetchFromGitHub
33, buildPythonPackage
44, astropy
55, radio_beam
@@ -10,11 +10,14 @@
1010
1111buildPythonPackage rec {
1212 pname = "spectral-cube";
13− version = "0.4.4";
14−
15− src = fetchPypi {
16− inherit pname version;
17− sha256 = "9051ede204b1e25b6358b5e0e573b624ec0e208c24eb03a7ed4925b745c93b5e";
13+ version = "0.4.5";
14+
15+ # Fetch from GitHub instead of PyPi, as 0.4.5 isn't available in PyPi
16+ src = fetchFromGitHub {
17+ owner = "radio-astro-tools";
18+ repo = pname;
19+ rev = "v${version}";
20+ sha256 = "1xc1m6vpl0bm600fx9vypa7zcvwg7yvhgn0w89y6v9d1vl0qcs7z";
1821 };
1922
2023 propagatedBuildInputs = [ astropy radio_beam ];
@@ -40,8 +43,6 @@ buildPythonPackage rec {
4043 license = lib.licenses.bsd3;
4144 platforms = lib.platforms.all;
4245 maintainers = with lib.maintainers; [ smaret ];
43− broken = true;
4446 };
4547}
4648
47−
pkgs/development/tools/analysis/flow/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "flow";
5− version = "0.112.0";
5+ version = "0.113.0";
66
77 src = fetchFromGitHub {
88 owner = "facebook";
99 repo = "flow";
1010 rev = "refs/tags/v${version}";
11− sha256 = "1l8aahvlj9hk93snvrqm7r0mxj5iw244q72s6wallsqm7j4g967h";
11+ sha256 = "1z7zy2ma1rmx2jjrsrnlrv2j5ff4zlzzlqvlmv7fc7dds3wlz6ia";
1212 };
1313
1414 installPhase = ''
pkgs/development/tools/lazygit/default.nix+3−3
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 pname = "lazygit";
5− version = "0.8";
5+ version = "0.11.3";
66
77 goPackagePath = "github.com/jesseduffield/lazygit";
88
@@ -12,13 +12,13 @@ buildGoPackage rec {
1212 owner = "jesseduffield";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "0zynw5gr96a59x1qshzhhvld883ndf1plnw6l9dbhmff0wcfv6l1";
15+ sha256 = "0v765f93hkq94bmzfwkkb9ndbfka415sxyi01679fg860746rl6l";
1616 };
1717
1818 meta = with stdenv.lib; {
1919 description = "Simple terminal UI for git commands";
2020 homepage = "https://github.com/jesseduffield/lazygit";
2121 license = licenses.mit;
22− maintainers = with maintainers; [ fpletz ];
22+ maintainers = with maintainers; [ fpletz equirosa ];
2323 };
2424}
pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix+4−3
@@ -3,11 +3,12 @@
33}:
44
55stdenv.mkDerivation {
6− pname = "js_of_ocaml";
6+ pname = "js_of_ocaml";
77
8− inherit (js_of_ocaml-compiler) version src installPhase meta;
8+ inherit (js_of_ocaml-compiler) version src installPhase meta;
99
10− buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned ];
10+ buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
11+ nativeBuildInputs = [ ocaml findlib dune ];
1112
1213 postPatch = "patchShebangs lib/generate_stubs.sh";
1314
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix+4−2
@@ -1,5 +1,5 @@
11{ lib, fetchFromGitHub, buildDunePackage
2−, cmdliner, cppo, yojson
2+, ocaml, findlib, cmdliner, dune, cppo, yojson
33}:
44
55buildDunePackage rec {
@@ -13,8 +13,10 @@ buildDunePackage rec {
1313 sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj";
1414 };
1515
16− buildInputs = [ cmdliner cppo ];
16+ nativeBuildInputs = [ ocaml findlib dune cppo ];
17+ buildInputs = [ cmdliner ];
1718
19+ configurePlatforms = [];
1820 propagatedBuildInputs = [ yojson ];
1921
2022 meta = {
pkgs/development/tools/rubocop/Gemfile.lock+3−3
@@ -2,12 +2,12 @@ GEM
22 remote: https://rubygems.org/
33 specs:
44 ast (2.4.0)
5− jaro_winkler (1.5.3)
6− parallel (1.18.0)
5+ jaro_winkler (1.5.4)
6+ parallel (1.19.1)
77 parser (2.6.5.0)
88 ast (~> 2.4.0)
99 rainbow (3.0.0)
10− rubocop (0.76.0)
10+ rubocop (0.77.0)
1111 jaro_winkler (~> 1.5.1)
1212 parallel (~> 1.10)
1313 parser (>= 2.6)
pkgs/development/tools/rubocop/gemset.nix+6−6
@@ -14,20 +14,20 @@
1414 platforms = [];
1515 source = {
1616 remotes = ["https://rubygems.org"];
17− sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
17+ sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
1818 type = "gem";
1919 };
20− version = "1.5.3";
20+ version = "1.5.4";
2121 };
2222 parallel = {
2323 groups = ["default"];
2424 platforms = [];
2525 source = {
2626 remotes = ["https://rubygems.org"];
27− sha256 = "091p5zrzzyg3fg48jhdz9lzjf2r9r3akra2cd46yd4nza3xgxshz";
27+ sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
2828 type = "gem";
2929 };
30− version = "1.18.0";
30+ version = "1.19.1";
3131 };
3232 parser = {
3333 dependencies = ["ast"];
@@ -56,10 +56,10 @@
5656 platforms = [];
5757 source = {
5858 remotes = ["https://rubygems.org"];
59− sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0";
59+ sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9";
6060 type = "gem";
6161 };
62− version = "0.76.0";
62+ version = "0.77.0";
6363 };
6464 ruby-progressbar = {
6565 groups = ["default"];
pkgs/os-specific/linux/cpupower/default.nix+5−1
@@ -14,7 +14,11 @@ stdenv.mkDerivation {
1414 sed -i 's,/usr/bin/install,${buildPackages.coreutils}/bin/install,' Makefile
1515 '';
1616
17− makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ];
17+ makeFlags = [
18+ "CROSS=${stdenv.cc.targetPrefix}"
19+ "CC=${stdenv.cc.targetPrefix}cc"
20+ "LD=${stdenv.cc.targetPrefix}cc"
21+ ];
1822
1923 installFlags = stdenv.lib.mapAttrsToList
2024 (n: v: "${n}dir=${placeholder "out"}/${v}") {
pkgs/os-specific/linux/kernel-headers/default.nix+1−1
@@ -58,7 +58,7 @@ let
5858 + '' mkdir -p $out/include/config
5959 echo "${version}-default" > $out/include/config/kernel.release
6060 ''
61− # These oddly named file records teh `SHELL` passed, which causes bootstrap
61+ # These oddly named file records the `SHELL` passed, which causes bootstrap
6262 # tools run-time dependency.
6363 + ''
6464 find "$out" -name '..install.cmd' -print0 | xargs -0 rm
pkgs/os-specific/linux/kmod/default.nix+5−3
@@ -1,5 +1,6 @@
11{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
2−, libxslt, xz, elf-header }:
2+, libxslt, xz, elf-header
3+, withStatic ? false }:
34
45let
56 systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ];
@@ -21,10 +22,11 @@ in stdenv.mkDerivation rec {
2122 "--sysconfdir=/etc"
2223 "--with-xz"
2324 "--with-modulesdirs=${modulesDirs}"
24− ];
25+ ] ++ lib.optional withStatic "--enable-static";
2526
2627 patches = [ ./module-dir.patch ]
27− ++ lib.optional stdenv.isDarwin ./darwin.patch;
28+ ++ lib.optional stdenv.isDarwin ./darwin.patch
29+ ++ lib.optional withStatic ./enable-static.patch;
2830
2931 postInstall = ''
3032 for prog in rmmod insmod lsmod modinfo modprobe depmod; do
pkgs/os-specific/linux/kmod/enable-static.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/configure.ac b/configure.ac
2+index ee72283..b42c42a 100644
3+--- a/configure.ac
4++++ b/configure.ac
5+@@ -19,7 +19,6 @@ AM_SILENT_RULES([yes])
6+ LT_INIT([disable-static pic-only])
7+ DOLT
8+
9+-AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])])
10+ AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by kmod])])
11+
12+ #####################################################################
pkgs/servers/amqp/qpid-cpp/default.nix+2−2
@@ -2,11 +2,11 @@
22
33let
44 name = "qpid-cpp-${version}";
5− version = "1.37.0";
5+ version = "1.38.0";
66
77 src = fetchurl {
88 url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
9− sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb";
9+ sha256 = "1q7nsl9g8xv81ymhpkdp9mlw3gkzba62gggp3b72f0ywpc3kc3cz";
1010 };
1111
1212 meta = with stdenv.lib; {
pkgs/servers/caddy/default.nix+5−5
@@ -2,7 +2,7 @@
22
33buildGoModule rec {
44 pname = "caddy";
5− version = "1.0.3";
5+ version = "1.0.4";
66
77 goPackagePath = "github.com/caddyserver/caddy";
88
@@ -12,9 +12,9 @@ buildGoModule rec {
1212 owner = "caddyserver";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "1n7i9w4vva5x5wry7gzkyfylk39x40ykv7ypf1ca3zbbk7w5x6mw";
15+ sha256 = "0mqbaa9cshrqm5fggm5l5nzcnv8c9dvylcc4z7qj3322vl5cpfdc";
1616 };
17− modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q";
17+ modSha256 = "0f08smcnzmrj3v43v0qgyd11qwdbymbl86c9prais6sykgh1ld97";
1818
1919 preBuild = ''
2020 cat << EOF > caddy/main.go
@@ -28,9 +28,9 @@ buildGoModule rec {
2828 '';
2929
3030 meta = with stdenv.lib; {
31− homepage = https://caddyserver.com;
31+ homepage = "https://caddyserver.com";
3232 description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
3333 license = licenses.asl20;
34− maintainers = with maintainers; [ rushmorem fpletz zimbatm ];
34+ maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ];
3535 };
3636}
pkgs/servers/caddy/v2.nixnew file+25
@@ -0,0 +1,25 @@
1+{ stdenv, callPackage, buildGoModule, fetchFromGitHub }:
2+
3+buildGoModule rec {
4+ pname = "caddy";
5+ version = "2.0.0-beta10";
6+
7+ goPackagePath = "github.com/caddyserver/caddy";
8+
9+ subPackages = [ "cmd/caddy" ];
10+
11+ src = fetchFromGitHub {
12+ owner = "caddyserver";
13+ repo = pname;
14+ rev = "v${version}";
15+ sha256 = "1vagcw6ibri4nbx1n60xp7rffcfr64a2202hjaijyjzc8wcl80na";
16+ };
17+ modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn";
18+
19+ meta = with stdenv.lib; {
20+ homepage = "https://caddyserver.com";
21+ description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
22+ license = licenses.asl20;
23+ maintainers = with maintainers; [ filalex77 ];
24+ };
25+}
pkgs/servers/monitoring/zabbix/versions.nix+4−9
@@ -1,17 +1,12 @@
11generic: {
22 v44 = generic {
3− version = "4.4.1";
4− sha256 = "0jjn2przn9s25slrcxmq8iqdgqkgxnqs45zy0n1ma6nlgmclxxqb";
5− };
6−
7− v42 = generic {
8− version = "4.2.7";
9− sha256 = "09znh8x1sass5mw6wjrfmizjbfls8ad2c16y24ldfj40hlfxz6wx";
3+ version = "4.4.3";
4+ sha256 = "1rpkgimi9kv9zrcis1zwbrny7yzralick206n71i8071hf95jvwx";
105 };
116
127 v40 = generic {
13− version = "4.0.14";
14− sha256 = "0igdxxfc61rqx6r7r81jsmv2d7nxw4whai211gk3y88dfm7l4xkb";
8+ version = "4.0.15";
9+ sha256 = "19q8h79h7lnsq6gbd0awrlw59scg92x0a1375kd2av6bjpx8r0y9";
1510 };
1611
1712 v30 = generic {
pkgs/servers/tautulli/default.nix+2−2
@@ -1,7 +1,7 @@
11{stdenv, fetchFromGitHub, python }:
22
33stdenv.mkDerivation rec {
4− version = "2.1.37";
4+ version = "2.1.38";
55 pname = "Tautulli";
66
77 pythonPath = [ python.pkgs.setuptools ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 owner = "Tautulli";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "0imq81njw6hsd0m091hmbaaq0znfan6lmnbg6m7g2vfgwvqh9fbq";
15+ sha256 = "00kxz4i97lk3cb11vcpj894xdi7q9f1jcy29yglya8rcvsqmddwd";
1616 };
1717
1818 buildPhase = ":";
pkgs/shells/bash/bash-completion/default.nix+10
@@ -1,4 +1,5 @@
11{ stdenv, fetchFromGitHub
2+, fetchpatch
23, autoreconfHook
34, python3Packages
45, bashInteractive
@@ -6,6 +7,7 @@
67
78stdenv.mkDerivation rec {
89 pname = "bash-completion";
10+ # TODO: Remove musl patch below upon next release!
911 version = "2.9";
1012
1113 src = fetchFromGitHub {
@@ -26,6 +28,14 @@ stdenv.mkDerivation rec {
2628
2729 patches = [
2830 ./0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch
31+ # TODO: Remove when https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393
32+ # is availabe in a release in nixpkgs. see https://github.com/scop/bash-completion/issues/312.
33+ # Fixes a test failure with musl.
34+ (fetchpatch {
35+ url = "https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393.patch";
36+ name = "bash-completion-musl-test_iconv-skip-option-completion-if-help-fails";
37+ sha256 = "1l53d62zf01k625nzw3vcrxky93h7bzdpchgk4argxalrn17ckvb";
38+ })
2939 ];
3040
3141 # ignore ip_addresses because it tries to touch network
pkgs/tools/admin/azure-cli/default.nix+6−4
@@ -1,16 +1,16 @@
1−{ lib, python, fetchFromGitHub, installShellFiles }:
1+{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:
22
33let
4− version = "2.0.76";
4+ version = "2.0.77";
55 src = fetchFromGitHub {
66 owner = "Azure";
77 repo = "azure-cli";
88 rev = "azure-cli-${version}";
9− sha256 = "0zfy8nhw4nx0idh94qidr06vsfxgdk2ky0ih76s27121pdwr05aa";
9+ sha256 = "1qd6di8cqwhpcsqcx6g3scmwj90m15r695y5977q6a3qy13knisv";
1010 };
1111
1212 # put packages that needs to be overriden in the py package scope
13− py = import ./python-packages.nix { inherit python lib src version; };
13+ py = import ./python-packages.nix { inherit stdenv python lib src version; };
1414in
1515py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
1616 pname = "azure-cli";
@@ -45,6 +45,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
4545 azure-functions-devops-build
4646 azure-graphrbac
4747 azure-keyvault
48+ azure-loganalytics
4849 azure-mgmt-advisor
4950 azure-mgmt-apimanagement
5051 azure-mgmt-applicationinsights
@@ -173,6 +174,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
173174 "azure_functions_devops_build"
174175 "azure.graphrbac"
175176 "azure.keyvault"
177+ "azure.loganalytics"
176178 "azure.mgmt.advisor"
177179 "azure.mgmt.apimanagement"
178180 "azure.mgmt.applicationinsights"
pkgs/tools/admin/azure-cli/python-packages.nix+28−27
@@ -1,4 +1,4 @@
1−{ python, lib, src, version }:
1+{ stdenv, python, lib, src, version }:
22
33let
44 buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage (attrs // {
@@ -53,31 +53,37 @@ let
5353 propagatedBuildInputs = with self; [
5454 adal
5555 argcomplete
56+ azure-common
5657 azure-cli-telemetry
58+ azure-mgmt-resource
5759 colorama
58− jmespath
5960 humanfriendly
61+ jmespath
6062 knack
6163 msrest
6264 msrestazure
6365 paramiko
66+ psutil
6467 pygments
6568 pyjwt
6669 pyopenssl
70+ pyperclip
6771 pyyaml
6872 requests
6973 six
70− azure-mgmt-resource
7174 tabulate
72− pyperclip
73− psutil
7475 ]
7576 ++ lib.optionals isPy3k [ antlr4-python3-runtime ]
7677 ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ];
7778
79+ doCheck = stdenv.isLinux;
7880 # ignore test that does network call
7981 checkPhase = ''
80− HOME=$TMPDIR pytest --ignore=azure/cli/core/tests/test_profile.py
82+ rm azure/{,cli/}__init__.py
83+ python -c 'import azure.common; print(azure.common)'
84+ PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \
85+ --ignore=azure/cli/core/tests/test_profile.py \
86+ --ignore=azure/cli/core/tests/test_generic_update.py
8187 '';
8288
8389 pythonImportsCheck = [
@@ -108,18 +114,21 @@ let
108114 azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "4.0.0" "zip"
109115 "0gy89bi89ikg5hps8rvnq28r33lixci3sk2m86jvziv9fh9rz41b";
110116
111− azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "8.0.0" "zip"
112− "06hmf9iq2yqpmmvw7pr9zm4v427q03i436lnin3aczizfndrk76i";
117+ azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip"
118+ "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg";
113119
114120 azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
115121 "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
116122
117− azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "7.0.0" "zip"
118− "104w7rxv7hy84yzddbbpkjqha04ghr0zz9qy788n3wl69cj4cv1a";
123+ azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.0.0" "zip"
124+ "0akpm12xj453dp84dfdpi06phr4q0hknr5l7bz96zbc8iand78wg";
119125
120126 azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.8.0" "zip"
121127 "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb";
122128
129+ azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.2.1" "zip"
130+ "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky";
131+
123132 azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.8.2" "zip"
124133 "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq";
125134
@@ -129,8 +138,8 @@ let
129138 azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "2.2.0" "zip"
130139 "15lpyv9z8ss47rjmg1wx5akh22p9br2vckaj7jk3639vi38ac5nl";
131140
132− azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.6.0" "zip"
133− "10ymvyj386z9bjdm2g1b5a4vfnn87ig2zm6xn2xddvbpy0jxnyfv";
141+ azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.7.0" "zip"
142+ "0cf4pknb5y2yz4jqwg7xm626zkfx8i8hqcr3dkvq21lrx7fz96r3";
134143
135144 azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
136145 "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
@@ -144,12 +153,15 @@ let
144153 azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.42.0" "zip"
145154 "0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn";
146155
147− azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.3.2" "zip"
148− "0nksxjh5kh09dr0zw667fg8mzik4ymvfq3dipwag6pynbqr9ls4l";
156+ azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip"
157+ "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3";
149158
150159 azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip"
151160 "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx";
152161
162+ azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.4.0" "zip"
163+ "1jxmikjvyxkwr8c9kn6xw8gvj9pajlk7y8111rq8fgkivwjq8wcm";
164+
153165 azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip"
154166 "1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77";
155167
@@ -165,8 +177,8 @@ let
165177 azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc7" "zip"
166178 "1bzfpbz186dhnxn0blgr20xxnk67gkr8ysn2b3f1r41bq9hz97xp";
167179
168− azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.5.2" "zip"
169− "1r01aq5rbynbc1my4qljdifjdj9h65bh8cdzgd7vm4ij7r48v9gi";
180+ azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.7.0" "zip"
181+ "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2";
170182
171183 azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip"
172184 "1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r";
@@ -233,17 +245,6 @@ let
233245 '';
234246 });
235247
236−
237−
238−
239−
240−
241−
242−
243−
244−
245−
246−
247248 };
248249 };
249250in
pkgs/tools/misc/chezmoi/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "chezmoi";
5− version = "1.7.2";
5+ version = "1.7.5";
66
77 src = fetchFromGitHub {
88 owner = "twpayne";
99 repo = "chezmoi";
1010 rev = "v${version}";
11− sha256 = "06wgfnlzcs6yfrjpy6zhcg5y844zd22manbm2sfq5vyng02bg229";
11+ sha256 = "1s64468q7hhp42lzgcixhh3jq7i7bgmiakahyfj0mzc49mn6rr0a";
1212 };
1313
14− modSha256 = "1y1q1lps3a8piikh8ds28yrw5r82af9pyl6vy87207z1y5v2hams";
14+ modSha256 = "0c2jslcigq9ajchfr7inb7b6cpla7xjibcmjsvwspfzknrlrsbfn";
1515
1616 buildFlagsArray = [
1717 "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}"
pkgs/tools/misc/multitime/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ stdenv, fetchFromGitHub, autoreconfHook }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "multitime";
5+ version = "1.4";
6+
7+ src = fetchFromGitHub {
8+ owner = "ltratt";
9+ repo = pname;
10+ rev = "${pname}-${version}";
11+ sha256 = "1p6m4gyy6dw7nxnpsk32qiijagmiq9vwch0fbc25qvmybwqp8qc0";
12+ };
13+
14+ nativeBuildInputs = [ autoreconfHook ];
15+
16+ meta = {
17+ description = "Time command execution over multiple executions";
18+
19+ longDescription = ''
20+ Unix's `time` utility is a simple and often effective way of measuring
21+ how long a command takes to run. Unfortunately, running a command once
22+ can give misleading timings: the process may create a cache on its first
23+ execution, running faster subsequently; other processes may cause the
24+ command to be starved of CPU or IO time; etc. It is common to see people
25+ run `time` several times and take whichever values they feel most
26+ comfortable with. Inevitably, this causes problems.
27+
28+ `multitime` is, in essence, a simple extension to time which runs a
29+ command multiple times and prints the timing means (with confidence
30+ intervals), standard deviations, minimums, medians, and maximums having
31+ done so. This can give a much better understanding of the command's
32+ performance.
33+ '';
34+
35+ license = stdenv.lib.licenses.mit;
36+ homepage = "https://tratt.net/laurie/src/multitime/";
37+ platforms = stdenv.lib.platforms.unix;
38+ };
39+}
pkgs/tools/misc/youtube-dl/default.nix+2−2
@@ -18,11 +18,11 @@ buildPythonPackage rec {
1818 # The websites youtube-dl deals with are a very moving target. That means that
1919 # downloads break constantly. Because of that, updates should always be backported
2020 # to the latest stable release.
21− version = "2019.11.22";
21+ version = "2019.11.28";
2222
2323 src = fetchurl {
2424 url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
25− sha256 = "0avdlp0dc9p3lm68mfnic21x6blxmr0zvlxa4br5vj4y4sckq2m8";
25+ sha256 = "19xiwdn3l0kizyj7cik9vyhgrlwg7ss4wl4hy2pbbbqwh5vwppwk";
2626 };
2727
2828 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/networking/sslsplit/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, fetchFromGitHub, openssl, libevent, libpcap, libnet, zlib }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "sslsplit";
5+ version = "0.5.5";
6+
7+ src = fetchFromGitHub {
8+ owner = "droe";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "1p43z9ln5rbc76v0j1k3r4nhvfw71hq8jzsallb54z9hvwfvqp3l";
12+ };
13+
14+ buildInputs = [ openssl libevent libpcap libnet zlib ];
15+
16+ makeFlags = [
17+ "PREFIX=$(out)"
18+ "OPENSSL_BASE=${openssl.dev}"
19+ "LIBEVENT_BASE=${libevent.dev}"
20+ "LIBPCAP_BASE=${libpcap}"
21+ "LIBNET_BASE=${libnet}"
22+ ];
23+
24+ meta = with stdenv.lib; {
25+ description = "Transparent SSL/TLS interception";
26+ homepage = "https://www.roe.ch/SSLsplit";
27+ platforms = platforms.all;
28+ maintainers = with maintainers; [ contrun ];
29+ license = with licenses; [ bsd2 mit unlicense free ];
30+ };
31+}
pkgs/tools/networking/v2ray/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ callPackage, fetchFromGitHub, fetchurl
2+, assetOverrides ? {}
3+, ... } @ args:
4+
5+callPackage ./generic.nix (rec {
6+ version = "4.21.3";
7+
8+ src = fetchFromGitHub {
9+ owner = "v2ray";
10+ repo = "v2ray-core";
11+ rev = "v${version}";
12+ sha256 = "0z45nrjnalrvpprq7g4zrjbrdkc3d3lhs4ci8hb8m69f92asiwbs";
13+ };
14+
15+ assets = {
16+ # MIT licensed
17+ "geoip.dat" = let
18+ geoipRev = "20190516.1";
19+ geoipSha256 = "14h4rq7rlcl1397pwpylfgwpk3fiscpzqb04c4wd5lxkfvk5f02r";
20+ in fetchurl {
21+ url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat";
22+ sha256 = geoipSha256;
23+ };
24+
25+ # MIT licensed
26+ "geosite.dat" = let
27+ geositeRev = "20191121.1";
28+ geositeSha256 = "0ijmvy43pvm69w38djf114j8swni7wfq5ry9wdpv9dj0rzb59m74";
29+ in fetchurl {
30+ url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat";
31+ sha256 = geositeSha256;
32+ };
33+
34+ } // assetOverrides;
35+
36+} // args)
pkgs/tools/networking/v2ray/generic.nixnew file+50
@@ -0,0 +1,50 @@
1+{ lib, linkFarm, buildGoModule, runCommand, makeWrapper
2+
3+# Version specific args
4+, version, src, assets
5+, ... }:
6+
7+let
8+ assetsDrv = linkFarm "v2ray-assets" (lib.mapAttrsToList (name: path: {
9+ inherit name path;
10+ }) assets);
11+
12+ core = buildGoModule rec {
13+ pname = "v2ray-core";
14+ inherit version src;
15+
16+ modSha256 = "11gsncy3449a7y6w6pr7acqabyj2q2a1q52f8fcl5cdz1vjbmmxi";
17+
18+ buildPhase = ''
19+ runHook preBuild
20+
21+ go build -o v2ray v2ray.com/core/main
22+ go build -o v2ctl v2ray.com/core/infra/control/main
23+
24+ runHook postBuild
25+ '';
26+
27+ installPhase = ''
28+ install -Dm755 v2ray v2ctl -t $out/bin
29+ '';
30+ };
31+
32+in runCommand "v2ray-${version}" {
33+ inherit version;
34+
35+ buildInputs = [ assetsDrv core ];
36+ nativeBuildInputs = [ makeWrapper ];
37+
38+ meta = {
39+ homepage = "https://www.v2ray.com/en/index.html";
40+ description = "A platform for building proxies to bypass network restrictions";
41+ license = with lib.licenses; [ mit ];
42+ maintainers = with lib.maintainers; [ servalcatty ];
43+ };
44+
45+} ''
46+ for file in ${core}/bin/*; do
47+ makeWrapper "$file" "$out/bin/$(basename "$file")" \
48+ --set-default V2RAY_LOCATION_ASSET ${assetsDrv}
49+ done
50+''
pkgs/tools/networking/v2ray/update.shnew file+53
@@ -0,0 +1,53 @@
1+#!/usr/bin/env nix-shell
2+#!nix-shell -i bash -p curl jq
3+set -eo pipefail
4+
5+version_nix=$(dirname "$0")/default.nix
6+deps_nix=$(dirname "$0")/deps.nix
7+
8+old_core_rev="v$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix")"
9+old_geoip_rev=$(sed -En 's/.*\bgeoipRev = "(.*?)".*/\1/p' "$version_nix")
10+old_geosite_rev=$(sed -En 's/.*\bgeositeRev = "(.*?)".*/\1/p' "$version_nix")
11+echo "Current version:" >&2
12+echo "core: $old_core_rev, geoip: $old_geoip_rev, geosite: $old_geosite_rev" >&2
13+
14+function fetch_latest_rev {
15+ curl "https://api.github.com/repos/v2ray/$1/releases" |
16+ jq '.[0].tag_name' --raw-output
17+}
18+
19+core_rev=$(fetch_latest_rev 'v2ray-core')
20+geoip_rev=$(fetch_latest_rev 'geoip')
21+geosite_rev=$(fetch_latest_rev 'domain-list-community')
22+echo "Latest version:" >&2
23+echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2
24+
25+if [[ $core_rev != $old_core_rev ]]; then
26+ echo "Prefetching core..." >&2
27+ { read hash; read store_path; } < <(
28+ nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/$core_rev.zip"
29+ )
30+
31+ sed --in-place \
32+ -e "s/\bversion = \".*\"/version = \"$(echo "$core_rev" | tail -c+2)\"/" \
33+ -e "s/\bsha256 = \".*\"/sha256 = \"$hash\"/" \
34+ "$version_nix"
35+fi
36+
37+if [[ $geoip_rev != $old_geoip_rev ]]; then
38+ echo "Prefetching geoip..." >&2
39+ hash=$(nix-prefetch-url "https://github.com/v2ray/geoip/releases/download/$geoip_rev/geoip.dat")
40+ sed --in-place \
41+ -e "s/\bgeoipRev = \".*\"/geoipRev = \"$geoip_rev\"/" \
42+ -e "s/\bgeoipSha256 = \".*\"/geoipSha256 = \"$hash\"/" \
43+ "$version_nix"
44+fi
45+
46+if [[ $geosite_rev != $old_geosite_rev ]]; then
47+ echo "Prefetching geosite..." >&2
48+ hash=$(nix-prefetch-url "https://github.com/v2ray/domain-list-community/releases/download/$geosite_rev/dlc.dat")
49+ sed --in-place \
50+ -e "s/\bgeositeRev = \".*\"/geositeRev = \"$geosite_rev\"/" \
51+ -e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \
52+ "$version_nix"
53+fi
pkgs/tools/package-management/emplace/default.nixnew file+23
@@ -0,0 +1,23 @@
1+{ lib, rustPlatform, fetchFromGitHub }:
2+
3+rustPlatform.buildRustPackage rec {
4+ pname = "emplace";
5+ version = "0.2.7";
6+
7+ src = fetchFromGitHub {
8+ owner = "tversteeg";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "0dkdgb0hbaixc69yh75lq4lamvgd421lk1v7qn802h83fibcmh81";
12+ };
13+
14+ cargoSha256 = "10y7lpgj9mxrh3rmc15km4rfzspwdjr8dcdh0747rjn6dcpfhcdq";
15+
16+ meta = with lib; {
17+ description = "Mirror installed software on multiple machines";
18+ homepage = "https://github.com/tversteeg/emplace";
19+ license = licenses.agpl3;
20+ maintainers = with maintainers; [ filalex77 ];
21+ platforms = platforms.all;
22+ };
23+}
pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patchdeleted−41
@@ -1,41 +0,0 @@
1−From 511400b8ec0794588df88e2bb1c45cc6a4a51b1e Mon Sep 17 00:00:00 2001
2−From: Maximilian Bosch <maximilian@mbosch.me>
3−Date: Sun, 26 May 2019 23:10:02 +0200
4−Subject: [PATCH] Fix CMake configuration for Nix
5−
6−* -fno-limit-debug-info: CLang specific, patch away to support both
7− CLang and GCC.
8−* Dropped unnecessary `lvm-internal` and `daemonclient` references.
9−---
10− CMakeLists.txt | 1 -
11− osquery/tables/CMakeLists.txt | 2 +-
12− 2 files changed, 1 insertion(+), 2 deletions(-)
13−
14−diff --git a/CMakeLists.txt b/CMakeLists.txt
15−index f545d6c9..cfe68ddb 100644
16−--- a/CMakeLists.txt
17−+++ b/CMakeLists.txt
18−@@ -328,7 +328,6 @@ if (POSIX)
19− # To be safe, only include them when building 'release' outputs.
20− add_compile_options(
21− "$<$<CONFIG:RELEASE>:-g>"
22−- "$<$<CONFIG:RELEASE>:-fno-limit-debug-info>"
23− "$<$<CONFIG:RELEASE>:-fPIE>"
24− "$<$<CONFIG:RELEASE>:-fpie>"
25− "$<$<CONFIG:RELEASE>:-fPIC>"
26−diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt
27−index 470bdf1d..caa6ab6f 100644
28−--- a/osquery/tables/CMakeLists.txt
29−+++ b/osquery/tables/CMakeLists.txt
30−@@ -68,7 +68,7 @@ if(LINUX)
31− set(TABLE_PLATFORM "linux")
32−
33− ADD_OSQUERY_LINK_ADDITIONAL("libresolv.so")
34−- ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app lvm-internal daemonclient")
35−+ ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app")
36− ADD_OSQUERY_LINK_ADDITIONAL("gcrypt gpg-error")
37− ADD_OSQUERY_LINK_ADDITIONAL("blkid")
38− ADD_OSQUERY_LINK_ADDITIONAL("ip4tc")
39−--
40−2.19.2
41−
pkgs/tools/text/amber/default.nix+3−3
@@ -4,16 +4,16 @@
44
55rustPlatform.buildRustPackage rec {
66 pname = "amber";
7− version = "0.5.2";
7+ version = "0.5.3";
88
99 src = fetchFromGitHub {
1010 owner = "dalance";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "0jwrkd6qhxj2mqsfmhk687k15f7gf36gjyxnynj0yh8db2db6mjc";
13+ sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx";
1414 };
1515
16− cargoSha256 = "0iv8zvglwaihcc89dk9kkhchbj1g3v8wq8jcbrgcbclcsyymmplc";
16+ cargoSha256 = "0hh3sgcdcp0llgf3i3dysrr3vry3fv3fzzf44ad1953d5mnyhvap";
1717
1818 buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
1919
pkgs/tools/typesetting/pdf2djvu/default.nix+13−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
1+{ stdenv, fetchurl, fetchpatch, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
22
33stdenv.mkDerivation rec {
44 version = "0.9.14";
@@ -9,6 +9,18 @@ stdenv.mkDerivation rec {
99 sha256 = "05z2bbg54pfsi668fwcjrcr5iz9llf9gprzdsrn6fw5wjv4876zi";
1010 };
1111
12+ patches = [
13+ # fix build with Poppler 0.83
14+ (fetchpatch {
15+ url = "https://github.com/jwilk/pdf2djvu/commit/0aa17bb79dbcdfc249e4841f5b5398e27cfdfd41.patch";
16+ sha256 = "0mr14nz5w7z4ri2556bxkf3cnn2f7dhwsld7csrh6z5qqb7d5805";
17+ })
18+ (fetchpatch {
19+ url = "https://github.com/jwilk/pdf2djvu/commit/27b9e028091a2f370367e9eaf37b4bb1cde87b62.patch";
20+ sha256 = "03apsg1487jl800q8j70hicvg6xsndd593bg7babm4vgivkxb0da";
21+ })
22+ ];
23+
1224 nativeBuildInputs = [ pkgconfig ];
1325
1426 buildInputs = [ djvulibre poppler fontconfig libjpeg ];
pkgs/tools/typesetting/tex/texlive/bin.nix+35−15
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch
1+{ stdenv, fetchurl, fetchpatch, patchutils
22, texlive
33, zlib, libiconv, libpng, libX11
44, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
@@ -27,27 +27,47 @@ let
2727 };
2828
2929 patches = [
30− ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast (stdenv.lib.getVersion poppler) "0.76") [
31− (fetchpatch {
32− name = "pdftex-poppler0.76.patch";
33− url = "https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk/pdftex-poppler0.76.patch?id=8cb784073cfd2299a6c301ce7bb0d89126a47f4e";
34− sha256 = "04x7myzysranddzjifxhahl7gjy407zkiyzfs5l9cbwzp6pqh7gh";
35−
36− includes = [
37− "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc"
38− "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc"
39− ];
40− })
4130 ];
4231
4332 postPatch = let
44− popplerSuffix = if (stdenv.lib.versionAtLeast (stdenv.lib.getVersion poppler) "0.76") then "-poppler0.76.0" else "-poppler0.72.0";
33+ # The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year}
34+ # so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959
35+ popplerVersion = "0.83.0";
36+ pdftoepdf = let
37+ revert-pdfmajorversion = fetchpatch {
38+ name = "pdftoepdf-revert-pdfmajorversion.patch";
39+ url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc?view=patch&r1=52953&r2=52952&pathrev=52953";
40+ sha256 = "19jiv5xbvnfdk8lj6yd6mdxgs8f313a4dwg8svjj90dd35kjcfh8";
41+ revert = true;
42+ postFetch = ''
43+ # The default file, changed by this patch, contains a branch for vendored Poppler
44+ # The version-specific file replaces the section with an error, so we need to drop that part from the patch.
45+ # Fortunately, there is not anything else in the patch after #else.
46+ sed '/ #else/q' $out > "$tmpfile"
47+ ${patchutils}/bin/recountdiff "$tmpfile" > "$out"
48+ '';
49+ };
50+ in fetchurl {
51+ name = "pdftoepdf-poppler${popplerVersion}.cc";
52+ url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co";
53+ sha256 = "0pngvw1jgnm4cqskrzf5a3z8rj4ssl10007n3wbblj50hvvzjph3";
54+ postFetch = ''
55+ # The trunk added some extra arguments to certain functions so we need to revert that
56+ # https://www.tug.org/svn/texlive?view=revision&revision=52953
57+ patch $out < ${revert-pdfmajorversion}
58+ '';
59+ };
60+ pdftosrc = fetchurl {
61+ name = "pdftosrc-poppler${popplerVersion}.cc";
62+ url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co";
63+ sha256 = "0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g06380";
64+ };
4565 in ''
4666 for i in texk/kpathsea/mktex*; do
4767 sed -i '/^mydir=/d' "$i"
4868 done
49− cp -pv texk/web2c/pdftexdir/pdftoepdf{${popplerSuffix},}.cc
50− cp -pv texk/web2c/pdftexdir/pdftosrc{${popplerSuffix},}.cc
69+ cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc
70+ cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc
5171 '';
5272
5373 # remove when removing synctex-missing-header.patch
pkgs/top-level/all-packages.nix+13−3
@@ -853,6 +853,8 @@ in
853853
854854 elvish = callPackage ../shells/elvish { };
855855
856+ emplace = callPackage ../tools/package-management/emplace { };
857+
856858 encryptr = callPackage ../tools/security/encryptr {
857859 gconf = gnome2.GConf;
858860 };
@@ -1310,6 +1312,7 @@ in
13101312 });
13111313
13121314 caddy = callPackage ../servers/caddy { };
1315+ caddy2 = callPackage ../servers/caddy/v2.nix { };
13131316 traefik = callPackage ../servers/traefik { };
13141317
13151318 calamares = libsForQt5.callPackage ../tools/misc/calamares {
@@ -2561,7 +2564,7 @@ in
25612564
25622565 cron = callPackage ../tools/system/cron { };
25632566
2564− cudaPackages = callPackages ../development/compilers/cudatoolkit { };
2567+ cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {});
25652568 inherit (cudaPackages)
25662569 cudatoolkit_6
25672570 cudatoolkit_6_5
@@ -5020,6 +5023,8 @@ in
50205023
50215024 mt-st = callPackage ../tools/backup/mt-st {};
50225025
5026+ multitime = callPackage ../tools/misc/multitime { };
5027+
50235028 multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in {
50245029 multitrandata = callPackage ../tools/text/multitran/data { };
50255030
@@ -6436,6 +6441,8 @@ in
64366441
64376442 ssldump = callPackage ../tools/networking/ssldump { };
64386443
6444+ sslsplit = callPackage ../tools/networking/sslsplit { };
6445+
64396446 sstp = callPackage ../tools/networking/sstp {};
64406447
64416448 strip-nondeterminism = perlPackages.strip-nondeterminism;
@@ -6891,6 +6898,8 @@ in
68916898
68926899 uwsgi = callPackage ../servers/uwsgi { };
68936900
6901+ v2ray = callPackage ../tools/networking/v2ray { };
6902+
68946903 vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
68956904
68966905 vampire = callPackage ../applications/science/logic/vampire {};
@@ -19527,7 +19536,7 @@ in
1952719536 k3d = callPackage ../applications/graphics/k3d {
1952819537 inherit (pkgs.gnome2) gtkglext;
1952919538 stdenv = gcc6Stdenv;
19530− boost = boost.override { enablePython = true; };
19539+ boost = boost155.override { enablePython = true; };
1953119540 };
1953219541
1953319542 k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
@@ -24535,8 +24544,9 @@ in
2453524544 kops_1_12
2453624545 kops_1_13
2453724546 kops_1_14
24547+ kops_1_15
2453824548 ;
24539− kops = kops_1_14;
24549+ kops = kops_1_15;
2454024550
2454124551 lguf-brightness = callPackage ../misc/lguf-brightness { };
2454224552
pkgs/top-level/coq-packages.nix+1−1
@@ -128,7 +128,7 @@ in rec {
128128 version = "8.9.1";
129129 };
130130 coq_8_10 = callPackage ../applications/science/logic/coq {
131− version = "8.10.1";
131+ version = "8.10.2";
132132 };
133133
134134 coqPackages_8_5 = mkCoqPackages coq_8_5;
pkgs/top-level/static.nix+41
@@ -52,6 +52,39 @@ self: super: let
5252 });
5353 };
5454
55+ removeUnknownConfigureFlags = f: with self.lib;
56+ remove "--disable-shared"
57+ (remove "--enable-static" f);
58+
59+ ocamlFixPackage = b:
60+ b.overrideAttrs (o: {
61+ configurePlatforms = [ ];
62+ configureFlags = removeUnknownConfigureFlags (o.configureFlags or [ ]);
63+ buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ];
64+ propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ];
65+ });
66+
67+ ocamlStaticAdapter = _: super:
68+ self.lib.mapAttrs
69+ (_: p: if p ? overrideAttrs then ocamlFixPackage p else p)
70+ super
71+ // {
72+ lablgtk = null; # Currently xlibs cause infinite recursion
73+ ocaml = ((super.ocaml.override { useX11 = false; }).overrideAttrs (o: {
74+ configurePlatforms = [ ];
75+ dontUpdateAutotoolsGnuConfigScripts = true;
76+ })).overrideDerivation (o: {
77+ preConfigure = ''
78+ configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r")
79+ '';
80+ configureFlags = (removeUnknownConfigureFlags o.configureFlags) ++ [
81+ "--no-shared-libs"
82+ "-host ${o.stdenv.hostPlatform.config}"
83+ "-target ${o.stdenv.targetPlatform.config}"
84+ ];
85+ });
86+ };
87+
5588in {
5689 stdenv = foldl (flip id) super.stdenv staticAdapters;
5790 gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters;
@@ -172,6 +205,10 @@ in {
172205 };
173206 };
174207
208+ kmod = super.kmod.override {
209+ withStatic = true;
210+ };
211+
175212 curl = super.curl.override {
176213 # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039
177214 gssSupport = false;
@@ -196,5 +233,9 @@ in {
196233 };
197234 };
198235
236+ ocaml-ng = self.lib.mapAttrs (_: set:
237+ if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set
238+ ) super.ocaml-ng;
239+
199240 python27 = super.python27.override { static = true; };
200241}