git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commitec3edaf7b59519306df244ea84cf67d21e717462 authorFrederik Rietdijk <fridh@fridh.nl> dateMon 10 Feb 2020, 12:55 (7 years ago) parentcffec219a329b1
154 files changed+3377−1177
doc/languages-frameworks/dotnet.section.md+75 maintainers/maintainer-list.nix+6 nixos/doc/manual/release-notes/rl-2003.xml+21 nixos/lib/make-ext4-fs.nix+3−16 nixos/lib/testing.nix+5−1 nixos/modules/module-list.nix+4 nixos/modules/programs/zsh/zsh.nix+53−13 nixos/modules/security/acme.nix+130−43 nixos/modules/security/acme.xml+1−1 nixos/modules/security/sudo.nix+19−17 nixos/modules/services/audio/mopidy.nix+2−2 nixos/modules/services/backup/sanoid.nix+213 nixos/modules/services/backup/syncoid.nix+168 nixos/modules/services/mail/sympa.nix+596 nixos/modules/services/networking/minidlna.nix+17 nixos/modules/services/web-apps/grocy.nix+172 nixos/modules/services/web-apps/grocy.xml+77 nixos/modules/system/boot/loader/grub/memtest.nix+40−17 nixos/modules/virtualisation/hyperv-guest.nix+1−1 nixos/release-combined.nix+6−8 nixos/tests/acme.nix+101−17 nixos/tests/all-tests.nix+3 nixos/tests/common/letsencrypt/common.nix+3 nixos/tests/corerad.nix+1−1 nixos/tests/grocy.nix+47 nixos/tests/sanoid.nix+90 nixos/tests/sympa.nix+36 pkgs/applications/audio/kid3/default.nix+2−2 pkgs/applications/audio/mopidy/default.nix+5−5 pkgs/applications/audio/mopidy/iris.nix+6−7 pkgs/applications/audio/mopidy/spotify.nix+5−5 pkgs/applications/editors/okteta/default.nix+2−2 pkgs/applications/misc/calibre/default.nix+2−1 pkgs/applications/misc/gmtp/default.nix+1−1 pkgs/applications/misc/syncthingtray/default.nix+2−2 pkgs/applications/networking/browsers/conkeror/default.nix−39 pkgs/applications/networking/browsers/firefox/common.nix+49−111 pkgs/applications/networking/browsers/firefox/packages.nix+14−135 pkgs/applications/networking/browsers/firefox/wrapper.nix+2−2 pkgs/applications/networking/browsers/opera/default.nix+2−2 pkgs/applications/networking/browsers/palemoon/default.nix+2−2 pkgs/applications/networking/p2p/tribler/default.nix+2−2 pkgs/applications/office/scribus/unstable.nix+91−21 pkgs/applications/science/electronics/pcb/default.nix+2−2 pkgs/applications/science/logic/verifast/default.nix+2−2 pkgs/applications/science/logic/workcraft/default.nix+2−2 pkgs/applications/version-management/git-repo/default.nix+2−2 pkgs/applications/version-management/gitkraken/default.nix+25−21 pkgs/applications/video/handbrake/default.nix+3−5 pkgs/applications/video/manim/default.nix+64 pkgs/applications/video/manim/remove-dependency-constraints.patch+26 pkgs/data/misc/osinfo-db/default.nix+2−2 pkgs/data/themes/ant-theme/default.nix+1−3 pkgs/development/compilers/adoptopenjdk-bin/sources.json+94−70 pkgs/development/compilers/bluespec/default.nix+94 pkgs/development/compilers/gcc/4.9/default.nix+1−1 pkgs/development/compilers/gcc/snapshot/default.nix−252 pkgs/development/interpreters/octave/default.nix+3−3 pkgs/development/interpreters/octave/hg.nix−75 pkgs/development/libraries/aws-c-event-stream/default.nix+1 pkgs/development/libraries/aws-checksums/default.nix+2 pkgs/development/libraries/grpc/default.nix+2−2 pkgs/development/libraries/libcdio-paranoia/default.nix+1−1 pkgs/development/libraries/libdap/default.nix+2−2 pkgs/development/libraries/libexif/default.nix+5 pkgs/development/libraries/libgpiod/default.nix+2−2 pkgs/development/libraries/libphonenumber/default.nix+2−2 pkgs/development/libraries/libsolv/default.nix+2−2 pkgs/development/libraries/poppler/default.nix+1−1 pkgs/development/libraries/ti-rpc/default.nix+2−2 pkgs/development/libraries/unixODBCDrivers/default.nix+2−2 pkgs/development/ocaml-modules/apron/default.nix+8−6 pkgs/development/python-modules/augeas/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix+2−2 pkgs/development/python-modules/cmd2/default.nix+2−2 pkgs/development/python-modules/django-storages/default.nix+2−2 pkgs/development/python-modules/feedgen/default.nix+2−2 pkgs/development/python-modules/flower/default.nix+22 pkgs/development/python-modules/geopy/2.nix+2−2 pkgs/development/python-modules/grpcio-tools/default.nix+2−2 pkgs/development/python-modules/hstspreload/default.nix+2−2 pkgs/development/python-modules/ijson/default.nix+3−3 pkgs/development/python-modules/jieba/default.nix+2−2 pkgs/development/python-modules/kconfiglib/default.nix+2−2 pkgs/development/python-modules/localzone/default.nix+34 pkgs/development/python-modules/m3u8/default.nix+2−2 pkgs/development/python-modules/nbconflux/default.nix+28 pkgs/development/python-modules/nuitka/default.nix+2−2 pkgs/development/python-modules/nwdiag/default.nix+4−4 pkgs/development/python-modules/persim/default.nix+2−2 pkgs/development/python-modules/phonenumbers/default.nix+2−2 pkgs/development/python-modules/pikepdf/default.nix+2−2 pkgs/development/python-modules/pyTelegramBotAPI/default.nix+2−2 pkgs/development/python-modules/pycollada/default.nix+2−2 pkgs/development/python-modules/pydantic/default.nix+2−2 pkgs/development/python-modules/pykka/default.nix+2−2 pkgs/development/python-modules/pylint-django/default.nix+2−2 pkgs/development/python-modules/pynamecheap/default.nix+28 pkgs/development/python-modules/pysaml2/default.nix+5−2 pkgs/development/python-modules/python-dotenv/default.nix+2−2 pkgs/development/python-modules/rq/default.nix+2−2 pkgs/development/python-modules/simplekml/default.nix+3−3 pkgs/development/python-modules/softlayer/default.nix+41 pkgs/development/python-modules/sphinxcontrib-tikz/default.nix+2−2 pkgs/development/python-modules/spotipy/default.nix+2−2 pkgs/development/python-modules/transip/default.nix+39 pkgs/development/python-modules/ua-parser/default.nix+2−2 pkgs/development/python-modules/uproot-methods/default.nix+2−2 pkgs/development/python-modules/uproot/default.nix+2−2 pkgs/development/python-modules/user-agents/default.nix+2−2 pkgs/development/tools/buildkit/default.nix+6−5 pkgs/development/tools/kcli/default.nix+2−2 pkgs/development/tools/misc/babeltrace/default.nix+2−2 pkgs/development/tools/ocaml/ocamlformat/default.nix+2−2 pkgs/development/tools/scaff/default.nix+26 pkgs/games/dwarf-fortress/game.json+14 pkgs/games/dwarf-fortress/game.nix+1−1 pkgs/games/dwarf-fortress/themes/default.nix+1−1 pkgs/games/dwarf-fortress/themes/themes.json+26−26 pkgs/games/dwarf-fortress/unfuck.nix+4 pkgs/games/dwarf-fortress/update.sh+2−2 pkgs/games/openmw/default.nix+2−2 pkgs/games/openmw/tes3mp.nix+1−1 pkgs/misc/cups/drivers/hll2340dw/default.nix+68 pkgs/misc/emulators/dolphin-emu/master.nix+3−3 pkgs/servers/atlassian/jira.nix+2−2 pkgs/servers/grocy/config-locations.patch+61 pkgs/servers/grocy/default.nix+32 pkgs/servers/mail/sympa/default.nix+116 pkgs/servers/mail/sympa/make-docs.patch+11 pkgs/servers/memcached/default.nix+11−1 pkgs/test/nixos-functions/default.nix+1−1 pkgs/tools/admin/azure-cli/default.nix+2−2 pkgs/tools/admin/azure-cli/python-packages.nix+17−14 pkgs/tools/admin/lexicon/default.nix+31 pkgs/tools/backup/sanoid/default.nix+75 pkgs/tools/bluetooth/bluez-alsa/default.nix+6−7 pkgs/tools/filesystems/reiserfsprogs/default.nix+1−1 pkgs/tools/graphics/wdisplays/default.nix+5−5 pkgs/tools/misc/fzf/default.nix+12−10 pkgs/tools/misc/parallel/default.nix+2−2 pkgs/tools/networking/corerad/default.nix+3−5 pkgs/tools/networking/lldpd/default.nix+2−2 pkgs/tools/networking/rtptools/default.nix+16 pkgs/tools/networking/socat/default.nix−2 pkgs/tools/networking/socat/speed-type-fix.patch−13 pkgs/tools/networking/tcptraceroute/default.nix+1−1 pkgs/tools/security/jwt-cli/default.nix+3−3 pkgs/tools/system/ioping/default.nix+2−2 pkgs/top-level/aliases.nix+14 pkgs/top-level/all-packages.nix+42−49 pkgs/top-level/perl-packages.nix+42 pkgs/top-level/pure-packages.nix+2−2 pkgs/top-level/python-packages.nix+12
doc/languages-frameworks/dotnet.section.mdnew file+75
@@ -0,0 +1,75 @@
1+# Dotnet
2+
3+## Local Development Workflow
4+
5+For local development, it's recommended to use nix-shell to create a dotnet environment:
6+
7+```
8+# shell.nix
9+with import <nixpkgs> {};
10+
11+mkShell {
12+ name = "dotnet-env";
13+ buildInputs = [
14+ dotnet-sdk_3
15+ ];
16+}
17+```
18+
19+### Using many sdks in a workflow
20+
21+It's very likely that more than one sdk will be needed on a given project. Dotnet provides several different frameworks (E.g dotnetcore, aspnetcore, etc.) as well as many versions for a given framework. Normally, dotnet is able to fetch a framework and install it relative to the executable. However, this would mean writing to the nix store in nixpkgs, which is read-only. To support the many-sdk use case, one can compose an environment using `dotnetCorePackages.combinePackages`:
22+
23+```
24+with import <nixpkgs> {};
25+
26+mkShell {
27+ name = "dotnet-env";
28+ buildInputs = [
29+ (with dotnetCorePackages; combinePackages [
30+ sdk_3_1
31+ sdk_3_0
32+ sdk_2_1
33+ ])
34+ ];
35+}
36+```
37+
38+This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output:
39+
40+```
41+$ dotnet --info
42+.NET Core SDK (reflecting any global.json):
43+ Version: 3.1.101
44+ Commit: b377529961
45+
46+...
47+
48+.NET Core SDKs installed:
49+ 2.1.803 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk]
50+ 3.0.102 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk]
51+ 3.1.101 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk]
52+
53+.NET Core runtimes installed:
54+ Microsoft.AspNetCore.All 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.All]
55+ Microsoft.AspNetCore.App 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App]
56+ Microsoft.AspNetCore.App 3.0.2 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App]
57+ Microsoft.AspNetCore.App 3.1.1 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App]
58+ Microsoft.NETCore.App 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App]
59+ Microsoft.NETCore.App 3.0.2 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App]
60+ Microsoft.NETCore.App 3.1.1 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App]
61+```
62+
63+## dotnet-sdk vs dotnetCorePackages.sdk
64+
65+The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project.
66+
67+## dotnetCorePackages.sdk vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore
68+
69+The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications.
70+
71+## Packaging a Dotnet Application
72+
73+Ideally, we would like to build against the sdk, then only have the dotnet runtime available in the runtime closure.
74+
75+TODO: Create closure-friendly way to package dotnet applications
maintainers/maintainer-list.nix+6
@@ -4304,6 +4304,12 @@
43044304 email = "wheatdoge@gmail.com";
43054305 name = "Tim Liou";
43064306 };
4307+ m1cr0man = {
4308+ email = "lucas+nix@m1cr0man.com";
4309+ github = "m1cr0man";
4310+ githubId = 3044438;
4311+ name = "Lucas Savva";
4312+ };
43074313 m3tti = {
43084314 email = "mathaeus.peter.sander@gmail.com";
43094315 name = "Mathaeus Sander";
nixos/doc/manual/release-notes/rl-2003.xml+21
@@ -615,6 +615,12 @@ auth required pam_succeed_if.so uid >= 1000 quiet
615615 <link xlink:href="https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-relnotes-194-5908846.html">release notes</link>.
616616 </para>
617617 </listitem>
618+ <listitem>
619+ <para>
620+ The <package>gcc-snapshot</package>-package has been removed. It's marked as broken for &gt;2 years and used to point
621+ to a fairly old snapshot from the <package>gcc7</package>-branch.
622+ </para>
623+ </listitem>
618624 </itemizedlist>
619625 </section>
620626
@@ -654,6 +660,21 @@ auth required pam_succeed_if.so uid >= 1000 quiet
654660 <literal>PRETTY_NAME</literal> in <literal>/etc/os-release</literal>
655661 now uses the short rather than full version string.
656662 </para>
663+ </listitem>
664+ <listitem>
665+ <para>
666+ The ACME module has switched from simp-le to <link xlink:href="https://github.com/go-acme/lego">lego</link>
667+ which allows us to support DNS-01 challenges and wildcard certificates. The following options have been added:
668+ <link linkend="opt-security.acme.acceptTerms">security.acme.acceptTerms</link>,
669+ <link linkend="opt-security.acme.certs">security.acme.certs.&lt;name&gt;.dnsProvider</link>,
670+ <link linkend="opt-security.acme.certs">security.acme.certs.&lt;name&gt;.credentialsFile</link>,
671+ <link linkend="opt-security.acme.certs">security.acme.certs.&lt;name&gt;.dnsPropagationCheck</link>.
672+ As well as this, the options <literal>security.acme.acceptTerms</literal> and either
673+ <literal>security.acme.email</literal> or <literal>security.acme.certs.&lt;name&gt;.email</literal>
674+ must be set in order to use the ACME module.
675+ Certificates will be regenerated anew on the next renewal date. The credentials for simp-le are
676+ preserved and thus it is possible to roll back to previous versions without breaking certificate
677+ generation.
657678 </listitem>
658679 <listitem>
659680 <para>
nixos/lib/make-ext4-fs.nix+3−16
@@ -64,7 +64,7 @@ pkgs.stdenv.mkDerivation {
6464 echo "copying files to image..."
6565 cptofs -t ext4 -i $img ./files/* /
6666
67−
67+ export EXT2FS_NO_MTAB_OK=yes
6868 # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
6969 if ! fsck.ext4 -n -f $img; then
7070 echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
@@ -72,21 +72,8 @@ pkgs.stdenv.mkDerivation {
7272 return 1
7373 fi
7474
75− (
76− # Resizes **snugly** to its actual limits (or closer to)
77− free=$(dumpe2fs $img | grep '^Free blocks:')
78− blocksize=$(dumpe2fs $img | grep '^Block size:')
79− blocks=$(dumpe2fs $img | grep '^Block count:')
80− blocks=$((''${blocks##*:})) # format the number.
81− blocksize=$((''${blocksize##*:})) # format the number.
82− # System can't boot with 0 blocks free.
83− # Add 16MiB of free space
84− fudge=$(( 16 * 1024 * 1024 / blocksize ))
85− size=$(( blocks - ''${free##*:} + fudge ))
86−
87− echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
88− EXT2FS_NO_MTAB_OK=yes resize2fs $img -f $size
89− )
75+ echo "Resizing to minimum allowed size"
76+ resize2fs -M $img
9077
9178 # And a final fsck, because of the previous truncating.
9279 fsck.ext4 -n -f $img
nixos/lib/testing.nix+5−1
@@ -19,7 +19,11 @@ in rec {
1919 inherit pkgs;
2020
2121
22− testDriver = stdenv.mkDerivation {
22+ testDriver = lib.warn ''
23+ Perl VM tests are deprecated and will be removed for 20.09.
24+ Please update your tests to use the python test driver.
25+ See https://github.com/NixOS/nixpkgs/pull/71684 for details.
26+ '' stdenv.mkDerivation {
2327 name = "nixos-test-driver";
2428
2529 buildInputs = [ makeWrapper perl ];
nixos/modules/module-list.nix+4
@@ -229,6 +229,8 @@
229229 ./services/backup/restic.nix
230230 ./services/backup/restic-rest-server.nix
231231 ./services/backup/rsnapshot.nix
232+ ./services/backup/sanoid.nix
233+ ./services/backup/syncoid.nix
232234 ./services/backup/tarsnap.nix
233235 ./services/backup/tsm.nix
234236 ./services/backup/zfs-replication.nix
@@ -401,6 +403,7 @@
401403 ./services/mail/rspamd.nix
402404 ./services/mail/rss2email.nix
403405 ./services/mail/roundcube.nix
406+ ./services/mail/sympa.nix
404407 ./services/mail/nullmailer.nix
405408 ./services/misc/airsonic.nix
406409 ./services/misc/apache-kafka.nix
@@ -814,6 +817,7 @@
814817 ./services/web-apps/dokuwiki.nix
815818 ./services/web-apps/frab.nix
816819 ./services/web-apps/gotify-server.nix
820+ ./services/web-apps/grocy.nix
817821 ./services/web-apps/icingaweb2/icingaweb2.nix
818822 ./services/web-apps/icingaweb2/module-monitoring.nix
819823 ./services/web-apps/ihatemoney
nixos/modules/programs/zsh/zsh.nix+53−13
@@ -15,6 +15,24 @@ let
1515 (filterAttrs (k: v: v != null) cfg.shellAliases)
1616 );
1717
18+ zshStartupNotes = ''
19+ # Note that generated /etc/zprofile and /etc/zshrc files do a lot of
20+ # non-standard setup to make zsh usable with no configuration by default.
21+ #
22+ # Which means that unless you explicitly meticulously override everything
23+ # generated, interactions between your ~/.zshrc and these files are likely
24+ # to be rather surprising.
25+ #
26+ # Note however, that you can disable loading of the generated /etc/zprofile
27+ # and /etc/zshrc (you can't disable loading of /etc/zshenv, but it is
28+ # designed to not set anything surprising) by setting `no_global_rcs` option
29+ # in ~/.zshenv:
30+ #
31+ # echo setopt no_global_rcs >> ~/.zshenv
32+ #
33+ # See "STARTUP/SHUTDOWN FILES" section of zsh(1) for more info.
34+ '';
35+
1836in
1937
2038{
@@ -69,6 +87,10 @@ in
6987
7088 promptInit = mkOption {
7189 default = ''
90+ # Note that to manually override this in ~/.zshrc you should run `prompt off`
91+ # before setting your PS1 and etc. Otherwise this will likely to interact with
92+ # your ~/.zshrc configuration in unexpected ways as the default prompt sets
93+ # a lot of different prompt variables.
7294 autoload -U promptinit && promptinit && prompt walters && setopt prompt_sp
7395 '';
7496 description = ''
@@ -100,7 +122,8 @@ in
100122 ];
101123 example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ];
102124 description = ''
103− Configure zsh options.
125+ Configure zsh options. See
126+ <citerefentry><refentrytitle>zshoptions</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
104127 '';
105128 };
106129
@@ -147,6 +170,14 @@ in
147170 . ${config.system.build.setEnvironment}
148171 fi
149172
173+ HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
174+
175+ # Tell zsh how to find installed completions.
176+ for p in ''${(z)NIX_PROFILES}; do
177+ fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
178+ done
179+
180+ # Setup custom shell init stuff.
150181 ${cfge.shellInit}
151182
152183 ${cfg.shellInit}
@@ -161,11 +192,14 @@ in
161192 ''
162193 # /etc/zprofile: DO NOT EDIT -- this file has been generated automatically.
163194 # This file is read for login shells.
195+ #
196+ ${zshStartupNotes}
164197
165198 # Only execute this file once per shell.
166199 if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
167200 __ETC_ZPROFILE_SOURCED=1
168201
202+ # Setup custom login shell init stuff.
169203 ${cfge.loginShellInit}
170204
171205 ${cfg.loginShellInit}
@@ -180,38 +214,44 @@ in
180214 ''
181215 # /etc/zshrc: DO NOT EDIT -- this file has been generated automatically.
182216 # This file is read for interactive shells.
217+ #
218+ ${zshStartupNotes}
183219
184220 # Only execute this file once per shell.
185221 if [ -n "$__ETC_ZSHRC_SOURCED" -o -n "$NOSYSZSHRC" ]; then return; fi
186222 __ETC_ZSHRC_SOURCED=1
187223
188− . /etc/zinputrc
224+ ${optionalString (cfg.setOptions != []) ''
225+ # Set zsh options.
226+ setopt ${concatStringsSep " " cfg.setOptions}
227+ ''}
189228
190− # Don't export these, otherwise other shells (bash) will try to use same histfile
229+ # Setup command line history.
230+ # Don't export these, otherwise other shells (bash) will try to use same HISTFILE.
191231 SAVEHIST=${toString cfg.histSize}
192232 HISTSIZE=${toString cfg.histSize}
193233 HISTFILE=${cfg.histFile}
194234
195− HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
196−
197− # Tell zsh how to find installed completions
198− for p in ''${(z)NIX_PROFILES}; do
199− fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
200− done
235+ # Configure sane keyboard defaults.
236+ . /etc/zinputrc
201237
202− ${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"}
238+ ${optionalString cfg.enableGlobalCompInit ''
239+ # Enable autocompletion.
240+ autoload -U compinit && compinit
241+ ''}
203242
243+ # Setup custom interactive shell init stuff.
204244 ${cfge.interactiveShellInit}
205245
206246 ${cfg.interactiveShellInit}
207247
208− ${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"}
209−
248+ # Setup aliases.
210249 ${zshAliases}
211250
251+ # Setup prompt.
212252 ${cfg.promptInit}
213253
214− # Need to disable features to support TRAMP
254+ # Disable some features to support TRAMP.
215255 if [ "$TERM" = dumb ]; then
216256 unsetopt zle prompt_cr prompt_subst
217257 unset RPS1 RPROMPT
nixos/modules/security/acme.nix+130−43
@@ -1,7 +1,5 @@
11{ config, lib, pkgs, ... }:
2−
32with lib;
4−
53let
64
75 cfg = config.security.acme;
@@ -9,7 +7,8 @@ let
97 certOpts = { name, ... }: {
108 options = {
119 webroot = mkOption {
12− type = types.str;
10+ type = types.nullOr types.str;
11+ default = null;
1312 example = "/var/lib/acme/acme-challenges";
1413 description = ''
1514 Where the webroot of the HTTP vhost is located.
@@ -38,7 +37,7 @@ let
3837
3938 email = mkOption {
4039 type = types.nullOr types.str;
41− default = null;
40+ default = cfg.email;
4241 description = "Contact email address for the CA to be able to reach you.";
4342 };
4443
@@ -76,20 +75,6 @@ let
7675 '';
7776 };
7877
79− plugins = mkOption {
80− type = types.listOf (types.enum [
81− "cert.der" "cert.pem" "chain.pem" "external.sh"
82− "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json" "account_reg.json"
83− ]);
84− default = [ "fullchain.pem" "full.pem" "key.pem" "account_key.json" "account_reg.json" ];
85− description = ''
86− Plugins to enable. With default settings simp_le will
87− store public certificate bundle in <filename>fullchain.pem</filename>,
88− private key in <filename>key.pem</filename> and those two previous
89− files combined in <filename>full.pem</filename> in its state directory.
90− '';
91− };
92−
9378 directory = mkOption {
9479 type = types.str;
9580 readOnly = true;
@@ -111,6 +96,46 @@ let
11196 own server roots if needed.
11297 '';
11398 };
99+
100+ keyType = mkOption {
101+ type = types.str;
102+ default = "ec384";
103+ description = ''
104+ Key type to use for private keys.
105+ For an up to date list of supported values check the --key-type option
106+ at https://go-acme.github.io/lego/usage/cli/#usage.
107+ '';
108+ };
109+
110+ dnsProvider = mkOption {
111+ type = types.nullOr types.str;
112+ default = null;
113+ example = "route53";
114+ description = ''
115+ DNS Challenge provider. For a list of supported providers, see the "code"
116+ field of the DNS providers listed at https://go-acme.github.io/lego/dns/.
117+ '';
118+ };
119+
120+ credentialsFile = mkOption {
121+ type = types.path;
122+ description = ''
123+ Path to an EnvironmentFile for the cert's service containing any required and
124+ optional environment variables for your selected dnsProvider.
125+ To find out what values you need to set, consult the documentation at
126+ https://go-acme.github.io/lego/dns/ for the corresponding dnsProvider.
127+ '';
128+ example = "/var/src/secrets/example.org-route53-api-token";
129+ };
130+
131+ dnsPropagationCheck = mkOption {
132+ type = types.bool;
133+ default = true;
134+ description = ''
135+ Toggles lego DNS propagation check, which is used alongside DNS-01
136+ challenge to ensure the DNS entries required are available.
137+ '';
138+ };
114139 };
115140 };
116141
@@ -130,14 +155,21 @@ in
130155 (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
131156 (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
132157 (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
158+ (mkChangedOptionModule [ "security" "acme" "validMin"] [ "security" "acme" "validMinDays"] (config: config.security.acme.validMin / (24 * 3600)))
133159 ];
134160 options = {
135161 security.acme = {
136162
137− validMin = mkOption {
163+ validMinDays = mkOption {
138164 type = types.int;
139− default = 30 * 24 * 3600;
140− description = "Minimum remaining validity before renewal in seconds.";
165+ default = 30;
166+ description = "Minimum remaining validity before renewal in days.";
167+ };
168+
169+ email = mkOption {
170+ type = types.nullOr types.str;
171+ default = null;
172+ description = "Contact email address for the CA to be able to reach you.";
141173 };
142174
143175 renewInterval = mkOption {
@@ -173,6 +205,15 @@ in
173205 '';
174206 };
175207
208+ acceptTerms = mkOption {
209+ type = types.bool;
210+ default = false;
211+ description = ''
212+ Accept the CA's terms of service. The default provier is Let's Encrypt,
213+ you can find their ToS at https://letsencrypt.org/repository/
214+ '';
215+ };
216+
176217 certs = mkOption {
177218 default = { };
178219 type = with types; attrsOf (submodule certOpts);
@@ -204,27 +245,55 @@ in
204245 config = mkMerge [
205246 (mkIf (cfg.certs != { }) {
206247
248+ assertions = let
249+ certs = (mapAttrsToList (k: v: v) cfg.certs);
250+ in [
251+ {
252+ assertion = all (certOpts: certOpts.dnsProvider == null || certOpts.webroot == null) certs;
253+ message = ''
254+ Options `security.acme.certs.<name>.dnsProvider` and
255+ `security.acme.certs.<name>.webroot` are mutually exclusive.
256+ '';
257+ }
258+ {
259+ assertion = cfg.email != null || all (certOpts: certOpts.email != null) certs;
260+ message = ''
261+ You must define `security.acme.certs.<name>.email` or
262+ `security.acme.email` to register with the CA.
263+ '';
264+ }
265+ {
266+ assertion = cfg.acceptTerms;
267+ message = ''
268+ You must accept the CA's terms of service before using
269+ the ACME module by setting `security.acme.acceptTerms`
270+ to `true`. For Let's Encrypt's ToS see https://letsencrypt.org/repository/
271+ '';
272+ }
273+ ];
274+
207275 systemd.services = let
208276 services = concatLists servicesLists;
209277 servicesLists = mapAttrsToList certToServices cfg.certs;
210278 certToServices = cert: data:
211279 let
280+ # StateDirectory must be relative, and will be created under /var/lib by systemd
212281 lpath = "acme/${cert}";
282+ apath = "/var/lib/${lpath}";
283+ spath = "/var/lib/acme/.lego";
213284 rights = if data.allowKeysForGroup then "750" else "700";
214− cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
215− ++ optionals (data.email != null) [ "--email" data.email ]
216− ++ concatMap (p: [ "-f" p ]) data.plugins
217− ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
285+ globalOpts = [ "-d" data.domain "--email" data.email "--path" "." "--key-type" data.keyType ]
286+ ++ optionals (cfg.acceptTerms) [ "--accept-tos" ]
287+ ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ]
288+ ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains)
289+ ++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ])
218290 ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)];
291+ runOpts = escapeShellArgs (globalOpts ++ [ "run" ]);
292+ renewOpts = escapeShellArgs (globalOpts ++ [ "renew" "--days" (toString cfg.validMinDays) ]);
219293 acmeService = {
220294 description = "Renew ACME Certificate for ${cert}";
221295 after = [ "network.target" "network-online.target" ];
222296 wants = [ "network-online.target" ];
223− # simp_le uses requests, which uses certifi under the hood,
224− # which doesn't respect the system trust store.
225− # At least in the acme test, we provision a fake CA, impersonating the LE endpoint.
226− # REQUESTS_CA_BUNDLE is a way to teach python requests to use something else
227− environment.REQUESTS_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt";
228297 serviceConfig = {
229298 Type = "oneshot";
230299 # With RemainAfterExit the service is considered active even
@@ -233,18 +302,37 @@ in
233302 # the permissions of the StateDirectory get adjusted
234303 # according to the specified group
235304 RemainAfterExit = true;
236− SuccessExitStatus = [ "0" "1" ];
237305 User = data.user;
238306 Group = data.group;
239307 PrivateTmp = true;
240− StateDirectory = lpath;
308+ StateDirectory = "acme/.lego ${lpath}";
241309 StateDirectoryMode = rights;
242− WorkingDirectory = "/var/lib/${lpath}";
243− ExecStart = "${pkgs.simp_le}/bin/simp_le ${escapeShellArgs cmdline}";
310+ WorkingDirectory = spath;
311+ # Only try loading the credentialsFile if the dns challenge is enabled
312+ EnvironmentFile = if data.dnsProvider != null then data.credentialsFile else null;
313+ ExecStart = pkgs.writeScript "acme-start" ''
314+ #!${pkgs.runtimeShell} -e
315+ ${pkgs.lego}/bin/lego ${renewOpts} || ${pkgs.lego}/bin/lego ${runOpts}
316+ '';
244317 ExecStartPost =
245318 let
319+ keyName = builtins.replaceStrings ["*"] ["_"] data.domain;
246320 script = pkgs.writeScript "acme-post-start" ''
247321 #!${pkgs.runtimeShell} -e
322+ cd ${apath}
323+
324+ # Test that existing cert is older than new cert
325+ KEY=${spath}/certificates/${keyName}.key
326+ if [ -e $KEY -a $KEY -nt key.pem ]; then
327+ cp -p ${spath}/certificates/${keyName}.key key.pem
328+ cp -p ${spath}/certificates/${keyName}.crt cert.pem
329+ cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
330+ cat cert.pem chain.pem > fullchain.pem
331+ cat key.pem cert.pem chain.pem > full.pem
332+ chmod ${rights} *.pem
333+ chown '${data.user}:${data.group}' *.pem
334+ fi
335+
248336 ${data.postRun}
249337 '';
250338 in
@@ -276,17 +364,17 @@ in
276364 -out $workdir/server.crt
277365
278366 # Copy key to destination
279− cp $workdir/server.key /var/lib/${lpath}/key.pem
367+ cp $workdir/server.key ${apath}/key.pem
280368
281369 # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates)
282− cat $workdir/{server.crt,ca.crt} > "/var/lib/${lpath}/fullchain.pem"
370+ cat $workdir/{server.crt,ca.crt} > "${apath}/fullchain.pem"
283371
284372 # Create full.pem for e.g. lighttpd
285− cat $workdir/{server.key,server.crt,ca.crt} > "/var/lib/${lpath}/full.pem"
373+ cat $workdir/{server.key,server.crt,ca.crt} > "${apath}/full.pem"
286374
287375 # Give key acme permissions
288− chown '${data.user}:${data.group}' "/var/lib/${lpath}/"{key,fullchain,full}.pem
289− chmod ${rights} "/var/lib/${lpath}/"{key,fullchain,full}.pem
376+ chown '${data.user}:${data.group}' "${apath}/"{key,fullchain,full}.pem
377+ chmod ${rights} "${apath}/"{key,fullchain,full}.pem
290378 '';
291379 serviceConfig = {
292380 Type = "oneshot";
@@ -297,7 +385,7 @@ in
297385 };
298386 unitConfig = {
299387 # Do not create self-signed key when key already exists
300− ConditionPathExists = "!/var/lib/${lpath}/key.pem";
388+ ConditionPathExists = "!${apath}/key.pem";
301389 };
302390 };
303391 in (
@@ -309,8 +397,7 @@ in
309397 servicesAttr;
310398
311399 systemd.tmpfiles.rules =
312− flip mapAttrsToList cfg.certs
313− (cert: data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}");
400+ map (data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}") (filter (data: data.webroot != null) (attrValues cfg.certs));
314401
315402 systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair
316403 ("acme-${cert}")
@@ -334,7 +421,7 @@ in
334421 ];
335422
336423 meta = {
337− maintainers = with lib.maintainers; [ abbradar fpletz globin ];
424+ maintainers = with lib.maintainers; [ abbradar fpletz globin m1cr0man ];
338425 doc = ./acme.xml;
339426 };
340427}
nixos/modules/security/acme.xml+1−1
@@ -7,7 +7,7 @@
77 <para>
88 NixOS supports automatic domain validation &amp; certificate retrieval and
99 renewal using the ACME protocol. This is currently only implemented by and
10− for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is
10+ for Let's Encrypt. The alternative ACME client <literal>lego</literal> is
1111 used under the hood.
1212 </para>
1313 <section xml:id="module-security-acme-prerequisites">
nixos/modules/security/sudo.nix+19−17
@@ -71,23 +71,25 @@ in
7171 this is the case when configuration options are merged.
7272 '';
7373 default = [];
74− example = [
75− # Allow execution of any command by all users in group sudo,
76− # requiring a password.
77− { groups = [ "sudo" ]; commands = [ "ALL" ]; }
78−
79− # Allow execution of "/home/root/secret.sh" by user `backup`, `database`
80− # and the group with GID `1006` without a password.
81− { users = [ "backup" "database" ]; groups = [ 1006 ];
82− commands = [ { command = "/home/root/secret.sh"; options = [ "SETENV" "NOPASSWD" ]; } ]; }
83−
84− # Allow all users of group `bar` to run two executables as user `foo`
85− # with arguments being pre-set.
86− { groups = [ "bar" ]; runAs = "foo";
87− commands =
88− [ "/home/baz/cmd1.sh hello-sudo"
89− { command = ''/home/baz/cmd2.sh ""''; options = [ "SETENV" ]; } ]; }
90− ];
74+ example = literalExample ''
75+ [
76+ # Allow execution of any command by all users in group sudo,
77+ # requiring a password.
78+ { groups = [ "sudo" ]; commands = [ "ALL" ]; }
79+
80+ # Allow execution of "/home/root/secret.sh" by user `backup`, `database`
81+ # and the group with GID `1006` without a password.
82+ { users = [ "backup" "database" ]; groups = [ 1006 ];
83+ commands = [ { command = "/home/root/secret.sh"; options = [ "SETENV" "NOPASSWD" ]; } ]; }
84+
85+ # Allow all users of group `bar` to run two executables as user `foo`
86+ # with arguments being pre-set.
87+ { groups = [ "bar" ]; runAs = "foo";
88+ commands =
89+ [ "/home/baz/cmd1.sh hello-sudo"
90+ { command = '''/home/baz/cmd2.sh ""'''; options = [ "SETENV" ]; } ]; }
91+ ]
92+ '';
9193 type = with types; listOf (submodule {
9294 options = {
9395 users = mkOption {
nixos/modules/services/audio/mopidy.nix+2−2
@@ -13,11 +13,11 @@ let
1313 mopidyEnv = buildEnv {
1414 name = "mopidy-with-extensions-${mopidy.version}";
1515 paths = closePropagation cfg.extensionPackages;
16− pathsToLink = [ "/${python.sitePackages}" ];
16+ pathsToLink = [ "/${python3.sitePackages}" ];
1717 buildInputs = [ makeWrapper ];
1818 postBuild = ''
1919 makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
20− --prefix PYTHONPATH : $out/${python.sitePackages}
20+ --prefix PYTHONPATH : $out/${python3.sitePackages}
2121 '';
2222 };
2323in {
nixos/modules/services/backup/sanoid.nixnew file+213
@@ -0,0 +1,213 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.sanoid;
7+
8+ datasetSettingsType = with types;
9+ (attrsOf (nullOr (oneOf [ str int bool (listOf str) ]))) // {
10+ description = "dataset/template options";
11+ };
12+
13+ # Default values from https://github.com/jimsalterjrs/sanoid/blob/master/sanoid.defaults.conf
14+
15+ commonOptions = {
16+ hourly = mkOption {
17+ description = "Number of hourly snapshots.";
18+ type = types.ints.unsigned;
19+ default = 48;
20+ };
21+
22+ daily = mkOption {
23+ description = "Number of daily snapshots.";
24+ type = types.ints.unsigned;
25+ default = 90;
26+ };
27+
28+ monthly = mkOption {
29+ description = "Number of monthly snapshots.";
30+ type = types.ints.unsigned;
31+ default = 6;
32+ };
33+
34+ yearly = mkOption {
35+ description = "Number of yearly snapshots.";
36+ type = types.ints.unsigned;
37+ default = 0;
38+ };
39+
40+ autoprune = mkOption {
41+ description = "Whether to automatically prune old snapshots.";
42+ type = types.bool;
43+ default = true;
44+ };
45+
46+ autosnap = mkOption {
47+ description = "Whether to automatically take snapshots.";
48+ type = types.bool;
49+ default = true;
50+ };
51+
52+ settings = mkOption {
53+ description = ''
54+ Free-form settings for this template/dataset. See
55+ <link xlink:href="https://github.com/jimsalterjrs/sanoid/blob/master/sanoid.defaults.conf"/>
56+ for allowed values.
57+ '';
58+ type = datasetSettingsType;
59+ };
60+ };
61+
62+ commonConfig = config: {
63+ settings = {
64+ hourly = mkDefault config.hourly;
65+ daily = mkDefault config.daily;
66+ monthly = mkDefault config.monthly;
67+ yearly = mkDefault config.yearly;
68+ autoprune = mkDefault config.autoprune;
69+ autosnap = mkDefault config.autosnap;
70+ };
71+ };
72+
73+ datasetOptions = {
74+ useTemplate = mkOption {
75+ description = "Names of the templates to use for this dataset.";
76+ type = (types.listOf (types.enum (attrNames cfg.templates))) // {
77+ description = "list of template names";
78+ };
79+ default = [];
80+ };
81+
82+ recursive = mkOption {
83+ description = "Whether to recursively snapshot dataset children.";
84+ type = types.bool;
85+ default = false;
86+ };
87+
88+ processChildrenOnly = mkOption {
89+ description = "Whether to only snapshot child datasets if recursing.";
90+ type = types.bool;
91+ default = false;
92+ };
93+ };
94+
95+ datasetConfig = config: {
96+ settings = {
97+ use_template = mkDefault config.useTemplate;
98+ recursive = mkDefault config.recursive;
99+ process_children_only = mkDefault config.processChildrenOnly;
100+ };
101+ };
102+
103+ # Extract pool names from configured datasets
104+ pools = unique (map (d: head (builtins.match "([^/]+).*" d)) (attrNames cfg.datasets));
105+
106+ configFile = let
107+ mkValueString = v:
108+ if builtins.isList v then concatStringsSep "," v
109+ else generators.mkValueStringDefault {} v;
110+
111+ mkKeyValue = k: v: if v == null then ""
112+ else generators.mkKeyValueDefault { inherit mkValueString; } "=" k v;
113+ in generators.toINI { inherit mkKeyValue; } cfg.settings;
114+
115+ configDir = pkgs.writeTextDir "sanoid.conf" configFile;
116+
117+in {
118+
119+ # Interface
120+
121+ options.services.sanoid = {
122+ enable = mkEnableOption "Sanoid ZFS snapshotting service";
123+
124+ interval = mkOption {
125+ type = types.str;
126+ default = "hourly";
127+ example = "daily";
128+ description = ''
129+ Run sanoid at this interval. The default is to run hourly.
130+
131+ The format is described in
132+ <citerefentry><refentrytitle>systemd.time</refentrytitle>
133+ <manvolnum>7</manvolnum></citerefentry>.
134+ '';
135+ };
136+
137+ datasets = mkOption {
138+ type = types.attrsOf (types.submodule ({ config, ... }: {
139+ options = commonOptions // datasetOptions;
140+ config = mkMerge [ (commonConfig config) (datasetConfig config) ];
141+ }));
142+ default = {};
143+ description = "Datasets to snapshot.";
144+ };
145+
146+ templates = mkOption {
147+ type = types.attrsOf (types.submodule ({ config, ... }: {
148+ options = commonOptions;
149+ config = commonConfig config;
150+ }));
151+ default = {};
152+ description = "Templates for datasets.";
153+ };
154+
155+ settings = mkOption {
156+ type = types.attrsOf datasetSettingsType;
157+ description = ''
158+ Free-form settings written directly to the config file. See
159+ <link xlink:href="https://github.com/jimsalterjrs/sanoid/blob/master/sanoid.defaults.conf"/>
160+ for allowed values.
161+ '';
162+ };
163+
164+ extraArgs = mkOption {
165+ type = types.listOf types.str;
166+ default = [];
167+ example = [ "--verbose" "--readonly" "--debug" ];
168+ description = ''
169+ Extra arguments to pass to sanoid. See
170+ <link xlink:href="https://github.com/jimsalterjrs/sanoid/#sanoid-command-line-options"/>
171+ for allowed options.
172+ '';
173+ };
174+ };
175+
176+ # Implementation
177+
178+ config = mkIf cfg.enable {
179+ services.sanoid.settings = mkMerge [
180+ (mapAttrs' (d: v: nameValuePair ("template_" + d) v.settings) cfg.templates)
181+ (mapAttrs (d: v: v.settings) cfg.datasets)
182+ ];
183+
184+ systemd.services.sanoid = {
185+ description = "Sanoid snapshot service";
186+ serviceConfig = {
187+ ExecStartPre = map (pool: lib.escapeShellArgs [
188+ "+/run/booted-system/sw/bin/zfs" "allow"
189+ "sanoid" "snapshot,mount,destroy" pool
190+ ]) pools;
191+ ExecStart = lib.escapeShellArgs ([
192+ "${pkgs.sanoid}/bin/sanoid"
193+ "--cron"
194+ "--configdir" configDir
195+ ] ++ cfg.extraArgs);
196+ ExecStopPost = map (pool: lib.escapeShellArgs [
197+ "+/run/booted-system/sw/bin/zfs" "unallow" "sanoid" pool
198+ ]) pools;
199+ User = "sanoid";
200+ Group = "sanoid";
201+ DynamicUser = true;
202+ RuntimeDirectory = "sanoid";
203+ CacheDirectory = "sanoid";
204+ };
205+ # Prevents missing snapshots during DST changes
206+ environment.TZ = "UTC";
207+ after = [ "zfs.target" ];
208+ startAt = cfg.interval;
209+ };
210+ };
211+
212+ meta.maintainers = with maintainers; [ lopsided98 ];
213+ }
nixos/modules/services/backup/syncoid.nixnew file+168
@@ -0,0 +1,168 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.syncoid;
7+in {
8+
9+ # Interface
10+
11+ options.services.syncoid = {
12+ enable = mkEnableOption "Syncoid ZFS synchronization service";
13+
14+ interval = mkOption {
15+ type = types.str;
16+ default = "hourly";
17+ example = "*-*-* *:15:00";
18+ description = ''
19+ Run syncoid at this interval. The default is to run hourly.
20+
21+ The format is described in
22+ <citerefentry><refentrytitle>systemd.time</refentrytitle>
23+ <manvolnum>7</manvolnum></citerefentry>.
24+ '';
25+ };
26+
27+ user = mkOption {
28+ type = types.str;
29+ default = "root";
30+ example = "backup";
31+ description = ''
32+ The user for the service. Sudo or ZFS privilege delegation must be
33+ configured to use a user other than root.
34+ '';
35+ };
36+
37+ sshKey = mkOption {
38+ type = types.nullOr types.path;
39+ # Prevent key from being copied to store
40+ apply = mapNullable toString;
41+ default = null;
42+ description = ''
43+ SSH private key file to use to login to the remote system. Can be
44+ overridden in individual commands.
45+ '';
46+ };
47+
48+ commonArgs = mkOption {
49+ type = types.listOf types.str;
50+ default = [];
51+ example = [ "--no-sync-snap" ];
52+ description = ''
53+ Arguments to add to every syncoid command, unless disabled for that
54+ command. See
55+ <link xlink:href="https://github.com/jimsalterjrs/sanoid/#syncoid-command-line-options"/>
56+ for available options.
57+ '';
58+ };
59+
60+ commands = mkOption {
61+ type = types.attrsOf (types.submodule ({ name, ... }: {
62+ options = {
63+ source = mkOption {
64+ type = types.str;
65+ example = "pool/dataset";
66+ description = ''
67+ Source ZFS dataset. Can be either local or remote. Defaults to
68+ the attribute name.
69+ '';
70+ };
71+
72+ target = mkOption {
73+ type = types.str;
74+ example = "user@server:pool/dataset";
75+ description = ''
76+ Target ZFS dataset. Can be either local
77+ (<replaceable>pool/dataset</replaceable>) or remote
78+ (<replaceable>user@server:pool/dataset</replaceable>).
79+ '';
80+ };
81+
82+ recursive = mkOption {
83+ type = types.bool;
84+ default = false;
85+ description = ''
86+ Whether to also transfer child datasets.
87+ '';
88+ };
89+
90+ sshKey = mkOption {
91+ type = types.nullOr types.path;
92+ # Prevent key from being copied to store
93+ apply = mapNullable toString;
94+ description = ''
95+ SSH private key file to use to login to the remote system.
96+ Defaults to <option>services.syncoid.sshKey</option> option.
97+ '';
98+ };
99+
100+ sendOptions = mkOption {
101+ type = types.separatedString " ";
102+ default = "";
103+ example = "Lc e";
104+ description = ''
105+ Advanced options to pass to zfs send. Options are specified
106+ without their leading dashes and separated by spaces.
107+ '';
108+ };
109+
110+ recvOptions = mkOption {
111+ type = types.separatedString " ";
112+ default = "";
113+ example = "ux recordsize o compression=lz4";
114+ description = ''
115+ Advanced options to pass to zfs recv. Options are specified
116+ without their leading dashes and separated by spaces.
117+ '';
118+ };
119+
120+ useCommonArgs = mkOption {
121+ type = types.bool;
122+ default = true;
123+ description = ''
124+ Whether to add the configured common arguments to this command.
125+ '';
126+ };
127+
128+ extraArgs = mkOption {
129+ type = types.listOf types.str;
130+ default = [];
131+ example = [ "--sshport 2222" ];
132+ description = "Extra syncoid arguments for this command.";
133+ };
134+ };
135+ config = {
136+ source = mkDefault name;
137+ sshKey = mkDefault cfg.sshKey;
138+ };
139+ }));
140+ default = {};
141+ example."pool/test".target = "root@target:pool/test";
142+ description = "Syncoid commands to run.";
143+ };
144+ };
145+
146+ # Implementation
147+
148+ config = mkIf cfg.enable {
149+ systemd.services.syncoid = {
150+ description = "Syncoid ZFS synchronization service";
151+ script = concatMapStringsSep "\n" (c: lib.escapeShellArgs
152+ ([ "${pkgs.sanoid}/bin/syncoid" ]
153+ ++ (optionals c.useCommonArgs cfg.commonArgs)
154+ ++ (optional c.recursive "-r")
155+ ++ (optionals (c.sshKey != null) [ "--sshkey" c.sshKey ])
156+ ++ c.extraArgs
157+ ++ [ "--sendoptions" c.sendOptions
158+ "--recvoptions" c.recvOptions
159+ c.source c.target
160+ ])) (attrValues cfg.commands);
161+ after = [ "zfs.target" ];
162+ serviceConfig.User = cfg.user;
163+ startAt = cfg.interval;
164+ };
165+ };
166+
167+ meta.maintainers = with maintainers; [ lopsided98 ];
168+ }
nixos/modules/services/mail/sympa.nixnew file+596
@@ -0,0 +1,596 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.sympa;
7+ dataDir = "/var/lib/sympa";
8+ user = "sympa";
9+ group = "sympa";
10+ pkg = pkgs.sympa;
11+ fqdns = attrNames cfg.domains;
12+ usingNginx = cfg.web.enable && cfg.web.server == "nginx";
13+ mysqlLocal = cfg.database.createLocally && cfg.database.type == "MySQL";
14+ pgsqlLocal = cfg.database.createLocally && cfg.database.type == "PostgreSQL";
15+
16+ sympaSubServices = [
17+ "sympa-archive.service"
18+ "sympa-bounce.service"
19+ "sympa-bulk.service"
20+ "sympa-task.service"
21+ ];
22+
23+ # common for all services including wwsympa
24+ commonServiceConfig = {
25+ StateDirectory = "sympa";
26+ ProtectHome = true;
27+ ProtectSystem = "full";
28+ ProtectKernelTunables = true;
29+ ProtectKernelModules = true;
30+ ProtectControlGroups = true;
31+ };
32+
33+ # wwsympa has its own service config
34+ sympaServiceConfig = srv: {
35+ Type = "simple";
36+ Restart = "always";
37+ ExecStart = "${pkg}/bin/${srv}.pl --foreground";
38+ PIDFile = "/run/sympa/${srv}.pid";
39+ User = user;
40+ Group = group;
41+
42+ # avoid duplicating log messageges in journal
43+ StandardError = "null";
44+ } // commonServiceConfig;
45+
46+ configVal = value:
47+ if isBool value then
48+ if value then "on" else "off"
49+ else toString value;
50+ configGenerator = c: concatStrings (flip mapAttrsToList c (key: val: "${key}\t${configVal val}\n"));
51+
52+ mainConfig = pkgs.writeText "sympa.conf" (configGenerator cfg.settings);
53+ robotConfig = fqdn: domain: pkgs.writeText "${fqdn}-robot.conf" (configGenerator domain.settings);
54+
55+ transport = pkgs.writeText "transport.sympa" (concatStringsSep "\n" (flip map fqdns (domain: ''
56+ ${domain} error:User unknown in recipient table
57+ sympa@${domain} sympa:sympa@${domain}
58+ listmaster@${domain} sympa:listmaster@${domain}
59+ bounce@${domain} sympabounce:sympa@${domain}
60+ abuse-feedback-report@${domain} sympabounce:sympa@${domain}
61+ '')));
62+
63+ virtual = pkgs.writeText "virtual.sympa" (concatStringsSep "\n" (flip map fqdns (domain: ''
64+ sympa-request@${domain} postmaster@localhost
65+ sympa-owner@${domain} postmaster@localhost
66+ '')));
67+
68+ listAliases = pkgs.writeText "list_aliases.tt2" ''
69+ #--- [% list.name %]@[% list.domain %]: list transport map created at [% date %]
70+ [% list.name %]@[% list.domain %] sympa:[% list.name %]@[% list.domain %]
71+ [% list.name %]-request@[% list.domain %] sympa:[% list.name %]-request@[% list.domain %]
72+ [% list.name %]-editor@[% list.domain %] sympa:[% list.name %]-editor@[% list.domain %]
73+ #[% list.name %]-subscribe@[% list.domain %] sympa:[% list.name %]-subscribe@[%list.domain %]
74+ [% list.name %]-unsubscribe@[% list.domain %] sympa:[% list.name %]-unsubscribe@[% list.domain %]
75+ [% list.name %][% return_path_suffix %]@[% list.domain %] sympabounce:[% list.name %]@[% list.domain %]
76+ '';
77+
78+ enabledFiles = filterAttrs (n: v: v.enable) cfg.settingsFile;
79+in
80+{
81+
82+ ###### interface
83+ options.services.sympa = with types; {
84+
85+ enable = mkEnableOption "Sympa mailing list manager";
86+
87+ lang = mkOption {
88+ type = str;
89+ default = "en_US";
90+ example = "cs";
91+ description = ''
92+ Default Sympa language.
93+ See <link xlink:href='https://github.com/sympa-community/sympa/tree/sympa-6.2/po/sympa' />
94+ for available options.
95+ '';
96+ };
97+
98+ listMasters = mkOption {
99+ type = listOf str;
100+ example = [ "postmaster@sympa.example.org" ];
101+ description = ''
102+ The list of the email addresses of the listmasters
103+ (users authorized to perform global server commands).
104+ '';
105+ };
106+
107+ mainDomain = mkOption {
108+ type = nullOr str;
109+ default = null;
110+ example = "lists.example.org";
111+ description = ''
112+ Main domain to be used in <filename>sympa.conf</filename>.
113+ If <literal>null</literal>, one of the <option>services.sympa.domains</option> is chosen for you.
114+ '';
115+ };
116+
117+ domains = mkOption {
118+ type = attrsOf (submodule ({ name, config, ... }: {
119+ options = {
120+ webHost = mkOption {
121+ type = nullOr str;
122+ default = null;
123+ example = "archive.example.org";
124+ description = ''
125+ Domain part of the web interface URL (no web interface for this domain if <literal>null</literal>).
126+ DNS record of type A (or AAAA or CNAME) has to exist with this value.
127+ '';
128+ };
129+ webLocation = mkOption {
130+ type = str;
131+ default = "/";
132+ example = "/sympa";
133+ description = "URL path part of the web interface.";
134+ };
135+ settings = mkOption {
136+ type = attrsOf (oneOf [ str int bool ]);
137+ default = {};
138+ example = {
139+ default_max_list_members = 3;
140+ };
141+ description = ''
142+ The <filename>robot.conf</filename> configuration file as key value set.
143+ See <link xlink:href='https://sympa-community.github.io/gpldoc/man/sympa.conf.5.html' />
144+ for list of configuration parameters.
145+ '';
146+ };
147+ };
148+
149+ config.settings = mkIf (cfg.web.enable && config.webHost != null) {
150+ wwsympa_url = mkDefault "https://${config.webHost}${strings.removeSuffix "/" config.webLocation}";
151+ };
152+ }));
153+
154+ description = ''
155+ Email domains handled by this instance. There have
156+ to be MX records for keys of this attribute set.
157+ '';
158+ example = literalExample ''
159+ {
160+ "lists.example.org" = {
161+ webHost = "lists.example.org";
162+ webLocation = "/";
163+ };
164+ "sympa.example.com" = {
165+ webHost = "example.com";
166+ webLocation = "/sympa";
167+ };
168+ }
169+ '';
170+ };
171+
172+ database = {
173+ type = mkOption {
174+ type = enum [ "SQLite" "PostgreSQL" "MySQL" ];
175+ default = "SQLite";
176+ example = "MySQL";
177+ description = "Database engine to use.";
178+ };
179+
180+ host = mkOption {
181+ type = nullOr str;
182+ default = null;
183+ description = ''
184+ Database host address.
185+
186+ For MySQL, use <literal>localhost</literal> to connect using Unix domain socket.
187+
188+ For PostgreSQL, use path to directory (e.g. <filename>/run/postgresql</filename>)
189+ to connect using Unix domain socket located in this directory.
190+
191+ Use <literal>null</literal> to fall back on Sympa default, or when using
192+ <option>services.sympa.database.createLocally</option>.
193+ '';
194+ };
195+
196+ port = mkOption {
197+ type = nullOr port;
198+ default = null;
199+ description = "Database port. Use <literal>null</literal> for default port.";
200+ };
201+
202+ name = mkOption {
203+ type = str;
204+ default = if cfg.database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa";
205+ defaultText = ''if database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa"'';
206+ description = ''
207+ Database name. When using SQLite this must be an absolute
208+ path to the database file.
209+ '';
210+ };
211+
212+ user = mkOption {
213+ type = nullOr str;
214+ default = user;
215+ description = "Database user. The system user name is used as a default.";
216+ };
217+
218+ passwordFile = mkOption {
219+ type = nullOr path;
220+ default = null;
221+ example = "/run/keys/sympa-dbpassword";
222+ description = ''
223+ A file containing the password for <option>services.sympa.database.user</option>.
224+ '';
225+ };
226+
227+ createLocally = mkOption {
228+ type = bool;
229+ default = true;
230+ description = "Whether to create a local database automatically.";
231+ };
232+ };
233+
234+ web = {
235+ enable = mkOption {
236+ type = bool;
237+ default = true;
238+ description = "Whether to enable Sympa web interface.";
239+ };
240+
241+ server = mkOption {
242+ type = enum [ "nginx" "none" ];
243+ default = "nginx";
244+ description = ''
245+ The webserver used for the Sympa web interface. Set it to `none` if you want to configure it yourself.
246+ Further nginx configuration can be done by adapting
247+ <option>services.nginx.virtualHosts.<replaceable>name</replaceable></option>.
248+ '';
249+ };
250+
251+ https = mkOption {
252+ type = bool;
253+ default = true;
254+ description = ''
255+ Whether to use HTTPS. When nginx integration is enabled, this option forces SSL and enables ACME.
256+ Please note that Sympa web interface always uses https links even when this option is disabled.
257+ '';
258+ };
259+
260+ fcgiProcs = mkOption {
261+ type = ints.positive;
262+ default = 2;
263+ description = "Number of FastCGI processes to fork.";
264+ };
265+ };
266+
267+ mta = {
268+ type = mkOption {
269+ type = enum [ "postfix" "none" ];
270+ default = "postfix";
271+ description = ''
272+ Mail transfer agent (MTA) integration. Use <literal>none</literal> if you want to configure it yourself.
273+
274+ The <literal>postfix</literal> integration sets up local Postfix instance that will pass incoming
275+ messages from configured domains to Sympa. You still need to configure at least outgoing message
276+ handling using e.g. <option>services.postfix.relayHost</option>.
277+ '';
278+ };
279+ };
280+
281+ settings = mkOption {
282+ type = attrsOf (oneOf [ str int bool ]);
283+ default = {};
284+ example = literalExample ''
285+ {
286+ default_home = "lists";
287+ viewlogs_page_size = 50;
288+ }
289+ '';
290+ description = ''
291+ The <filename>sympa.conf</filename> configuration file as key value set.
292+ See <link xlink:href='https://sympa-community.github.io/gpldoc/man/sympa.conf.5.html' />
293+ for list of configuration parameters.
294+ '';
295+ };
296+
297+ settingsFile = mkOption {
298+ type = attrsOf (submodule ({ name, config, ... }: {
299+ options = {
300+ enable = mkOption {
301+ type = bool;
302+ default = true;
303+ description = "Whether this file should be generated. This option allows specific files to be disabled.";
304+ };
305+ text = mkOption {
306+ default = null;
307+ type = nullOr lines;
308+ description = "Text of the file.";
309+ };
310+ source = mkOption {
311+ type = path;
312+ description = "Path of the source file.";
313+ };
314+ };
315+
316+ config.source = mkIf (config.text != null) (mkDefault (pkgs.writeText "sympa-${baseNameOf name}" config.text));
317+ }));
318+ default = {};
319+ example = literalExample ''
320+ {
321+ "list_data/lists.example.org/help" = {
322+ text = "subject This list provides help to users";
323+ };
324+ }
325+ '';
326+ description = "Set of files to be linked in <filename>${dataDir}</filename>.";
327+ };
328+ };
329+
330+ ###### implementation
331+
332+ config = mkIf cfg.enable {
333+
334+ services.sympa.settings = (mapAttrs (_: v: mkDefault v) {
335+ domain = if cfg.mainDomain != null then cfg.mainDomain else head fqdns;
336+ listmaster = concatStringsSep "," cfg.listMasters;
337+ lang = cfg.lang;
338+
339+ home = "${dataDir}/list_data";
340+ arc_path = "${dataDir}/arc";
341+ bounce_path = "${dataDir}/bounce";
342+
343+ sendmail = "${pkgs.system-sendmail}/bin/sendmail";
344+
345+ db_type = cfg.database.type;
346+ db_name = cfg.database.name;
347+ }
348+ // (optionalAttrs (cfg.database.host != null) {
349+ db_host = cfg.database.host;
350+ })
351+ // (optionalAttrs mysqlLocal {
352+ db_host = "localhost"; # use unix domain socket
353+ })
354+ // (optionalAttrs pgsqlLocal {
355+ db_host = "/run/postgresql"; # use unix domain socket
356+ })
357+ // (optionalAttrs (cfg.database.port != null) {
358+ db_port = cfg.database.port;
359+ })
360+ // (optionalAttrs (cfg.database.user != null) {
361+ db_user = cfg.database.user;
362+ })
363+ // (optionalAttrs (cfg.mta.type == "postfix") {
364+ sendmail_aliases = "${dataDir}/sympa_transport";
365+ aliases_program = "${pkgs.postfix}/bin/postmap";
366+ aliases_db_type = "hash";
367+ })
368+ // (optionalAttrs cfg.web.enable {
369+ static_content_path = "${dataDir}/static_content";
370+ css_path = "${dataDir}/static_content/css";
371+ pictures_path = "${dataDir}/static_content/pictures";
372+ mhonarc = "${pkgs.perlPackages.MHonArc}/bin/mhonarc";
373+ }));
374+
375+ services.sympa.settingsFile = {
376+ "virtual.sympa" = mkDefault { source = virtual; };
377+ "transport.sympa" = mkDefault { source = transport; };
378+ "etc/list_aliases.tt2" = mkDefault { source = listAliases; };
379+ }
380+ // (flip mapAttrs' cfg.domains (fqdn: domain:
381+ nameValuePair "etc/${fqdn}/robot.conf" (mkDefault { source = robotConfig fqdn domain; })));
382+
383+ environment = {
384+ systemPackages = [ pkg ];
385+ };
386+
387+ users.users.${user} = {
388+ description = "Sympa mailing list manager user";
389+ group = group;
390+ home = dataDir;
391+ createHome = false;
392+ isSystemUser = true;
393+ };
394+
395+ users.groups.${group} = {};
396+
397+ assertions = [
398+ { assertion = cfg.database.createLocally -> cfg.database.user == user;
399+ message = "services.sympa.database.user must be set to ${user} if services.sympa.database.createLocally is set to true";
400+ }
401+ { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
402+ message = "a password cannot be specified if services.sympa.database.createLocally is set to true";
403+ }
404+ ];
405+
406+ systemd.tmpfiles.rules = [
407+ "d ${dataDir} 0711 ${user} ${group} - -"
408+ "d ${dataDir}/etc 0700 ${user} ${group} - -"
409+ "d ${dataDir}/spool 0700 ${user} ${group} - -"
410+ "d ${dataDir}/list_data 0700 ${user} ${group} - -"
411+ "d ${dataDir}/arc 0700 ${user} ${group} - -"
412+ "d ${dataDir}/bounce 0700 ${user} ${group} - -"
413+ "f ${dataDir}/sympa_transport 0600 ${user} ${group} - -"
414+
415+ # force-copy static_content so it's up to date with package
416+ # set permissions for wwsympa which needs write access (...)
417+ "R ${dataDir}/static_content - - - - -"
418+ "C ${dataDir}/static_content 0711 ${user} ${group} - ${pkg}/static_content"
419+ "e ${dataDir}/static_content/* 0711 ${user} ${group} - -"
420+
421+ "d /run/sympa 0755 ${user} ${group} - -"
422+ ]
423+ ++ (flip concatMap fqdns (fqdn: [
424+ "d ${dataDir}/etc/${fqdn} 0700 ${user} ${group} - -"
425+ "d ${dataDir}/list_data/${fqdn} 0700 ${user} ${group} - -"
426+ ]))
427+ #++ (flip mapAttrsToList enabledFiles (k: v:
428+ # "L+ ${dataDir}/${k} - - - - ${v.source}"
429+ #))
430+ ++ (concatLists (flip mapAttrsToList enabledFiles (k: v: [
431+ # sympa doesn't handle symlinks well (e.g. fails to create locks)
432+ # force-copy instead
433+ "R ${dataDir}/${k} - - - - -"
434+ "C ${dataDir}/${k} 0700 ${user} ${group} - ${v.source}"
435+ ])));
436+
437+ systemd.services.sympa = {
438+ description = "Sympa mailing list manager";
439+
440+ wantedBy = [ "multi-user.target" ];
441+ after = [ "network-online.target" ];
442+ wants = sympaSubServices;
443+ before = sympaSubServices;
444+ serviceConfig = sympaServiceConfig "sympa_msg";
445+
446+ preStart = ''
447+ umask 0077
448+
449+ cp -f ${mainConfig} ${dataDir}/etc/sympa.conf
450+ ${optionalString (cfg.database.passwordFile != null) ''
451+ chmod u+w ${dataDir}/etc/sympa.conf
452+ echo -n "db_passwd " >> ${dataDir}/etc/sympa.conf
453+ cat ${cfg.database.passwordFile} >> ${dataDir}/etc/sympa.conf
454+ ''}
455+
456+ ${optionalString (cfg.mta.type == "postfix") ''
457+ ${pkgs.postfix}/bin/postmap hash:${dataDir}/virtual.sympa
458+ ${pkgs.postfix}/bin/postmap hash:${dataDir}/transport.sympa
459+ ''}
460+ ${pkg}/bin/sympa_newaliases.pl
461+ ${pkg}/bin/sympa.pl --health_check
462+ '';
463+ };
464+ systemd.services.sympa-archive = {
465+ description = "Sympa mailing list manager (archiving)";
466+ bindsTo = [ "sympa.service" ];
467+ serviceConfig = sympaServiceConfig "archived";
468+ };
469+ systemd.services.sympa-bounce = {
470+ description = "Sympa mailing list manager (bounce processing)";
471+ bindsTo = [ "sympa.service" ];
472+ serviceConfig = sympaServiceConfig "bounced";
473+ };
474+ systemd.services.sympa-bulk = {
475+ description = "Sympa mailing list manager (message distribution)";
476+ bindsTo = [ "sympa.service" ];
477+ serviceConfig = sympaServiceConfig "bulk";
478+ };
479+ systemd.services.sympa-task = {
480+ description = "Sympa mailing list manager (task management)";
481+ bindsTo = [ "sympa.service" ];
482+ serviceConfig = sympaServiceConfig "task_manager";
483+ };
484+
485+ systemd.services.wwsympa = mkIf usingNginx {
486+ wantedBy = [ "multi-user.target" ];
487+ after = [ "sympa.service" ];
488+ serviceConfig = {
489+ Type = "forking";
490+ PIDFile = "/run/sympa/wwsympa.pid";
491+ Restart = "always";
492+ ExecStart = ''${pkgs.spawn_fcgi}/bin/spawn-fcgi \
493+ -u ${user} \
494+ -g ${group} \
495+ -U nginx \
496+ -M 0600 \
497+ -F ${toString cfg.web.fcgiProcs} \
498+ -P /run/sympa/wwsympa.pid \
499+ -s /run/sympa/wwsympa.socket \
500+ -- ${pkg}/bin/wwsympa.fcgi
501+ '';
502+
503+ } // commonServiceConfig;
504+ };
505+
506+ services.nginx.enable = mkIf usingNginx true;
507+ services.nginx.virtualHosts = mkIf usingNginx (let
508+ vHosts = unique (remove null (mapAttrsToList (_k: v: v.webHost) cfg.domains));
509+ hostLocations = host: map (v: v.webLocation) (filter (v: v.webHost == host) (attrValues cfg.domains));
510+ httpsOpts = optionalAttrs cfg.web.https { forceSSL = mkDefault true; enableACME = mkDefault true; };
511+ in
512+ genAttrs vHosts (host: {
513+ locations = genAttrs (hostLocations host) (loc: {
514+ extraConfig = ''
515+ include ${config.services.nginx.package}/conf/fastcgi_params;
516+
517+ fastcgi_pass unix:/run/sympa/wwsympa.socket;
518+ fastcgi_split_path_info ^(${loc})(.*)$;
519+
520+ fastcgi_param PATH_INFO $fastcgi_path_info;
521+ fastcgi_param SCRIPT_FILENAME ${pkg}/bin/wwsympa.fcgi;
522+ '';
523+ }) // {
524+ "/static-sympa/".alias = "${dataDir}/static_content/";
525+ };
526+ } // httpsOpts));
527+
528+ services.postfix = mkIf (cfg.mta.type == "postfix") {
529+ enable = true;
530+ recipientDelimiter = "+";
531+ config = {
532+ virtual_alias_maps = [ "hash:${dataDir}/virtual.sympa" ];
533+ virtual_mailbox_maps = [
534+ "hash:${dataDir}/transport.sympa"
535+ "hash:${dataDir}/sympa_transport"
536+ "hash:${dataDir}/virtual.sympa"
537+ ];
538+ virtual_mailbox_domains = [ "hash:${dataDir}/transport.sympa" ];
539+ transport_maps = [
540+ "hash:${dataDir}/transport.sympa"
541+ "hash:${dataDir}/sympa_transport"
542+ ];
543+ };
544+ masterConfig = {
545+ "sympa" = {
546+ type = "unix";
547+ privileged = true;
548+ chroot = false;
549+ command = "pipe";
550+ args = [
551+ "flags=hqRu"
552+ "user=${user}"
553+ "argv=${pkg}/bin/queue"
554+ "\${nexthop}"
555+ ];
556+ };
557+ "sympabounce" = {
558+ type = "unix";
559+ privileged = true;
560+ chroot = false;
561+ command = "pipe";
562+ args = [
563+ "flags=hqRu"
564+ "user=${user}"
565+ "argv=${pkg}/bin/bouncequeue"
566+ "\${nexthop}"
567+ ];
568+ };
569+ };
570+ };
571+
572+ services.mysql = optionalAttrs mysqlLocal {
573+ enable = true;
574+ package = mkDefault pkgs.mariadb;
575+ ensureDatabases = [ cfg.database.name ];
576+ ensureUsers = [
577+ { name = cfg.database.user;
578+ ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
579+ }
580+ ];
581+ };
582+
583+ services.postgresql = optionalAttrs pgsqlLocal {
584+ enable = true;
585+ ensureDatabases = [ cfg.database.name ];
586+ ensureUsers = [
587+ { name = cfg.database.user;
588+ ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; };
589+ }
590+ ];
591+ };
592+
593+ };
594+
595+ meta.maintainers = with maintainers; [ mmilata sorki ];
596+}
nixos/modules/services/networking/minidlna.nix+17
@@ -95,6 +95,22 @@ in
9595 '';
9696 };
9797
98+ services.minidlna.announceInterval = mkOption {
99+ type = types.int;
100+ default = 895;
101+ description =
102+ ''
103+ The interval between announces (in seconds).
104+
105+ By default miniDLNA will announce its presence on the network
106+ approximately every 15 minutes.
107+
108+ Many people prefer shorter announce intervals (e.g. 60 seconds)
109+ on their home networks, especially when DLNA clients are
110+ started on demand.
111+ '';
112+ };
113+
98114 services.minidlna.config = mkOption {
99115 type = types.lines;
100116 description =
@@ -144,6 +160,7 @@ in
144160 ${concatMapStrings (dir: ''
145161 media_dir=${dir}
146162 '') cfg.mediaDirs}
163+ notify_interval=${toString cfg.announceInterval}
147164 ${cfg.extraConfig}
148165 '';
149166
nixos/modules/services/web-apps/grocy.nixnew file+172
@@ -0,0 +1,172 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.grocy;
7+in {
8+ options.services.grocy = {
9+ enable = mkEnableOption "grocy";
10+
11+ hostName = mkOption {
12+ type = types.str;
13+ description = ''
14+ FQDN for the grocy instance.
15+ '';
16+ };
17+
18+ nginx.enableSSL = mkOption {
19+ type = types.bool;
20+ default = true;
21+ description = ''
22+ Whether or not to enable SSL (with ACME and let's encrypt)
23+ for the grocy vhost.
24+ '';
25+ };
26+
27+ phpfpm.settings = mkOption {
28+ type = with types; attrsOf (oneOf [ int str bool ]);
29+ default = {
30+ "pm" = "dynamic";
31+ "php_admin_value[error_log]" = "stderr";
32+ "php_admin_flag[log_errors]" = true;
33+ "listen.owner" = "nginx";
34+ "catch_workers_output" = true;
35+ "pm.max_children" = "32";
36+ "pm.start_servers" = "2";
37+ "pm.min_spare_servers" = "2";
38+ "pm.max_spare_servers" = "4";
39+ "pm.max_requests" = "500";
40+ };
41+
42+ description = ''
43+ Options for grocy's PHPFPM pool.
44+ '';
45+ };
46+
47+ dataDir = mkOption {
48+ type = types.str;
49+ default = "/var/lib/grocy";
50+ description = ''
51+ Home directory of the <literal>grocy</literal> user which contains
52+ the application's state.
53+ '';
54+ };
55+
56+ settings = {
57+ currency = mkOption {
58+ type = types.str;
59+ default = "USD";
60+ example = "EUR";
61+ description = ''
62+ ISO 4217 code for the currency to display.
63+ '';
64+ };
65+
66+ culture = mkOption {
67+ type = types.enum [ "de" "en" "da" "en_GB" "es" "fr" "hu" "it" "nl" "no" "pl" "pt_BR" "ru" "sk_SK" "sv_SE" "tr" ];
68+ default = "en";
69+ description = ''
70+ Display language of the frontend.
71+ '';
72+ };
73+
74+ calendar = {
75+ showWeekNumber = mkOption {
76+ default = true;
77+ type = types.bool;
78+ description = ''
79+ Show the number of the weeks in the calendar views.
80+ '';
81+ };
82+ firstDayOfWeek = mkOption {
83+ default = null;
84+ type = types.nullOr (types.enum (range 0 6));
85+ description = ''
86+ Which day of the week (0=Sunday, 1=Monday etc.) should be the
87+ first day.
88+ '';
89+ };
90+ };
91+ };
92+ };
93+
94+ config = mkIf cfg.enable {
95+ environment.etc."grocy/config.php".text = ''
96+ <?php
97+ Setting('CULTURE', '${cfg.settings.culture}');
98+ Setting('CURRENCY', '${cfg.settings.currency}');
99+ Setting('CALENDAR_FIRST_DAY_OF_WEEK', '${toString cfg.settings.calendar.firstDayOfWeek}');
100+ Setting('CALENDAR_SHOW_WEEK_OF_YEAR', ${boolToString cfg.settings.calendar.showWeekNumber});
101+ '';
102+
103+ users.users.grocy = {
104+ isSystemUser = true;
105+ createHome = true;
106+ home = cfg.dataDir;
107+ group = "nginx";
108+ };
109+
110+ systemd.tmpfiles.rules = map (
111+ dirName: "d '${cfg.dataDir}/${dirName}' - grocy nginx - -"
112+ ) [ "viewcache" "plugins" "settingoverrides" "storage" ];
113+
114+ services.phpfpm.pools.grocy = {
115+ user = "grocy";
116+ group = "nginx";
117+
118+ # PHP 7.3 is the only version which is supported/tested by upstream:
119+ # https://github.com/grocy/grocy/blob/v2.6.0/README.md#how-to-install
120+ phpPackage = pkgs.php73;
121+
122+ inherit (cfg.phpfpm) settings;
123+
124+ phpEnv = {
125+ GROCY_CONFIG_FILE = "/etc/grocy/config.php";
126+ GROCY_DB_FILE = "${cfg.dataDir}/grocy.db";
127+ GROCY_STORAGE_DIR = "${cfg.dataDir}/storage";
128+ GROCY_PLUGIN_DIR = "${cfg.dataDir}/plugins";
129+ GROCY_CACHE_DIR = "${cfg.dataDir}/viewcache";
130+ };
131+ };
132+
133+ services.nginx = {
134+ enable = true;
135+ virtualHosts."${cfg.hostName}" = mkMerge [
136+ { root = "${pkgs.grocy}/public";
137+ locations."/".extraConfig = ''
138+ rewrite ^ /index.php;
139+ '';
140+ locations."~ \\.php$".extraConfig = ''
141+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
142+ fastcgi_pass unix:${config.services.phpfpm.pools.grocy.socket};
143+ include ${config.services.nginx.package}/conf/fastcgi.conf;
144+ include ${config.services.nginx.package}/conf/fastcgi_params;
145+ '';
146+ locations."~ \\.(js|css|ttf|woff2?|png|jpe?g|svg)$".extraConfig = ''
147+ add_header Cache-Control "public, max-age=15778463";
148+ add_header X-Content-Type-Options nosniff;
149+ add_header X-XSS-Protection "1; mode=block";
150+ add_header X-Robots-Tag none;
151+ add_header X-Download-Options noopen;
152+ add_header X-Permitted-Cross-Domain-Policies none;
153+ add_header Referrer-Policy no-referrer;
154+ access_log off;
155+ '';
156+ extraConfig = ''
157+ try_files $uri /index.php;
158+ '';
159+ }
160+ (mkIf cfg.nginx.enableSSL {
161+ enableACME = true;
162+ forceSSL = true;
163+ })
164+ ];
165+ };
166+ };
167+
168+ meta = {
169+ maintainers = with maintainers; [ ma27 ];
170+ doc = ./grocy.xml;
171+ };
172+}
nixos/modules/services/web-apps/grocy.xmlnew file+77
@@ -0,0 +1,77 @@
1+<chapter xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xmlns:xi="http://www.w3.org/2001/XInclude"
4+ version="5.0"
5+ xml:id="module-services-grocy">
6+
7+ <title>Grocy</title>
8+ <para>
9+ <link xlink:href="https://grocy.info/">Grocy</link> is a web-based self-hosted groceries
10+ &amp; household management solution for your home.
11+ </para>
12+
13+ <section xml:id="module-services-grocy-basic-usage">
14+ <title>Basic usage</title>
15+ <para>
16+ A very basic configuration may look like this:
17+<programlisting>{ pkgs, ... }:
18+{
19+ services.grocy = {
20+ <link linkend="opt-services.grocy.enable">enable</link> = true;
21+ <link linkend="opt-services.grocy.hostName">hostName</link> = "grocy.tld";
22+ };
23+}</programlisting>
24+ This configures a simple vhost using <link linkend="opt-services.nginx.enable">nginx</link>
25+ which listens to <literal>grocy.tld</literal> with fully configured ACME/LE (this can be
26+ disabled by setting <link linkend="opt-services.grocy.nginx.enableSSL">services.grocy.nginx.enableSSL</link>
27+ to <literal>false</literal>). After the initial setup the credentials <literal>admin:admin</literal>
28+ can be used to login.
29+ </para>
30+ <para>
31+ The application's state is persisted at <literal>/var/lib/grocy/grocy.db</literal> in a
32+ <package>sqlite3</package> database. The migration is applied when requesting the <literal>/</literal>-route
33+ of the application.
34+ </para>
35+ </section>
36+
37+ <section xml:id="module-services-grocy-settings">
38+ <title>Settings</title>
39+ <para>
40+ The configuration for <literal>grocy</literal> is located at <literal>/etc/grocy/config.php</literal>.
41+ By default, the following settings can be defined in the NixOS-configuration:
42+<programlisting>{ pkgs, ... }:
43+{
44+ services.grocy.settings = {
45+ # The default currency in the system for invoices etc.
46+ # Please note that exchange rates aren't taken into account, this
47+ # is just the setting for what's shown in the frontend.
48+ <link linkend="opt-services.grocy.settings.currency">currency</link> = "EUR";
49+
50+ # The display language (and locale configuration) for grocy.
51+ <link linkend="opt-services.grocy.settings.currency">culture</link> = "de";
52+
53+ calendar = {
54+ # Whether or not to show the week-numbers
55+ # in the calendar.
56+ <link linkend="opt-services.grocy.settings.calendar.showWeekNumber">showWeekNumber</link> = true;
57+
58+ # Index of the first day to be shown in the calendar (0=Sunday, 1=Monday,
59+ # 2=Tuesday and so on).
60+ <link linkend="opt-services.grocy.settings.calendar.firstDayOfWeek">firstDayOfWeek</link> = 2;
61+ };
62+ };
63+}</programlisting>
64+ </para>
65+ <para>
66+ If you want to alter the configuration file on your own, you can do this manually with
67+ an expression like this:
68+<programlisting>{ lib, ... }:
69+{
70+ environment.etc."grocy/config.php".text = lib.mkAfter ''
71+ // Arbitrary PHP code in grocy's configuration file
72+ '';
73+}</programlisting>
74+ </para>
75+ </section>
76+
77+</chapter>
nixos/modules/system/boot/loader/grub/memtest.nix+40−17
@@ -1,4 +1,4 @@
1−# This module adds Memtest86+ to the GRUB boot menu.
1+# This module adds Memtest86+/Memtest86 to the GRUB boot menu.
22
33{ config, lib, pkgs, ... }:
44
@@ -6,6 +6,7 @@ with lib;
66
77let
88 memtest86 = pkgs.memtest86plus;
9+ efiSupport = config.boot.loader.grub.efiSupport;
910 cfg = config.boot.loader.grub.memtest86;
1011in
1112
@@ -18,8 +19,11 @@ in
1819 default = false;
1920 type = types.bool;
2021 description = ''
21− Make Memtest86+, a memory testing program, available from the
22− GRUB boot menu.
22+ Make Memtest86+ (or MemTest86 if EFI support is enabled),
23+ a memory testing program, available from the
24+ GRUB boot menu. MemTest86 is an unfree program, so
25+ this requires <literal>allowUnfree</literal> to be set to
26+ <literal>true</literal>.
2327 '';
2428 };
2529
@@ -75,19 +79,38 @@ in
7579 };
7680 };
7781
78− config = mkIf cfg.enable {
79−
80− boot.loader.grub.extraEntries =
81− if config.boot.loader.grub.version == 2 then
82− ''
83− menuentry "Memtest86+" {
84− linux16 @bootRoot@/memtest.bin ${toString cfg.params}
85− }
86− ''
87− else
88− throw "Memtest86+ is not supported with GRUB 1.";
89−
90− boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";
82+ config = mkMerge [
83+ (mkIf (cfg.enable && efiSupport) {
84+ assertions = [
85+ {
86+ assertion = cfg.params == [];
87+ message = "Parameters are not available for MemTest86";
88+ }
89+ ];
90+
91+ boot.loader.grub.extraFiles = {
92+ "memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
93+ };
9194
92− };
95+ boot.loader.grub.extraEntries = ''
96+ menuentry "Memtest86" {
97+ chainloader /memtest86.efi
98+ }
99+ '';
100+ })
101+
102+ (mkIf (cfg.enable && !efiSupport) {
103+ boot.loader.grub.extraEntries =
104+ if config.boot.loader.grub.version == 2 then
105+ ''
106+ menuentry "Memtest86+" {
107+ linux16 @bootRoot@/memtest.bin ${toString cfg.params}
108+ }
109+ ''
110+ else
111+ throw "Memtest86+ is not supported with GRUB 1.";
112+
113+ boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";
114+ })
115+ ];
93116}
nixos/modules/virtualisation/hyperv-guest.nix+1−1
@@ -32,7 +32,7 @@ in {
3232 ];
3333
3434 kernelParams = [
35− "video=hyperv_fb:${cfg.videoMode}"
35+ "video=hyperv_fb:${cfg.videoMode} elevator=noop"
3636 ];
3737 };
3838
nixos/release-combined.nix+6−8
@@ -95,14 +95,12 @@ in rec {
9595 (all nixos.tests.env)
9696 (all nixos.tests.ipv6)
9797 (all nixos.tests.i3wm)
98− # 2018-06-06: keymap tests temporarily removed from tested job
99− # since non-deterministic failure are blocking the channel (#41538)
100− #(all nixos.tests.keymap.azerty)
101− #(all nixos.tests.keymap.colemak)
102− #(all nixos.tests.keymap.dvorak)
103− #(all nixos.tests.keymap.dvp)
104− #(all nixos.tests.keymap.neo)
105− #(all nixos.tests.keymap.qwertz)
98+ (except ["aarch64-linux"] nixos.tests.keymap.azerty)
99+ (except ["aarch64-linux"] nixos.tests.keymap.colemak)
100+ (except ["aarch64-linux"] nixos.tests.keymap.dvorak)
101+ (except ["aarch64-linux"] nixos.tests.keymap.dvp)
102+ (except ["aarch64-linux"] nixos.tests.keymap.neo)
103+ (except ["aarch64-linux"] nixos.tests.keymap.qwertz)
106104 (all nixos.tests.plasma5)
107105 (all nixos.tests.lightdm)
108106 (all nixos.tests.login)
nixos/tests/acme.nix+101−17
@@ -1,17 +1,50 @@
11let
22 commonConfig = ./common/letsencrypt/common.nix;
3+
4+ dnsScript = {writeScript, dnsAddress, bash, curl}: writeScript "dns-hook.sh" ''
5+ #!${bash}/bin/bash
6+ set -euo pipefail
7+ echo '[INFO]' "[$2]" 'dns-hook.sh' $*
8+ if [ "$1" = "present" ]; then
9+ ${curl}/bin/curl --data '{"host": "'"$2"'", "value": "'"$3"'"}' http://${dnsAddress}:8055/set-txt
10+ else
11+ ${curl}/bin/curl --data '{"host": "'"$2"'"}' http://${dnsAddress}:8055/clear-txt
12+ fi
13+ '';
14+
315in import ./make-test-python.nix {
416 name = "acme";
517
618 nodes = rec {
7− letsencrypt = ./common/letsencrypt;
19+ letsencrypt = { nodes, lib, ... }: {
20+ imports = [ ./common/letsencrypt ];
21+ networking.nameservers = lib.mkForce [
22+ nodes.dnsserver.config.networking.primaryIPAddress
23+ ];
24+ };
25+
26+ dnsserver = { nodes, pkgs, ... }: {
27+ networking.firewall.allowedTCPPorts = [ 8055 53 ];
28+ networking.firewall.allowedUDPPorts = [ 53 ];
29+ systemd.services.pebble-challtestsrv = {
30+ enable = true;
31+ description = "Pebble ACME challenge test server";
32+ wantedBy = [ "network.target" ];
33+ serviceConfig = {
34+ ExecStart = "${pkgs.pebble}/bin/pebble-challtestsrv -dns01 ':53' -defaultIPv6 '' -defaultIPv4 '${nodes.webserver.config.networking.primaryIPAddress}'";
35+ # Required to bind on privileged ports.
36+ User = "root";
37+ Group = "root";
38+ };
39+ };
40+ };
841
9− acmeStandalone = { config, pkgs, ... }: {
42+ acmeStandalone = { nodes, lib, config, pkgs, ... }: {
1043 imports = [ commonConfig ];
44+ networking.nameservers = lib.mkForce [
45+ nodes.dnsserver.config.networking.primaryIPAddress
46+ ];
1147 networking.firewall.allowedTCPPorts = [ 80 ];
12− networking.extraHosts = ''
13− ${config.networking.primaryIPAddress} standalone.com
14− '';
1548 security.acme = {
1649 server = "https://acme-v02.api.letsencrypt.org/dir";
1750 certs."standalone.com" = {
@@ -29,14 +62,12 @@ in import ./make-test-python.nix {
2962 };
3063 };
3164
32− webserver = { config, pkgs, ... }: {
65+ webserver = { nodes, config, pkgs, lib, ... }: {
3366 imports = [ commonConfig ];
3467 networking.firewall.allowedTCPPorts = [ 80 443 ];
35−
36− networking.extraHosts = ''
37− ${config.networking.primaryIPAddress} a.example.com
38− ${config.networking.primaryIPAddress} b.example.com
39− '';
68+ networking.nameservers = lib.mkForce [
69+ nodes.dnsserver.config.networking.primaryIPAddress
70+ ];
4071
4172 # A target remains active. Use this to probe the fact that
4273 # a service fired eventhough it is not RemainAfterExit
@@ -61,14 +92,11 @@ in import ./make-test-python.nix {
6192
6293 nesting.clone = [
6394 ({pkgs, ...}: {
64−
65− networking.extraHosts = ''
66− ${config.networking.primaryIPAddress} b.example.com
67− '';
6895 systemd.targets."acme-finished-b.example.com" = {};
6996 systemd.services."acme-b.example.com" = {
7097 wants = [ "acme-finished-b.example.com.target" ];
7198 before = [ "acme-finished-b.example.com.target" ];
99+ after = [ "nginx.service" ];
72100 };
73101 services.nginx.virtualHosts."b.example.com" = {
74102 enableACME = true;
@@ -79,15 +107,48 @@ in import ./make-test-python.nix {
79107 '';
80108 };
81109 })
110+ ({pkgs, config, nodes, lib, ...}: {
111+ security.acme.certs."example.com" = {
112+ domain = "*.example.com";
113+ dnsProvider = "exec";
114+ dnsPropagationCheck = false;
115+ credentialsFile = with pkgs; writeText "wildcard.env" ''
116+ EXEC_PATH=${dnsScript { inherit writeScript bash curl; dnsAddress = nodes.dnsserver.config.networking.primaryIPAddress; }}
117+ '';
118+ user = config.services.nginx.user;
119+ group = config.services.nginx.group;
120+ };
121+ systemd.targets."acme-finished-example.com" = {};
122+ systemd.services."acme-example.com" = {
123+ wants = [ "acme-finished-example.com.target" ];
124+ before = [ "acme-finished-example.com.target" "nginx.service" ];
125+ wantedBy = [ "nginx.service" ];
126+ };
127+ services.nginx.virtualHosts."c.example.com" = {
128+ forceSSL = true;
129+ sslCertificate = config.security.acme.certs."example.com".directory + "/cert.pem";
130+ sslTrustedCertificate = config.security.acme.certs."example.com".directory + "/full.pem";
131+ sslCertificateKey = config.security.acme.certs."example.com".directory + "/key.pem";
132+ locations."/".root = pkgs.runCommand "docroot" {} ''
133+ mkdir -p "$out"
134+ echo hello world > "$out/index.html"
135+ '';
136+ };
137+ })
82138 ];
83139 };
84140
85− client = commonConfig;
141+ client = {nodes, lib, ...}: {
142+ imports = [ commonConfig ];
143+ networking.nameservers = lib.mkForce [
144+ nodes.dnsserver.config.networking.primaryIPAddress
145+ ];
146+ };
86147 };
87148
88149 testScript = {nodes, ...}:
89150 let
90− newServerSystem = nodes.webserver2.config.system.build.toplevel;
151+ newServerSystem = nodes.webserver.config.system.build.toplevel;
91152 switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test";
92153 in
93154 # Note, wait_for_unit does not work for oneshot services that do not have RemainAfterExit=true,
@@ -97,6 +158,17 @@ in import ./make-test-python.nix {
97158 # can use them to probe that a oneshot fired. It is a bit ugly, but it is the best we can do
98159 ''
99160 client.start()
161+ dnsserver.start()
162+
163+ letsencrypt.wait_for_unit("default.target")
164+ dnsserver.wait_for_unit("pebble-challtestsrv.service")
165+ client.succeed(
166+ 'curl --data \'{"host": "acme-v02.api.letsencrypt.org", "addresses": ["${nodes.letsencrypt.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a'
167+ )
168+ client.succeed(
169+ 'curl --data \'{"host": "standalone.com", "addresses": ["${nodes.acmeStandalone.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a'
170+ )
171+
100172 letsencrypt.start()
101173 acmeStandalone.start()
102174
@@ -129,5 +201,17 @@ in import ./make-test-python.nix {
129201 client.succeed(
130202 "curl --cacert /tmp/ca.crt https://b.example.com/ | grep -qF 'hello world'"
131203 )
204+
205+ with subtest("Can request wildcard certificates using DNS-01 challenge"):
206+ webserver.succeed(
207+ "${switchToNewServer}"
208+ )
209+ webserver.succeed(
210+ "/run/current-system/fine-tune/child-2/bin/switch-to-configuration test"
211+ )
212+ webserver.wait_for_unit("acme-finished-example.com.target")
213+ client.succeed(
214+ "curl --cacert /tmp/ca.crt https://c.example.com/ | grep -qF 'hello world'"
215+ )
132216 '';
133217}
nixos/tests/all-tests.nix+3
@@ -96,6 +96,7 @@ in
9696 freeswitch = handleTest ./freeswitch.nix {};
9797 fsck = handleTest ./fsck.nix {};
9898 gotify-server = handleTest ./gotify-server.nix {};
99+ grocy = handleTest ./grocy.nix {};
99100 gitea = handleTest ./gitea.nix {};
100101 gitlab = handleTest ./gitlab.nix {};
101102 gitolite = handleTest ./gitolite.nix {};
@@ -256,6 +257,7 @@ in
256257 runInMachine = handleTest ./run-in-machine.nix {};
257258 rxe = handleTest ./rxe.nix {};
258259 samba = handleTest ./samba.nix {};
260+ sanoid = handleTest ./sanoid.nix {};
259261 sddm = handleTest ./sddm.nix {};
260262 shiori = handleTest ./shiori.nix {};
261263 signal-desktop = handleTest ./signal-desktop.nix {};
@@ -269,6 +271,7 @@ in
269271 strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
270272 sudo = handleTest ./sudo.nix {};
271273 switchTest = handleTest ./switch-test.nix {};
274+ sympa = handleTest ./sympa.nix {};
272275 syncthing-init = handleTest ./syncthing-init.nix {};
273276 syncthing-relay = handleTest ./syncthing-relay.nix {};
274277 systemd = handleTest ./systemd.nix {};
nixos/tests/common/letsencrypt/common.nix+3
@@ -5,5 +5,8 @@ in {
55 nodes.letsencrypt.config.networking.primaryIPAddress
66 ];
77
8+ security.acme.acceptTerms = true;
9+ security.acme.email = "webmaster@example.com";
10+
811 security.pki.certificateFiles = [ letsencrypt-ca ];
912}
nixos/tests/corerad.nix+1−1
@@ -17,7 +17,7 @@ import ./make-test-python.nix (
1717 configFile = pkgs.writeText "corerad.toml" ''
1818 [[interfaces]]
1919 name = "eth1"
20− send_advertisements = true
20+ advertise = true
2121 [[interfaces.prefix]]
2222 prefix = "::/64"
2323 '';
nixos/tests/grocy.nixnew file+47
@@ -0,0 +1,47 @@
1+import ./make-test-python.nix ({ pkgs, ... }: {
2+ name = "grocy";
3+ meta = with pkgs.stdenv.lib.maintainers; {
4+ maintainers = [ ma27 ];
5+ };
6+
7+ machine = { pkgs, ... }: {
8+ services.grocy = {
9+ enable = true;
10+ hostName = "localhost";
11+ nginx.enableSSL = false;
12+ };
13+ environment.systemPackages = [ pkgs.jq ];
14+ };
15+
16+ testScript = ''
17+ machine.start()
18+ machine.wait_for_open_port(80)
19+ machine.wait_for_unit("multi-user.target")
20+
21+ machine.succeed("curl -sSf http://localhost")
22+
23+ machine.succeed(
24+ "curl -c cookies -sSf -X POST http://localhost/login -d 'username=admin&password=admin'"
25+ )
26+
27+ cookie = machine.succeed(
28+ "grep -v '^#' cookies | awk '{ print $7 }' | sed -e '/^$/d' | perl -pe 'chomp'"
29+ )
30+
31+ machine.succeed(
32+ f"curl -sSf -X POST http://localhost/api/objects/tasks -b 'grocy_session={cookie}' "
33+ + '-d \'{"assigned_to_user_id":1,"name":"Test Task","due_date":"1970-01-01"}\'''
34+ + " --header 'Content-Type: application/json'"
35+ )
36+
37+ task_name = machine.succeed(
38+ f"curl -sSf http://localhost/api/tasks -b 'grocy_session={cookie}' --header 'Accept: application/json' | jq '.[].name' | xargs echo | perl -pe 'chomp'"
39+ )
40+
41+ assert task_name == "Test Task"
42+
43+ machine.succeed("curl -sSfI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'")
44+
45+ machine.shutdown()
46+ '';
47+})
nixos/tests/sanoid.nixnew file+90
@@ -0,0 +1,90 @@
1+import ./make-test-python.nix ({ pkgs, ... }: let
2+ inherit (import ./ssh-keys.nix pkgs)
3+ snakeOilPrivateKey snakeOilPublicKey;
4+
5+ commonConfig = { pkgs, ... }: {
6+ virtualisation.emptyDiskImages = [ 2048 ];
7+ boot.supportedFilesystems = [ "zfs" ];
8+ environment.systemPackages = [ pkgs.parted ];
9+ };
10+in {
11+ name = "sanoid";
12+ meta = with pkgs.stdenv.lib.maintainers; {
13+ maintainers = [ lopsided98 ];
14+ };
15+
16+ nodes = {
17+ source = { ... }: {
18+ imports = [ commonConfig ];
19+ networking.hostId = "daa82e91";
20+
21+ programs.ssh.extraConfig = ''
22+ UserKnownHostsFile=/dev/null
23+ StrictHostKeyChecking=no
24+ '';
25+
26+ services.sanoid = {
27+ enable = true;
28+ templates.test = {
29+ hourly = 12;
30+ daily = 1;
31+ monthly = 1;
32+ yearly = 1;
33+
34+ autosnap = true;
35+ };
36+ datasets."pool/test".useTemplate = [ "test" ];
37+ };
38+
39+ services.syncoid = {
40+ enable = true;
41+ sshKey = "/root/.ssh/id_ecdsa";
42+ commonArgs = [ "--no-sync-snap" ];
43+ commands."pool/test".target = "root@target:pool/test";
44+ };
45+ };
46+ target = { ... }: {
47+ imports = [ commonConfig ];
48+ networking.hostId = "dcf39d36";
49+
50+ services.openssh.enable = true;
51+ users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
52+ };
53+ };
54+
55+ testScript = ''
56+ source.succeed(
57+ "mkdir /tmp/mnt",
58+ "parted --script /dev/vdb -- mklabel msdos mkpart primary 1024M -1s",
59+ "udevadm settle",
60+ "zpool create pool /dev/vdb1",
61+ "zfs create -o mountpoint=legacy pool/test",
62+ "mount -t zfs pool/test /tmp/mnt",
63+ "udevadm settle",
64+ )
65+ target.succeed(
66+ "parted --script /dev/vdb -- mklabel msdos mkpart primary 1024M -1s",
67+ "udevadm settle",
68+ "zpool create pool /dev/vdb1",
69+ "udevadm settle",
70+ )
71+
72+ source.succeed("mkdir -m 700 /root/.ssh")
73+ source.succeed(
74+ "cat '${snakeOilPrivateKey}' > /root/.ssh/id_ecdsa"
75+ )
76+ source.succeed("chmod 600 /root/.ssh/id_ecdsa")
77+
78+ source.succeed("touch /tmp/mnt/test.txt")
79+ source.systemctl("start --wait sanoid.service")
80+
81+ target.wait_for_open_port(22)
82+ source.systemctl("start --wait syncoid.service")
83+ target.succeed(
84+ "mkdir /tmp/mnt",
85+ "zfs set mountpoint=legacy pool/test",
86+ "mount -t zfs pool/test /tmp/mnt",
87+ )
88+ target.succeed("cat /tmp/mnt/test.txt")
89+ '';
90+})
nixos/tests/sympa.nixnew file+36
@@ -0,0 +1,36 @@
1+import ./make-test-python.nix ({ pkgs, lib, ... }: {
2+ name = "sympa";
3+ meta.maintainers = with lib.maintainers; [ mmilata ];
4+
5+ machine =
6+ { ... }:
7+ {
8+ virtualisation.memorySize = 1024;
9+
10+ services.sympa = {
11+ enable = true;
12+ domains = {
13+ "lists.example.org" = {
14+ webHost = "localhost";
15+ };
16+ };
17+ listMasters = [ "joe@example.org" ];
18+ web.enable = true;
19+ web.https = false;
20+ database = {
21+ type = "PostgreSQL";
22+ createLocally = true;
23+ };
24+ };
25+ };
26+
27+ testScript = ''
28+ start_all()
29+
30+ machine.wait_for_unit("sympa.service")
31+ machine.wait_for_unit("wwsympa.service")
32+ assert "Mailing lists service" in machine.succeed(
33+ "curl --insecure -L http://localhost/"
34+ )
35+ '';
36+})
pkgs/applications/audio/kid3/default.nix+2−2
@@ -9,11 +9,11 @@
99stdenv.mkDerivation rec {
1010
1111 pname = "kid3";
12− version = "3.8.1";
12+ version = "3.8.2";
1313
1414 src = fetchurl {
1515 url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
16− sha256 = "1d2lr500dx7gnxw2vrvpbhadpn313ly3zyp178864z26dnfkjv8x";
16+ sha256 = "051y77swpi9isx275gwzl4fn3igd2dmixbszv9m3h0h9lqhcjrvr";
1717 };
1818
1919 nativeBuildInputs = [ wrapQtAppsHook ];
pkgs/applications/audio/mopidy/default.nix+5−5
@@ -1,16 +1,16 @@
1−{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
1+{ stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook
22, gst_all_1, glib-networking, gobject-introspection
33}:
44
5−pythonPackages.buildPythonApplication rec {
5+python3Packages.buildPythonApplication rec {
66 pname = "mopidy";
7− version = "2.3.1";
7+ version = "3.0.1";
88
99 src = fetchFromGitHub {
1010 owner = "mopidy";
1111 repo = "mopidy";
1212 rev = "v${version}";
13− sha256 = "1qdflxr0an6l2m3j90h55bzyj7rjlkkwmxx945hwv8xi472rcgdj";
13+ sha256 = "0fpjprjw143ixak68iwxjpscdjgyb7rsr1cxj7fsdrw6hc83nq4z";
1414 };
1515
1616 nativeBuildInputs = [ wrapGAppsHook ];
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
2020 glib-networking gobject-introspection
2121 ];
2222
23− propagatedBuildInputs = with pythonPackages; [
23+ propagatedBuildInputs = with python3Packages; [
2424 gst-python pygobject3 pykka tornado_4 requests setuptools
2525 ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
2626
pkgs/applications/audio/mopidy/iris.nix+6−7
@@ -1,18 +1,17 @@
1−{ stdenv, pythonPackages, mopidy, mopidy-local-images }:
1+{ stdenv, python3Packages, mopidy, mopidy-local-images }:
22
3−pythonPackages.buildPythonApplication rec {
3+python3Packages.buildPythonApplication rec {
44 pname = "Mopidy-Iris";
5− version = "3.43.0";
5+ version = "3.44.0";
66
7− src = pythonPackages.fetchPypi {
7+ src = python3Packages.fetchPypi {
88 inherit pname version;
9− sha256 = "1qg9xyjf27dp0810h4kdliyfb8r3kvi37lq8r93d01xwfphdzs05";
9+ sha256 = "0gap0cyw6sfb4487i1x220rr9fbsz6xyw68l15ar0vfll0zv0760";
1010 };
1111
1212 propagatedBuildInputs = [
1313 mopidy
14− mopidy-local-images
15− ] ++ (with pythonPackages; [
14+ ] ++ (with python3Packages; [
1615 configobj
1716 requests
1817 tornado_4
pkgs/applications/audio/mopidy/spotify.nix+5−5
@@ -1,15 +1,15 @@
1−{ stdenv, fetchurl, pythonPackages, mopidy }:
1+{ stdenv, fetchurl, python3Packages, mopidy }:
22
3−pythonPackages.buildPythonApplication rec {
3+python3Packages.buildPythonApplication rec {
44 pname = "mopidy-spotify";
5− version = "3.1.0";
5+ version = "4.0.1";
66
77 src = fetchurl {
88 url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
9− sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl";
9+ sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f";
1010 };
1111
12− propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
12+ propagatedBuildInputs = [ mopidy python3Packages.pyspotify ];
1313
1414 doCheck = false;
1515
pkgs/applications/editors/okteta/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "okteta";
7− version = "0.26.2";
7+ version = "0.26.3";
88
99 src = fetchurl {
1010 url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
11− sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv";
11+ sha256 = "1454844s76skk18gpcf56y9pkmffs7p4z09ggmy37ifzf7yk1p19";
1212 };
1313
1414 nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
pkgs/applications/misc/calibre/default.nix+2−1
@@ -93,12 +93,13 @@ mkDerivation rec {
9393 netifaces
9494 pillow
9595 python
96− pyqt5_with_qtwebkit
96+ pyqt5
9797 sip
9898 regex
9999 msgpack
100100 beautifulsoup4
101101 html2text
102+ pyqtwebengine
102103 # the following are distributed with calibre, but we use upstream instead
103104 odfpy
104105 ]
pkgs/applications/misc/gmtp/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
2626 description = "A simple MP3 and Media player client for UNIX and UNIX like systems.";
2727 homepage = https://gmtp.sourceforge.io;
2828 platforms = stdenv.lib.platforms.linux;
29− maintainers = [ stdenv.lib.maintainers.pbogdan ];
29+ maintainers = [ ];
3030 license = stdenv.lib.licenses.bsd3;
3131 };
3232}
pkgs/applications/misc/syncthingtray/default.nix+2−2
@@ -20,14 +20,14 @@
2020}:
2121
2222mkDerivation rec {
23− version = "0.10.5";
23+ version = "0.10.6";
2424 pname = "syncthingtray";
2525
2626 src = fetchFromGitHub {
2727 owner = "Martchus";
2828 repo = "syncthingtray";
2929 rev = "v${version}";
30− sha256 = "177ywk1dfdfwz7kvlxx3an1q4vv2c27d7qivy0463a3hvkacybxn";
30+ sha256 = "1lh1qsdy5081jrs27ba0mfh90ya1fj9h6j5k0cdsfap9mcxyjd9g";
3131 };
3232
3333 buildInputs = [ qtbase cpp-utilities qtutilities ]
pkgs/applications/networking/browsers/conkeror/default.nixdeleted−39
@@ -1,39 +0,0 @@
1−{ stdenv, fetchgit, unzip, firefox-esr-52, makeWrapper }:
2−
3−stdenv.mkDerivation rec {
4− pkgname = "conkeror";
5− version = "1.0.4";
6− name = "${pkgname}-${version}";
7−
8− src = fetchgit {
9− url = git://repo.or.cz/conkeror.git;
10− rev = "refs/tags/${version}";
11− sha256 = "10c57wqybp9kcjpkb01wxq0h3vafcdb1g5kb4k8sb2zajg59afv8";
12− };
13−
14− buildInputs = [ unzip makeWrapper ];
15−
16− installPhase = ''
17− mkdir -p $out/libexec/conkeror
18− cp -r * $out/libexec/conkeror
19−
20− makeWrapper ${firefox-esr-52}/bin/firefox $out/bin/conkeror \
21− --add-flags "-app $out/libexec/conkeror/application.ini"
22− '';
23−
24− meta = with stdenv.lib; {
25− description = "A keyboard-oriented, customizable, extensible web browser";
26− longDescription = ''
27− Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
28− web browser based on Mozilla XULRunner, written mainly in JavaScript,
29− and inspired by exceptional software such as Emacs and vi. Conkeror
30− features a sophisticated keyboard system, allowing users to run commands
31− and interact with content in powerful and novel ways. It is
32− self-documenting, featuring a powerful interactive help system.
33− '';
34− homepage = http://conkeror.org/;
35− license = with licenses; [ mpl11 gpl2 lgpl21 ];
36− maintainers = with maintainers; [ astsmtl ];
37− platforms = platforms.linux;
38− };
39−}
pkgs/applications/networking/browsers/firefox/common.nix+49−111
@@ -1,8 +1,6 @@
11{ pname, ffversion, meta, updateScript ? null
22, src, unpackPhase ? null, patches ? []
3−, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? []
4−, isIceCatLike ? false, icversion ? null
5−, isTorBrowserLike ? false, tbversion ? null }:
3+, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }:
64
75{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL
86, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
@@ -27,16 +25,14 @@
2725
2826## privacy-related options
2927
30−, privacySupport ? isTorBrowserLike || isIceCatLike
28+, privacySupport ? false
3129
3230# WARNING: NEVER set any of the options below to `true` by default.
3331# Set to `!privacySupport` or `false`.
3432
3533# webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63.
3634# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589
37−, webrtcSupport ? !privacySupport && (!stdenv.isAarch64 || !(
38− lib.versionAtLeast ffversion "60" && lib.versionOlder ffversion "63"
39− ))
35+, webrtcSupport ? !privacySupport
4036, geolocationSupport ? !privacySupport
4137, googleAPISupport ? geolocationSupport
4238, crashreporterSupport ? false
@@ -79,7 +75,7 @@ let
7975 default-toolkit = if stdenv.isDarwin then "cairo-cocoa"
8076 else "cairo-gtk${if gtk3Support then "3${lib.optionalString waylandSupport "-wayland"}" else "2"}";
8177
82− binaryName = if isIceCatLike then "icecat" else "firefox";
78+ binaryName = "firefox";
8379 binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName;
8480
8581 browserName = if stdenv.isDarwin then binaryNameCapitalized else binaryName;
@@ -87,21 +83,17 @@ let
8783 execdir = if stdenv.isDarwin
8884 then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
8985 else "/bin";
86+in
87+
88+stdenv.mkDerivation ({
89+ name = "${pname}-unwrapped-${ffversion}";
90+ version = ffversion;
9091
91− browserVersion = if isIceCatLike then icversion
92− else if isTorBrowserLike then tbversion
93− else ffversion;
92+ inherit src unpackPhase meta;
9493
95− browserPatches = [
94+ patches = [
9695 ./env_var_for_system_dir.patch
97− ]
98− ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "68.3.0")
99− (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
100− name = "write_error-parallel_make.diff";
101− url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py";
102− sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y";
103− })
104− ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [
96+ ] ++ lib.optionals (stdenv.isAarch64) [
10597 (fetchpatch {
10698 url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch";
10799 sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32";
@@ -117,15 +109,6 @@ let
117109 })
118110 ++ patches;
119111
120−in
121−
122−stdenv.mkDerivation (rec {
123− name = "${pname}-unwrapped-${version}";
124− version = browserVersion;
125−
126− inherit src unpackPhase meta;
127−
128− patches = browserPatches;
129112
130113 # Ignore trivial whitespace changes in patches, this fixes compatibility of
131114 # ./env_var_for_system_dir.patch with Firefox >=65 without having to track
@@ -141,16 +124,14 @@ stdenv.mkDerivation (rec {
141124 xorg.libXext sqlite unzip makeWrapper
142125 libevent libstartup_notification libvpx /* cairo */
143126 icu libpng jemalloc glib
127+ nasm
128+ # >= 66 requires nasm for the AV1 lib dav1d
129+ # yasm can potentially be removed in future versions
130+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
131+ # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
132+ nspr nss
144133 ]
145− ++ lib.optionals (!isTorBrowserLike) [ nspr nss ]
146− ++ lib.optional (lib.versionOlder ffversion "53") libXdamage
147− ++ lib.optional (lib.versionOlder ffversion "61") hunspell
148−
149− # >= 66 requires nasm for the AV1 lib dav1d
150− # yasm can potentially be removed in future versions
151− # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
152− # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
153− ++ lib.optional (lib.versionAtLeast ffversion "66") nasm
134+
154135 ++ lib.optional alsaSupport alsaLib
155136 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
156137 ++ lib.optional gtk3Support gtk3
@@ -162,27 +143,33 @@ stdenv.mkDerivation (rec {
162143
163144 NIX_CFLAGS_COMPILE = toString ([
164145 "-I${glib.dev}/include/gio-unix-2.0"
165− ]
166− ++ lib.optionals (!isTorBrowserLike) [
167146 "-I${nss.dev}/include/nss"
168147 ]
169− ++ lib.optional (pname == "firefox-esr" && lib.versionAtLeast ffversion "68"
170− && lib.versionOlder ffversion "69")
148+ ++ lib.optional (pname == "firefox-esr" && lib.versionOlder ffversion "69")
171149 "-Wno-error=format-security");
172150
173− postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
151+ postPatch = ''
174152 substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
175− '' + lib.optionalString (lib.versionAtLeast ffversion "68") ''
176153 rm -rf obj-x86_64-pc-linux-gnu
177154 '';
178155
179156 nativeBuildInputs =
180− [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
157+ [
158+ autoconf213
159+ cargo
160+ gnused
161+ llvmPackages.llvm # llvm-objdump
162+ nodejs
163+ perl
164+ pkgconfig
165+ python2
166+ python3
167+ rust-cbindgen
168+ rustc
169+ which
170+ ]
181171 ++ lib.optional gtk3Support wrapGAppsHook
182172 ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
183− ++ lib.optional (lib.versionAtLeast ffversion "61.0") python3
184− ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
185− ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0
186173 ++ extraNativeBuildInputs;
187174
188175 preConfigure = ''
@@ -190,14 +177,8 @@ stdenv.mkDerivation (rec {
190177 rm -f configure
191178 rm -f js/src/configure
192179 rm -f .mozconfig*
193− '' + (if lib.versionAtLeast ffversion "58"
194− # this will run autoconf213
195− then ''
180+ # this will run autoconf213
196181 configureScript="$(realpath ./mach) configure"
197− '' else ''
198− make -f client.mk configure-files
199− configureScript="$(realpath ./configure)"
200− '') + lib.optionalString (lib.versionAtLeast ffversion "53") ''
201182 export MOZCONFIG=$(pwd)/mozconfig
202183
203184 # Set C flags for Rust's bindgen program. Unlike ordinary C
@@ -214,23 +195,16 @@ stdenv.mkDerivation (rec {
214195 $NIX_CFLAGS_COMPILE"
215196
216197 echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG
217− '' + lib.optionalString googleAPISupport ''
198+ '' + (lib.optionalString googleAPISupport ''
218199 # Google API key used by Chromium and Firefox.
219200 # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
220201 # please get your own set of keys.
221202 echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
222203 # 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176
223− ${if (lib.versionAtLeast ffversion "60.6" && lib.versionOlder ffversion "61") || (lib.versionAtLeast ffversion "66") then ''
224− configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga")
225− configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga")
226− '' else ''
227− configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
228− ''}
229− '' + lib.optionalString (lib.versionOlder ffversion "58") ''
230− cd obj-*
231− ''
232− # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
233− + lib.optionalString (lib.versionAtLeast ffversion "64") ''
204+ configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga")
205+ configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga")
206+ '') + ''
207+ # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
234208 unset AS
235209 '';
236210
@@ -255,32 +229,15 @@ stdenv.mkDerivation (rec {
255229 "--enable-jemalloc"
256230 "--disable-gconf"
257231 "--enable-default-toolkit=${default-toolkit}"
258− ]
259− ++ lib.optional (lib.versionOlder ffversion "64") "--disable-maintenance-service"
260− ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks"
261− ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell"
262− ++ lib.optionals (lib.versionAtLeast ffversion "56") [
263232 "--with-libclang-path=${llvmPackages.libclang}/lib"
264233 "--with-clang-path=${llvmPackages.clang}/bin/clang"
265− ]
266− ++ lib.optionals (lib.versionAtLeast ffversion "57" && lib.versionOlder ffversion "69") [
267− "--enable-webrender=build"
268− ]
269−
270− # TorBrowser patches these
271− ++ lib.optionals (!isTorBrowserLike) [
272234 "--with-system-nspr"
273235 "--with-system-nss"
274236 ]
275−
276− # and wants these
277− ++ lib.optionals isTorBrowserLike ([
278− "--with-tor-browser-version=${tbversion}"
279− "--with-distribution-id=org.torproject"
280− "--enable-signmar"
281− "--enable-verify-mar"
282− "--enable-bundled-fonts"
283− ])
237+ ++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks"
238+ ++ lib.optionals (lib.versionOlder ffversion "69") [
239+ "--enable-webrender=build"
240+ ]
284241
285242 ++ flag alsaSupport "alsa"
286243 ++ flag pulseaudioSupport "pulseaudio"
@@ -290,11 +247,6 @@ stdenv.mkDerivation (rec {
290247 ++ flag crashreporterSupport "crashreporter"
291248 ++ lib.optional drmSupport "--enable-eme=widevine"
292249
293− ++ lib.optionals (lib.versionOlder ffversion "60") ([]
294− ++ flag geolocationSupport "mozril-geoloc"
295− ++ flag safeBrowsingSupport "safe-browsing"
296− )
297−
298250 ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
299251 else [ "--disable-debug" "--enable-release"
300252 "--enable-optimize"
@@ -302,29 +254,16 @@ stdenv.mkDerivation (rec {
302254 ++ lib.optional enableOfficialBranding "--enable-official-branding"
303255 ++ extraConfigureFlags;
304256
305− # Before 58 we have to run `make -f client.mk configure-files` at
306− # the top level, and then run `./configure` in the obj-* dir (see
307− # above), but in 58 we have to instead run `./mach configure` at the
308− # top level and then run `make` in obj-*. (We can also run the
309− # `make` at the top level in 58, but then we would have to `cd` to
310− # `make install` anyway. This is ugly, but simple.)
311− postConfigure = lib.optionalString (lib.versionAtLeast ffversion "58") ''
257+ postConfigure = ''
312258 cd obj-*
313259 '';
314260
315− preBuild = lib.optionalString isTorBrowserLike ''
316− buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser")
317− '';
318−
319261 makeFlags = lib.optionals enableOfficialBranding [
320262 "MOZILLA_OFFICIAL=1"
321263 "BUILD_OFFICIAL=1"
322264 ]
323265 ++ extraMakeFlags;
324266
325− RUSTFLAGS = if (lib.versionAtLeast ffversion "67"/*somewhere betwween ESRs*/)
326− then null else "--cap-lints warn";
327−
328267 enableParallelBuilding = true;
329268 doCheck = false; # "--disable-tests" above
330269
@@ -355,10 +294,9 @@ stdenv.mkDerivation (rec {
355294 '';
356295
357296 passthru = {
358− inherit version updateScript;
297+ inherit updateScript;
298+ version = ffversion;
359299 isFirefox3Like = true;
360− inherit isIceCatLike;
361− inherit isTorBrowserLike;
362300 gtk = gtk2;
363301 inherit nspr;
364302 inherit ffmpegSupport;
@@ -366,12 +304,12 @@ stdenv.mkDerivation (rec {
366304 inherit execdir;
367305 inherit browserName;
368306 } // lib.optionalAttrs gtk3Support { inherit gtk3; };
369−
370307} //
371308# the build system verifies checksums of the bundled rust sources
372309# ./third_party/rust is be patched by our libtool fixup code in stdenv
373310# unfortunately we can't just set this to `false` when we do not want it.
374311# See https://github.com/NixOS/nixpkgs/issues/77289 for more details
312+
375313lib.optionalAttrs (lib.versionAtLeast ffversion "72") {
376314 # Ideally we would figure out how to tell the build system to not
377315 # care about changed hashes as we are already doing that when we
pkgs/applications/networking/browsers/firefox/packages.nix+14−135
@@ -1,4 +1,4 @@
1−{ lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }:
1+{ config, lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }:
22
33let
44
@@ -40,64 +40,6 @@ rec {
4040 };
4141 };
4242
43− # Do not remove. This is the last version of Firefox that supports
44− # the old plugins. While this package is unsafe to use for browsing
45− # the web, there are many old useful plugins targeting offline
46− # activities (e.g. ebook readers, syncronous translation, etc) that
47− # will probably never be ported to WebExtensions API.
48− firefox-esr-52 = (common rec {
49− pname = "firefox-esr";
50− ffversion = "52.9.0esr";
51− src = fetchurl {
52− url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
53− sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9";
54− };
55−
56− patches = [
57− # this one is actually an omnipresent bug
58− # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
59− ./fix-pa-context-connect-retval.patch
60− ];
61−
62− meta = firefox.meta // {
63− description = "A web browser built from Firefox Extended Support Release source tree";
64− knownVulnerabilities = [ "Support ended in August 2018." ];
65− };
66− }).override {
67− stdenv = overrideCC gccStdenv gcc6; # gcc7 fails with "undefined reference to `__divmoddi4'"
68− gtk3Support = false;
69− };
70−
71− firefox-esr-60 = common rec {
72− pname = "firefox-esr";
73− ffversion = "60.9.0esr";
74−
75− src = fetchurl {
76− url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
77− sha512 = "4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf";
78− };
79−
80− patches = [
81− ./no-buildconfig-ffx65.patch
82−
83− # this one is actually an omnipresent bug
84− # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
85− ./fix-pa-context-connect-retval.patch
86−
87− missing-documentation-patch
88− ];
89−
90− meta = firefox.meta // {
91− description = "A web browser built from Firefox Extended Support Release source tree";
92− knownVulnerabilities = [ "Support ended around October 2019." ];
93− };
94− updateScript = callPackage ./update.nix {
95− attrPath = "firefox-esr-60-unwrapped";
96− versionSuffix = "esr";
97− versionKey = "ffversion";
98− };
99− };
100−
10143 firefox-esr-68 = common rec {
10244 pname = "firefox-esr";
10345 ffversion = "68.4.2esr";
@@ -119,86 +61,23 @@ rec {
11961 versionKey = "ffversion";
12062 };
12163 };
64+} // lib.optionalAttrs (config.allowAliases or true) {
65+ #### ALIASES
66+ #### remove after 20.03 branchoff
12267
123−} // (let
124−
125− iccommon = args: common (args // {
126− pname = "icecat";
127− isIceCatLike = true;
128−
129− meta = (args.meta or {}) // {
130− description = "The GNU version of the Firefox web browser";
131− longDescription = ''
132− GNUzilla is the GNU version of the Mozilla suite, and GNU
133− IceCat is the GNU version of the Firefox web browser.
134−
135− Notable differences from mainline Firefox:
68+ firefox-esr-52 = throw ''
69+ firefoxPackages.firefox-esr-52 was removed as it's an unsupported ESR with
70+ open security issues. If you need it because you need to run some plugins
71+ not having been ported to WebExtensions API, import it from an older
72+ nixpkgs checkout still containing it.
73+ '';
74+ firefox-esr-60 = throw "firefoxPackages.firefox-esr-60 was removed as it's an unsupported ESR with open security issues.";
13675
137− - entirely free software, no non-free plugins, addons,
138− artwork,
139− - no telemetry, no "studies",
140− - sane privacy and security defaults (for instance, unlike
141− Firefox, IceCat does _zero_ network requests on startup by
142− default, which means that with IceCat you won't need to
143− unplug your Ethernet cable each time you want to create a
144− new browser profile without announcing that action to a
145− bunch of data-hungry corporations),
146− - all essential privacy and security settings can be
147− configured directly from the main screen,
148− - optional first party isolation (like TorBrowser),
149− - comes with HTTPS Everywhere (like TorBrowser), Tor Browser
150− Button (like TorBrowser Bundle), LibreJS, and SpyBlock
151− plugins out of the box.
152−
153− This package can be installed together with Firefox and
154− TorBrowser, it will use distinct binary names and profile
155− directories.
156− '';
157− homepage = "https://www.gnu.org/software/gnuzilla/";
158− platforms = lib.platforms.unix;
159− license = with lib.licenses; [ mpl20 gpl3Plus ];
160− };
161− });
162−
163−in {
164−
165− icecat = iccommon rec {
166− ffversion = "60.3.0";
167− icversion = "${ffversion}-gnu1";
168−
169− src = fetchurl {
170− url = "mirror://gnu/gnuzilla/${ffversion}/icecat-${icversion}.tar.bz2";
171− sha256 = "0icnl64nxcyf7dprpdpygxhabsvyhps8c3ixysj9bcdlj9q34ib1";
172− };
173−
174− patches = [
175− ./no-buildconfig.patch
176− missing-documentation-patch
177− ];
178− meta.knownVulnerabilities = [ "Support ended around October 2019." ];
179− };
180−
181− # Similarly to firefox-esr-52 above.
182− icecat-52 = iccommon rec {
183− ffversion = "52.6.0";
184− icversion = "${ffversion}-gnu1";
185−
186− src = fetchurl {
187− url = "mirror://gnu/gnuzilla/${ffversion}/icecat-${icversion}.tar.bz2";
188− sha256 = "09fn54glqg1aa93hnz5zdcy07cps09dbni2b4200azh6nang630a";
189− };
190−
191− patches = [
192− # this one is actually an omnipresent bug
193− # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
194− ./fix-pa-context-connect-retval.patch
195− ];
196−
197− meta.knownVulnerabilities = [ "Support ended in August 2018." ];
198− };
76+ icecat = throw "firefoxPackages.icecat was removed as even its latest upstream version is based on an unsupported ESR release with open security issues.";
77+ icecat-52 = throw "firefoxPackages.icecat was removed as even its latest upstream version is based on an unsupported ESR release with open security issues.";
19978
20079 tor-browser-7-5 = throw "firefoxPackages.tor-browser-7-5 was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452.";
20180 tor-browser-8-5 = throw "firefoxPackages.tor-browser-8-5 was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452.";
20281 tor-browser = throw "firefoxPackages.tor-browser was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452.";
20382
204−})
83+}
pkgs/applications/networking/browsers/firefox/wrapper.nix+2−2
@@ -155,9 +155,9 @@ let
155155
156156 install -D -t $out/share/applications $desktopItem/share/applications/*
157157
158− mkdir -p $out/lib/mozilla
158+ mkdir -p $out/lib/mozilla/native-messaging-hosts
159159 for ext in ${toString nativeMessagingHosts}; do
160− lndir -silent $ext/lib/mozilla $out/lib/mozilla
160+ ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*
161161 done
162162
163163 # For manpages, in case the program supplies them
pkgs/applications/networking/browsers/opera/default.nix+2−2
@@ -47,11 +47,11 @@ let
4747in stdenv.mkDerivation rec {
4848
4949 pname = "opera";
50− version = "66.0.3515.36";
50+ version = "66.0.3515.72";
5151
5252 src = fetchurl {
5353 url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
54− sha256 = "1kmd8dxdid593a98a13n8k22hi1whvichda6qam2bqcz99rsczdd";
54+ sha256 = "1mw4sfjf9ijbgghkbkg45b6kzbd0qa0mxb88ajrjnxf4g26brhra";
5555 };
5656
5757 unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
pkgs/applications/networking/browsers/palemoon/default.nix+2−2
@@ -13,13 +13,13 @@ let
1313
1414in stdenv.mkDerivation rec {
1515 pname = "palemoon";
16− version = "28.8.1";
16+ version = "28.8.2.1";
1717
1818 src = fetchFromGitHub {
1919 owner = "MoonchildProductions";
2020 repo = "UXP";
2121 rev = "PM${version}_Release";
22− sha256 = "055bmfgasxf7azjqry06bbgwx6ryrdc1zrcq8b217b6zb1in037x";
22+ sha256 = "1m7dfgy5vjw1ndjsh0aksvsp0ii2kj7gxn0sp3h0xgwi0yq7lwyb";
2323 };
2424
2525 desktopItem = makeDesktopItem {
pkgs/applications/networking/p2p/tribler/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "tribler";
6− version = "7.4.0-exp1";
6+ version = "7.4.1";
77
88 src = fetchurl {
99 url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
10− sha256 = "18ziisg0v2gdxnprbhqsryz92yk270waj0la7m2h326k5qql3qkf";
10+ sha256 = "1s9hzr0n00d3hb1z2srq75j7mbml6csylb14hzy9psw27q2c0fqs";
1111 };
1212
1313 nativeBuildInputs = [
pkgs/applications/office/scribus/unstable.nix+91−21
@@ -1,12 +1,41 @@
1−{ stdenv, fetchurl, fetchpatch, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
2−boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2,
3−podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }:
1+{ boost
2+, cairo
3+, cmake
4+, cups
5+, fetchpatch
6+, fetchurl
7+, fontconfig
8+, freetype
9+, harfbuzzFull
10+, hunspell
11+, lcms2
12+, libjpeg
13+, libtiff
14+, libxml2
15+, mkDerivation
16+, pixman
17+, pkgconfig
18+, podofo
19+, poppler
20+, poppler_data
21+, python2
22+, qtbase
23+, qtimageformats
24+, qttools
25+, stdenv
26+}:
427
528let
6− pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
29+ pythonEnv = python2.withPackages (
30+ ps: [
31+ ps.pillow
32+ ps.tkinter
33+ ]
34+ );
735in
836mkDerivation rec {
937 pname = "scribus";
38+
1039 version = "1.5.5";
1140
1241 src = fetchurl {
@@ -16,31 +45,72 @@ mkDerivation rec {
1645
1746 patches = [
1847 # fix build with Poppler 0.82
19− (fetchpatch {
20− url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
21− sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
22− })
48+ (
49+ fetchpatch {
50+ url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
51+ sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
52+ }
53+ )
2354 # fix build with Poppler 0.83
24− (fetchpatch {
25− url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
26− sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
27− })
55+ (
56+ fetchpatch {
57+ url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
58+ sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
59+ }
60+ )
61+ # fix build with Poppler 0.84
62+ # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version
63+ (
64+ fetchpatch {
65+ url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch";
66+ sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y";
67+ }
68+ )
2869 ];
2970
3071 enableParallelBuilding = true;
3172
32− nativeBuildInputs = [ pkgconfig cmake ];
73+ nativeBuildInputs = [
74+ cmake
75+ pkgconfig
76+ ];
77+
3378 buildInputs = [
34− qtbase cairo pixman boost cups fontconfig
35− freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler
36− poppler_data pythonEnv qtimageformats qttools harfbuzzFull
79+ boost
80+ cairo
81+ cups
82+ fontconfig
83+ freetype
84+ harfbuzzFull
85+ hunspell
86+ lcms2
87+ libjpeg
88+ libtiff
89+ libxml2
90+ pixman
91+ podofo
92+ poppler
93+ poppler_data
94+ pythonEnv
95+ qtbase
96+ qtimageformats
97+ qttools
3798 ];
3899
39− meta = {
40− maintainers = [ stdenv.lib.maintainers.erictapen ];
41− platforms = stdenv.lib.platforms.linux;
100+ meta = with stdenv.lib; {
101+ maintainers = with maintainers; [
102+ erictapen
103+ kiwi
104+ ];
105+ platforms = platforms.linux;
42106 description = "Desktop Publishing (DTP) and Layout program for Linux";
43− homepage = http://www.scribus.net;
44− license = stdenv.lib.licenses.gpl2;
107+ homepage = "http://www.scribus.net";
108+ # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
109+ license = with licenses; [
110+ bsd3
111+ gpl2
112+ mit
113+ publicDomain
114+ ];
45115 };
46116}
pkgs/applications/science/electronics/pcb/default.nix+2−2
@@ -21,11 +21,11 @@
2121
2222stdenv.mkDerivation rec {
2323 pname = "pcb";
24− version = "4.2.1";
24+ version = "4.2.2";
2525
2626 src = fetchurl {
2727 url = "mirror://sourceforge/pcb/${pname}-${version}.tar.gz";
28− sha256 = "1i9zvcj0vgwp2g2hkmvafdq0k39klj90jsdanqx9xl7gl70345cq";
28+ sha256 = "0pbfyfadbia1jf9ywkf02j8mfdh8c3mj390c2jdqnl70vcdszvhw";
2929 };
3030
3131 nativeBuildInputs = [
pkgs/applications/science/logic/verifast/default.nix+2−2
@@ -20,11 +20,11 @@ let
2020in
2121stdenv.mkDerivation rec {
2222 pname = "verifast";
23− version = "18.02";
23+ version = "19.12";
2424
2525 src = fetchurl {
2626 url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz";
27− sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e";
27+ sha256 = "169kshjq4cf4i9v92azv0xaflrnik5686w7fwcgdhd6qkbzflzl6";
2828 };
2929
3030 dontStrip = true;
pkgs/applications/science/logic/workcraft/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "workcraft";
5− version = "3.1.9";
5+ version = "3.2.5";
66
77 src = fetchurl {
88 url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
9− sha256 = "0d1mi8jffwr7irp215j9rfpa3nmwxrx6mv13bh7vn0qf6i0aw0xi";
9+ sha256 = "11dk00b17yhk7cv8zms4nlffc0qwgsapimzr8csb89qmgabd7rj3";
1010 };
1111
1212 buildInputs = [ makeWrapper ];
pkgs/applications/version-management/git-repo/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "git-repo";
7− version = "1.13.9.3";
7+ version = "1.13.9.4";
88
99 src = fetchFromGitHub {
1010 owner = "android";
1111 repo = "tools_repo";
1212 rev = "v${version}";
13− sha256 = "0xrgq6v1bh9zgrgg2r9z4zndzch08p0z5y3sppffyrb19mib055k";
13+ sha256 = "0kkb3s472zvmz5xign25rgv7amdzhjb1wvchqxaf80g4913rw583";
1414 };
1515
1616 patches = [ ./import-ssl-module.patch ];
pkgs/applications/version-management/gitkraken/default.nix+25−21
@@ -1,8 +1,8 @@
11{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
22, libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig
33, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
4−, nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
5−, dpkg, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, libuuid
4+, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
5+, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid
66, e2fsprogs, krb5
77}:
88
@@ -13,13 +13,16 @@ let
1313in
1414stdenv.mkDerivation rec {
1515 pname = "gitkraken";
16− version = "6.4.1";
16+ version = "6.5.1";
1717
18− src = fetchurl {
19− url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
20− sha256 = "1w8iwpbr6nwzhhf63fvr7pd66yjx3jgjy4gx5y02qxa3ip5psq5b";
18+ src = fetchzip {
19+ url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
20+ sha256 = "0dwjwismv4rfw58801g2ay51h9qrffcxgbl910frd4i530w0y44p";
2121 };
2222
23+ dontBuild = true;
24+ dontConfigure = true;
25+
2326 libPath = makeLibraryPath [
2427 stdenv.cc.cc.lib
2528 curlWithGnuTls
@@ -54,6 +57,7 @@ stdenv.mkDerivation rec {
5457 libgnome-keyring
5558 openssl
5659 at-spi2-atk
60+ at-spi2-core
5761 libuuid
5862 e2fsprogs
5963 krb5
@@ -69,27 +73,27 @@ stdenv.mkDerivation rec {
6973 comment = "Graphical Git client from Axosoft";
7074 };
7175
72− nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
76+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
7377 buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
7478
75− unpackCmd = ''
76− mkdir out
77− dpkg -x $curSrc out
78− '';
79−
8079 installPhase = ''
8180 runHook preInstall
82− mkdir $out
83− pushd usr
84− pushd share
85− substituteInPlace applications/gitkraken.desktop \
86− --replace /usr/share/gitkraken $out/bin
87− popd
88− rm -rf bin/gitkraken share/lintian
89− cp -av share bin $out/
90− popd
9181
82+ mkdir -p $out/share/gitkraken/
83+ cp -R $src/* $out/share/gitkraken/
84+
85+ mkdir -p $out/bin
9286 ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
87+
88+ mkdir -p $out/share/applications
89+ cp ${desktopItem}/share/applications/* $out/share/applications/
90+
91+ substituteInPlace $out/share/applications/gitkraken.desktop \
92+ --replace $out/usr/share/gitkraken $out/bin
93+
94+ mkdir -p $out/share/pixmaps
95+ cp gitkraken.png $out/share/pixmaps/gitkraken.png
96+
9397 runHook postInstall
9498 '';
9599
pkgs/applications/video/handbrake/default.nix+3−5
@@ -49,11 +49,11 @@ assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null
4949
5050stdenv.mkDerivation rec {
5151 pname = "handbrake";
52− version = "1.3.0";
52+ version = "1.3.1";
5353
5454 src = fetchurl {
55− url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
56− sha256 = "15hxncswmaj62hb40fxixsa6d519zb712z9xbdq979q4rasjxa59";
55+ url = ''https://download.handbrake.fr/releases/${version}/HandBrake-${version}-source.tar.bz2'';
56+ sha256 = "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0";
5757 };
5858
5959 nativeBuildInputs = [
@@ -102,8 +102,6 @@ stdenv.mkDerivation rec {
102102 # NOTE: 2018-12-27: Check NixOS HandBrake test if changing
103103 NIX_LDFLAGS = toString [
104104 "-lx265"
105− # NOTE: The -ldl flag was fixed upstream for a release after 1.3.0
106− "-ldl"
107105 ];
108106
109107 preBuild = ''
pkgs/applications/video/manim/default.nixnew file+64
@@ -0,0 +1,64 @@
1+{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch
2+, cairo, ffmpeg, sox, xdg_utils, texlive
3+, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub
4+, pbr, fetchPypi
5+}:
6+buildPythonApplication rec {
7+ pname = "manim";
8+ version = "0.1.10";
9+
10+ src = fetchPypi {
11+ pname = "manimlib";
12+ inherit version;
13+ sha256 = "0vg9b3rwypq5zir74pi0pmj47yqlcg7hrvscwrpjzjbqq2yihn49";
14+ };
15+
16+ patches = [ ./remove-dependency-constraints.patch ];
17+
18+ nativeBuildInputs = [ pbr ];
19+
20+ propagatedBuildInputs = [
21+ colour
22+ numpy
23+ pillow
24+ progressbar
25+ scipy
26+ tqdm
27+ opencv
28+ pycairo
29+ pydub
30+
31+ cairo sox ffmpeg xdg_utils
32+ ];
33+
34+ # Test with texlive to see whether it works but don't propagate
35+ # because it's huge and optional
36+ # TODO: Use smaller TexLive distribution
37+ # Doesn't need everything but it's hard to figure out what it needs
38+ checkInputs = [ cairo sox ffmpeg xdg_utils texlive.combined.scheme-full ];
39+
40+ # Simple test and complex test with LaTeX
41+ checkPhase = ''
42+ for scene in SquareToCircle OpeningManimExample
43+ do
44+ python3 manim.py example_scenes.py $scene -l
45+ tail -n 20 files/Tex/*.log # Print potential LaTeX erorrs
46+ ${file}/bin/file videos/example_scenes/480p15/$scene.mp4 \
47+ | tee | grep -F "ISO Media, MP4 Base Media v1 [IS0 14496-12:2003]"
48+ done
49+ '';
50+
51+ disabled = pythonOlder "3.7";
52+
53+ meta = {
54+ description = "Animation engine for explanatory math videos";
55+ longDescription = ''
56+ Manim is an animation engine for explanatory math videos. It's used to
57+ create precise animations programmatically, as seen in the videos of
58+ 3Blue1Brown on YouTube.
59+ '';
60+ homepage = https://github.com/3b1b/manim;
61+ license = lib.licenses.mit;
62+ maintainers = with lib.maintainers; [ johnazoidberg ];
63+ };
64+}
pkgs/applications/video/manim/remove-dependency-constraints.patchnew file+26
@@ -0,0 +1,26 @@
1+diff --git i/requirements.txt w/requirements.txt
2+index 556122ad..11fd49d5 100644
3+--- i/requirements.txt
4++++ w/requirements.txt
5+@@ -1,11 +1,10 @@
6+-argparse==1.4.0
7+-colour==0.1.5
8+-numpy==1.15.0
9+-Pillow==5.2.0
10+-progressbar==2.5
11+-scipy==1.1.0
12+-tqdm==4.24.0
13+-opencv-python==3.4.2.17
14+-pycairo==1.17.1; sys_platform == 'linux'
15+-pycairo>=1.18.0; sys_platform == 'win32'
16+-pydub==0.23.0
17++colour
18++numpy
19++Pillow
20++progressbar
21++scipy
22++tqdm
23++pycairo
24++pycairo>=1.18.1; sys_platform == 'win32'
25++pydub
26++pyreadline==2.1; sys_platform == 'win32'
pkgs/data/misc/osinfo-db/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "osinfo-db";
5− version = "20191125";
5+ version = "20200203";
66
77 src = fetchurl {
88 url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
9− sha256 = "102mdykp5pjv7lw7saig640vb5a8ivy4ji8sa68q2wzfwg1yix78";
9+ sha256 = "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5";
1010 };
1111
1212 nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
pkgs/data/themes/ant-theme/default.nix+1−3
@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
3232 homepage = https://github.com/EliverLara/Ant;
3333 license = licenses.gpl3;
3434 platforms = platforms.all;
35− maintainers = [
36− maintainers.pbogdan
37− ];
35+ maintainers = [ ];
3836 };
3937}
pkgs/development/compilers/adoptopenjdk-bin/sources.json+94−70
@@ -4,30 +4,30 @@
44 "jdk": {
55 "hotspot": {
66 "aarch64": {
7− "build": "11",
8− "sha256": "10e33e1862638e11a9158947b3d7b461727d8e396e378b171be1eb4dfe12f1ed",
9− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz",
10− "version": "11.0.4"
7+ "build": "10",
8+ "sha256": "04b77f6754aed68528f39750c5cfd6a439190206aff216aa081d62a0e1a794fa",
9+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz",
10+ "version": "11.0.6"
1111 },
1212 "armv6l": {
1313 "build": "10",
14− "sha256": "c6b1fda3f8807028cbfcc34a4ded2e8a5a6b6239d2bcc1f06673ea6b1530df94",
15− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz",
16− "version": "11.0.5"
14+ "sha256": "ab5b76203e54fe7a5221535f6f407efa43153de029a746f60af3cffb7cb5080b",
15+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz",
16+ "version": "11.0.6"
1717 },
1818 "armv7l": {
1919 "build": "10",
20− "sha256": "c6b1fda3f8807028cbfcc34a4ded2e8a5a6b6239d2bcc1f06673ea6b1530df94",
21− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz",
22− "version": "11.0.5"
20+ "sha256": "ab5b76203e54fe7a5221535f6f407efa43153de029a746f60af3cffb7cb5080b",
21+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz",
22+ "version": "11.0.6"
2323 },
2424 "packageType": "jdk",
2525 "vmType": "hotspot",
2626 "x86_64": {
2727 "build": "10",
28− "sha256": "6dd0c9c8a740e6c19149e98034fba8e368fd9aa16ab417aa636854d40db1a161",
29− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz",
30− "version": "11.0.5"
28+ "sha256": "330d19a2eaa07ed02757d7a785a77bab49f5ee710ea03b4ee2fa220ddd0feffc",
29+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz",
30+ "version": "11.0.6"
3131 }
3232 },
3333 "openj9": {
@@ -35,27 +35,27 @@
3535 "vmType": "openj9",
3636 "x86_64": {
3737 "build": "10",
38− "sha256": "6ead0515aecb24c6a8f5f3800a070b7d20a66c8f26cba5dad137824da590a532",
39− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10_openj9-0.17.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.5_10_openj9-0.17.0.tar.gz",
40− "version": "11.0.5"
38+ "sha256": "1530172ee98edd129954fcdca1bf725f7b30c8bfc3cdc381c88de96b7d19e690",
39+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz",
40+ "version": "11.0.6"
4141 }
4242 }
4343 },
4444 "jre": {
4545 "hotspot": {
4646 "aarch64": {
47− "build": "11",
48− "sha256": "5f7b5c110fc0f344a549cb11784a6d76838061a2b6f654f7841f60e0cd286c6a",
49− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.4_11.tar.gz",
50− "version": "11.0.4"
47+ "build": "10",
48+ "sha256": "7ed04ed9ed7271528e7f03490f1fd7dfbbc2d391414bd6fe4dd80ec3bad76d30",
49+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.6_10.tar.gz",
50+ "version": "11.0.6"
5151 },
5252 "packageType": "jre",
5353 "vmType": "hotspot",
5454 "x86_64": {
5555 "build": "10",
56− "sha256": "2f08c469c9a8adea1b6ee3444ba2a8242a7e99d87976a077faf037a9eb7f884b",
57− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.5_10.tar.gz",
58− "version": "11.0.5"
56+ "sha256": "c5a4e69e2be0e3e5f5bb7c759960b20650967d0f571baad4a7f15b2c03bda352",
57+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz",
58+ "version": "11.0.6"
5959 }
6060 },
6161 "openj9": {
@@ -63,9 +63,9 @@
6363 "vmType": "openj9",
6464 "x86_64": {
6565 "build": "10",
66− "sha256": "2b68ea68d41281238a9dbe494cec762bd97fe34cf4fb6ba44ee1ce66bcec9d38",
67− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10_openj9-0.17.0/OpenJDK11U-jre_x64_linux_openj9_11.0.5_10_openj9-0.17.0.tar.gz",
68− "version": "11.0.5"
66+ "sha256": "056e4b5f7166f5daa44f36b06c735913bda52831d2e77fa2ac371505c66d10c1",
67+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jre_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz",
68+ "version": "11.0.6"
6969 }
7070 }
7171 }
@@ -77,9 +77,9 @@
7777 "vmType": "hotspot",
7878 "x86_64": {
7979 "build": "10",
80− "sha256": "0825d0d3177832320b697944cd8e7b2e7fe3893fafe8bfcf33ee3631aa5ca96b",
81− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.5_10.tar.gz",
82− "version": "11.0.5"
80+ "sha256": "b87102274d983bf6bb0aa6c2c623301d0ff5eb7f61043ffd04abb00f962c2dcd",
81+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.6_10.tar.gz",
82+ "version": "11.0.6"
8383 }
8484 },
8585 "openj9": {
@@ -87,9 +87,9 @@
8787 "vmType": "openj9",
8888 "x86_64": {
8989 "build": "10",
90− "sha256": "97dc8234b73e233316b5dfdca75af9a0d54aa23b1309b1a68fd0a5d2fa928e05",
91− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10.1_openj9-0.17.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.5_10_openj9-0.17.0.tar.gz",
92− "version": "11.0.5"
90+ "sha256": "9a5c5b3bb51a82e666c46b2d1bbafa8c2bbc3aae50194858c8f96c5d43a96f64",
91+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.6_10_openj9-0.18.1.tar.gz",
92+ "version": "11.0.6"
9393 }
9494 }
9595 },
@@ -99,9 +99,9 @@
9999 "vmType": "hotspot",
100100 "x86_64": {
101101 "build": "10",
102− "sha256": "dfd212023321ebb41bce8cced15b4668001e86ecff6bffdd4f2591ccaae41566",
103− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.5_10.tar.gz",
104− "version": "11.0.5"
102+ "sha256": "ab3c2038a32c62843500109d2efb8f5dacdfa1de3cbb713c8226f26dc603cc33",
103+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.6_10.tar.gz",
104+ "version": "11.0.6"
105105 }
106106 },
107107 "openj9": {
@@ -109,9 +109,9 @@
109109 "vmType": "openj9",
110110 "x86_64": {
111111 "build": "10",
112− "sha256": "ea6bd0be4562e766c035b997447c059d10d5d2e58ca464c57f9078858da1c967",
113− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10.1_openj9-0.17.0/OpenJDK11U-jre_x64_mac_openj9_11.0.5_10_openj9-0.17.0.tar.gz",
114− "version": "11.0.5"
112+ "sha256": "130850133d9701393352c2ce13ab541b4f900ff1f5ddf8257cda624968aada9f",
113+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jre_x64_mac_openj9_11.0.6_10_openj9-0.18.1.tar.gz",
114+ "version": "11.0.6"
115115 }
116116 }
117117 }
@@ -127,23 +127,35 @@
127127 "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz",
128128 "version": "8.0.232"
129129 },
130+ "armv6l": {
131+ "build": "9",
132+ "sha256": "fdd9f61f1b2df74242da54ee3b3231b0123782a917e9673351276da439c7cab1",
133+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz",
134+ "version": "8.0.232"
135+ },
136+ "armv7l": {
137+ "build": "9",
138+ "sha256": "fdd9f61f1b2df74242da54ee3b3231b0123782a917e9673351276da439c7cab1",
139+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz",
140+ "version": "8.0.232"
141+ },
130142 "packageType": "jdk",
131143 "vmType": "hotspot",
132144 "x86_64": {
133− "build": "9",
134− "sha256": "7b7884f2eb2ba2d47f4c0bf3bb1a2a95b73a3a7734bd47ebf9798483a7bcc423",
135− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz",
136− "version": "8.0.232"
145+ "build": "8",
146+ "sha256": "f39b523c724d0e0047d238eb2bb17a9565a60574cf651206c867ee5fc000ab43",
147+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz",
148+ "version": "8.0.242"
137149 }
138150 },
139151 "openj9": {
140152 "packageType": "jdk",
141153 "vmType": "openj9",
142154 "x86_64": {
143− "build": "9",
144− "sha256": "abea758c7e102f3c4a3be8757ee0ce039a70e2d498c160400dfb83c6f7004dbf",
145− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09_openj9-0.17.0/OpenJDK8U-jdk_x64_linux_openj9_8u232b09_openj9-0.17.0.tar.gz",
146− "version": "8.0.232"
155+ "build": "8",
156+ "sha256": "ca785af638b24f9d4df896f5a9f557cc9f1e5fa5e2b1174d6b906e3fd5474c2e",
157+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz",
158+ "version": "8.0.242"
147159 }
148160 }
149161 },
@@ -155,23 +167,35 @@
155167 "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u232b09.tar.gz",
156168 "version": "8.0.232"
157169 },
170+ "armv6l": {
171+ "build": "9",
172+ "sha256": "8ab786fc2fa0a282f5cf57f6040f1976c32c3c5e480e900ce5925de6543f6688",
173+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz",
174+ "version": "8.0.232"
175+ },
176+ "armv7l": {
177+ "build": "9",
178+ "sha256": "8ab786fc2fa0a282f5cf57f6040f1976c32c3c5e480e900ce5925de6543f6688",
179+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz",
180+ "version": "8.0.232"
181+ },
158182 "packageType": "jre",
159183 "vmType": "hotspot",
160184 "x86_64": {
161− "build": "9",
162− "sha256": "bd06b84a1fc10e0a555431bc49a84e86df45de0be93c8ee4d09d13513219843b",
163− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_x64_linux_hotspot_8u232b09.tar.gz",
164− "version": "8.0.232"
185+ "build": "8",
186+ "sha256": "5edfaefdbb0469d8b24d61c8aef80c076611053b1738029c0232b9a632fe2708",
187+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz",
188+ "version": "8.0.242"
165189 }
166190 },
167191 "openj9": {
168192 "packageType": "jre",
169193 "vmType": "openj9",
170194 "x86_64": {
171− "build": "9",
172− "sha256": "30bdfdb38901d4807d96a72a33b83f7a4f40255e11a88853c1e8732acc4644a7",
173− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09_openj9-0.17.0/OpenJDK8U-jre_x64_linux_openj9_8u232b09_openj9-0.17.0.tar.gz",
174− "version": "8.0.232"
195+ "build": "8",
196+ "sha256": "985d3134b64c6196d4c9ddbc87af0c62b0e643cef71b29f3d25a8c7811811745",
197+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jre_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz",
198+ "version": "8.0.242"
175199 }
176200 }
177201 }
@@ -182,20 +206,20 @@
182206 "packageType": "jdk",
183207 "vmType": "hotspot",
184208 "x86_64": {
185− "build": "9",
186− "sha256": "c237b2c2c32c893e4ee60cdac8c4bcc34ca731a5445986c03b95cf79918e40c3",
187− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_mac_hotspot_8u232b09.tar.gz",
188− "version": "8.0.232"
209+ "build": "8",
210+ "sha256": "06675b7d65bce0313ee1f2e888dd44267e8afeced75e0b39b5ad1f5fdff54e0b",
211+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u242b08.tar.gz",
212+ "version": "8.0.242"
189213 }
190214 },
191215 "openj9": {
192216 "packageType": "jdk",
193217 "vmType": "openj9",
194218 "x86_64": {
195− "build": "9",
196− "sha256": "168079dcc20f62ac4409800c78d23a63ba7c665e58cd7ac8bde21ebbbb2b6d48",
197− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09.1_openj9-0.17.0/OpenJDK8U-jdk_x64_mac_openj9_8u232b09_openj9-0.17.0.tar.gz",
198− "version": "8.0.232"
219+ "build": "8",
220+ "sha256": "665dc9c8239b7270b007ab9dd7522570e2686e327d89caf57a6aa6e5c6450078",
221+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_mac_openj9_8u242b08_openj9-0.18.1.tar.gz",
222+ "version": "8.0.242"
199223 }
200224 }
201225 },
@@ -204,20 +228,20 @@
204228 "packageType": "jre",
205229 "vmType": "hotspot",
206230 "x86_64": {
207− "build": "9",
208− "sha256": "5ec5f11dbc81ab65641b765e1ef2f924736c0d1cc797cb95b078598d9d863afd",
209− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_x64_mac_hotspot_8u232b09.tar.gz",
210− "version": "8.0.232"
231+ "build": "8",
232+ "sha256": "fae3777e3441dc7384c339a9054aa7efc40cd2c501625a535c2d4648367ccca3",
233+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_mac_hotspot_8u242b08.tar.gz",
234+ "version": "8.0.242"
211235 }
212236 },
213237 "openj9": {
214238 "packageType": "jre",
215239 "vmType": "openj9",
216240 "x86_64": {
217− "build": "9",
218− "sha256": "60b70aa16c8ca38b96c305003f3d9871897555d0b4039b8e1f8db9ceeab16d53",
219− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09.1_openj9-0.17.0/OpenJDK8U-jre_x64_mac_openj9_8u232b09_openj9-0.17.0.tar.gz",
220− "version": "8.0.232"
241+ "build": "8",
242+ "sha256": "d4a924558ddda0aed671a67f71714b71c25871a7659fd4c505851cf5ee866de5",
243+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jre_x64_mac_openj9_8u242b08_openj9-0.18.1.tar.gz",
244+ "version": "8.0.242"
221245 }
222246 }
223247 }
pkgs/development/compilers/bluespec/default.nixnew file+94
@@ -0,0 +1,94 @@
1+{ stdenv
2+, fetchFromGitHub
3+, fetchpatch
4+, autoconf
5+, automake
6+, fontconfig
7+, gmp
8+, gperf
9+, haskell
10+, libX11
11+, libpoly
12+, perl
13+, pkgconfig
14+, verilog
15+, xorg
16+, zlib
17+}:
18+
19+let
20+ # yices wants a libgmp.a and fails otherwise
21+ gmpStatic = gmp.override { withStatic = true; };
22+
23+ # Compiling PreludeBSV fails with more recent GHC versions
24+ # > imperative statement (not BVI context)
25+ # https://github.com/B-Lang-org/bsc/issues/20#issuecomment-583724030
26+ ghcWithPackages = haskell.packages.ghc844.ghc.withPackages (g: (with g; [old-time regex-compat syb]));
27+in stdenv.mkDerivation rec {
28+ pname = "bluespec";
29+ version = "unstable-2020.02.09";
30+
31+ src = fetchFromGitHub {
32+ owner = "B-Lang-org";
33+ repo = "bsc";
34+ rev = "05c8afb08078e437c635b9c708124b428ac51b3d";
35+ sha256 = "06yhpkz7wga1a0p9031cfjqbzw7205bj2jxgdghhfzmllaiphniy";
36+ fetchSubmodules = true;
37+ };
38+
39+ enableParallelBuilding = true;
40+
41+ buildInputs = [
42+ zlib
43+ gmpStatic gperf libpoly # yices
44+ libX11 # tcltk
45+ xorg.libXft
46+ fontconfig
47+ ];
48+
49+ nativeBuildInputs = [
50+ automake autoconf
51+ perl
52+ pkgconfig
53+ ghcWithPackages
54+ ];
55+
56+ checkInputs = [
57+ verilog
58+ ];
59+
60+ patches = [
61+ # drop stp support https://github.com/B-Lang-org/bsc/pull/31
62+ (fetchpatch {
63+ url = "https://github.com/flokli/bsc/commit/0bd48ecc2561541dc1368918863c0b2f4915006f.patch";
64+ sha256 = "0bam9anld33zfi9d4gs502g94w49zhl5iqmbs2d1p5i19aqpy38l";
65+ })
66+ ];
67+
68+ preBuild = ''
69+ patchShebangs \
70+ src/Verilog/copy_module.pl \
71+ src/comp/update-build-version.sh \
72+ src/comp/update-build-system.sh \
73+ src/comp/wrapper.sh
74+ '';
75+
76+ makeFlags = [
77+ "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12
78+ "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43
79+ ];
80+
81+ installPhase = "mv inst $out";
82+
83+ doCheck = true;
84+
85+ meta = {
86+ description = "Toolchain for the Bluespec Hardware Definition Language";
87+ homepage = "https://github.com/B-Lang-org/bsc";
88+ license = stdenv.lib.licenses.bsd3;
89+ platforms = [ "x86_64-linux" ];
90+ # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562
91+ # aarch64 fails, as GHC fails with "ghc: could not execute: opt"
92+ maintainers = with stdenv.lib.maintainers; [ flokli thoughtpolice ];
93+ };
94+}
pkgs/development/compilers/gcc/4.9/default.nix+1−1
@@ -303,7 +303,7 @@ stdenv.mkDerivation ({
303303 compiler used in the GNU system including the GNU/Linux variant.
304304 '';
305305
306− maintainers = with stdenv.lib.maintainers; [ peti ];
306+ maintainers = with stdenv.lib.maintainers; [ peti veprbl ];
307307
308308 platforms =
309309 stdenv.lib.platforms.linux ++
pkgs/development/compilers/gcc/snapshot/default.nixdeleted−252
@@ -1,252 +0,0 @@
1−{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
2−, langC ? true, langCC ? true, langFortran ? false
3−, langObjC ? stdenv.targetPlatform.isDarwin
4−, langObjCpp ? stdenv.targetPlatform.isDarwin
5−, langGo ? false
6−, profiledCompiler ? false
7−, staticCompiler ? false
8−, enableShared ? true
9−, enableLTO ? true
10−, texinfo ? null
11−, perl ? null # optional, for texi2pod (then pod2man)
12−, gmp, mpfr, libmpc, gettext, which
13−, libelf # optional, for link-time optimizations (LTO)
14−, isl ? null # optional, for the Graphite optimization framework.
15−, zlib ? null
16−, enableMultilib ? false
17−, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
18−, name ? "gcc"
19−, libcCross ? null
20−, threadsCross ? null # for MinGW
21−, crossStageStatic ? false
22−, # Strip kills static libs of other archs (hence no cross)
23− stripped ? stdenv.hostPlatform == stdenv.buildPlatform
24− && stdenv.targetPlatform == stdenv.hostPlatform
25−, gnused ? null
26−, cloog # unused; just for compat with gcc4, as we override the parameter on some places
27−, flex ? null
28−, buildPackages
29−}:
30−
31−# LTO needs libelf and zlib.
32−assert libelf != null -> zlib != null;
33−
34−# Make sure we get GNU sed.
35−assert stdenv.hostPlatform.isDarwin -> gnused != null;
36−
37−# The go frontend is written in c++
38−assert langGo -> langCC;
39−
40−# threadsCross is just for MinGW
41−assert threadsCross != null -> stdenv.targetPlatform.isWindows;
42−
43−with stdenv.lib;
44−with builtins;
45−
46−let majorVersion = "7";
47− version = "${majorVersion}-20170409";
48−
49− inherit (stdenv) buildPlatform hostPlatform targetPlatform;
50−
51− patches =
52− [ ]
53− ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
54− ++ optional noSysDirs ../no-sys-dirs.patch
55− ++ optional langFortran ../gfortran-driving.patch
56− ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch {
57− url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch";
58− sha256 = "1nyjnshpq5gbcbbpfv27hy4ajvycmgkpiabkjlxnnrnq1d99k1ay";
59− });
60−
61− /* Cross-gcc settings (build == host != target) */
62− crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
63− stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
64− crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
65−
66−in
67−
68−stdenv.mkDerivation ({
69− pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
70− inherit version;
71−
72− builder = ../builder.sh;
73−
74− src = fetchurl {
75− url = "mirror://gcc/snapshots/${version}/gcc-${version}.tar.bz2";
76− sha256 = "19197rw1xrpkb8h10lfgn6zj7yj52x95hdmr0x5lg8i4v3i23b67";
77− };
78−
79− inherit patches;
80−
81− outputs = [ "out" "lib" "man" "info" ];
82− setOutputFlags = false;
83− NIX_NO_SELF_RPATH = true;
84−
85− libc_dev = stdenv.cc.libc_dev;
86−
87− hardeningDisable = [ "format" "pie" ];
88−
89− postPatch =
90− if targetPlatform != hostPlatform || stdenv.cc.libc != null then
91− # On NixOS, use the right path to the dynamic linker instead of
92− # `/lib/ld*.so'.
93− let
94− libc = if libcCross != null then libcCross else stdenv.cc.libc;
95− in
96− '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
97− for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
98− do
99− grep -q LIBC_DYNAMIC_LINKER "$header" || continue
100− echo " fixing \`$header'..."
101− sed -i "$header" \
102− -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
103− done
104− ''
105− else null;
106−
107− inherit noSysDirs staticCompiler crossStageStatic
108− libcCross crossMingw;
109−
110− depsBuildBuild = [ buildPackages.stdenv.cc ];
111− nativeBuildInputs = [ texinfo which gettext ]
112− ++ (optional (perl != null) perl);
113−
114− # For building runtime libs
115− depsBuildTarget =
116− if hostPlatform == buildPlatform then [
117− targetPackages.stdenv.cc.bintools # newly-built gcc will be used
118− ] else assert targetPlatform == hostPlatform; [ # build != host == target
119− stdenv.cc
120− ];
121−
122− buildInputs = [
123− gmp mpfr libmpc libelf flex
124− targetPackages.stdenv.cc.bintools # For linking code at run-time
125− ] ++ (optional (isl != null) isl)
126− ++ (optional (zlib != null) zlib)
127− # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
128− # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
129− ++ (optional hostPlatform.isDarwin gnused)
130− ;
131−
132− depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
133−
134− NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
135−
136− preConfigure = import ../common/pre-configure.nix {
137− inherit (stdenv) lib;
138− inherit version hostPlatform langGo;
139− };
140−
141− dontDisableStatic = true;
142−
143− # TODO(@Ericson2314): Always pass "--target" and always prefix.
144− configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
145−
146− configureFlags = import ../common/configure-flags.nix {
147− inherit
148− stdenv
149− targetPackages
150− crossStageStatic libcCross
151− version
152−
153− gmp mpfr libmpc libelf isl
154−
155− enableLTO
156− enableMultilib
157− enablePlugin
158− enableShared
159−
160− langC
161− langCC
162− langFortran
163− langGo
164− langObjC
165− langObjCpp
166− ;
167− };
168−
169− targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
170−
171− buildFlags = optional
172− (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
173− (if profiledCompiler then "profiledbootstrap" else "bootstrap");
174−
175− dontStrip = !stripped;
176− NIX_STRIP_DEBUG = !stripped;
177−
178− installTargets =
179− if stripped
180− then "install-strip"
181− else "install";
182−
183− # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
184− ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
185−
186− # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
187− # library headers and binaries, regarless of the language being compiled.
188− #
189− # Likewise, the LTO code doesn't find zlib.
190− #
191− # Cross-compiling, we need gcc not to read ./specs in order to build the g++
192− # compiler (after the specs for the cross-gcc are created). Having
193− # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
194−
195− CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
196− ++ optional (zlib != null) zlib
197− ));
198−
199− LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
200−
201− inherit
202− (import ../common/extra-target-flags.nix {
203− inherit stdenv crossStageStatic libcCross threadsCross;
204− })
205− EXTRA_TARGET_FLAGS
206− EXTRA_TARGET_LDFLAGS
207− ;
208−
209− passthru = {
210− inherit langC langCC langObjC langObjCpp langFortran langGo version;
211− isGNU = true;
212− };
213−
214− enableParallelBuilding = true;
215− inherit enableMultilib;
216−
217− inherit (stdenv) is64bit;
218−
219− meta = {
220− homepage = https://gcc.gnu.org/;
221− license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
222− description = "GNU Compiler Collection, version ${version}"
223− + (if stripped then "" else " (with debugging info)");
224−
225− longDescription = ''
226− The GNU Compiler Collection includes compiler front ends for C, C++,
227− Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
228− libraries for these languages (libstdc++, libgomp,...).
229−
230− GCC development is a part of the GNU Project, aiming to improve the
231− compiler used in the GNU system including the GNU/Linux variant.
232− '';
233−
234− maintainers = with stdenv.lib.maintainers; [ ];
235−
236− platforms =
237− stdenv.lib.platforms.linux ++
238− stdenv.lib.platforms.freebsd ++
239− stdenv.lib.platforms.illumos ++
240− stdenv.lib.platforms.darwin;
241−
242− broken = true;
243− };
244−}
245−
246−// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
247− makeFlags = [ "all-gcc" "all-target-libgcc" ];
248− installTargets = "install-gcc install-target-libgcc";
249−}
250−
251−// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
252−)
pkgs/development/interpreters/octave/default.nix+3−3
@@ -18,11 +18,11 @@ let
1818in
1919
2020stdenv.mkDerivation rec {
21− version = "5.1.0";
21+ version = "5.2.0";
2222 pname = "octave";
2323 src = fetchurl {
2424 url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
25− sha256 = "15blrldzwyxma16rnd4n01gnsrriii0dwmyca6m7qz62r8j12sz3";
25+ sha256 = "1qcmcpsq1lfka19fxzvxjwjhg113c39a9a0x8plkhvwdqyrn5sig";
2626 };
2727
2828 buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
7777 };
7878
7979 meta = {
80− homepage = http://octave.org/;
80+ homepage = "https://www.gnu.org/software/octave/";
8181 license = stdenv.lib.licenses.gpl3Plus;
8282 maintainers = with stdenv.lib.maintainers; [raskin];
8383 description = "Scientific Pragramming Language";
pkgs/development/interpreters/octave/hg.nixdeleted−75
@@ -1,75 +0,0 @@
1−args@{ stdenv, openblas, ghostscript ? null, texinfo
2−
3− , # These are arguments that shouldn't be passed to the
4− # octave package.
5− texlive, tex ? texlive.combined.scheme-small
6− , epstool, pstoedit, transfig
7− , lib, fetchhg, callPackage
8− , autoconf, automake, libtool
9− , bison, librsvg, icoutils, gperf
10−
11− , # These are options that can be passed in addition to the ones
12− # octave usually takes.
13− # - rev is the HG revision. Use "tip" for the bleeding edge.
14− # - docs can be set to false to skip building documentation.
15− rev ? "23269", docs ? true
16−
17− , # All remaining arguments will be passed to the octave package.
18− ...
19− }:
20−
21−with stdenv.lib;
22−let
23− octaveArgs = removeAttrs args
24− [ "texlive" "tex"
25− "epstool" "pstoedit" "transfig"
26− "lib" "fetchhg" "callPackage"
27− "autoconf" "automake" "libtool"
28− "bison" "librsvg" "icoutils" "gperf"
29− "rev" "docs"
30− ];
31− octave = callPackage ./default.nix octaveArgs;
32−
33− # List of hashes for known HG revisions.
34− sha256s = {
35− "23269" = "87f560e873ad1454fdbcdd8aca65f9f0b1e605bdc00aebbdc4f9d862ca72ff1d";
36− };
37−
38−in lib.overrideDerivation octave (attrs: rec {
39− version = "4.3.0pre${rev}";
40− name = "octave-${version}";
41−
42− src = fetchhg {
43− url = http://www.octave.org/hg/octave;
44− inherit rev;
45−
46− sha256 =
47− if builtins.hasAttr rev sha256s
48− then builtins.getAttr rev sha256s
49− else null;
50−
51− fetchSubrepos = true;
52− };
53−
54− # Octave's test for including this flag seems to be broken in 4.3.
55− F77_INTEGER_8_FLAG = optional openblas.blas64 "-fdefault-integer-8";
56−
57− # This enables texinfo to find the files it needs.
58− TEXINPUTS = ".:build-aux:${texinfo}/texmf-dist/tex/generic/epsf:";
59−
60− disableDocs = !docs || ghostscript == null;
61−
62− nativeBuildInputs = attrs.nativeBuildInputs
63− ++ [ autoconf automake libtool bison librsvg icoutils gperf ]
64− ++ optionals (!disableDocs) [ tex epstool pstoedit transfig ];
65−
66− # Run bootstrap before any other patches, as other patches may refer
67− # to files that are generated by the bootstrap.
68− prePatch = ''
69− patchShebangs bootstrap
70− ./bootstrap
71− '' + attrs.prePatch;
72−
73− configureFlags = attrs.configureFlags ++
74− optional disableDocs "--disable-docs";
75−})
pkgs/development/libraries/aws-c-event-stream/default.nix+1
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
1616 buildInputs = [ aws-c-common aws-checksums ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo;
1717
1818 cmakeFlags = [
19+ "-DBUILD_SHARED_LIBS:BOOL=ON"
1920 "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
2021 ];
2122
pkgs/development/libraries/aws-checksums/default.nix+2
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ cmake ];
1515
16+ cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ];
17+
1618 meta = with lib; {
1719 description = "HW accelerated CRC32c and CRC32";
1820 homepage = https://github.com/awslabs/aws-checksums;
pkgs/development/libraries/grpc/default.nix+2−2
@@ -1,13 +1,13 @@
11{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
22
33stdenv.mkDerivation rec {
4− version = "1.26.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
4+ version = "1.27.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
55 pname = "grpc";
66 src = fetchFromGitHub {
77 owner = "grpc";
88 repo = "grpc";
99 rev = "v${version}";
10− sha256 = "1fxydarl00vbhd9q153qn4ax1yc6xrd8wij6bfy9j8chipw1bgir";
10+ sha256 = "1yvmqxv6pwzbxw3si47x3anvl2pp3qy1acspmz4v60pd188c1fnc";
1111 fetchSubmodules = true;
1212 };
1313 patches = [
pkgs/development/libraries/libcdio-paranoia/default.nix+1−1
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
3030 license = licenses.gpl3;
3131 homepage = https://github.com/rocky/libcdio-paranoia;
3232 platforms = platforms.linux ++ platforms.darwin;
33− maintainers = [ maintainers.pbogdan ];
33+ maintainers = [ ];
3434 };
3535}
pkgs/development/libraries/libdap/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
22
33stdenv.mkDerivation rec {
4− version = "3.20.4";
4+ version = "3.20.5";
55 pname = "libdap";
66
77 nativeBuildInputs = [ bison flex ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99
1010 src = fetchurl {
1111 url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz";
12− sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i";
12+ sha256 = "17j6ca2qsp69a91lm11mwbs4l8q13xqcdz60l94avl5krymrqg47";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/libexif/default.nix+5
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
2525 sha256 = "01aqvz63glwq6wg0wr7ykqqghb4abgq77ghvhizbzadg1k4h7drx";
2626 excludes = [ "NEWS" ];
2727 })
28+ (fetchpatch {
29+ name = "CVE-2019-9278.patch";
30+ url = "https://github.com/libexif/libexif/commit/75aa73267fdb1e0ebfbc00369e7312bac43d0566.patch";
31+ sha256 = "10ikg33mips5zq9as7l9xqnyzbg1wwr4sw17517nzf4hafjpasrj";
32+ })
2833 ];
2934
3035 buildInputs = [ gettext ];
pkgs/development/libraries/libgpiod/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libgpiod";
5− version = "1.4.1";
5+ version = "1.4.2";
66
77 src = fetchurl {
88 url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
9− sha256 = "0x8ar31b0cp47dgmamxf6a54ixwrjgvs81zra8l9ws4szrzgrnbw";
9+ sha256 = "0r0hdindy6pi1va3mhk2lg5dis0qbi535k790w76dxfx1hyavk70";
1010 };
1111
1212 buildInputs = [ kmod ];
pkgs/development/libraries/libphonenumber/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "phonenumber";
5− version = "8.10.20";
5+ version = "8.11.3";
66
77 src = fetchFromGitHub {
88 owner = "googlei18n";
99 repo = "libphonenumber";
1010 rev = "v${version}";
11− sha256 = "12xszrd4mrjabhzsp0xvy2qx2rxl36y5a00xfsh0w7bc299rq13v";
11+ sha256 = "06y3mh1d1mks6d0ynxp3980g712nkf8l5nyljpybsk326b246hg9";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/development/libraries/libsolv/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
22
33stdenv.mkDerivation rec {
4− version = "0.7.10";
4+ version = "0.7.11";
55 pname = "libsolv";
66
77 src = fetchFromGitHub {
88 owner = "openSUSE";
99 repo = "libsolv";
1010 rev = version;
11− sha256 = "1qih2j2vng32hk5c0v16gcr7nfq218hrync7xbn33aham8cxfrfa";
11+ sha256 = "1jq08qgj05cr9zk5paj3qvma7y2ixvkqlvbszcgmfvx0yq4gl1af";
1212 };
1313
1414 cmakeFlags = [
pkgs/development/libraries/poppler/default.nix+1−1
@@ -12,7 +12,7 @@ let
1212in
1313stdenv.mkDerivation rec {
1414 name = "poppler-${suffix}-${version}";
15− version = "0.84.0"; # beware: updates often break cups-filters build, check texlive too!
15+ version = "0.84.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
1616
1717 src = fetchurl {
1818 url = "${meta.homepage}/poppler-${version}.tar.xz";
pkgs/development/libraries/ti-rpc/default.nix+2−2
@@ -1,11 +1,11 @@
11{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
22
33stdenv.mkDerivation rec {
4− name = "libtirpc-1.1.4";
4+ name = "libtirpc-1.2.5";
55
66 src = fetchurl {
77 url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
8− sha256 = "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c";
8+ sha256 = "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk";
99 };
1010
1111 outputs = [ "out" "dev" ];
pkgs/development/libraries/unixODBCDrivers/default.nix+2−2
@@ -137,12 +137,12 @@
137137 version = "${versionMajor}.${versionMinor}.${versionAdditional}-1";
138138
139139 versionMajor = "17";
140− versionMinor = "4";
140+ versionMinor = "5";
141141 versionAdditional = "1.1";
142142
143143 src = fetchurl {
144144 url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb";
145− sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w";
145+ sha256 = "0ysrl01z5ca72qw8n8kwwcl432cgiyw4pibfwg5nifx0kd7i7z4z";
146146 };
147147
148148 nativeBuildInputs = [ dpkg patchelf ];
pkgs/development/ocaml-modules/apron/default.nix+8−6
@@ -1,18 +1,20 @@
1−{ stdenv, fetchzip, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }:
1+{ stdenv, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }:
22
33stdenv.mkDerivation rec {
44 name = "ocaml${ocaml.version}-apron-${version}";
5− version = "20160125";
6− src = fetchzip {
7− url = "http://apron.gforge.inria.fr/apron-${version}.tar.gz";
8− sha256 = "1a7b7b9wsd0gdvm41lgg6ayb85wxc2a3ggcrghy4qiphs4b9v4m4";
5+ version = "0.9.12";
6+ src = fetchFromGitHub {
7+ owner = "antoinemine";
8+ repo = "apron";
9+ rev = "v${version}";
10+ sha256 = "0bciv4wz52p57q0aggmvixvqrsd1slflfyrm1z6fy5c44f4fmjjn";
911 };
1012
1113 buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ];
1214 propagatedBuildInputs = [ mlgmpidl ];
1315
1416 prefixKey = "-prefix ";
15− createFindlibDestdir = true;
17+ preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
1618
1719 meta = {
1820 license = stdenv.lib.licenses.lgpl21;
pkgs/development/python-modules/augeas/default.nix+2−2
@@ -1,13 +1,13 @@
11{ stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }:
22buildPythonPackage rec {
33 pname = "augeas";
4− version = "1.0.3";
4+ version = "1.1.0";
55
66 src = fetchFromGitHub {
77 owner = "hercules-team";
88 repo = "python-augeas";
99 rev = "v${version}";
10− sha256 = "1fb904ym8g8hkd82zlibzk6wrldnfd5v5d0rkynsy1zlhcylq4f6";
10+ sha256 = "12q52ilcx059rn544x3712xq6myn99niz131l0fs3xx67456pajh";
1111 };
1212
1313 # TODO: not very nice!
pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix+2−2
@@ -10,12 +10,12 @@
1010
1111buildPythonPackage rec {
1212 pname = "azure-mgmt-policyinsights";
13− version = "0.3.1";
13+ version = "0.4.0";
1414
1515 src = fetchPypi {
1616 inherit pname version;
1717 extension = "zip";
18− sha256 = "b27f5ac367b69e225ab02fa2d1ea20cbbfe948ff43b0af4698cd8cbde0063908";
18+ sha256 = "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g";
1919 };
2020
2121 propagatedBuildInputs = [
pkgs/development/python-modules/cmd2/default.nix+2−2
@@ -6,11 +6,11 @@
66}:
77buildPythonPackage rec {
88 pname = "cmd2";
9− version = "0.9.23";
9+ version = "0.9.25";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "17ic6lxzz9yrwxh3l1skcqgr59c47w5fidj5qmrk1l26rkrjxlca";
13+ sha256 = "0w5jh2lanqxsva9fr9p07mmbd5w4v6zmhf6lr0awksvhjx77lhdc";
1414 };
1515
1616 LC_ALL="en_US.UTF-8";
pkgs/development/python-modules/django-storages/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "django-storages";
7− version = "1.8";
7+ version = "1.9.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "000abaayhymh4rxmk19hwhlyibc62rs0qdfczkhf4wb3p9san8lk";
11+ sha256 = "148y2hyx1l4pfbqpq8hgq95fw8bhfbblwd3m5xwnhw6frcirk7m5";
1212 };
1313
1414 propagatedBuildInputs = [ django ];
pkgs/development/python-modules/feedgen/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "feedgen";
5− version = "0.8.0";
5+ version = "0.9.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0551ixbcz2gaala4gi3i8gici3haijj7dhvjsz1a61s050276m96";
9+ sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf";
1010 };
1111
1212 propagatedBuildInputs = [ dateutil lxml ];
pkgs/development/python-modules/flower/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ lib, buildPythonPackage, fetchPypi, Babel, celery, importlib-metadata, pytz, tornado, mock }:
2+
3+buildPythonPackage rec {
4+ pname = "flower";
5+ version = "0.9.3";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "7f45acb297ab7cf3dd40140816143a2588f6938dbd70b8c46b59c7d8d1e93d55";
10+ };
11+
12+ propagatedBuildInputs = [ Babel celery importlib-metadata pytz tornado ];
13+
14+ checkInputs = [ mock ];
15+
16+ meta = with lib; {
17+ description = "Celery Flower";
18+ homepage = "https://github.com/mher/flower";
19+ license = licenses.bsdOriginal;
20+ maintainers = [ maintainers.arnoldfarkas ];
21+ };
22+}
pkgs/development/python-modules/geopy/2.nix+2−2
@@ -7,7 +7,7 @@
77
88buildPythonPackage rec {
99 pname = "geopy";
10− version = "1.20.0";
10+ version = "1.21.0";
1111
1212 disabled = !isPy27; # only Python 2.7
1313 doCheck = false; # Needs network access
@@ -16,7 +16,7 @@ buildPythonPackage rec {
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2";
19+ sha256 = "1p1sgy2p59j0297bp7c82b45bx4d3i1p4kvbgf89c9i0llyb80nw";
2020 };
2121
2222 meta = with stdenv.lib; {
pkgs/development/python-modules/grpcio-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "grpcio-tools";
5− version = "1.26.0";
5+ version = "1.27.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "5580b86cf49936c9c74f0def44d3582a7a1bb720eba8a14805c3a61efa790c70";
9+ sha256 = "e29aa3f7a47d37f8a15605e97bec580baa6bb7ead7114b8d2f20d7b28da30c5c";
1010 };
1111
1212 enableParallelBuilding = true;
pkgs/development/python-modules/hstspreload/default.nix+2−2
@@ -6,14 +6,14 @@
66
77buildPythonPackage rec {
88 pname = "hstspreload";
9− version = "2020.1.17";
9+ version = "2020.2.5";
1010 disabled = isPy27;
1111
1212 src = fetchFromGitHub {
1313 owner = "sethmlarson";
1414 repo = pname;
1515 rev = version;
16− sha256 = "08qcisiscnx74pwavh3ai3lg92zfrikwzr06p700kwk1gp8xhf3v";
16+ sha256 = "1jz4qma04vkiczlj0fd9ahjf6c3yxvycvhp48c3n3l4aw4gfsbiz";
1717 };
1818
1919 # tests require network connection
pkgs/development/python-modules/ijson/default.nix+3−3
@@ -2,18 +2,18 @@
22
33buildPythonPackage rec {
44 pname = "ijson";
5− version = "2.5.1";
5+ version = "2.6.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "19ec46a2f7991004e5202ecee56c569616b8a7f95686ad7fd0a9ec81cac00269";
9+ sha256 = "1l034zq23315icym2n0zppa5lwpdll3mvavmyjbiryxb4c5wdsvm";
1010 };
1111
1212 doCheck = false; # something about yajl
1313
1414 meta = with stdenv.lib; {
1515 description = "Iterative JSON parser with a standard Python iterator interface";
16− homepage = "https://github.com/isagalaev/ijson";
16+ homepage = "https://github.com/ICRAR/ijson";
1717 license = licenses.bsd3;
1818 maintainers = with maintainers; [ rvl ];
1919 };
pkgs/development/python-modules/jieba/default.nix+2−2
@@ -2,14 +2,14 @@
22
33buildPythonPackage rec {
44 pname = "jieba";
5− version = "0.40";
5+ version = "0.42.1";
66
77 # no tests in PyPI tarball
88 src = fetchFromGitHub {
99 owner = "fxsjy";
1010 repo = pname;
1111 rev = "v${version}";
12− sha256 = "1nasyxva9m3k9fb9g627ppphp3697jdplbb2bavqx71sa7mqim2m";
12+ sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk";
1313 };
1414
1515 checkInputs = [ glibcLocales ];
pkgs/development/python-modules/kconfiglib/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "kconfiglib";
5− version = "13.7.0";
5+ version = "14.1.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0dkfprrsds64d2jbqnwdzb4why84jaj968s3ccmyqg5385nr9fwd";
9+ sha256 = "0g690bk789hsry34y4ahvly5c8w8imca90ss4njfqf7m2qicrlmy";
1010 };
1111
1212 # doesnt work out of the box but might be possible
pkgs/development/python-modules/localzone/default.nixnew file+34
@@ -0,0 +1,34 @@
1+{ stdenv
2+, buildPythonPackage
3+, fetchFromGitHub
4+, dnspython
5+, sphinx
6+, pytest
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "localzone";
11+ version = "0.9.5";
12+
13+ src = fetchFromGitHub {
14+ owner = "ags-slc";
15+ repo = pname;
16+ rev = "v${version}";
17+ sha256 = "1zziqyhbg8vg901b4hjzzab0paag5cng48vk9xf1hchxk5naf58n";
18+ };
19+
20+ propagatedBuildInputs = [ dnspython sphinx ];
21+
22+ checkInputs = [ pytest ];
23+
24+ checkPhase = ''
25+ pytest
26+ '';
27+
28+ meta = with stdenv.lib; {
29+ description = "A simple DNS library for managing zone files";
30+ homepage = https://localzone.iomaestro.com;
31+ license = licenses.bsd3;
32+ maintainers = with maintainers; [ flyfloh ];
33+ };
34+}
pkgs/development/python-modules/m3u8/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "m3u8";
5− version = "0.5.2";
5+ version = "0.5.4";
66
77 src = fetchFromGitHub {
88 owner = "globocom";
99 repo = pname;
1010 rev = version;
11− sha256 = "0p6wmwv1nfa5pyakq5d55w9v142z5ja3db3s3qr44kx895d9lhng";
11+ sha256 = "1a2c7vqcysxkaffk40zg8d60l9hpjk0dw221fy9cg72i8jxq1gmm";
1212 };
1313
1414 checkInputs = [ bottle pytest pytestcov ];
pkgs/development/python-modules/nbconflux/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ lib, buildPythonPackage, fetchFromGitHub, nbconvert, pytest, requests, responses }:
2+
3+buildPythonPackage rec {
4+ pname = "nbconflux";
5+ version = "0.7.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "Valassis-Digital-Media";
9+ repo = "nbconflux";
10+ rev = version;
11+ sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh";
12+ };
13+
14+ propagatedBuildInputs = [ nbconvert requests ];
15+
16+ checkInputs = [ pytest responses ];
17+
18+ checkPhase = ''
19+ pytest tests
20+ '';
21+
22+ meta = with lib; {
23+ description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert";
24+ homepage = "https://github.com/Valassis-Digital-Media/nbconflux";
25+ license = licenses.bsd3;
26+ maintainers = [ maintainers.arnoldfarkas ];
27+ };
28+}
pkgs/development/python-modules/nuitka/default.nix+2−2
@@ -12,13 +12,13 @@ let
1212 # Therefore we create a separate env for it.
1313 scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
1414in buildPythonPackage rec {
15− version = "0.6.6";
15+ version = "0.6.7";
1616 pname = "Nuitka";
1717
1818 # Latest version is not yet on PyPi
1919 src = fetchurl {
2020 url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
21− sha256 = "1ia37072qdbgdvh9qxkrhi3mlqn3kcn0qm5xjz6f68sis6ni9kw2";
21+ sha256 = "09mrm7iz2wdrd7y2csbcidg6bkskjignx2pnifh4i8zlh0vm61bg";
2222 };
2323
2424 checkInputs = [ vmprof pyqt4 ];
pkgs/development/python-modules/nwdiag/default.nix+4−4
@@ -1,19 +1,19 @@
11{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
2−, blockdiag
2+, blockdiag, setuptools
33}:
44
55buildPythonPackage rec {
66 pname = "nwdiag";
7− version = "1.0.4";
7+ version = "2.0.0";
88
99 src = fetchurl {
1010 url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz";
11− sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa";
11+ sha256 = "1qkl1lq7cblr6fra2rjw3zlcccragp8384hpm4n7dkc5c3yzmmsw";
1212 };
1313
1414 buildInputs = [ pep8 nose unittest2 docutils ];
1515
16− propagatedBuildInputs = [ blockdiag ];
16+ propagatedBuildInputs = [ blockdiag setuptools ];
1717
1818 # tests fail
1919 doCheck = false;
pkgs/development/python-modules/persim/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "persim";
14− version = "0.1.1";
14+ version = "0.1.2";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "932bb0489d4dc158e4f007ec609c61e4700003d882d8e7bdac218b70d14ce9cf";
18+ sha256 = "0vz6s49ar7mhg4pj4jcbwb79s8acqj6jc70va5w79pjxb5pw8k2n";
1919 };
2020
2121 propagatedBuildInputs = [
pkgs/development/python-modules/phonenumbers/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "phonenumbers";
5− version = "8.11.2";
5+ version = "8.11.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0j73mr3d3rf2r4nkaxbvl7323xima0l95pjagjzgk2piqwa3nbd2";
9+ sha256 = "1rh0860ml00kw5c4b4r31wz5s8cmd5mpxx5slypdgljk4ralyg6p";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/pikepdf/default.nix+2−2
@@ -22,12 +22,12 @@
2222
2323buildPythonPackage rec {
2424 pname = "pikepdf";
25− version = "1.8.2";
25+ version = "1.10.0";
2626 disabled = ! isPy3k;
2727
2828 src = fetchPypi {
2929 inherit pname version;
30− sha256 = "1n3fd7i1br1s4f90yismgfcq9ix5kcqfacr7yy0hhhrabkf2sm37";
30+ sha256 = "1qa4sam1kvglwqwk573mjpsy8cy89yamr4val0g80hq1ribc56ah";
3131 };
3232
3333 buildInputs = [
pkgs/development/python-modules/pyTelegramBotAPI/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pyTelegramBotAPI";
5− version = "3.6.6";
5+ version = "3.6.7";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "00vycd7jvfnzmvmmhkjx9vf40vkcrwv7adas5i81r2jhjy7sks54";
9+ sha256 = "0spn3gjbppyl4b7kqnc8g30qss72dcb1d6ap2bizyam5wn591z8f";
1010 };
1111
1212 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/pycollada/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pycollada";
5− version = "0.7";
5+ version = "0.7.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0b2vz9fp9asw57m3p9zjlz9gddanrhpxbdfimg98ik654kp2vj7r";
9+ sha256 = "1rp4wlvfywgk3v6l3hnhjx61x9yqawvvivpq4dig2jj71k3mpsyj";
1010 };
1111
1212 propagatedBuildInputs = [ numpy dateutil ];
pkgs/development/python-modules/pydantic/default.nix+2−2
@@ -12,14 +12,14 @@
1212
1313buildPythonPackage rec {
1414 pname = "pydantic";
15− version = "1.3";
15+ version = "1.4";
1616 disabled = !isPy3k;
1717
1818 src = fetchFromGitHub {
1919 owner = "samuelcolvin";
2020 repo = pname;
2121 rev = "v${version}";
22− sha256 = "0s85nzlsyj97j54zsgv569hkzv617z0vqsifsxkkyiimgbvnx7g8";
22+ sha256 = "1zmnwyvvrj6nb2r1wh63yb6dzqaxw8m4njzqycjdq9911c5gwg6z";
2323 };
2424
2525 propagatedBuildInputs = [
pkgs/development/python-modules/pykka/default.nix+2−2
@@ -5,12 +5,12 @@
55
66buildPythonPackage rec {
77 pname = "pykka";
8− version = "1.2.0";
8+ version = "2.0.1";
99
1010 src = fetchgit {
1111 url = "https://github.com/jodal/pykka.git";
1212 rev = "refs/tags/v${version}";
13− sha256 = "0qlfw1054ap0cha1m6dbnq51kjxqxaf338g7jwnwy33b3gr8x0hg";
13+ sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs";
1414 };
1515
1616 # There are no tests
pkgs/development/python-modules/pylint-django/default.nix+2−2
@@ -10,14 +10,14 @@
1010
1111buildPythonPackage rec {
1212 pname = "pylint-django";
13− version = "2.0.12";
13+ version = "2.0.13";
1414 disabled = !isPy3k;
1515
1616 src = fetchFromGitHub {
1717 owner = "PyCQA";
1818 repo = pname;
1919 rev = "v${version}";
20− sha256 = "0ha06wpqqn5fp5dapgjhsdx3ahh3y62l7k2f3czlrdjmmivgdp9y";
20+ sha256 = "16xfn8zs5khdfh5pdsv3wjjhywzc1qhx7mxi5kpbcvmd6an9qi7s";
2121 };
2222
2323 propagatedBuildInputs = [
pkgs/development/python-modules/pynamecheap/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, requests
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "PyNamecheap";
9+ version = "0.0.3";
10+
11+ propagatedBuildInputs = [ requests ];
12+
13+ # Tests require access to api.sandbox.namecheap.com
14+ doCheck = false;
15+
16+ src = fetchFromGitHub {
17+ owner = "Bemmu";
18+ repo = pname;
19+ rev = "v${version}";
20+ sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97";
21+ };
22+
23+ meta = with lib; {
24+ description = "Namecheap API client in Python.";
25+ homepage = https://github.com/Bemmu/PyNamecheap;
26+ license = licenses.mit;
27+ };
28+}
pkgs/development/python-modules/pysaml2/default.nix+5−2
@@ -1,5 +1,6 @@
11{ stdenv
22, buildPythonPackage
3+, isPy3k
34, fetchFromGitHub
45, substituteAll
56, xmlsec
@@ -9,14 +10,16 @@
910
1011buildPythonPackage rec {
1112 pname = "pysaml2";
12− version = "4.9.0";
13+ version = "5.0.0";
14+
15+ disabled = !isPy3k;
1316
1417 # No tests in PyPI tarball
1518 src = fetchFromGitHub {
1619 owner = "IdentityPython";
1720 repo = pname;
1821 rev = "v${version}";
19− sha256 = "1ww1l34zn25vxifs8nr0bg7gkhbpy5g45mj0jj4d8hzimahb1brx";
22+ sha256 = "0hwhxz45h8l1b0615hf855z7valfcmm0nb7k31bcj84v68zp5rjs";
2023 };
2124
2225 patches = [
pkgs/development/python-modules/python-dotenv/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "python-dotenv";
11− version = "0.10.4";
11+ version = "0.10.5";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "16s2x5ghrhz9ljm6h3y0pbwh97558vbs7l0yiicag4s0xyn0nzq0";
15+ sha256 = "1p6xk0f1yj1s4n8wjs9m8xqilc5bcwvfzsy9nv5lrmkhr78bym7j";
1616 };
1717
1818 propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];
pkgs/development/python-modules/rq/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "rq";
5− version = "1.1.0";
5+ version = "1.2.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1fs03g1n1l8k03zwhkhckhsrnnsm3645sqby2nwh5gfij2kcc9sg";
9+ sha256 = "0dk664lzjhj0rk4ffpv29mbcr7vh41ph1sx7ngszk3744gh1nshp";
1010 };
1111
1212 # test require a running redis rerver, which is something we can't do yet
pkgs/development/python-modules/simplekml/default.nix+3−3
@@ -2,14 +2,14 @@
22
33buildPythonPackage rec {
44 pname = "simplekml";
5− version = "1.3.1";
5+ version = "1.3.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "30c121368ce1d73405721730bf766721e580cae6fbb7424884c734c89ec62ad7";
9+ sha256 = "08l24gfql83yjcdqb51nnnvckbnfb7bl89am4q9zr0fslrbcn3vf";
1010 };
1111
12− doCheck = false; # no tests are defined in 1.3.1
12+ doCheck = false; # no tests are defined in 1.3.3
1313
1414 meta = with lib; {
1515 description = "Generate KML with as little effort as possible";
pkgs/development/python-modules/softlayer/default.nixnew file+41
@@ -0,0 +1,41 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, ptable
5+, click
6+, requests
7+, prompt_toolkit
8+, pygments
9+, urllib3
10+, pytest
11+, pytestcov
12+, mock
13+, sphinx
14+, testtools
15+}:
16+
17+buildPythonPackage rec {
18+ pname = "softlayer-python";
19+ version = "5.8.4";
20+
21+ propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ];
22+
23+ checkInputs = [ pytest pytestcov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ];
24+
25+ checkPhase = ''
26+ pytest
27+ '';
28+
29+ src = fetchFromGitHub {
30+ owner = "softlayer";
31+ repo = pname;
32+ rev = "v${version}";
33+ sha256 = "10kzi7kvvifr21a46q2xqsibs0bx5ys22nfym0bg605ka37vcz88";
34+ };
35+
36+ meta = with lib; {
37+ description = "A set of Python libraries that assist in calling the SoftLayer API.";
38+ homepage = https://github.com/softlayer/softlayer-python;
39+ license = licenses.mit;
40+ };
41+}
pkgs/development/python-modules/sphinxcontrib-tikz/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "sphinxcontrib-tikz";
12− version = "0.4.6";
12+ version = "0.4.8";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "4f362b11e3c2bd17d5f0f07fec03917c16fc5bbcda6fe31ee137c547ed6b03a3";
16+ sha256 = "1rvm0l40iz1z03d09irkqdwzi9gs6pn0203hylaqbix5c7gabwhy";
1717 };
1818
1919 patches = [
pkgs/development/python-modules/spotipy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "spotipy";
5− version = "2.6.1";
5+ version = "2.7.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1jpj9ljc5g89jbnzwnmgz5s6jdrsgd6g9s09igvbw3pppi9070h0";
9+ sha256 = "1i4gpmvjk608fxz1kwfb3dnmm4dydr0bir0zw9k2nng7n8b6knvr";
1010 };
1111
1212 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/transip/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ stdenv
2+, buildPythonPackage
3+, fetchFromGitHub
4+, requests
5+, cryptography
6+, suds-jurko
7+, pytest
8+}:
9+
10+buildPythonPackage rec {
11+ pname = "transip-api";
12+ version = "2.0.0";
13+
14+ src = fetchFromGitHub {
15+ owner = "benkonrath";
16+ repo = pname;
17+ rev = "v${version}";
18+ sha256 = "153x8ph7cp432flaqiy2zgp060ddychcqcrssxkcmjvbm86xrz17";
19+ };
20+
21+ checkInputs = [ pytest ];
22+
23+ # Constructor Tests require network access
24+ checkPhase = ''
25+ pytest --deselect=tests/service_tests/test_domain.py::TestDomainService::test_constructor \
26+ --deselect tests/service_tests/test_vps.py::TestVPSService::testConstructor \
27+ --deselect tests/service_tests/test_webhosting.py::TestWebhostingService::testConstructor
28+ '';
29+
30+
31+ propagatedBuildInputs = [ requests cryptography suds-jurko ];
32+
33+ meta = with stdenv.lib; {
34+ description = "TransIP API Connector";
35+ homepage = https://github.com/benkonrath/transip-api;
36+ license = licenses.mit;
37+ maintainers = with maintainers; [ flyfloh ];
38+ };
39+}
pkgs/development/python-modules/ua-parser/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "ua-parser";
5− version = "0.8.0";
5+ version = "0.9.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "97bbcfc9321a3151d96bb5d62e54270247b0e3be0590a6f2ff12329851718dcb";
9+ sha256 = "1qpw1jdm8bp09jwjp8r38rr7rd2jy4k2if798cax3wylphm285xy";
1010 };
1111
1212 buildInputs = [ pyyaml ];
pkgs/development/python-modules/uproot-methods/default.nix+2−2
@@ -6,12 +6,12 @@
66}:
77
88buildPythonPackage rec {
9− version = "0.7.2";
9+ version = "0.7.3";
1010 pname = "uproot-methods";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "4382983e4e6c5e1aeb3013d04334907f87f62b0d7c19a29968e5a0aac1653ae1";
14+ sha256 = "01x7raa2l75g96y6fsi6h2fjpjm0swlnw0j9vn8mlahridycrjss";
1515 };
1616
1717 propagatedBuildInputs = [ numpy awkward ];
pkgs/development/python-modules/uproot/default.nix+2−2
@@ -16,11 +16,11 @@
1616
1717buildPythonPackage rec {
1818 pname = "uproot";
19− version = "3.11.1";
19+ version = "3.11.2";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "1m6yjvdbffyk32gmfki7h01frlg9vhqf8g734m4gxyyf8m8g60zd";
23+ sha256 = "1bn8z640408s4h04ymy0y79fm5ss2mx99mkgdbw68a80x0p6982h";
2424 };
2525
2626 nativeBuildInputs = [ pytestrunner ];
pkgs/development/python-modules/user-agents/default.nix+2−2
@@ -2,14 +2,14 @@
22
33buildPythonPackage rec {
44 pname = "user-agents";
5− version = "2.0";
5+ version = "2.1.0";
66
77 # PyPI is missing devices.json
88 src = fetchFromGitHub {
99 owner = "selwin";
1010 repo = "python-user-agents";
1111 rev = "v${version}";
12− sha256 = "0ix2yajqdnfj433j50dls90mkmqz8m4fiywxg097zwkkc95wm8s4";
12+ sha256 = "04bndajsfnpymxfiggnj7g38cmlvca3ry5k2611x8ibp38x53yhc";
1313 };
1414
1515 propagatedBuildInputs = [ ua-parser ];
pkgs/development/tools/buildkit/default.nix+6−5
@@ -2,23 +2,24 @@
22
33buildGoPackage rec {
44 pname = "buildkit";
5− version = "0.4.0";
6− rev = "v${version}";
5+ version = "0.6.3";
76
87 goPackagePath = "github.com/moby/buildkit";
98 subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
109
1110 src = fetchFromGitHub {
12− inherit rev;
1311 owner = "moby";
1412 repo = "buildkit";
15− sha256 = "0gkwcjqbcskn63y79jwa26hxkps452z4bgz8lrryaskzbdpvhh3d";
13+ rev = "v${version}";
14+ sha256 = "032jq74n9mkw22s4ba9blfmi0hqvk587m5v23xz3sxx2rkg0wlbn";
1615 };
1716
17+ buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ];
18+
1819 meta = with stdenv.lib; {
1920 description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
2021 homepage = https://github.com/moby/buildkit;
2122 license = licenses.asl20;
22− maintainers = with maintainers; [ vdemeester ];
23+ maintainers = with maintainers; [ vdemeester marsam ];
2324 };
2425}
pkgs/development/tools/kcli/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "kcli";
5− version = "1.8.2";
5+ version = "1.8.3";
66
77 src = fetchFromGitHub {
88 owner = "cswank";
99 repo = "kcli";
1010 rev = version;
11− sha256 = "1m9967f9wk1113ap2qmqinqg7gvpmg5y2g1ji0q818qbandzlh23";
11+ sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls";
1212 };
1313
1414 modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn";
pkgs/development/tools/misc/babeltrace/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
22
33stdenv.mkDerivation rec {
4− name = "babeltrace-1.5.7";
4+ name = "babeltrace-1.5.8";
55
66 src = fetchurl {
77 url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2";
8− sha256 = "0yw05cnk5w8b5nbznycglyn4h3hq56a1n8rlb9k9rlzz4ph32lr1";
8+ sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz";
99 };
1010
1111 nativeBuildInputs = [ pkgconfig ];
pkgs/development/tools/ocaml/ocamlformat/default.nix+2−2
@@ -7,8 +7,8 @@ with ocamlPackages; buildDunePackage rec {
77 minimumOCamlVersion = "4.06";
88
99 src = fetchurl {
10− url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz";
11− sha256 = "09y6sfkqfrgxbmphz5q8w7mdlj8fjsrkiapcx86f94dnwz6j3ajf";
10+ url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}-2.tbz";
11+ sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq";
1212 };
1313
1414 buildInputs = [
pkgs/development/tools/scaff/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }:
2+
3+rustPlatform.buildRustPackage rec {
4+ pname = "scaff";
5+ version = "0.1.1";
6+
7+ src = fetchFromGitLab {
8+ owner = "jD91mZM2";
9+ repo = pname;
10+ rev = version;
11+
12+ sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7";
13+ };
14+
15+ cargoSha256 = "17rnzwlgrpr6isbajaccxa83msvvskxyqrc4cirgjmc7aqa0ilbh";
16+
17+ nativeBuildInputs = [ pkgconfig ];
18+ buildInputs = [ openssl ];
19+
20+ meta = with lib; {
21+ description = "Painless and powerful scaffolding of projects";
22+ license = licenses.mit;
23+ maintainers = with maintainers; [ jD91mZM2 ];
24+ platforms = platforms.unix;
25+ };
26+}
pkgs/games/dwarf-fortress/game.json+14
@@ -93,5 +93,19 @@
9393 "win32": "07mqhm64c1ddjc3vpyhf9qf14lp19xwz3pgg4c2pvcwy4yyrys22",
9494 "win32_s": "07acbxai8g04yxg7n68nyx4jwcqqkgjn7n96q2lzxdvc988kiivz",
9595 "legacy32_s": "1gxmc3rsl9glai3wb4wzsda3qyhdimd8s5kbr5m753n8lmzasafx"
96+ },
97+ "0.47.02": {
98+ "linux": "1zbsygbfiqxxs767qxkxjp3ayywi5q0d8xlrqlbd0l8a3ccg5avw",
99+ "linux32": "1ddc9s4n408j8gidgign51bgv2wgy5z4cy74jzx00pvnhsfp2mpy",
100+ "osx": "1mwy88yxip1wys1kxpfsbg7wlvfrkc4lg04gqw0d266a88dj7a30",
101+ "osx32": "08ssnzl52gqqgcqhl0ynyikbxz76825kpcg1d6yx8g7ifjndf19n",
102+ "win": "08g7fy18y8q32l0158314bny0qg57xz37qj9fri9r4xbhci67ldk",
103+ "win_s": "0x56s1md62yk661aqcdgnz8k0zir0zr8qwan5vrqc0q9yh069yl1",
104+ "win32": "0ww64mymbilb235n93d7w4c9axq3ww2mxa0f7bl4x8yrxwc8k942",
105+ "win32_s": "0r801vip807v88icf47i3s82v7lshx67q4ilzfjirqfslh1x00bs",
106+ "legacy": "14f4d6r7swfjnlaalg4l5916ihj6wvhlsgjp7cygamzp4c2wgng8",
107+ "legacy_s": "1jxf52kaijf4crwxj30a4f6z7rzs6xa91y6vn5s8jr0cvbr5pz64",
108+ "legacy32": "0j7shqdv3gimacj03cil2y0fmr0j0fp57cwmdjwnxwx3m96k3xwm",
109+ "legacy32_s": "1wc7pcp9dwz0q1na3i5pbqknya595qdkmr7hsmgh2kk8rsp3g9g2"
96110 }
97111}
pkgs/games/dwarf-fortress/game.nix+1−1
@@ -96,6 +96,6 @@ stdenv.mkDerivation {
9696 inherit homepage;
9797 license = licenses.unfreeRedistributable;
9898 platforms = attrNames platforms;
99− maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ];
99+ maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit shazow ];
100100 };
101101}
pkgs/games/dwarf-fortress/themes/default.nix+1−1
@@ -12,7 +12,7 @@ listToAttrs (map (v: {
1212 sha256 = v.sha256;
1313 meta = with lib; {
1414 platforms = platforms.all;
15− maintainers = [ maintainers.matthewbauer ];
15+ maintainers = [ maintainers.matthewbauer maintainers.shazow ];
1616 license = licenses.free;
1717 };
1818 };
pkgs/games/dwarf-fortress/themes/themes.json+26−26
@@ -1,18 +1,18 @@
11[
22 {
33 "name": "afro-graphics",
4− "version": "44.11a",
5− "sha256": "0hxh1qbwj6m780m522cfwjx0qkmiz3328xqwf13vkhlvgbz3azrk"
4+ "version": "47.02",
5+ "sha256": "0np4jc05905q3bjplbrfi09q4rq3pjbf2vmbrmazfagj2mp8m7z5"
66 },
77 {
88 "name": "autoreiv",
9− "version": "44.03",
10− "sha256": "03w9dp42718p5gnswynw3p9wz85y61gkzz60jf71arw1zhf23wm0"
9+ "version": "47.01",
10+ "sha256": "1c2xchlfq7ajpcq8qgrzkw5yfgm0k3fiwq6n7l4724dlbim3rjp2"
1111 },
1212 {
1313 "name": "cla",
14− "version": "0.47.xx-v26",
15− "sha256": "04i17rl3gwpfnylvd554nsdi246yb3ih7wdmxmjy9177l14cp0kk"
14+ "version": "0.47.xx-v26.3",
15+ "sha256": "0ca81r3821jja4pqib75qxcsgg3s0wxzyq1jb4jc0495cvzxw7qa"
1616 },
1717 {
1818 "name": "dfgraphics",
@@ -21,18 +21,18 @@
2121 },
2222 {
2323 "name": "gemset",
24− "version": "44.10a",
25− "sha256": "14q69dyqzhxsfv1a4vh17fx7r7mylfimmjrydz6ygdypblgc9zm6"
24+ "version": "47.02",
25+ "sha256": "0gz6cfx9kyldh5dxicyw0yl9lq4qw51vvlpzl767ml0bx3w38bwy"
2626 },
2727 {
2828 "name": "ironhand",
29− "version": "47.01",
30− "sha256": "0ndf5gy1c0f8h745gg2j9ljwarq4kqi28anvgxcaj73j9cv6jsgw"
29+ "version": "47.02",
30+ "sha256": "0j612xxz8g91zslw3a6yls3bzzmz0xdi2n0zx9zkmpzcl67f39ry"
3131 },
3232 {
3333 "name": "jolly-bastion",
34− "version": "44.11",
35− "sha256": "0nziz6c94c9l28m8pp14fzbbnh7if1dnzrfl160ckv7arqpjv5r9"
34+ "version": "47.02",
35+ "sha256": "1df2hvm72lklmhhphcwsqm1m3dnaqxd8qvpygg5x71cfgkjd41ic"
3636 },
3737 {
3838 "name": "mayday",
@@ -41,37 +41,37 @@
4141 },
4242 {
4343 "name": "obsidian",
44− "version": "44.11",
45− "sha256": "12ij21c47gfws5brxwxhjpcr82q4ghxd1h4k6b0n2zs35071rfrp"
44+ "version": "47.02",
45+ "sha256": "03b26z557099k0l44lizagh17pz1y6apy496ivzv426xy0mzz684"
4646 },
4747 {
4848 "name": "phoebus",
49− "version": "47.01",
50− "sha256": "1rf47p6a4f6scpzlmy9q3v1pakdjs06f9aingajpaia44lmjdfn6"
49+ "version": "47.02a",
50+ "sha256": "16zllnkrxi2365rd5m392xv72a9wvai0l3pz8xwkb8nlws8f58lb"
5151 },
5252 {
5353 "name": "rally-ho",
54− "version": "44.11",
55− "sha256": "0v8aixvhhjlfxycbnldk35s757299a8mlgx4ba5qgnl8y2gg7f35"
54+ "version": "47.02",
55+ "sha256": "0xw2psmfjrgab0267scc7frgl9h1ypc0mbymn8z3x06m5wc3hbdh"
5656 },
5757 {
5858 "name": "spacefox",
59− "version": "47.01",
60− "sha256": "1zbn5z8a40if1yr8kq9v5gnydygqx26jw22jfqqf3hrqfqn4mcb8"
59+ "version": "47.02",
60+ "sha256": "180fp2s489m2arc2z11j1qjnpcadjjkyami13yr3zd0v7msg64h8"
6161 },
6262 {
6363 "name": "taffer",
64− "version": "44.10a",
65− "sha256": "0gp8hmv55bp34db0caksdpd3kn2glh7sz03gyxknzdymh1cpy0qv"
64+ "version": "47.01b",
65+ "sha256": "0b5hnli3gg32r7yvb3x1fqrmpxlk33j1hila2wiihybkkfnvxy5f"
6666 },
6767 {
6868 "name": "tergel",
69− "version": "44.03",
70− "sha256": "1kgk0cav5b6v7mca36gm84b2p556ibd8yy4rwbfc4i6i3hlsdw07"
69+ "version": "47.01",
70+ "sha256": "142sd1i11vvirn68rp4gqzl67ww597df1lc57ycnpnz0n3q39kxy"
7171 },
7272 {
7373 "name": "wanderlust",
74− "version": "44.10",
75− "sha256": "016acv0ab2wj4rn9slhbf626977zas6q4372f7avaf99ihcmwi85"
74+ "version": "47.02",
75+ "sha256": "0c36nxry189qdyinjk03wwm3j7q9q7b2sabkv7glx8yz2i61j5q9"
7676 }
7777]
pkgs/games/dwarf-fortress/unfuck.nix+4
@@ -36,6 +36,10 @@ let
3636 unfuckRelease = "0.47.01";
3737 sha256 = "11xvb3qh4crdf59pwfwpi73rzm3ysd1r1xp2k1jp7527jmqapk4k";
3838 };
39+ "0.47.02" = {
40+ unfuckRelease = "0.47.01";
41+ sha256 = "11xvb3qh4crdf59pwfwpi73rzm3ysd1r1xp2k1jp7527jmqapk4k";
42+ };
3943 };
4044
4145 release = if hasAttr dfVersion unfuck-releases
pkgs/games/dwarf-fortress/update.sh+2−2
@@ -8,8 +8,8 @@ systems='linux linux32 osx osx32
88
99if [ $# -eq 0 ]; then
1010 versions="$(curl http://www.bay12games.com/dwarves/ \
11− | grep 'DOWNLOAD DWARF FORTRESS' \
12− | sed 's/.*DOWNLOAD DWARF FORTRESS \([0-9.]*\) .*/\1/')"
11+ | grep 'DWARF FORTRESS CLASSIC ' \
12+ | sed 's/.*DWARF FORTRESS CLASSIC \([0-9.]*\) .*/\1/')"
1313else
1414 versions="$@"
1515fi
pkgs/games/openmw/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, mkDerivation, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg
1+{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg
22, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }:
33
44let
@@ -10,7 +10,7 @@ let
1010 sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb";
1111 };
1212 });
13−in mkDerivation rec {
13+in mkDerivationWith stdenv.mkDerivation rec {
1414 version = "0.45.0";
1515 pname = "openmw";
1616
pkgs/games/openmw/tes3mp.nix+1−1
@@ -71,7 +71,7 @@ in openmw.overrideAttrs (oldAttrs: rec {
7171 description = "Multiplayer for TES3:Morrowind based on OpenMW";
7272 homepage = https://tes3mp.com/;
7373 license = licenses.gpl3;
74− platforms = platforms.linux;
74+ platforms = [ "x86_64-linux" "i686-linux" ];
7575 maintainers = with maintainers; [ gnidorah ];
7676 };
7777})
pkgs/misc/cups/drivers/hll2340dw/default.nixnew file+68
@@ -0,0 +1,68 @@
1+{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which}:
2+
3+let
4+ version = "3.2.0-1";
5+ lprdeb = fetchurl {
6+ url = "https://download.brother.com/welcome/dlf101912/hll2340dlpr-${version}.i386.deb";
7+ sha256 = "c0ae98b49b462cd8fbef445550f2177ce9d8bf627c904e182daa8cbaf8781e50";
8+ };
9+
10+ cupsdeb = fetchurl {
11+ url = "https://download.brother.com/welcome/dlf101913/hll2340dcupswrapper-${version}.i386.deb";
12+ sha256 = "8aa24a6a825e3a4d5b51778cb46fe63032ec5a731ace22f9ef2b0ffcc2033cc9";
13+ };
14+
15+in
16+stdenv.mkDerivation {
17+ name = "cups-brother-hll2340dw";
18+
19+ nativeBuildInputs = [ makeWrapper ];
20+ buildInputs = [ cups ghostscript dpkg a2ps ];
21+
22+ dontUnpack = true;
23+
24+ installPhase = ''
25+ mkdir -p $out
26+ dpkg-deb -x ${cupsdeb} $out
27+ dpkg-deb -x ${lprdeb} $out
28+
29+ substituteInPlace $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D \
30+ --replace /opt "$out/opt" \
31+ --replace /usr/bin/perl ${perl}/bin/perl \
32+ --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2340D/\"; #" \
33+ --replace "PRINTER =~" "PRINTER = \"HLL2340D\"; #"
34+
35+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
36+ $out/opt/brother/Printers/HLL2340D/lpd/brprintconflsr3
37+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
38+ $out/opt/brother/Printers/HLL2340D/lpd/rawtobr3
39+
40+ for f in \
41+ $out/opt/brother/Printers/HLL2340D/cupswrapper/brother_lpdwrapper_HLL2340D \
42+ $out/opt/brother/Printers/HLL2340D/cupswrapper/paperconfigml1 \
43+ ; do
44+ wrapProgram $f \
45+ --prefix PATH : ${stdenv.lib.makeBinPath [
46+ coreutils ghostscript gnugrep gnused
47+ ]}
48+ done
49+
50+ mkdir -p $out/lib/cups/filter/
51+ ln -s $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D $out/lib/cups/filter/brother_lpdwrapper_HLL2340D
52+
53+ mkdir -p $out/share/cups/model
54+ ln -s $out/opt/brother/Printers/HLL2340D/cupswrapper/brother-HLL2340D-cups-en.ppd $out/share/cups/model/
55+
56+ wrapProgram $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D \
57+ --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] }
58+ '';
59+
60+ meta = with stdenv.lib; {
61+ homepage = http://www.brother.com/;
62+ description = "Brother hl-l2340dw printer driver";
63+ license = licenses.unfree;
64+ platforms = platforms.linux;
65+ downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=es&prod=hll2340dw_us_eu_as&os=128&flang=English";
66+ maintainers = [ maintainers.qknight ];
67+ };
68+}
pkgs/misc/emulators/dolphin-emu/master.nix+3−3
@@ -21,13 +21,13 @@ let
2121 };
2222in stdenv.mkDerivation rec {
2323 pname = "dolphin-emu";
24− version = "5.0-11109";
24+ version = "5.0-11608";
2525
2626 src = fetchFromGitHub {
2727 owner = "dolphin-emu";
2828 repo = "dolphin";
29− rev = "93d7b3d15962a3393cf2971e14c4acf54d90cecd";
30− sha256 = "1kkx3agdsc0qmf3yymlzq315nypm34qvq04qpjqycpfhmpx8gdnq";
29+ rev = "69ee15e5ef369d51681540e6714f02554e3bd8a6";
30+ sha256 = "1svi9mnddhjcv64xh3y9l68k3rix7wimq8b0mqf5hp7qrda07lx8";
3131 };
3232
3333 enableParallelBuilding = true;
pkgs/servers/atlassian/jira.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "atlassian-jira";
8− version = "8.6.0";
8+ version = "8.7.0";
99
1010 src = fetchurl {
1111 url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
12− sha256 = "091vcr0hvrrm9zjqs67ai5mkx7b8ybpwqpdxy7jw5z3994rdx3xw";
12+ sha256 = "0k3z4j5pp0xx8qq5clr3069449w5k43gzag60jv3dzq35586yvdi";
1313 };
1414
1515 buildPhase = ''
pkgs/servers/grocy/config-locations.patchnew file+61
@@ -0,0 +1,61 @@
1+diff --git a/app.php b/app.php
2+index 5f91e4d..09c6010 100644
3+--- a/app.php
4++++ b/app.php
5+@@ -23,7 +23,7 @@ else
6+ require_once __DIR__ . '/vendor/autoload.php';
7+
8+ // Load config files
9+-require_once GROCY_DATAPATH . '/config.php';
10++require_once getenv('GROCY_CONFIG_FILE');
11+ require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
12+
13+ // Definitions for dev/demo/prerelease mode
14+@@ -49,7 +49,7 @@ $appContainer = new \Slim\Container([
15+ ],
16+ 'view' => function($container)
17+ {
18+- return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
19++ return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
20+ },
21+ 'LoginControllerInstance' => function($container)
22+ {
23+diff --git a/services/DatabaseService.php b/services/DatabaseService.php
24+index 0bcf9b8..ec45e93 100644
25+--- a/services/DatabaseService.php
26++++ b/services/DatabaseService.php
27+@@ -13,7 +13,7 @@ class DatabaseService
28+ return GROCY_DATAPATH . '/grocy_' . GROCY_CULTURE . '.db';
29+ }
30+
31+- return GROCY_DATAPATH . '/grocy.db';
32++ return getenv('GROCY_DB_FILE');
33+ }
34+
35+ private $DbConnectionRaw;
36+diff --git a/services/FilesService.php b/services/FilesService.php
37+index 7933b73..f52657e 100644
38+--- a/services/FilesService.php
39++++ b/services/FilesService.php
40+@@ -12,7 +12,7 @@ class FilesService extends BaseService
41+ {
42+ parent::__construct();
43+
44+- $this->StoragePath = GROCY_DATAPATH . '/storage';
45++ $this->StoragePath = getenv('GROCY_STORAGE_DIR');
46+
47+ if (!file_exists($this->StoragePath))
48+ {
49+diff --git a/services/StockService.php b/services/StockService.php
50+index d7482ef..d1399a7 100644
51+--- a/services/StockService.php
52++++ b/services/StockService.php
53+@@ -933,7 +933,7 @@ class StockService extends BaseService
54+ throw new \Exception('No barcode lookup plugin defined');
55+ }
56+
57+- $path = GROCY_DATAPATH . "/plugins/$pluginName.php";
58++ $path = getenv('GROCY_PLUGIN_DIR');
59+ if (file_exists($path))
60+ {
61+ require_once $path;
pkgs/servers/grocy/default.nixnew file+32
@@ -0,0 +1,32 @@
1+{ stdenv, fetchurl, unzip }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "grocy";
5+ version = "2.6.0";
6+
7+ src = fetchurl {
8+ url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
9+ sha256 = "1d4hy495in7p0i4fnhai1yqhjhmblv1g30siggmqpjrzdiiw3bak";
10+ };
11+
12+ nativeBuildInputs = [ unzip ];
13+ unpackPhase = ''
14+ unzip ${src} -d .
15+ '';
16+
17+ patches = [ ./config-locations.patch ];
18+
19+ dontBuild = true;
20+
21+ installPhase = ''
22+ mkdir -p $out/
23+ cp -R . $out/
24+ '';
25+
26+ meta = with stdenv.lib; {
27+ license = licenses.mit;
28+ maintainers = with maintainers; [ ma27 ];
29+ description = "ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home";
30+ homepage = "https://grocy.info/";
31+ };
32+}
pkgs/servers/mail/sympa/default.nixnew file+116
@@ -0,0 +1,116 @@
1+{ stdenv, perl, fetchFromGitHub, autoreconfHook
2+}:
3+
4+let
5+ dataDir = "/var/lib/sympa";
6+ runtimeDir = "/run/sympa";
7+ perlEnv = perl.withPackages (p: with p; [
8+ ArchiveZip
9+ CGI
10+ CGIFast
11+ ClassSingleton
12+ DateTime
13+ DBI
14+ DateTimeFormatMail
15+ DateTimeTimeZone
16+ DigestMD5
17+ Encode
18+ FCGI
19+ FileCopyRecursive
20+ FileNFSLock
21+ FilePath
22+ HTMLParser
23+ HTMLFormatter
24+ HTMLTree
25+ HTMLStripScriptsParser
26+ IO
27+ IOStringy
28+ LWP
29+ libintl_perl
30+
31+ MHonArc
32+ MIMEBase64
33+ MIMECharset
34+ MIMETools
35+ MIMEEncWords
36+ MIMELiteHTML
37+ MailTools
38+ NetCIDR
39+ ScalarListUtils
40+ SysSyslog
41+ TermProgressBar
42+ TemplateToolkit
43+ URI
44+ UnicodeLineBreak
45+ XMLLibXML
46+
47+ ### Features
48+ Clone
49+ CryptEksblowfish
50+
51+ DBDPg
52+ DBDSQLite
53+ DBDmysql
54+
55+ DataPassword
56+ EncodeLocale
57+ IOSocketSSL
58+ MailDKIM
59+ NetDNS
60+ NetLDAP
61+ NetSMTP
62+ SOAPLite
63+ ]);
64+in
65+stdenv.mkDerivation rec {
66+ pname = "sympa";
67+ version = "6.2.52";
68+
69+ src = fetchFromGitHub {
70+ owner = "sympa-community";
71+ repo = pname;
72+ rev = version;
73+ sha256 = "071kx6ryifs2f6fhfky9g297frzp5584kn444af1vb2imzydsbnh";
74+ };
75+
76+ configureFlags = [
77+ "--without-initdir"
78+ "--without-unitsdir"
79+ "--without-smrshdir"
80+
81+ "--with-lockdir=${runtimeDir}"
82+ "--with-piddir=${runtimeDir}"
83+ "--with-confdir=${dataDir}/etc"
84+ "--sysconfdir=${dataDir}/etc"
85+ "--with-spooldir=${dataDir}/spool"
86+ "--with-expldir=${dataDir}/list_data"
87+ ];
88+ nativeBuildInputs = [ autoreconfHook ];
89+ buildInputs = [ perlEnv ];
90+ patches = [ ./make-docs.patch ];
91+
92+ prePatch = ''
93+ patchShebangs po/sympa/add-lang.pl
94+ '';
95+
96+ preInstall = ''
97+ mkdir "$TMP/bin"
98+ for i in chown chgrp chmod; do
99+ echo '#!${stdenv.shell}' >> "$TMP/bin/$i"
100+ chmod +x "$TMP/bin/$i"
101+ done
102+ PATH="$TMP/bin:$PATH"
103+ '';
104+
105+ postInstall = ''
106+ rm -rf "$TMP/bin"
107+ '';
108+
109+ meta = with stdenv.lib; {
110+ description = "Open source mailing list manager";
111+ homepage = "https://www.sympa.org";
112+ license = licenses.gpl2;
113+ maintainers = with maintainers; [ sorki mmilata ];
114+ platforms = platforms.all;
115+ };
116+}
pkgs/servers/mail/sympa/make-docs.patchnew file+11
@@ -0,0 +1,11 @@
1+diff -ur sympa-6.2.44-orig/doc/Makefile.am sympa-6.2.44/doc/Makefile.am
2+--- sympa-6.2.44-orig/doc/Makefile.am 2019-08-29 01:57:43.512539087 +0200
3++++ sympa-6.2.44/doc/Makefile.am 2019-08-29 01:58:24.393531358 +0200
4+@@ -83,6 +83,4 @@
5+ --lax --release="$(VERSION)" $< $@
6+
7+ .podpl.pod:
8+- $(AM_V_GEN)PERL5LIB=$(top_builddir)/src/lib:$(top_srcdir)/src/lib; \
9+- export PERL5LIB; \
10+- $(PERL) $< --top_srcdir=$(top_srcdir) > $*.pod
11++ $(AM_V_GEN)$(PERL) -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib $< --top_srcdir=$(top_srcdir) > $*.pod
pkgs/servers/memcached/default.nix+11−1
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, cyrus_sasl, libevent}:
1+{stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent}:
22
33stdenv.mkDerivation rec {
44 version = "1.5.21";
@@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
99 sha256 = "1x4jzrz09aq4nllkarn7d5x77gsys5l3nvfj8c7j4nvmvc30rlg3";
1010 };
1111
12+ patches = [
13+ # Fixes compilation error on Darwin due to redeclaration of
14+ # htonll. The fix should appear in 1.5.23.
15+ # https://github.com/memcached/memcached/issues/598
16+ (fetchpatch {
17+ url = "https://github.com/memcached/memcached/commit/95c67710aaf5cfe188d94b510faef8c66d6f5604.diff";
18+ sha256 = "0ab5l24p4n4fpx78ilmg7jvs9nl84pdza90jbpbx3ns5n23pqbfs";
19+ })
20+ ];
21+
1222 configureFlags = [
1323 "ac_cv_c_endian=${if stdenv.hostPlatform.isBigEndian then "big" else "little"}"
1424 ];
pkgs/test/nixos-functions/default.nix+1−1
@@ -33,7 +33,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux (
3333 environment.systemPackages = [ pkgs.hello ];
3434 };
3535 testScript = ''
36− $machine->succeed("hello");
36+ machine.succeed("hello")
3737 '';
3838 });
3939
pkgs/tools/admin/azure-cli/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:
22
33let
4− version = "2.0.80";
4+ version = "2.0.81";
55 src = fetchFromGitHub {
66 owner = "Azure";
77 repo = "azure-cli";
88 rev = "azure-cli-${version}";
9− sha256 = "05j74cfxjpi3w79w0i5av3h2m81bavbsc581vvh773ixivndds1k";
9+ sha256 = "1fpdc59qqkx9s5aip62jzcky92fhlbvc97hi1x047sldh9ibp02n";
1010 };
1111
1212 # put packages that needs to be overriden in the py package scope
pkgs/tools/admin/azure-cli/python-packages.nix+17−14
@@ -111,6 +111,9 @@ let
111111 '';
112112 };
113113
114+ azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip"
115+ "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g";
116+
114117 azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.5.0" "zip"
115118 "0jhq8fi3dn2cncyv2rrgr4kldd254f30zgwf6p85rdgvg2p9k4hl";
116119
@@ -123,14 +126,14 @@ let
123126 azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
124127 "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
125128
126− azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.0.0" "zip"
127− "0akpm12xj453dp84dfdpi06phr4q0hknr5l7bz96zbc8iand78wg";
129+ azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.1.0" "zip"
130+ "07vpzhvi2946v5dn9cb2hkd1b9vj5c6zl32958bg2bxsjg9vvyi1";
128131
129132 azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.11.0" "zip"
130133 "05j0s2ng6ck35lw85cbjf5cm6canc71c41aagr68cmiqj1li6v1z";
131134
132− azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.1.0" "zip"
133− "0gvh17bhfcpvr6w0nd06v482m8lqxchlk256w68agi2qnqw6v2ir";
135+ azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip"
136+ "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
134137
135138 azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.2.1" "zip"
136139 "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky";
@@ -138,8 +141,8 @@ let
138141 azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.8.2" "zip"
139142 "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq";
140143
141− azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "1.0.0" "zip"
142− "1s1x0pzynz0sd0l4k1kvkph9i1y03y9qd6afbw0nafcr3znqib4s";
144+ azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "2.0.0" "zip"
145+ "1fql0j28d2r6slgabb7b438gdga513iskqh4al6c7dsmj1yzdzwa";
143146
144147 azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip"
145148 "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y";
@@ -162,8 +165,8 @@ let
162165 azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip"
163166 "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6";
164167
165− azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.42.0" "zip"
166− "0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn";
168+ azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.44.0" "zip"
169+ "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw";
167170
168171 azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "7.0.0rc1" "zip"
169172 "086wk31wsl8dx14qpd0g1bly8i9a8fix007djlj9cybva2f2bk6k";
@@ -192,11 +195,11 @@ let
192195 azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "1.1.0" "zip"
193196 "16a0d3j5dilbp7pd7gbwf8jr46vzbjim1p9alcmisi12m4km7885";
194197
195− azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "3.1.0" "zip"
196− "1qvnksmvsg8cw1ac6vbdxjdqsm7s1sak27k8xy24hm7c9a8y1nqc";
198+ azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.0.0" "zip"
199+ "0aphqh4mvrc1yiyis8zvks0d19d1m3lqylr9jc8fj73iw84rwgm5";
197200
198− azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc7" "zip"
199− "1bzfpbz186dhnxn0blgr20xxnk67gkr8ysn2b3f1r41bq9hz97xp";
201+ azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc8" "zip"
202+ "1j2xyfid0qg95lywwsz8520r7gd8m0a487n03jxnckr91vd890v1";
200203
201204 azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.7.0" "zip"
202205 "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2";
@@ -213,8 +216,8 @@ let
213216 azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.1.0" "zip"
214217 "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l";
215218
216− azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.2.0" "zip"
217− "1bcq6fcgrsvmk6q7v8mxzn1180jm2qijdqkqbv1m117zp1wj5gxj";
219+ azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip"
220+ "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";
218221
219222 azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.3.0" "zip"
220223 "1r7isr7hzq2dv1idwwa9xxxgk8wh0ncka45r4rdcsl1p7kd2kqam";
pkgs/tools/admin/lexicon/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib
2+, python3Packages
3+, fetchFromGitHub
4+}:
5+
6+python3Packages.buildPythonApplication rec {
7+ pname = "lexicon";
8+ version = "3.3.17";
9+
10+ propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ];
11+
12+ checkInputs = with python3Packages; [ pytest pytestcov pytest_xdist vcrpy mock ];
13+
14+ checkPhase = ''
15+ pytest --ignore=lexicon/tests/providers/test_auto.py
16+ '';
17+
18+ src = fetchFromGitHub {
19+ owner = "AnalogJ";
20+ repo = pname;
21+ rev = "v${version}";
22+ sha256 = "1wrsw759am6yp2m9b34iv82m371df3ssp2vhdjr18ys3xk7dvj89";
23+ };
24+
25+ meta = with lib; {
26+ description = "Manipulate DNS records on various DNS providers in a standardized way.";
27+ homepage = https://github.com/AnalogJ/lexicon;
28+ maintainers = with maintainers; [ flyfloh ];
29+ license = licenses.mit;
30+ };
31+}
pkgs/tools/backup/sanoid/default.nixnew file+75
@@ -0,0 +1,75 @@
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, zfs
2+, perlPackages, procps, which, openssh, sudo, mbuffer, pv, lzop, gzip, pigz }:
3+
4+with lib;
5+
6+stdenv.mkDerivation rec {
7+ pname = "sanoid";
8+ version = "2.0.3";
9+
10+ src = fetchFromGitHub {
11+ owner = "jimsalterjrs";
12+ repo = pname;
13+ rev = "v${version}";
14+ sha256 = "1wmymzqg503nmhw8hrblfs67is1l3ljbk2fjvrqwyb01b7mbn80x";
15+ };
16+
17+ patches = [
18+ # Make sanoid look for programs in PATH
19+ (fetchpatch {
20+ url = "https://github.com/jimsalterjrs/sanoid/commit/dc2371775afe08af799d3097d47b48182d1716eb.patch";
21+ sha256 = "16hlwcbcb8h3ar1ywd2bzr3h3whgbcfk6walmp8z6j74wbx81aav";
22+ })
23+ # Make findoid look for programs in PATH
24+ (fetchpatch {
25+ url = "https://github.com/jimsalterjrs/sanoid/commit/44bcd21f269e17765acd1ad0d45161902a205c7b.patch";
26+ sha256 = "0zqyl8q5sfscqcc07acw68ysnlnh3nb57cigjfwbccsm0zwlwham";
27+ })
28+ # Add --cache-dir option
29+ (fetchpatch {
30+ url = "https://github.com/jimsalterjrs/sanoid/commit/a1f5e4c0c006e16a5047a16fc65c9b3663adb81e.patch";
31+ sha256 = "1bb4g2zxrbvf7fvcgzzxsr1cvxzrxg5dzh89sx3h7qlrd6grqhdy";
32+ })
33+ # Add --run-dir option
34+ (fetchpatch {
35+ url = "https://github.com/jimsalterjrs/sanoid/commit/59a07f92b4920952cc9137b03c1533656f48b121.patch";
36+ sha256 = "11v4jhc36v839gppzvhvzp5jd22904k8xqdhhpx6ghl75yyh4f4s";
37+ })
38+ ];
39+
40+ nativeBuildInputs = [ makeWrapper ];
41+ buildInputs = with perlPackages; [ perl ConfigIniFiles CaptureTiny ];
42+
43+ installPhase = ''
44+ mkdir -p "$out/bin"
45+ mkdir -p "$out/etc/sanoid"
46+ cp sanoid.defaults.conf "$out/etc/sanoid/sanoid.defaults.conf"
47+ # Hardcode path to default config
48+ substitute sanoid "$out/bin/sanoid" \
49+ --replace "\$args{'configdir'}/sanoid.defaults.conf" "$out/etc/sanoid/sanoid.defaults.conf"
50+ chmod +x "$out/bin/sanoid"
51+ # Prefer ZFS userspace tools from /run/booted-system/sw/bin to avoid
52+ # incompatibilities with the ZFS kernel module.
53+ wrapProgram "$out/bin/sanoid" \
54+ --prefix PERL5LIB : "$PERL5LIB" \
55+ --prefix PATH : "${makeBinPath [ procps "/run/booted-system/sw" zfs ]}"
56+
57+ install -m755 syncoid "$out/bin/syncoid"
58+ wrapProgram "$out/bin/syncoid" \
59+ --prefix PERL5LIB : "$PERL5LIB" \
60+ --prefix PATH : "${makeBinPath [ openssh procps which pv mbuffer lzop gzip pigz "/run/booted-system/sw" zfs ]}"
61+
62+ install -m755 findoid "$out/bin/findoid"
63+ wrapProgram "$out/bin/findoid" \
64+ --prefix PERL5LIB : "$PERL5LIB" \
65+ --prefix PATH : "${makeBinPath [ "/run/booted-system/sw" zfs ]}"
66+ '';
67+
68+ meta = {
69+ description = "A policy-driven snapshot management tool for ZFS filesystems";
70+ homepage = "https://github.com/jimsalterjrs/sanoid";
71+ license = licenses.gpl3;
72+ maintainers = with maintainers; [ lopsided98 ];
73+ platforms = platforms.all;
74+ };
75+}
pkgs/tools/bluetooth/bluez-alsa/default.nix+6−7
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
2−, alsaLib, bluez, glib, sbc
2+, alsaLib, bluez, glib, sbc, dbus
33
44# optional, but useful utils
55, readline, libbsd, ncurses
@@ -13,32 +13,31 @@ with stdenv.lib;
1313
1414stdenv.mkDerivation rec {
1515 pname = "bluez-alsa";
16− version = "1.4.0";
16+ version = "2.0.0";
1717
1818 src = fetchFromGitHub {
1919 owner = "Arkq";
2020 repo = "bluez-alsa";
2121 rev = "v${version}";
22− sha256 = "12kc2896rbir8viywd6bjwcklkwf46j4svh9viryn6kmk084nb49";
22+ sha256 = "08mppgnjf1j2733bk9yf0cny6rfxxwiys0s62lz2zd2lpdl6d9lz";
2323 };
2424
2525 nativeBuildInputs = [ pkgconfig autoreconfHook ];
2626
2727 buildInputs = [
28− alsaLib bluez glib sbc
28+ alsaLib bluez glib sbc dbus
2929 readline libbsd ncurses
3030 ]
3131 ++ optional aacSupport fdk_aac;
3232
3333 configureFlags = [
3434 "--with-alsaplugindir=\$out/lib/alsa-lib"
35+ "--with-dbusconfdir=\$out/etc/dbus-1"
3536 "--enable-rfcomm"
3637 "--enable-hcitop"
3738 ]
3839 ++ optional aacSupport "--enable-aac";
3940
40− doCheck = false; # fails 1 of 3 tests, needs access to ALSA
41−
4241 meta = {
4342 description = "Bluez 5 Bluetooth Audio ALSA Backend";
4443 longDescription = ''
@@ -63,7 +62,7 @@ stdenv.mkDerivation rec {
6362 homepage = src.meta.homepage;
6463 license = licenses.mit;
6564 platforms = platforms.linux;
66− maintainers = [ maintainers.oxij ];
65+ maintainers = [ maintainers.oxij maintainers.lheckemann ];
6766 };
6867
6968}
pkgs/tools/filesystems/reiserfsprogs/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ autoreconfHook ];
1515 buildInputs = [ libuuid ];
1616
17− NIX_CFLAGS_COMPILE = "-std=gnu90";
17+ NIX_CFLAGS_COMPILE = [ "-std=gnu90" "-D_GNU_SOURCE" ];
1818
1919 meta = {
2020 inherit version;
pkgs/tools/graphics/wdisplays/default.nix+5−5
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }:
22stdenv.mkDerivation {
3− pname = "wdisplays";
4− version = "2019-10-26-unstable";
3+ pname = "wdisplays-unstable";
4+ version = "2020-01-12";
55
66 nativeBuildInputs = [ meson ninja pkgconfig ];
77
@@ -10,14 +10,14 @@ stdenv.mkDerivation {
1010 src = fetchFromGitHub {
1111 owner = "cyclopsian";
1212 repo = "wdisplays";
13− rev = "22669edadb8ff3478bdb51ddc140ef6e61e3d9ef";
14− sha256 = "127k5i98km6mh8yw4vf8n44b29kc3n0169xpkdh7yr0rhv6n9cdl";
13+ rev = "ba331cab535318888a562f5a2731d2523b310dac";
14+ sha256 = "0fk3l78hirxdi74iqmq6mxi9daqnxdkbb5a2wfshmr11ic9xixpm";
1515 };
1616
1717 meta = let inherit (stdenv) lib; in {
1818 description = "A graphical application for configuring displays in Wayland compositors";
1919 homepage = "https://github.com/cyclopsian/wdisplays";
20− maintainers = [ lib.maintainers.lheckemann ];
20+ maintainers = with lib.maintainers; [ lheckemann ma27 ];
2121 license = lib.licenses.mit;
2222 platforms = lib.platforms.linux;
2323 };
pkgs/tools/misc/fzf/default.nix+12−10
@@ -19,32 +19,34 @@ buildGoModule rec {
1919
2020 buildInputs = [ ncurses ];
2121
22+ # The vim plugin expects a relative path to the binary; patch it to abspath.
2223 patchPhase = ''
23− sed -i -e "s|expand('<sfile>:h:h')|'$bin'|" plugin/fzf.vim
24+ sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim
2425
25− # Original and output files can't be the same
26− if cmp -s $src/plugin/fzf.vim plugin/fzf.vim; then
27− echo "Vim plugin patch not applied properly. Aborting" && \
28− exit 1
26+ if ! grep -q $out plugin/fzf.vim; then
27+ echo "Failed to replace vim base_dir path with $out"
28+ exit 1
2929 fi
3030 '';
3131
32+ doCheck = true;
33+
3234 preInstall = ''
3335 mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d}
34− cp $src/shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish
36+ cp shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish
3537 cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
3638 '';
3739
3840 postInstall = ''
39− cp $src/bin/fzf-tmux $out/bin
41+ cp bin/fzf-tmux $out/bin
4042
4143 mkdir -p $man/share/man
42− cp -r $src/man/man1 $man/share/man
44+ cp -r man/man1 $man/share/man
4345
4446 mkdir -p $out/share/vim-plugins/${pname}
45− cp -r $src/plugin $out/share/vim-plugins/${pname}
47+ cp -r plugin $out/share/vim-plugins/${pname}
4648
47− cp -R $src/shell $out/share/fzf
49+ cp -R shell $out/share/fzf
4850 cat <<SCRIPT > $out/bin/fzf-share
4951 #!${runtimeShell}
5052 # Run this script to find the fzf shared folder where all the shell
pkgs/tools/misc/parallel/default.nix+2−2
@@ -1,11 +1,11 @@
11{ fetchurl, stdenv, perl, makeWrapper, procps }:
22
33stdenv.mkDerivation rec {
4− name = "parallel-20191222";
4+ name = "parallel-20200122";
55
66 src = fetchurl {
77 url = "mirror://gnu/parallel/${name}.tar.bz2";
8− sha256 = "0xvw578440s9cc382n7z2l8npj30nwr6wwmkyxn2pj1pcszfjagy";
8+ sha256 = "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi";
99 };
1010
1111 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/networking/corerad/default.nix+3−5
@@ -2,18 +2,16 @@
22
33buildGoModule rec {
44 pname = "corerad";
5− version = "0.1.9";
6−
7− goPackagePath = "github.com/mdlayher/corerad";
5+ version = "0.2.1";
86
97 src = fetchFromGitHub {
108 owner = "mdlayher";
119 repo = "corerad";
1210 rev = "v${version}";
13− sha256 = "1m23f318qr6b8c7hxrhihrm09pmdwab988k3bn4ygfm49z5phy4s";
11+ sha256 = "04w77cahnphgd8b09a67dkrgx9jh8mvgjfjydj6drcw67v0d18c0";
1412 };
1513
16− modSha256 = "0idlpkn6krs77akn3p6gxsbc8zpj1rnjkhhwmb8ns98x82g6bln0";
14+ modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c";
1715
1816 meta = with stdenv.lib; {
1917 homepage = "https://github.com/mdlayher/corerad";
pkgs/tools/networking/lldpd/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "lldpd";
7− version = "1.0.4";
7+ version = "1.0.5";
88
99 src = fetchurl {
1010 url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
11− sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak";
11+ sha256 = "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd";
1212 };
1313
1414 configureFlags = [
pkgs/tools/networking/rtptools/default.nixnew file+16
@@ -0,0 +1,16 @@
1+{ stdenv, lib, fetchurl }:
2+stdenv.mkDerivation rec {
3+ pname = "rtptools";
4+ version = "1.22";
5+ src = fetchurl {
6+ url = "http://www.cs.columbia.edu/irt/software/rtptools/download/rtptools-${version}.tar.gz";
7+ sha256 = "0a4c0vmhxibfc58rrxpbav2bsk546chkg50ir4h3i57v4fjb4xic";
8+ };
9+ meta = {
10+ description = "A number of small applications that can be used for processing RTP data";
11+ homepage = "http://www.cs.columbia.edu/irt/software/rtptools/";
12+ maintainers = [ lib.maintainers.lheckemann ];
13+ platforms = lib.platforms.unix;
14+ license = lib.licenses.bsd3;
15+ };
16+}
pkgs/tools/networking/socat/default.nix−2
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
88 sha256 = "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp";
99 };
1010
11− patches = stdenv.lib.optional stdenv.isDarwin ./speed-type-fix.patch;
12−
1311 postPatch = ''
1412 patchShebangs test.sh
1513 substituteInPlace test.sh \
pkgs/tools/networking/socat/speed-type-fix.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/xio-termios.h b/xio-termios.h
2−index a288a2f..9858aab 100644
3−--- a/xio-termios.h
4−+++ b/xio-termios.h
5−@@ -148,7 +148,7 @@ extern int xiotermiosflag_applyopt(int fd, struct opt *opt);
6− extern int xiotermios_value(int fd, int word, tcflag_t mask, tcflag_t value);
7− extern int xiotermios_char(int fd, int n, unsigned char c);
8− #ifdef HAVE_TERMIOS_ISPEED
9−-extern int xiotermios_speed(int fd, int n, unsigned int speed);
10−+extern int xiotermios_speed(int fd, int n, speed_t speed);
11− #endif
12− extern int xiotermios_spec(int fd, int optcode);
13− extern int xiotermios_flush(int fd);
pkgs/tools/networking/tcptraceroute/default.nix+1−1
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
2323 description = "A traceroute implementation using TCP packets.";
2424 homepage = https://github.com/mct/tcptraceroute;
2525 license = stdenv.lib.licenses.gpl2;
26− maintainers = [ stdenv.lib.maintainers.pbogdan ];
26+ maintainers = [ ];
2727 };
2828}
pkgs/tools/security/jwt-cli/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "jwt-cli";
5− version = "2.5.1";
5+ version = "2.5.2";
66
77 src = fetchFromGitHub {
88 owner = "mike-engel";
99 repo = pname;
1010 rev = version;
11− sha256 = "1p0c4398kwczwvl4krvfdhg1ixp1gj9nmvzqqv2xlmvrw1qsin8w";
11+ sha256 = "1q6dqh8z6mhiksjrhi602cvq31jgc18pfbwf6mlm9gi1grpgm5dl";
1212 };
1313
14− cargoSha256 = "005y92acsn5j490jkp23ny7bsjd9ql1glybmbh4cyc8b15hmy618";
14+ cargoSha256 = "0k3fla0zz2r66y5fvmbcdhjd2jq8md2sxgcjb3x8sipzqfv8bwi2";
1515
1616 buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
1717
pkgs/tools/system/ioping/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "ioping";
5− version = "1.1";
5+ version = "1.2";
66
77 src = fetchFromGitHub {
88 owner = "koct9i";
99 repo = "ioping";
1010 rev = "v${version}";
11− sha256 = "0cv2496jplka55yqdcf3ln78r8yggy4lgmgf06l6fbljjrdx7pgq";
11+ sha256 = "10bv36bqga8sdifxzywzzpjil7vmy62psirz7jbvlsq1bw71aiid";
1212 };
1313
1414 makeFlags = [ "PREFIX=$(out)" ];
pkgs/top-level/aliases.nix+14
@@ -117,6 +117,18 @@ mapAliases ({
117117 firefox-esr-wrapper = firefox-esr; # 2016-01
118118 firefox-wrapper = firefox; # 2016-01
119119 firefoxWrapper = firefox; # 2015-09
120+ firefox-esr-52 = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff
121+ firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff
122+ firefox-esr-60 = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff
123+ firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff
124+ icecat = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff
125+ icecat-unwrapped = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff
126+ conkeror-unwrapped = conkeror; # 2020-02, remove after 20.03 branchoff
127+ conkeror = throw ''
128+ Conkeror doesn't work with any secure firefox release.
129+ Please move to some of the alternatives at http://conkeror.org/Alternatives
130+ ''; # 2020-02, remove after 20.03 branchoff
131+
120132 firestr = throw "firestr has been removed."; # added 2019-12-08
121133 flameGraph = flamegraph; # added 2018-04-25
122134 font-awesome-ttf = font-awesome; # 2018-02-25
@@ -571,4 +583,6 @@ mapAliases ({
571583
572584 dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02
573585 sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04
586+
587+ gcc-snapshot = throw "Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7.";
574588})
pkgs/top-level/all-packages.nix+42−49
@@ -1907,6 +1907,8 @@ in
19071907
19081908 lepton = callPackage ../tools/graphics/lepton { };
19091909
1910+ lexicon = callPackage ../tools/admin/lexicon { };
1911+
19101912 lief = callPackage ../development/libraries/lief {};
19111913
19121914 libndtypes = callPackage ../development/libraries/libndtypes { };
@@ -5276,6 +5278,8 @@ in
52765278 inherit (darwin.apple_sdk.frameworks) Security;
52775279 };
52785280
5281+ grocy = callPackage ../servers/grocy { };
5282+
52795283 nextcloud = callPackage ../servers/nextcloud { };
52805284
52815285 nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
@@ -6090,6 +6094,8 @@ in
60906094 rtmpdump = callPackage ../tools/video/rtmpdump { };
60916095 rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
60926096
6097+ rtptools = callPackages ../tools/networking/rtptools {};
6098+
60936099 reaverwps = callPackage ../tools/networking/reaver-wps {};
60946100
60956101 reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {};
@@ -7791,6 +7797,8 @@ in
77917797
77927798 binaryen = callPackage ../development/compilers/binaryen { };
77937799
7800+ bluespec = callPackage ../development/compilers/bluespec { };
7801+
77947802 colm = callPackage ../development/compilers/colm { };
77957803
77967804 colmap = libsForQt5.callPackage ../applications/science/misc/colmap { };
@@ -8129,18 +8137,6 @@ in
81298137 isl = if !stdenv.isDarwin then isl_0_17 else null;
81308138 }));
81318139
8132− gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot {
8133− inherit noSysDirs;
8134−
8135− # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
8136− profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
8137−
8138− libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
8139− threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
8140−
8141− isl = isl_0_17;
8142− }));
8143−
81448140 gfortran = gfortran9;
81458141
81468142 gfortran48 = wrapCC (gcc48.cc.override {
@@ -9182,29 +9178,18 @@ in
91829178 git = gitMinimal;
91839179 };
91849180
9185− inherit (
9186− let
9187− defaultOctaveOptions = {
9188− qt = null;
9189− qscintilla = null;
9190− ghostscript = null;
9191− graphicsmagick = null;
9192− llvm = null;
9193− hdf5 = null;
9194− glpk = null;
9195− suitesparse = null;
9196− jdk = null;
9197− openblas = if stdenv.isDarwin then openblasCompat else openblas;
9198− };
9199−
9200− hgOctaveOptions =
9201− (removeAttrs defaultOctaveOptions ["ghostscript"]) // {
9202− overridePlatforms = stdenv.lib.platforms.none;
9203− };
9204− in {
9205− octave = callPackage ../development/interpreters/octave defaultOctaveOptions;
9206− octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions);
9207− }) octave octaveHg;
9181+ octave = callPackage ../development/interpreters/octave {
9182+ qt = null;
9183+ qscintilla = null;
9184+ ghostscript = null;
9185+ graphicsmagick = null;
9186+ llvm = null;
9187+ hdf5 = null;
9188+ glpk = null;
9189+ suitesparse = null;
9190+ jdk = null;
9191+ openblas = if stdenv.isDarwin then openblasCompat else openblas;
9192+ };
92089193
92099194 octaveFull = (lowPrio (octave.override {
92109195 qt = qt4;
@@ -10532,6 +10517,8 @@ in
1053210517
1053310518 sauce-connect = callPackage ../development/tools/sauce-connect { };
1053410519
10520+ scaff = callPackage ../development/tools/scaff { };
10521+
1053510522 selenium-server-standalone = callPackage ../development/tools/selenium/server { };
1053610523
1053710524 selendroid = callPackage ../development/tools/selenium/selendroid { };
@@ -15460,6 +15447,8 @@ in
1546015447
1546115448 pshs = callPackage ../servers/http/pshs { };
1546215449
15450+ sympa = callPackage ../servers/mail/sympa { };
15451+
1546315452 system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });
1546415453
1546515454 # PulseAudio daemons
@@ -18515,9 +18504,6 @@ in
1851518504
1851618505 comical = callPackage ../applications/graphics/comical { };
1851718506
18518− conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { };
18519− conkeror = wrapFirefox conkeror-unwrapped { };
18520−
1852118507 containerd = callPackage ../applications/virtualization/containerd { };
1852218508
1852318509 convchain = callPackage ../tools/graphics/convchain {};
@@ -19135,18 +19121,11 @@ in
1913519121 });
1913619122
1913719123 firefox-unwrapped = firefoxPackages.firefox;
19138− firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52;
19139− firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60;
1914019124 firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68;
19141− icecat-unwrapped = firefoxPackages.icecat;
19142−
1914319125 firefox = wrapFirefox firefox-unwrapped { };
1914419126 firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; };
19145− firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { };
19146− firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { };
1914719127 firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { };
1914819128 firefox-esr = firefox-esr-68;
19149− icecat = wrapFirefox icecat-unwrapped { };
1915019129
1915119130 firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
1915219131 channel = "release";
@@ -19314,6 +19293,10 @@ in
1931419293
1931519294 m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
1931619295
19296+ manim = python37Packages.callPackage ../applications/video/manim {
19297+ opencv = python37Packages.opencv3;
19298+ };
19299+
1931719300 manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
1931819301
1931919302 manul = callPackage ../development/tools/manul { };
@@ -23206,7 +23189,13 @@ in
2320623189
2320723190 openmw = libsForQt5.callPackage ../games/openmw { };
2320823191
23209− openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };
23192+ openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix {
23193+ openmw = openmw.override {
23194+ stdenv = gcc8Stdenv;
23195+ openscenegraph = openscenegraph.override { stdenv = gcc8Stdenv; };
23196+ mygui = mygui.override { stdenv = gcc8Stdenv; };
23197+ };
23198+ };
2321023199
2321123200 openraPackages = import ../games/openra pkgs;
2321223201
@@ -24721,6 +24710,8 @@ in
2472124710
2472224711 cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { };
2472324712
24713+ cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { };
24714+
2472424715 cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { };
2472524716
2472624717 # this driver ships with pre-compiled 32-bit binary libraries
@@ -25048,7 +25039,7 @@ in
2504825039 /*
2504925040 * Run a NixOS VM network test using this evaluation of Nixpkgs.
2505025041 *
25051− * It is mostly equivalent to `import ./make-test.nix` from the
25042+ * It is mostly equivalent to `import ./make-test-python.nix` from the
2505225043 * NixOS manual[1], except that your `pkgs` will be used instead of
2505325044 * letting NixOS invoke Nixpkgs again. If a test machine needs to
2505425045 * set NixOS options under `nixpkgs`, it must set only the
@@ -25074,11 +25065,11 @@ in
2507425065 */
2507525066 nixosTest =
2507625067 let
25077− /* The nixos/lib/testing.nix module, preapplied with arguments that
25068+ /* The nixos/lib/testing-python.nix module, preapplied with arguments that
2507825069 * make sense for this evaluation of Nixpkgs.
2507925070 */
2508025071 nixosTesting =
25081− (import ../../nixos/lib/testing.nix {
25072+ (import ../../nixos/lib/testing-python.nix {
2508225073 inherit (pkgs.stdenv.hostPlatform) system;
2508325074 inherit pkgs;
2508425075 extraConfigurations = [(
@@ -25366,6 +25357,8 @@ in
2536625357
2536725358 sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
2536825359
25360+ sanoid = callPackage ../tools/backup/sanoid { };
25361+
2536925362 satysfi = callPackage ../tools/typesetting/satysfi { };
2537025363
2537125364 sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
pkgs/top-level/perl-packages.nix+42
@@ -8524,6 +8524,33 @@ let
85248524 buildInputs = [ TestDifferences TestMemoryCycle ];
85258525 };
85268526
8527+ HTMLStripScripts = buildPerlPackage {
8528+ pname = "HTML-StripScripts";
8529+ version = "1.06";
8530+ src = fetchurl {
8531+ url = mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-1.06.tar.gz;
8532+ sha256 = "222bfb7ec1fdfa465e32da3dc4abed2edc7364bbe19e8e3c513c7d585b0109ad";
8533+ };
8534+ meta = {
8535+ description = "Strip scripting constructs out of HTML";
8536+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
8537+ };
8538+ };
8539+
8540+ HTMLStripScriptsParser = buildPerlPackage {
8541+ pname = "HTML-StripScripts-Parser";
8542+ version = "1.03";
8543+ src = fetchurl {
8544+ url = mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-Parser-1.03.tar.gz;
8545+ sha256 = "478c1a4e46eb77fa7bce96ba288168f0b98c27f250e00dc6312365081aed3407";
8546+ };
8547+ propagatedBuildInputs = [ HTMLParser HTMLStripScripts ];
8548+ meta = {
8549+ description = "XSS filter using HTML::Parser";
8550+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
8551+ };
8552+ };
8553+
85278554 HTMLTableExtract = buildPerlPackage {
85288555 pname = "HTML-TableExtract";
85298556 version = "2.13";
@@ -11418,6 +11445,21 @@ let
1141811445 };
1141911446 };
1142011447
11448+ MIMELiteHTML = buildPerlPackage {
11449+ pname = "MIME-Lite-HTML";
11450+ version = "1.24";
11451+ src = fetchurl {
11452+ url = mirror://cpan/authors/id/A/AL/ALIAN/MIME-Lite-HTML-1.24.tar.gz;
11453+ sha256 = "db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da";
11454+ };
11455+ doCheck = false;
11456+ propagatedBuildInputs = [ HTMLParser LWP MIMELite URI ];
11457+ meta = {
11458+ description = "Provide routine to transform a HTML page in a MIME-Lite mail";
11459+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
11460+ };
11461+ };
11462+
1142111463 MIMETools = buildPerlPackage {
1142211464 pname = "MIME-tools";
1142311465 version = "5.509";
pkgs/top-level/pure-packages.nix+2−2
@@ -1,4 +1,4 @@
1−{ callPackage, octaveHg }:
1+{ callPackage }:
22
33rec {
44 audio = callPackage ../development/pure-modules/audio { };
@@ -19,7 +19,7 @@ rec {
1919 lv2 = callPackage ../development/pure-modules/lv2 { };
2020 midi = callPackage ../development/pure-modules/midi { };
2121 mpfr = callPackage ../development/pure-modules/mpfr { };
22− octave = callPackage ../development/pure-modules/octave { octave = octaveHg; };
22+ octave = callPackage ../development/pure-modules/octave { };
2323 odbc = callPackage ../development/pure-modules/odbc { };
2424 pandoc = callPackage ../development/pure-modules/pandoc { };
2525 rational = callPackage ../development/pure-modules/rational { };
pkgs/top-level/python-packages.nix+12
@@ -678,6 +678,8 @@ in {
678678
679679 firetv = callPackage ../development/python-modules/firetv { };
680680
681+ flower = callPackage ../development/python-modules/flower { };
682+
681683 flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { };
682684
683685 flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { };
@@ -1000,6 +1002,8 @@ in {
10001002
10011003 pymupdf = callPackage ../development/python-modules/pymupdf { };
10021004
1005+ pynamecheap = callPackage ../development/python-modules/pynamecheap { };
1006+
10031007 Pmw = callPackage ../development/python-modules/Pmw { };
10041008
10051009 py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };
@@ -1400,6 +1404,8 @@ in {
14001404 usePython = true;
14011405 });
14021406
1407+ softlayer = callPackage ../development/python-modules/softlayer { };
1408+
14031409 sparse = callPackage ../development/python-modules/sparse { };
14041410
14051411 spglib = callPackage ../development/python-modules/spglib { };
@@ -4341,6 +4347,8 @@ in {
43414347
43424348 names = callPackage ../development/python-modules/names { };
43434349
4350+ nbconflux = callPackage ../development/python-modules/nbconflux { };
4351+
43444352 nbconvert = callPackage ../development/python-modules/nbconvert { };
43454353
43464354 nbformat = if isPy3k then
@@ -6800,6 +6808,8 @@ in {
68006808
68016809 tldextract = callPackage ../development/python-modules/tldextract { };
68026810
6811+ transip = callPackage ../development/python-modules/transip { };
6812+
68036813 pyemd = callPackage ../development/python-modules/pyemd { };
68046814
68056815 pulp = callPackage ../development/python-modules/pulp { };
@@ -6900,6 +6910,8 @@ in {
69006910 inherit python;
69016911 })).python;
69026912
6913+ localzone = callPackage ../development/python-modules/localzone { };
6914+
69036915 scour = callPackage ../development/python-modules/scour { };
69046916
69056917 pymssql = callPackage ../development/python-modules/pymssql { };