git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit8abe5ee07ee6b23fb014709f01bb161a62407a44 authorFrederik Rietdijk <fridh@fridh.nl> dateTue 14 May 2019, 10:23 (8 years ago) parentef0dbeff2affe0
307 files changed+3521−1494
maintainers/maintainer-list.nix+5 nixos/modules/config/malloc.nix−5 nixos/modules/rename.nix+3 nixos/modules/security/misc.nix+2−16 nixos/modules/services/backup/znapzend.nix+10−17 nixos/modules/services/security/fprintd.nix+6−14 nixos/modules/system/boot/binfmt.nix+219−95 nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−2 nixos/modules/system/boot/luksroot.nix+171−4 nixos/modules/system/boot/resolved.nix+3−2 nixos/modules/virtualisation/docker-containers.nix+5−8 nixos/tests/docker-tools.nix+7 pkgs/applications/audio/qmmp/default.nix+4−4 pkgs/applications/audio/vcv-rack/default.nix+3−2 pkgs/applications/graphics/openscad/default.nix+19−6 pkgs/applications/kde/kgpg.nix+3−3 pkgs/applications/misc/bemenu/default.nix+45 pkgs/applications/misc/electrum/default.nix−10 pkgs/applications/misc/k2pdfopt/default.nix+22−1 pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch+95 pkgs/applications/misc/kitty/default.nix+13−2 pkgs/applications/misc/octoprint/default.nix+16−3 pkgs/applications/misc/playonlinux/default.nix+2−2 pkgs/applications/misc/tilix/default.nix+2−2 pkgs/applications/misc/tzupdate/default.nix+2−2 pkgs/applications/misc/zathura/core/default.nix+5−5 pkgs/applications/misc/zathura/default.nix+2−1 pkgs/applications/misc/zathura/pdf-mupdf/default.nix+1−3 pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2 pkgs/applications/networking/p2p/tixati/default.nix+2−2 pkgs/applications/networking/sniffers/wireshark/default.nix+4−2 pkgs/applications/networking/syncthing/default.nix+2−2 pkgs/applications/science/biology/eggnog-mapper/default.nix+2−2 pkgs/applications/science/logic/symbiyosys/default.nix+4−1 pkgs/applications/science/math/cbc/default.nix+6−4 pkgs/applications/science/math/pynac/default.nix+2−2 pkgs/applications/version-management/git-and-tools/fast-export/default.nix+26−25 pkgs/applications/version-management/git-and-tools/git-crypt/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix+2−2 pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix+2−2 pkgs/applications/version-management/src/default.nix+8−6 pkgs/applications/video/mkclean/default.nix+37 pkgs/applications/virtualization/rkt/default.nix+2−2 pkgs/applications/window-managers/i3/wk-switch.nix+7−8 pkgs/build-support/docker/default.nix+11−10 pkgs/build-support/docker/examples.nix+39 pkgs/data/fonts/agave/default.nix+12−15 pkgs/data/fonts/aileron/default.nix+2−2 pkgs/data/fonts/andagii/default.nix+2−2 pkgs/data/fonts/andika/default.nix+2−2 pkgs/data/fonts/ankacoder/condensed.nix+2−2 pkgs/data/fonts/ankacoder/default.nix+2−2 pkgs/data/fonts/anonymous-pro/default.nix+2−2 pkgs/data/fonts/arkpandora/default.nix+1−2 pkgs/data/fonts/arphic/default.nix+3−3 pkgs/data/fonts/aurulent-sans/default.nix+9−8 pkgs/data/fonts/b612/default.nix+9−8 pkgs/data/fonts/babelstone-han/default.nix+4−4 pkgs/data/fonts/baekmuk-ttf/default.nix+3−5 pkgs/data/fonts/bakoma-ttf/default.nix+1−2 pkgs/data/fonts/behdad-fonts/default.nix+12−13 pkgs/data/fonts/cabin/default.nix+10−8 pkgs/data/fonts/caladea/default.nix+2−2 pkgs/data/fonts/camingo-code/default.nix+5−7 pkgs/data/fonts/carlito/default.nix+2−2 pkgs/data/fonts/charis-sil/default.nix+2−2 pkgs/data/fonts/clearlyU/default.nix+9−11 pkgs/data/fonts/cm-unicode/default.nix+4−6 pkgs/data/fonts/comfortaa/default.nix+2−3 pkgs/data/fonts/comic-neue/default.nix+2−2 pkgs/data/fonts/comic-relief/default.nix+2−2 pkgs/data/fonts/cooper-hewitt/default.nix+3−3 pkgs/data/fonts/corefonts/default.nix+2−4 pkgs/data/fonts/crimson/default.nix+4−7 pkgs/data/fonts/culmus/default.nix+8−11 pkgs/data/fonts/d2coding/default.nix+3−3 pkgs/data/fonts/dina-pcf/default.nix−1 pkgs/data/fonts/dina/default.nix+4−3 pkgs/data/fonts/dosemu-fonts/default.nix−1 pkgs/data/fonts/dosis/default.nix+10−8 pkgs/data/fonts/doulos-sil/default.nix+2−2 pkgs/data/fonts/eb-garamond/default.nix+2−2 pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix+2−2 pkgs/data/fonts/emojione/default.nix−1 pkgs/data/fonts/encode-sans/default.nix+2−2 pkgs/data/fonts/eunomia/default.nix+2−2 pkgs/data/fonts/f5_6/default.nix+2−2 pkgs/data/fonts/fantasque-sans-mono/default.nix+2−4 pkgs/data/fonts/ferrum/default.nix+2−2 pkgs/data/fonts/fira/default.nix+12−7 pkgs/data/fonts/fixedsys-excelsior/default.nix+12−20 pkgs/data/fonts/font-awesome-5/default.nix+8−6 pkgs/data/fonts/fontconfig-penultimate/default.nix+2−2 pkgs/data/fonts/freefont-ttf/default.nix+3−3 pkgs/data/fonts/gandom-fonts/default.nix+12−13 pkgs/data/fonts/gdouros/default.nix+11−25 pkgs/data/fonts/gentium-book-basic/default.nix+2−3 pkgs/data/fonts/gentium/default.nix+2−2 pkgs/data/fonts/go-font/default.nix+9−13 pkgs/data/fonts/gohufont/default.nix−1 pkgs/data/fonts/gyre/default.nix+4−4 pkgs/data/fonts/hack/default.nix+2−2 pkgs/data/fonts/hanazono/default.nix+2−2 pkgs/data/fonts/hasklig/default.nix+3−4 pkgs/data/fonts/helvetica-neue-lt-std/default.nix+4−4 pkgs/data/fonts/hermit/default.nix+10−13 pkgs/data/fonts/hyperscrypt/default.nix+2−2 pkgs/data/fonts/inriafonts/default.nix+11−15 pkgs/data/fonts/inter-ui/default.nix+2−2 pkgs/data/fonts/inter/default.nix+2−2 pkgs/data/fonts/ipaexfont/default.nix+4−5 pkgs/data/fonts/ipafont/default.nix+3−4 pkgs/data/fonts/ir-standard-fonts/default.nix+13−14 pkgs/data/fonts/iwona/default.nix+10−15 pkgs/data/fonts/junicode/default.nix+2−3 pkgs/data/fonts/kawkab-mono/default.nix+2−3 pkgs/data/fonts/kochi-substitute-naga10/default.nix+3−3 pkgs/data/fonts/kochi-substitute/default.nix−1 pkgs/data/fonts/lalezar-fonts/default.nix+11−11 pkgs/data/fonts/lato/default.nix+2−2 pkgs/data/fonts/liberastika/default.nix+2−2 pkgs/data/fonts/liberation-sans-narrow/default.nix+2−5 pkgs/data/fonts/libertinus/default.nix+13−19 pkgs/data/fonts/libre-baskerville/default.nix+10−8 pkgs/data/fonts/libre-bodoni/default.nix+10−8 pkgs/data/fonts/libre-franklin/default.nix+10−8 pkgs/data/fonts/lm-math/default.nix+10−16 pkgs/data/fonts/lmodern/default.nix+1−2 pkgs/data/fonts/lmodern/lmmath.nix+1−2 pkgs/data/fonts/lobster-two/default.nix+2−1 pkgs/data/fonts/lohit-fonts/default.nix+1−2 pkgs/data/fonts/manrope/default.nix+11−11 pkgs/data/fonts/marathi-cursive/default.nix+5−7 pkgs/data/fonts/material-design-icons/default.nix+11−12 pkgs/data/fonts/material-icons/default.nix+12−12 pkgs/data/fonts/medio/default.nix+2−2 pkgs/data/fonts/migmix/default.nix+1−3 pkgs/data/fonts/migu/default.nix−1 pkgs/data/fonts/mononoki/default.nix+2−2 pkgs/data/fonts/montserrat/default.nix+2−2 pkgs/data/fonts/mph-2b-damase/default.nix+1−2 pkgs/data/fonts/mplus-outline-fonts/default.nix+2−2 pkgs/data/fonts/mro-unicode/default.nix+1−1 pkgs/data/fonts/nahid-fonts/default.nix+12−13 pkgs/data/fonts/nanum-gothic-coding/default.nix+2−2 pkgs/data/fonts/nerdfonts/default.nix−1 pkgs/data/fonts/nika-fonts/default.nix+12−13 pkgs/data/fonts/norwester/default.nix+2−2 pkgs/data/fonts/noto-fonts/tools.nix−1 pkgs/data/fonts/office-code-pro/default.nix+13−17 pkgs/data/fonts/oldsindhi/default.nix+5−7 pkgs/data/fonts/oldstandard/default.nix+11−19 pkgs/data/fonts/open-dyslexic/default.nix+2−2 pkgs/data/fonts/open-sans/default.nix+12−14 pkgs/data/fonts/orbitron/default.nix+9−9 pkgs/data/fonts/overpass/default.nix+2−2 pkgs/data/fonts/oxygenfonts/default.nix+9−6 pkgs/data/fonts/parastoo-fonts/default.nix+12−12 pkgs/data/fonts/paratype-pt/mono.nix+5−2 pkgs/data/fonts/paratype-pt/sans.nix+5−2 pkgs/data/fonts/paratype-pt/serif.nix+5−2 pkgs/data/fonts/pecita/default.nix+2−4 pkgs/data/fonts/penna/default.nix+2−2 pkgs/data/fonts/poly/default.nix−1 pkgs/data/fonts/powerline-fonts/default.nix+12−18 pkgs/data/fonts/profont/default.nix+4−4 pkgs/data/fonts/public-sans/default.nix+2−2 pkgs/data/fonts/quattrocento-sans/default.nix+3−3 pkgs/data/fonts/quattrocento/default.nix+3−3 pkgs/data/fonts/raleway/default.nix+10−8 pkgs/data/fonts/ricty/default.nix−1 pkgs/data/fonts/roboto/default.nix+4−4 pkgs/data/fonts/rounded-mgenplus/default.nix+7−21 pkgs/data/fonts/route159/default.nix+2−2 pkgs/data/fonts/sahel-fonts/default.nix+12−12 pkgs/data/fonts/samim-fonts/default.nix+12−12 pkgs/data/fonts/sarasa-gothic/default.nix+4−8 pkgs/data/fonts/scheherazade/default.nix+2−2 pkgs/data/fonts/seshat/default.nix+2−2 pkgs/data/fonts/shabnam-fonts/default.nix+13−13 pkgs/data/fonts/shrikhand/default.nix+2−2 pkgs/data/fonts/siji/default.nix+4−4 pkgs/data/fonts/source-code-pro/default.nix+4−4 pkgs/data/fonts/source-han-code-jp/default.nix+4−4 pkgs/data/fonts/source-han-sans/default.nix+3−4 pkgs/data/fonts/source-han-serif/default.nix+3−4 pkgs/data/fonts/source-sans-pro/default.nix+2−2 pkgs/data/fonts/source-serif-pro/default.nix+2−2 pkgs/data/fonts/spleen/default.nix+12−10 pkgs/data/fonts/stix-otf/default.nix+3−3 pkgs/data/fonts/stix-two/default.nix+2−2 pkgs/data/fonts/sudo/default.nix+2−2 pkgs/data/fonts/tamsyn/default.nix+3−4 pkgs/data/fonts/tempora-lgc/default.nix−1 pkgs/data/fonts/tenderness/default.nix+2−2 pkgs/data/fonts/terminus-font-ttf/default.nix+2−3 pkgs/data/fonts/terminus-font/default.nix−1 pkgs/data/fonts/tewi/default.nix−1 pkgs/data/fonts/tex-gyre-math/default.nix+11−13 pkgs/data/fonts/tex-gyre/default.nix+1−1 pkgs/data/fonts/theano/default.nix+2−2 pkgs/data/fonts/tipa/default.nix−1 pkgs/data/fonts/tlwg/default.nix−1 pkgs/data/fonts/ttf-bitstream-vera/default.nix+2−5 pkgs/data/fonts/ttf-envy-code-r/default.nix+2−3 pkgs/data/fonts/twemoji-color-font/default.nix−1 pkgs/data/fonts/ubuntu-font-family/default.nix+5−5 pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix+2−3 pkgs/data/fonts/undefined-medium/default.nix+3−3 pkgs/data/fonts/uni-vga/default.nix+1−2 pkgs/data/fonts/unifont/default.nix+4−4 pkgs/data/fonts/unifont_upper/default.nix+4−4 pkgs/data/fonts/vazir-fonts/default.nix+13−14 pkgs/data/fonts/vdrsymbols/default.nix+2−2 pkgs/data/fonts/vegur/default.nix+9−16 pkgs/data/fonts/vista-fonts-chs/default.nix+5−5 pkgs/data/fonts/vista-fonts/default.nix+1−1 pkgs/data/fonts/weather-icons/default.nix+3−3 pkgs/data/fonts/wqy-microhei/default.nix+4−4 pkgs/data/fonts/wqy-zenhei/default.nix+4−4 pkgs/data/fonts/xkcd-font/default.nix+11−12 pkgs/data/fonts/yanone-kaffeesatz/default.nix+4−4 pkgs/data/fonts/zilla-slab/default.nix+3−4 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+2−2 pkgs/development/compilers/ghc/8.6.4.nix+3−2 pkgs/development/compilers/ghc/8.6.5.nix+3−2 pkgs/development/compilers/ghc/8.8.1.nix+3−2 pkgs/development/compilers/ghc/head.nix+3−2 pkgs/development/compilers/llvm/7/lldb.nix+6 pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch−36 pkgs/development/compilers/mruby/default.nix+3−7 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+39−3 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+17 pkgs/development/haskell-modules/configuration-nix.nix+20 pkgs/development/haskell-modules/hackage-packages.nix+106−9 pkgs/development/libraries/alkimia/default.nix+6−5 pkgs/development/libraries/ctl/default.nix+22−13 pkgs/development/libraries/ctl/source.nix−11 pkgs/development/libraries/gtksourceview/3.x.nix+2−2 pkgs/development/libraries/java/lombok/default.nix+2−2 pkgs/development/libraries/libdazzle/default.nix+2−2 pkgs/development/libraries/libgda/default.nix+2−2 pkgs/development/libraries/linbox/default.nix+3−2 pkgs/development/libraries/oniguruma/default.nix+2−2 pkgs/development/libraries/portaudio/default.nix+2 pkgs/development/libraries/range-v3/default.nix+2−2 pkgs/development/libraries/tbb/default.nix+2−2 pkgs/development/python-modules/ansible-runner/default.nix+2−2 pkgs/development/python-modules/av/default.nix+3−4 pkgs/development/python-modules/holoviews/default.nix+2−2 pkgs/development/python-modules/latexcodec/default.nix+2−2 pkgs/development/python-modules/phonenumbers/default.nix+2−2 pkgs/development/python-modules/py-radix/default.nix+28 pkgs/development/python-modules/pyopenssl/default.nix+14−1 pkgs/development/python-modules/python-gnupg/default.nix+3−3 pkgs/development/python-modules/qdarkstyle/default.nix+2−2 pkgs/development/python-modules/qtconsole/default.nix+2−2 pkgs/development/python-modules/qtpy/default.nix+2−2 pkgs/development/python-modules/shodan/default.nix+2−2 pkgs/development/python-modules/smart_open/default.nix+2−2 pkgs/development/python-modules/typed-ast/default.nix+2−2 pkgs/development/tools/analysis/radare2/default.nix+6−6 pkgs/development/tools/build-managers/bazel/default.nix+2−2 pkgs/development/tools/build-managers/buck/default.nix+2−2 pkgs/development/tools/build-managers/leiningen/default.nix+2−2 pkgs/development/tools/chit/default.nix+47 pkgs/development/tools/react-native-debugger/default.nix+2−2 pkgs/development/tools/scalafmt/default.nix+4−3 pkgs/development/tools/wabt/default.nix+2−2 pkgs/games/azimuth/default.nix+64 pkgs/misc/emulators/wine/sources.nix+3−3 pkgs/misc/screensavers/xautolock/default.nix+2−2 pkgs/misc/vscode-extensions/cpptools/default.nix+2−2 pkgs/misc/vscode-extensions/wakatime/default.nix+2−2 pkgs/os-specific/linux/bpftool/default.nix+26 pkgs/os-specific/linux/kernel/common-config.nix+6 pkgs/os-specific/linux/usbutils/default.nix+2−2 pkgs/os-specific/linux/zfs/default.nix+2−2 pkgs/servers/http/nginx/modules.nix+93−20 pkgs/servers/mail/spamassassin/default.nix+2−2 pkgs/servers/search/elasticsearch/5.x.nix+3−2 pkgs/servers/search/elasticsearch/6.x.nix+2−2 pkgs/servers/search/elasticsearch/7.x.nix+2−2 pkgs/shells/tcsh/default.nix+2−2 pkgs/tools/backup/duply/default.nix+2−2 pkgs/tools/misc/aptly/default.nix+2−2 pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch+1153 pkgs/tools/misc/coreutils/default.nix+10−4 pkgs/tools/misc/diffoscope/default.nix+2−2 pkgs/tools/misc/qt5ct/default.nix+2−2 pkgs/tools/misc/shell-hist/default.nix+23 pkgs/tools/misc/tlp/default.nix+2−2 pkgs/tools/misc/ttyplot/default.nix+2−2 pkgs/tools/misc/uutils-coreutils/default.nix+4−4 pkgs/tools/misc/youtube-dl/default.nix+2−2 pkgs/tools/networking/axel/default.nix+3−3 pkgs/tools/networking/i2pd/default.nix+2−2 pkgs/tools/networking/tgt/default.nix+2−2 pkgs/tools/security/signing-party/default.nix+15−15 pkgs/tools/security/tboot/default.nix+2−2 pkgs/tools/security/vault/default.nix+2−2 pkgs/tools/security/yara/default.nix+2−2 pkgs/tools/system/stress-ng/default.nix+32−18 pkgs/top-level/all-packages.nix+33−7 pkgs/top-level/php-packages.nix+2−2 pkgs/top-level/python-packages.nix+2 pkgs/top-level/release-cross.nix+1−1
maintainers/maintainer-list.nix+5
@@ -4967,6 +4967,11 @@
49674967 github = "ctheune";
49684968 name = "Christian Theune";
49694969 };
4970+ thiagokokada = {
4971+ email = "thiagokokada@gmail.com";
4972+ github = "thiagokokada";
4973+ name = "Thiago K. Okada";
4974+ };
49704975 ThomasMader = {
49714976 email = "thomas.mader@gmail.com";
49724977 github = "ThomasMader";
nixos/modules/config/malloc.nix−5
@@ -54,9 +54,7 @@ in
5454 default = "libc";
5555 description = ''
5656 The system-wide memory allocator.
57− </para>
5857
59− <para>
6058 Briefly, the system-wide memory allocator providers are:
6159 <itemizedlist>
6260 <listitem><para><literal>libc</literal>: the standard allocator provided by libc</para></listitem>
@@ -64,7 +62,6 @@ in
6462 (name: value: "<listitem><para><literal>${name}</literal>: ${value.description}</para></listitem>")
6563 providers)}
6664 </itemizedlist>
67− </para>
6865
6966 <warning>
7067 <para>
@@ -79,8 +76,6 @@ in
7976 Changing this option does not affect the current session.
8077 </para>
8178 </note>
82−
83− <para>
8479 '';
8580 };
8681 };
nixos/modules/rename.nix+3
@@ -234,6 +234,9 @@ with lib;
234234 (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
235235 (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
236236
237+ # binfmt
238+ (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
239+
237240 ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
238241 "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
239242 "snmpExporter" "unifiExporter" "varnishExporter" ]
nixos/modules/security/misc.nix+2−16
@@ -13,23 +13,17 @@ with lib;
1313 default = true;
1414 description = ''
1515 Whether to allow creation of user namespaces.
16− </para>
1716
18− <para>
1917 The motivation for disabling user namespaces is the potential
2018 presence of code paths where the kernel's permission checking
2119 logic fails to account for namespacing, instead permitting a
2220 namespaced process to act outside the namespace with the same
2321 privileges as it would have inside it. This is particularly
2422 damaging in the common case of running as root within the namespace.
25− </para>
2623
27− <para>
2824 When user namespace creation is disallowed, attempting to create a
2925 user namespace fails with "no space left on device" (ENOSPC).
3026 root may re-enable user namespace creation at runtime.
31− </para>
32− <para>
3327 '';
3428 };
3529
@@ -48,21 +42,15 @@ with lib;
4842 Whether to allow SMT/hyperthreading. Disabling SMT means that only
4943 physical CPU cores will be usable at runtime, potentially at
5044 significant performance cost.
51− </para>
5245
53− <para>
5446 The primary motivation for disabling SMT is to mitigate the risk of
5547 leaking data between threads running on the same CPU core (due to
5648 e.g., shared caches). This attack vector is unproven.
57− </para>
5849
59− <para>
6050 Disabling SMT is a supplement to the L1 data cache flushing mitigation
6151 (see <xref linkend="opt-security.virtualization.flushL1DataCache"/>)
6252 versus malicious VM guests (SMT could "bring back" previously flushed
6353 data).
64− </para>
65− <para>
6654 '';
6755 };
6856
@@ -73,10 +61,8 @@ with lib;
7361 Whether the hypervisor should flush the L1 data cache before
7462 entering guests.
7563 See also <xref linkend="opt-security.allowSimultaneousMultithreading"/>.
76− </para>
7764
78− <para>
79− <variablelist>
65+ <variablelist>
8066 <varlistentry>
8167 <term><literal>null</literal></term>
8268 <listitem><para>uses the kernel default</para></listitem>
@@ -98,7 +84,7 @@ with lib;
9884 enters the guest. May incur significant performance cost.
9985 </para></listitem>
10086 </varlistentry>
101− </variablelist>
87+ </variablelist>
10288 '';
10389 };
10490 };
nixos/modules/services/backup/znapzend.nix+10−17
@@ -7,28 +7,23 @@ let
77
88 planDescription = ''
99 The znapzend backup plan to use for the source.
10− </para>
11− <para>
10+
1211 The plan specifies how often to backup and for how long to keep the
1312 backups. It consists of a series of retention periodes to interval
1413 associations:
15− </para>
16− <para>
14+
1715 <literal>
1816 retA=>intA,retB=>intB,...
1917 </literal>
20− </para>
21− <para>
22− Both intervals and retention periods are expressed in standard units
23− of time or multiples of them. You can use both the full name or a
24− shortcut according to the following listing:
25− </para>
26− <para>
18+
19+ Both intervals and retention periods are expressed in standard units
20+ of time or multiples of them. You can use both the full name or a
21+ shortcut according to the following listing:
22+
2723 <literal>
2824 second|sec|s, minute|min, hour|h, day|d, week|w, month|mon|m, year|y
2925 </literal>
30− </para>
31− <para>
26+
3227 See <citerefentry><refentrytitle>znapzendzetup</refentrytitle><manvolnum>1</manvolnum></citerefentry> for more info.
3328 '';
3429 planExample = "1h=>10min,1d=>1h,1w=>1d,1m=>1w,1y=>1m";
@@ -139,12 +134,10 @@ let
139134 type = nullOr ints.u16;
140135 description = ''
141136 Port to use for <command>mbuffer</command>.
142− </para>
143− <para>
137+
144138 If this is null, it will run <command>mbuffer</command> through
145139 ssh.
146− </para>
147− <para>
140+
148141 If this is not null, it will run <command>mbuffer</command>
149142 directly through TCP, which is not encrypted but faster. In that
150143 case the given port needs to be open on the destination host.
nixos/modules/services/security/fprintd.nix+6−14
@@ -26,28 +26,20 @@ in
2626 };
2727
2828 };
29−
29+
3030 };
31−
32−
31+
32+
3333 ###### implementation
34−
34+
3535 config = mkIf cfg.enable {
3636
3737 services.dbus.packages = [ pkgs.fprintd ];
3838
3939 environment.systemPackages = [ pkgs.fprintd ];
4040
41− systemd.services.fprintd = {
42− description = "Fingerprint Authentication Daemon";
43−
44− serviceConfig = {
45− Type = "dbus";
46− BusName = "net.reactivated.Fprint";
47− ExecStart = "${pkgs.fprintd}/libexec/fprintd";
48− };
49− };
41+ systemd.packages = [ pkgs.fprintd ];
5042
5143 };
52−
44+
5345}
nixos/modules/system/boot/binfmt.nix+219−95
@@ -1,8 +1,8 @@
1−{ config, lib, ... }:
1+{ config, lib, pkgs, ... }:
22let
33 inherit (lib) mkOption types optionalString;
44
5− cfg = config.boot.binfmtMiscRegistrations;
5+ cfg = config.boot.binfmt;
66
77 makeBinfmtLine = name: { recognitionType, offset, magicOrExtension
88 , mask, preserveArgvZero, openBinary
@@ -13,125 +13,249 @@ let
1313 mask' = toString mask;
1414 interpreter = "/run/binfmt/${name}";
1515 flags = if !(matchCredentials -> openBinary)
16− then throw "boot.binfmtMiscRegistrations.${name}: you can't specify openBinary = false when matchCredentials = true."
16+ then throw "boot.binfmt.registrations.${name}: you can't specify openBinary = false when matchCredentials = true."
1717 else optionalString preserveArgvZero "P" +
1818 optionalString (openBinary && !matchCredentials) "O" +
1919 optionalString matchCredentials "C" +
2020 optionalString fixBinary "F";
2121 in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}";
2222
23− binfmtFile = builtins.toFile "binfmt_nixos.conf"
24− (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine cfg));
25−
2623 activationSnippet = name: { interpreter, ... }:
2724 "ln -sf ${interpreter} /run/binfmt/${name}";
28− activationScript = ''
29− mkdir -p -m 0755 /run/binfmt
30− ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet cfg)}
31− '';
25+
26+ getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs;
27+
28+ # Mapping of systems to “magicOrExtension” and “mask”. Mostly taken from:
29+ # - https://github.com/cleverca22/nixos-configs/blob/master/qemu.nix
30+ # and
31+ # - https://github.com/qemu/qemu/blob/master/scripts/qemu-binfmt-conf.sh
32+ # TODO: maybe put these in a JSON file?
33+ magics = {
34+ armv6l-linux = {
35+ magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00'';
36+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
37+ };
38+ armv7l-linux = {
39+ magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00'';
40+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
41+ };
42+ aarch64-linux = {
43+ magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00'';
44+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
45+ };
46+ aarch64_be-linux = {
47+ magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7'';
48+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
49+ };
50+ i386-linux = {
51+ magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00'';
52+ mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
53+ };
54+ i486-linux = {
55+ magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
56+ mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
57+ };
58+ i586-linux = {
59+ magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
60+ mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
61+ };
62+ i686-linux = {
63+ magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
64+ mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
65+ };
66+ x86_64-linux = {
67+ magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'';
68+ mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
69+ };
70+ alpha-linux = {
71+ magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90'';
72+ mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
73+ };
74+ sparc64-linux = {
75+ magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02'';
76+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
77+ };
78+ sparc-linux = {
79+ magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12'';
80+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
81+ };
82+ powerpc-linux = {
83+ magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14'';
84+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
85+ };
86+ powerpc64-linux = {
87+ magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15'';
88+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
89+ };
90+ powerpc64le-linux = {
91+ magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00'';
92+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00'';
93+ };
94+ mips-linux = {
95+ magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'';
96+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
97+ };
98+ mipsel-linux = {
99+ magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'';
100+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
101+ };
102+ mips64-linux = {
103+ magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'';
104+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
105+ };
106+ mips64el-linux = {
107+ magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'';
108+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
109+ };
110+ riscv32-linux = {
111+ magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
112+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
113+ };
114+ riscv64-linux = {
115+ magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
116+ mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
117+ };
118+ x86_64-windows = {
119+ magicOrExtension = ".exe";
120+ recognitionType = "extension";
121+ };
122+ i686-windows = {
123+ magicOrExtension = ".exe";
124+ recognitionType = "extension";
125+ };
126+ };
127+
32128in {
33129 options = {
34− boot.binfmtMiscRegistrations = mkOption {
35− default = {};
36−
37− description = ''
38− Extra binary formats to register with the kernel.
39− See https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html for more details.
40− '';
41−
42− type = types.attrsOf (types.submodule ({ config, ... }: {
43− options = {
44− recognitionType = mkOption {
45− default = "magic";
46− description = "Whether to recognize executables by magic number or extension.";
47− type = types.enum [ "magic" "extension" ];
48− };
130+ boot.binfmt = {
131+ registrations = mkOption {
132+ default = {};
49133
50− offset = mkOption {
51− default = null;
52− description = "The byte offset of the magic number used for recognition.";
53− type = types.nullOr types.int;
54− };
134+ description = ''
135+ Extra binary formats to register with the kernel.
136+ See https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html for more details.
137+ '';
55138
56− magicOrExtension = mkOption {
57− description = "The magic number or extension to match on.";
58− type = types.str;
59− };
139+ type = types.attrsOf (types.submodule ({ config, ... }: {
140+ options = {
141+ recognitionType = mkOption {
142+ default = "magic";
143+ description = "Whether to recognize executables by magic number or extension.";
144+ type = types.enum [ "magic" "extension" ];
145+ };
60146
61− mask = mkOption {
62− default = null;
63− description =
64− "A mask to be ANDed with the byte sequence of the file before matching";
65− type = types.nullOr types.str;
66− };
147+ offset = mkOption {
148+ default = null;
149+ description = "The byte offset of the magic number used for recognition.";
150+ type = types.nullOr types.int;
151+ };
67152
68− interpreter = mkOption {
69− description = ''
70− The interpreter to invoke to run the program.
153+ magicOrExtension = mkOption {
154+ description = "The magic number or extension to match on.";
155+ type = types.str;
156+ };
71157
72− Note that the actual registration will point to
73− /run/binfmt/''${name}, so the kernel interpreter length
74− limit doesn't apply.
75− '';
76− type = types.path;
77− };
158+ mask = mkOption {
159+ default = null;
160+ description =
161+ "A mask to be ANDed with the byte sequence of the file before matching";
162+ type = types.nullOr types.str;
163+ };
78164
79− preserveArgvZero = mkOption {
80− default = false;
81− description = ''
82− Whether to pass the original argv[0] to the interpreter.
165+ interpreter = mkOption {
166+ description = ''
167+ The interpreter to invoke to run the program.
83168
84− See the description of the 'P' flag in the kernel docs
85− for more details;
86− '';
87− type = types.bool;
88− };
169+ Note that the actual registration will point to
170+ /run/binfmt/''${name}, so the kernel interpreter length
171+ limit doesn't apply.
172+ '';
173+ type = types.path;
174+ };
89175
90− openBinary = mkOption {
91− default = config.matchCredentials;
92− description = ''
93− Whether to pass the binary to the interpreter as an open
94− file descriptor, instead of a path.
95− '';
96− type = types.bool;
97− };
176+ preserveArgvZero = mkOption {
177+ default = false;
178+ description = ''
179+ Whether to pass the original argv[0] to the interpreter.
98180
99− matchCredentials = mkOption {
100− default = false;
101− description = ''
102− Whether to launch with the credentials and security
103− token of the binary, not the interpreter (e.g. setuid
104− bit).
181+ See the description of the 'P' flag in the kernel docs
182+ for more details;
183+ '';
184+ type = types.bool;
185+ };
105186
106− See the description of the 'C' flag in the kernel docs
107− for more details.
187+ openBinary = mkOption {
188+ default = config.matchCredentials;
189+ description = ''
190+ Whether to pass the binary to the interpreter as an open
191+ file descriptor, instead of a path.
192+ '';
193+ type = types.bool;
194+ };
108195
109− Implies/requires openBinary = true.
110− '';
111− type = types.bool;
112− };
196+ matchCredentials = mkOption {
197+ default = false;
198+ description = ''
199+ Whether to launch with the credentials and security
200+ token of the binary, not the interpreter (e.g. setuid
201+ bit).
113202
114− fixBinary = mkOption {
115− default = false;
116− description = ''
117− Whether to open the interpreter file as soon as the
118− registration is loaded, rather than waiting for a
119− relevant file to be invoked.
120−
121− See the description of the 'F' flag in the kernel docs
122− for more details.
123− '';
124− type = types.bool;
203+ See the description of the 'C' flag in the kernel docs
204+ for more details.
205+
206+ Implies/requires openBinary = true.
207+ '';
208+ type = types.bool;
209+ };
210+
211+ fixBinary = mkOption {
212+ default = false;
213+ description = ''
214+ Whether to open the interpreter file as soon as the
215+ registration is loaded, rather than waiting for a
216+ relevant file to be invoked.
217+
218+ See the description of the 'F' flag in the kernel docs
219+ for more details.
220+ '';
221+ type = types.bool;
222+ };
125223 };
126− };
127− }));
224+ }));
225+ };
226+
227+ emulatedSystems = mkOption {
228+ default = [];
229+ description = ''
230+ List of systems to emulate. Will also configure Nix to
231+ support your new systems.
232+ '';
233+ type = types.listOf types.string;
234+ };
128235 };
129236 };
130237
131− config = lib.mkIf (cfg != {}) {
132− environment.etc."binfmt.d/nixos.conf".source = binfmtFile;
133− system.activationScripts.binfmt = activationScript;
134− systemd.additionalUpstreamSystemUnits =
238+ config = {
239+ boot.binfmt.registrations = builtins.listToAttrs (map (system: {
240+ name = system;
241+ value = {
242+ interpreter = getEmulator system;
243+ } // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}"));
244+ }) cfg.emulatedSystems);
245+ # TODO: add a nix.extraPlatforms option to NixOS!
246+ nix.extraOptions = lib.mkIf (cfg.emulatedSystems != []) ''
247+ extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")}
248+ '';
249+ nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != [])
250+ ([ "/run/binfmt" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems));
251+
252+ environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
253+ (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));
254+ system.activationScripts.binfmt = ''
255+ mkdir -p -m 0755 /run/binfmt
256+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}
257+ '';
258+ systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {})
135259 [ "proc-sys-fs-binfmt_misc.automount"
136260 "proc-sys-fs-binfmt_misc.mount"
137261 ];
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−2
@@ -62,8 +62,7 @@ in {
6262
6363 description = ''
6464 The resolution of the console. The following values are valid:
65− </para>
66− <para>
65+
6766 <itemizedlist>
6867 <listitem><para>
6968 <literal>"0"</literal>: Standard UEFI 80x25 mode
nixos/modules/system/boot/luksroot.nix+171−4
@@ -76,6 +76,33 @@ let
7676 fi
7777 return 0
7878 }
79+
80+ wait_gpgcard() {
81+ local secs="''${1:-10}"
82+
83+ gpg --card-status > /dev/null 2> /dev/null
84+ if [ $? != 0 ]; then
85+ echo -n "Waiting $secs seconds for GPG Card to appear"
86+ local success=false
87+ for try in $(seq $secs); do
88+ echo -n .
89+ sleep 1
90+ gpg --card-status > /dev/null 2> /dev/null
91+ if [ $? == 0 ]; then
92+ success=true
93+ break
94+ fi
95+ done
96+ if [ $success == true ]; then
97+ echo " - success";
98+ return 0
99+ else
100+ echo " - failure";
101+ return 1
102+ fi
103+ fi
104+ return 0
105+ }
79106 '';
80107
81108 preCommands = ''
@@ -93,6 +120,13 @@ let
93120 # For Yubikey salt storage
94121 mkdir -p /crypt-storage
95122
123+ ${optionalString luks.gpgSupport ''
124+ export GPG_TTY=$(tty)
125+ export GNUPGHOME=/crypt-ramfs/.gnupg
126+
127+ gpg-agent --daemon --scdaemon-program $out/bin/scdaemon > /dev/null 2> /dev/null
128+ ''}
129+
96130 # Disable all input echo for the whole stage. We could use read -s
97131 # instead but that would ocasionally leak characters between read
98132 # invocations.
@@ -105,7 +139,7 @@ let
105139 umount /crypt-ramfs 2>/dev/null
106140 '';
107141
108− openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name;
142+ openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, gpgCard, fallbackToPassword, ... }: assert name' == name;
109143 let
110144 csopen = "cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} ${optionalString (header != null) "--header=${header}"}";
111145 cschange = "cryptsetup luksChangeKey ${device} ${optionalString (header != null) "--header=${header}"}";
@@ -182,7 +216,7 @@ let
182216 ''}
183217 }
184218
185− ${if luks.yubikeySupport && (yubikey != null) then ''
219+ ${optionalString (luks.yubikeySupport && (yubikey != null)) ''
186220 # Yubikey
187221 rbtohex() {
188222 ( od -An -vtx1 | tr -d ' \n' )
@@ -278,7 +312,7 @@ let
278312 umount /crypt-storage
279313 }
280314
281− open_yubikey() {
315+ open_with_hardware() {
282316 if wait_yubikey ${toString yubikey.gracePeriod}; then
283317 do_open_yubikey
284318 else
@@ -286,8 +320,75 @@ let
286320 open_normally
287321 fi
288322 }
323+ ''}
289324
290− open_yubikey
325+ ${optionalString (luks.gpgSupport && (gpgCard != null)) ''
326+
327+ do_open_gpg_card() {
328+ # Make all of these local to this function
329+ # to prevent their values being leaked
330+ local pin
331+ local opened
332+
333+ gpg --import /gpg-keys/${device}/pubkey.asc > /dev/null 2> /dev/null
334+
335+ gpg --card-status > /dev/null 2> /dev/null
336+
337+ for try in $(seq 3); do
338+ echo -n "PIN for GPG Card associated with device ${device}: "
339+ pin=
340+ while true; do
341+ if [ -e /crypt-ramfs/passphrase ]; then
342+ echo "reused"
343+ pin=$(cat /crypt-ramfs/passphrase)
344+ break
345+ else
346+ # and try reading it from /dev/console with a timeout
347+ IFS= read -t 1 -r pin
348+ if [ -n "$pin" ]; then
349+ ${if luks.reusePassphrases then ''
350+ # remember it for the next device
351+ echo -n "$pin" > /crypt-ramfs/passphrase
352+ '' else ''
353+ # Don't save it to ramfs. We are very paranoid
354+ ''}
355+ echo
356+ break
357+ fi
358+ fi
359+ done
360+ echo -n "Verifying passphrase for ${device}..."
361+ echo -n "$pin" | gpg -q --batch --passphrase-fd 0 --pinentry-mode loopback -d /gpg-keys/${device}/cryptkey.gpg 2> /dev/null | ${csopen} --key-file=- > /dev/null 2> /dev/null
362+ if [ $? == 0 ]; then
363+ echo " - success"
364+ ${if luks.reusePassphrases then ''
365+ # we don't rm here because we might reuse it for the next device
366+ '' else ''
367+ rm -f /crypt-ramfs/passphrase
368+ ''}
369+ break
370+ else
371+ echo " - failure"
372+ # ask for a different one
373+ rm -f /crypt-ramfs/passphrase
374+ fi
375+ done
376+
377+ [ "$opened" == false ] && die "Maximum authentication errors reached"
378+ }
379+
380+ open_with_hardware() {
381+ if wait_gpgcard ${toString gpgCard.gracePeriod}; then
382+ do_open_gpg_card
383+ else
384+ echo "No GPG Card found, falling back to normal open procedure"
385+ open_normally
386+ fi
387+ }
388+ ''}
389+
390+ ${if (luks.yubikeySupport && (yubikey != null)) || (luks.gpgSupport && (gpgCard != null)) then ''
391+ open_with_hardware
291392 '' else ''
292393 open_normally
293394 ''}
@@ -473,6 +574,36 @@ in
473574 '';
474575 };
475576
577+ gpgCard = mkOption {
578+ default = null;
579+ description = ''
580+ The option to use this LUKS device with a GPG encrypted luks password by the GPG Smartcard.
581+ If null (the default), GPG-Smartcard will be disabled for this device.
582+ '';
583+
584+ type = with types; nullOr (submodule {
585+ options = {
586+ gracePeriod = mkOption {
587+ default = 10;
588+ type = types.int;
589+ description = "Time in seconds to wait for the GPG Smartcard.";
590+ };
591+
592+ encryptedPass = mkOption {
593+ default = "";
594+ type = types.path;
595+ description = "Path to the GPG encrypted passphrase.";
596+ };
597+
598+ publicKey = mkOption {
599+ default = "";
600+ type = types.path;
601+ description = "Path to the Public Key.";
602+ };
603+ };
604+ });
605+ };
606+
476607 yubikey = mkOption {
477608 default = null;
478609 description = ''
@@ -554,6 +685,14 @@ in
554685 }));
555686 };
556687
688+ boot.initrd.luks.gpgSupport = mkOption {
689+ default = false;
690+ type = types.bool;
691+ description = ''
692+ Enables support for authenticating with a GPG encrypted password.
693+ '';
694+ };
695+
557696 boot.initrd.luks.yubikeySupport = mkOption {
558697 default = false;
559698 type = types.bool;
@@ -567,6 +706,12 @@ in
567706
568707 config = mkIf (luks.devices != {} || luks.forceLuksSupportInInitrd) {
569708
709+ assertions =
710+ [ { assertion = !(luks.gpgSupport && luks.yubikeySupport);
711+ message = "Yubikey and GPG Card may not be used at the same time.";
712+ }
713+ ];
714+
570715 # actually, sbp2 driver is the one enabling the DMA attack, but this needs to be tested
571716 boot.blacklistedKernelModules = optionals luks.mitigateDMAAttacks
572717 ["firewire_ohci" "firewire_core" "firewire_sbp2"];
@@ -603,6 +748,23 @@ in
603748 EOF
604749 chmod +x $out/bin/openssl-wrap
605750 ''}
751+
752+ ${optionalString luks.gpgSupport ''
753+ copy_bin_and_libs ${pkgs.gnupg}/bin/gpg
754+ copy_bin_and_libs ${pkgs.gnupg}/bin/gpg-agent
755+ copy_bin_and_libs ${pkgs.gnupg}/libexec/scdaemon
756+
757+ ${concatMapStringsSep "\n" (x:
758+ if x.gpgCard != null then
759+ ''
760+ mkdir -p $out/secrets/gpg-keys/${x.device}
761+ cp -a ${x.gpgCard.encryptedPass} $out/secrets/gpg-keys/${x.device}/cryptkey.gpg
762+ cp -a ${x.gpgCard.publicKey} $out/secrets/gpg-keys/${x.device}/pubkey.asc
763+ ''
764+ else ""
765+ ) (attrValues luks.devices)
766+ }
767+ ''}
606768 '';
607769
608770 boot.initrd.extraUtilsCommandsTest = ''
@@ -612,6 +774,11 @@ in
612774 $out/bin/ykinfo -V
613775 $out/bin/openssl-wrap version
614776 ''}
777+ ${optionalString luks.gpgSupport ''
778+ $out/bin/gpg --version
779+ $out/bin/gpg-agent --version
780+ $out/bin/scdaemon --version
781+ ''}
615782 '';
616783
617784 boot.initrd.preFailCommands = postCommands;
nixos/modules/system/boot/resolved.nix+3−2
@@ -35,7 +35,7 @@ in
3535 when resolving single-label host names (domain names which
3636 contain no dot), in order to qualify them into fully-qualified
3737 domain names (FQDNs).
38− </para><para>
38+
3939 For compatibility reasons, if this setting is not specified,
4040 the search domains listed in
4141 <filename>/etc/resolv.conf</filename> are used instead, if
@@ -50,8 +50,9 @@ in
5050 description = ''
5151 Controls Link-Local Multicast Name Resolution support
5252 (RFC 4795) on the local host.
53− </para><para>
53+
5454 If set to
55+
5556 <variablelist>
5657 <varlistentry>
5758 <term><literal>"true"</literal></term>
nixos/modules/virtualisation/docker-containers.nix+5−8
@@ -65,10 +65,9 @@ let
6565 default = [];
6666 description = ''
6767 Network ports to publish from the container to the outer host.
68− </para>
69− <para>
68+
7069 Valid formats:
71− </para>
70+
7271 <itemizedlist>
7372 <listitem>
7473 <para>
@@ -91,21 +90,19 @@ let
9190 </para>
9291 </listitem>
9392 </itemizedlist>
94− <para>
93+
9594 Both <literal>hostPort</literal> and
9695 <literal>containerPort</literal> can be specified as a range of
9796 ports. When specifying ranges for both, the number of container
9897 ports in the range must match the number of host ports in the
9998 range. Example: <literal>1234-1236:1234-1236/tcp</literal>
100− </para>
101− <para>
99+
102100 When specifying a range for <literal>hostPort</literal> only, the
103101 <literal>containerPort</literal> must <emphasis>not</emphasis> be a
104102 range. In this case, the container port is published somewhere
105103 within the specified <literal>hostPort</literal> range. Example:
106104 <literal>1234-1236:1234/tcp</literal>
107− </para>
108− <para>
105+
109106 Refer to the
110107 <link xlink:href="https://docs.docker.com/engine/reference/run/#expose-incoming-ports">
111108 Docker engine documentation</link> for full details.
nixos/tests/docker-tools.nix+7
@@ -67,5 +67,12 @@ import ./make-test.nix ({ pkgs, ... }: {
6767 # Ensure building an image on top of a layered Docker images work
6868 $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'");
6969 $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}");
70+
71+ # Ensure order of layers is correct
72+ $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layersOrder}'");
73+ $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer1 | grep -q layer1");
74+ # This is to be sure the order of layers of the parent image is preserved
75+ $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer2 | grep -q layer2");
76+ $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer3 | grep -q layer3");
7077 '';
7178})
pkgs/applications/audio/qmmp/default.nix+4−4
@@ -29,17 +29,17 @@
2929# handle that.
3030
3131stdenv.mkDerivation rec {
32− name = "qmmp-1.3.1";
32+ name = "qmmp-1.3.2";
3333
3434 src = fetchurl {
3535 url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
36− sha256 = "1dmybzibpr6hpr2iv1wvrjgww842mng2x0rh1mr8gs8j191xvlhw";
36+ sha256 = "1rh063kcyg7gs9yj2r4v5irpnq4pjaxaxsgrw30mdr21xhhc15cz";
3737 };
3838
39+ nativeBuildInputs = [ cmake pkgconfig ];
3940 buildInputs =
4041 [ # basic requirements
41− cmake pkgconfig xlibsWrapper
42− qtbase qttools qtmultimedia qtx11extras
42+ qtbase qttools qtmultimedia qtx11extras xlibsWrapper
4343 # transports
4444 curl libmms
4545 # input plugins
pkgs/applications/audio/vcv-rack/default.nix+3−2
@@ -72,8 +72,9 @@ with stdenv.lib; stdenv.mkDerivation rec {
7272 meta = with stdenv.lib; {
7373 description = "Open-source virtual modular synthesizer";
7474 homepage = http://vcvrack.com/;
75− # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or unfree
76− license = [ licenses.bsd3 licenses.cc-by-nc-40 licenses.unfree ];
75+ # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a
76+ # no-derivatives clause
77+ license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ];
7778 maintainers = with maintainers; [ moredread ];
7879 platforms = platforms.linux;
7980 };
pkgs/applications/graphics/openscad/default.nix+19−6
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, qt5, libsForQt5
22, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
3−, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext
3+, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig
44}:
55
66stdenv.mkDerivation rec {
@@ -18,11 +18,13 @@ stdenv.mkDerivation rec {
1818 sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb";
1919 };
2020
21+ nativeBuildInputs = [ bison flex pkgconfig ];
22+
2123 buildInputs = [
22− bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
23− pkgconfig harfbuzz gettext
24− ]
25− ++ (with qt5; [qtbase qmake])
24+ eigen boost glew opencsg cgal mpfr gmp glib
25+ harfbuzz gettext freetype fontconfig
26+ ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined
27+ ++ (with qt5; [qtbase qmake] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras)
2628 ++ (with libsForQt5; [qscintilla])
2729 ;
2830
@@ -33,6 +35,17 @@ stdenv.mkDerivation rec {
3335
3436 doCheck = false;
3537
38+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
39+ mkdir $out/Applications
40+ mv $out/bin/*.app $out/Applications
41+ rmdir $out/bin || true
42+
43+ mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \
44+ $out/share/openscad/{examples,color-schemes,locale,libraries,fonts}
45+
46+ rmdir $out/share/openscad
47+ '';
48+
3649 meta = {
3750 description = "3D parametric model compiler";
3851 longDescription = ''
@@ -48,7 +61,7 @@ stdenv.mkDerivation rec {
4861 '';
4962 homepage = http://openscad.org/;
5063 license = stdenv.lib.licenses.gpl2;
51− platforms = stdenv.lib.platforms.linux;
64+ platforms = stdenv.lib.platforms.unix;
5265 maintainers = with stdenv.lib.maintainers;
5366 [ bjornfor raskin the-kenny ];
5467 };
pkgs/applications/kde/kgpg.nix+3−3
@@ -1,7 +1,7 @@
11{
22 mkDerivation, lib,
33 extra-cmake-modules, kdoctools, ki18n, makeWrapper,
4− akonadi-contacts, gnupg1, karchive, kcodecs, kcontacts, kcoreaddons,
4+ akonadi-contacts, gnupg, karchive, kcodecs, kcontacts, kcoreaddons,
55 kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
66 ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme,
77}:
@@ -10,12 +10,12 @@ mkDerivation {
1010 name = "kgpg";
1111 nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
1212 buildInputs = [
13− akonadi-contacts gnupg1 karchive kcodecs kcontacts kcoreaddons kcrash
13+ akonadi-contacts gnupg karchive kcodecs kcontacts kcoreaddons kcrash
1414 kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice
1515 ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme
1616 ];
1717 postFixup = ''
18− wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}"
18+ wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg ]}"
1919 '';
2020 meta = {
2121 license = [ lib.licenses.gpl2 ];
pkgs/applications/misc/bemenu/default.nixnew file+45
@@ -0,0 +1,45 @@
1+{ stdenv, fetchFromGitHub, cairo, cmake, libxkbcommon
2+, pango, fribidi, harfbuzz, pcre, pkgconfig
3+, ncursesSupport ? true, ncurses ? null
4+, waylandSupport ? true, wayland ? null
5+, x11Support ? true, xlibs ? null, xorg ? null
6+}:
7+
8+assert ncursesSupport -> ncurses != null;
9+assert waylandSupport -> wayland != null;
10+assert x11Support -> xlibs != null && xorg != null;
11+
12+stdenv.mkDerivation rec {
13+ pname = "bemenu";
14+ version = "0.1.0";
15+
16+ src = fetchFromGitHub {
17+ owner = "Cloudef";
18+ repo = "bemenu";
19+ rev = "33e540a2b04ce78f5c7ab4a60b899c67f586cc32";
20+ sha256 = "11h55m9dx6ai12pqij52ydjm36dvrcc856pa834njihrp626pl4w";
21+ };
22+
23+ nativeBuildInputs = [ cmake pkgconfig pcre ];
24+
25+ buildInputs = with stdenv.lib; [
26+ cairo
27+ fribidi
28+ harfbuzz
29+ libxkbcommon
30+ pango
31+ ] ++ optionals ncursesSupport [ ncurses ]
32+ ++ optionals waylandSupport [ wayland ]
33+ ++ optionals x11Support [
34+ xlibs.libX11 xlibs.libXinerama xlibs.libXft
35+ xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
36+ ];
37+
38+ meta = with stdenv.lib; {
39+ homepage = "https://github.com/Cloudef/bemenu";
40+ description = "Dynamic menu library and client program inspired by dmenu";
41+ license = licenses.gpl3Plus;
42+ maintainers = with maintainers; [ thiagokokada ];
43+ platforms = with platforms; linux;
44+ };
45+}
pkgs/applications/misc/electrum/default.nix−10
@@ -3,16 +3,6 @@
33let
44 version = "3.3.5";
55
6− qdarkstyle = python3Packages.buildPythonPackage rec {
7− pname = "QDarkStyle";
8− version = "2.5.4";
9− src = python3Packages.fetchPypi {
10− inherit pname version;
11− sha256 = "1w715m1i5pycfqcpkrggpn0rs9cakx6cm5v8rggcxnf4p0i0kdiy";
12− };
13− doCheck = false; # no tests
14− };
15−
166 # Not provided in official source releases, which are what upstream signs.
177 tests = fetchFromGitHub {
188 owner = "spesmilo";
pkgs/applications/misc/k2pdfopt/default.nix+22−1
@@ -57,7 +57,28 @@ stdenv.mkDerivation rec {
5757 prePatch = ''
5858 cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/
5959 '';
60− patches = [];
60+ patches = [
61+ # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2
62+ ./leptonica-CVE-2018-3836.patch
63+ (fetchpatch {
64+ # CVE-2018-7186
65+ url = "https://github.com/DanBloomberg/leptonica/commit/"
66+ + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch";
67+ sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d";
68+ })
69+ (fetchpatch {
70+ # CVE-2018-7247
71+ url = "https://github.com/DanBloomberg/leptonica/commit/"
72+ + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch";
73+ sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf";
74+ })
75+ (fetchpatch {
76+ # CVE-2018-7440
77+ url = "https://github.com/DanBloomberg/leptonica/commit/"
78+ + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch";
79+ sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy";
80+ })
81+ ];
6182 });
6283 tesseract_modded = tesseract4.override {
6384 tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: {
pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patchnew file+95
@@ -0,0 +1,95 @@
1+--- a/src/allheaders.h
2++++ b/src/allheaders.h
3+@@ -2600,6 +2600,7 @@
4+ LEPT_DLL extern char * stringReverse ( const char *src );
5+ LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr );
6+ LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail );
7++LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound );
8+ LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars );
9+ LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc );
10+ LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc );
11+--- a/src/gplot.c
12++++ b/src/gplot.c
13+@@ -141,9 +141,10 @@
14+ const char *xlabel,
15+ const char *ylabel)
16+ {
17+-char *newroot;
18+-char buf[L_BUF_SIZE];
19+-GPLOT *gplot;
20++char *newroot;
21++char buf[L_BUF_SIZE];
22++l_int32 badchar;
23++GPLOT *gplot;
24+
25+ PROCNAME("gplotCreate");
26+
27+@@ -152,6 +153,9 @@
28+ if (outformat != GPLOT_PNG && outformat != GPLOT_PS &&
29+ outformat != GPLOT_EPS && outformat != GPLOT_LATEX)
30+ return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL);
31++ stringCheckForChars(rootname, "`;&|><\"?*", &badchar);
32++ if (badchar) /* danger of command injection */
33++ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL);
34+
35+ if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL)
36+ return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL);
37+--- a/src/utils2.c
38++++ b/src/utils2.c
39+@@ -42,6 +42,7 @@
40+ * l_int32 stringSplitOnToken()
41+ *
42+ * Find and replace string and array procs
43++ * l_int32 stringCheckForChars()
44+ * char *stringRemoveChars()
45+ * l_int32 stringFindSubstr()
46+ * char *stringReplaceSubstr()
47+@@ -701,6 +702,48 @@
48+ /*--------------------------------------------------------------------*
49+ * Find and replace procs *
50+ *--------------------------------------------------------------------*/
51++/*!
52++ * \brief stringCheckForChars()
53++ *
54++ * \param[in] src input string; can be of zero length
55++ * \param[in] chars string of chars to be searched for in %src
56++ * \param[out] pfound 1 if any characters are found; 0 otherwise
57++ * \return 0 if OK, 1 on error
58++ *
59++ * <pre>
60++ * Notes:
61++ * (1) This can be used to sanitize an operation by checking for
62++ * special characters that don't belong in a string.
63++ * </pre>
64++ */
65++l_int32
66++stringCheckForChars(const char *src,
67++ const char *chars,
68++ l_int32 *pfound)
69++{
70++char ch;
71++l_int32 i, n;
72++
73++ PROCNAME("stringCheckForChars");
74++
75++ if (!pfound)
76++ return ERROR_INT("&found not defined", procName, 1);
77++ *pfound = FALSE;
78++ if (!src || !chars)
79++ return ERROR_INT("src and chars not both defined", procName, 1);
80++
81++ n = strlen(src);
82++ for (i = 0; i < n; i++) {
83++ ch = src[i];
84++ if (strchr(chars, ch)) {
85++ *pfound = TRUE;
86++ break;
87++ }
88++ }
89++ return 0;
90++}
91++
92++
93+ /*!
94+ * \brief stringRemoveChars()
95+ *
pkgs/applications/misc/kitty/default.nix+13−2
@@ -2,7 +2,7 @@
22 harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
33 libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
44 libxkbcommon, libXi, libXext, wayland-protocols, wayland,
5− which, dbus,
5+ which, dbus, fetchpatch,
66 Cocoa,
77 CoreGraphics,
88 Foundation,
@@ -67,6 +67,17 @@ buildPythonApplication rec {
6767 libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so";
6868 })
6969 ] ++ stdenv.lib.optionals stdenv.isDarwin [
70+ (fetchpatch {
71+ name = "macos-symlink-1";
72+ url = https://github.com/kovidgoyal/kitty/commit/bdeec612667f6976109247fe1750b10dda9c24c0.patch;
73+ sha256 = "1d18x260w059qag80kgb2cgi2h4rricvqhwpbrw79s8yxzs7jhxk";
74+ })
75+ (fetchpatch {
76+ # fixup of previous patch
77+ name = "macos-symlink-2";
78+ url = https://github.com/kovidgoyal/kitty/commit/af2c9a49b1ad31e94242295d88598591623fbf11.patch;
79+ sha256 = "0k3dmgbvmh66j8k3h8dw6la6ma6f20fng6jjypy982kxvracsnl5";
80+ })
7081 ./macos-10.11.patch
7182 ./no-lto.patch
7283 ./no-werror.patch
@@ -84,7 +95,7 @@ buildPythonApplication rec {
8495 mkdir -p $out
8596 ${if stdenv.isDarwin then ''
8697 mkdir "$out/bin"
87− ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty"
98+ ln -s ../Applications/kitty.app/Contents/MacOS/kitty-deref-symlink "$out/bin/kitty"
8899 mkdir "$out/Applications"
89100 cp -r kitty.app "$out/Applications/kitty.app"
90101 '' else ''
pkgs/applications/misc/octoprint/default.nix+16−3
@@ -15,13 +15,26 @@ let
1515 packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([
1616 (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc")
1717 (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3")
18− (mkOverride "jinja2" "2.8.1" "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m")
1918 (mkOverride "pylru" "1.0.9" "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi")
2019 (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar")
2120 (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d")
2221
2322 # https://github.com/NixOS/nixpkgs/pull/58179#issuecomment-478605134
2423 (mkOverride "werkzeug" "0.14.1" "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c")
24+
25+ # Octoprint holds back jinja2 to 2.8.1 due to breaking changes.
26+ # This old version does not have updated test config for pytest 4,
27+ # and pypi tarball doesn't contain tests dir anyways.
28+ (pself: psuper: {
29+ jinja2 = psuper.jinja2.overridePythonAttrs (oldAttrs: rec {
30+ version = "2.8.1";
31+ src = oldAttrs.src.override {
32+ inherit version;
33+ sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
34+ };
35+ doCheck = false;
36+ });
37+ })
2538 ]);
2639 };
2740
@@ -69,7 +82,7 @@ in py.pkgs.buildPythonApplication rec {
6982 pylru pyyaml sarge feedparser netifaces click websocket_client
7083 scandir chainmap future dateutil futures wrapt monotonic emoji
7184 frozendict
72− ];
85+ ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
7386
7487 checkInputs = with py.pkgs; [ nose mock ddt ];
7588
@@ -82,7 +95,7 @@ in py.pkgs.buildPythonApplication rec {
8295 '';
8396
8497 checkPhase = ''
85− HOME=$(mktemp -d) nosetests
98+ HOME=$(mktemp -d) nosetests ${lib.optionalString stdenv.isDarwin "--exclude=test_set_external_modification"}
8699 '';
87100
88101 meta = with stdenv.lib; {
pkgs/applications/misc/playonlinux/default.nix+2−2
@@ -4,7 +4,7 @@
44, cabextract
55, gettext
66, glxinfo
7−, gnupg1compat
7+, gnupg
88, icoutils
99, imagemagick
1010, netcat-gnu
@@ -32,7 +32,7 @@ let
3232 python2Packages.python
3333 gettext
3434 glxinfo
35− gnupg1compat
35+ gnupg
3636 icoutils
3737 imagemagick
3838 netcat-gnu
pkgs/applications/misc/tilix/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "tilix";
7− version = "1.9.0";
7+ version = "1.9.3";
88
99 src = fetchFromGitHub {
1010 owner = "gnunn1";
1111 repo = "tilix";
1212 rev = version;
13− sha256 = "1k8hqpq6bzmn06b4s8c257n37ghgp3fl7l9g6fy0giwk1x0ix735";
13+ sha256 = "0mg9y4xd2pnv0smibg7dyy733jarvx6qpdqap3sj7fpyni0jvpph";
1414 };
1515
1616 nativeBuildInputs = [
pkgs/applications/misc/tzupdate/default.nix+2−2
@@ -5,11 +5,11 @@ let
55in
66buildPythonApplication rec {
77 pname = "tzupdate";
8− version = "1.3.1";
8+ version = "1.4.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "085kp4v9ijhkfvr0r5rzn4z7nrkb2qig05j0bajb0gkgynwf8wnz";
12+ sha256 = "1sc3z2bx2nhnxg82x0jy19pr8lw56chbr90c2lr11w495csqwhz7";
1313 };
1414
1515 propagatedBuildInputs = [ requests ];
pkgs/applications/misc/zathura/core/default.nix+5−5
@@ -32,15 +32,15 @@ stdenv.mkDerivation rec {
3232 ] ++ optional synctexSupport "-Dsynctex=enabled";
3333
3434 nativeBuildInputs = [
35− meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx
35+ meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx
3636 gettext makeWrapper libxml2
37− ];
37+ ] ++ optional stdenv.isLinux appstream-glib;
3838
3939 buildInputs = [
40− gtk girara libintl libseccomp
41− sqlite glib file librsvg
40+ gtk girara libintl sqlite glib file librsvg
4241 ] ++ optional synctexSupport texlive.bin.core
43− ++ optional stdenv.isDarwin [ gtk-mac-integration ];
42+ ++ optional stdenv.isLinux libseccomp
43+ ++ optional stdenv.isDarwin gtk-mac-integration;
4444
4545 meta = {
4646 homepage = https://pwmt.org/projects/zathura/;
pkgs/applications/misc/zathura/default.nix+2−1
@@ -1,5 +1,6 @@
11{ config, pkgs
2−, useMupdf ? config.zathura.useMupdf or true
2+# zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980)
3+, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin)
34, synctexSupport ? true }:
45
56let
pkgs/applications/misc/zathura/pdf-mupdf/default.nix+1−3
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 buildInputs = [
2323 zathura_core girara mupdf cairo
24− ] ++ stdenv.lib.optional stdenv.isDarwin [
25− gtk-mac-integration
26− ];
24+ ] ++ lib.optional stdenv.isDarwin gtk-mac-integration;
2725
2826 PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";
2927
pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2
@@ -10,13 +10,13 @@ with stdenv.lib;
1010
1111stdenv.mkDerivation rec {
1212 name = "qbittorrent-${version}";
13− version = "4.1.5";
13+ version = "4.1.6";
1414
1515 src = fetchFromGitHub {
1616 owner = "qbittorrent";
1717 repo = "qbittorrent";
1818 rev = "release-${version}";
19− sha256 = "09zcygaxfv9g6av0vsvlyzv4v65wvj766xyfx31yz5ig3xan6ak1";
19+ sha256 = "1y9kv84sy5fg64wbl4xpm8qh0hjba7ibk045cazp0m736rjmxk8c";
2020 };
2121
2222 # NOTE: 2018-05-31: CMake is working but it is not officially supported
pkgs/applications/networking/p2p/tixati/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "tixati-${version}";
5− version = "2.59";
5+ version = "2.61";
66
77 src = fetchurl {
88 url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
9− sha256 = "0vf5y9kj2g7psgdzv2r46jdh5krdps838ca4wwwxi0dd1mwa65my";
9+ sha256 = "05f8lcsac2mr90bhk999qkj8wwd6igdl07389bqrd1ydjasacl2k";
1010 };
1111
1212 installPhase = ''
pkgs/applications/networking/sniffers/wireshark/default.nix+4−2
@@ -14,7 +14,8 @@ let
1414 variant = if withQt then "qt" else "cli";
1515
1616in stdenv.mkDerivation {
17− name = "wireshark-${variant}-${version}";
17+ pname = "wireshark-${variant}";
18+ inherit version;
1819 outputs = [ "out" "dev" ];
1920
2021 src = fetchurl {
@@ -24,7 +25,6 @@ in stdenv.mkDerivation {
2425
2526 cmakeFlags = [
2627 "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
27− "-DENABLE_QT5=${if withQt then "ON" else "OFF"}"
2828 "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
2929 ];
3030
@@ -95,6 +95,8 @@ in stdenv.mkDerivation {
9595
9696 enableParallelBuilding = true;
9797
98+ dontFixCmake = true;
99+
98100 shellHook = ''
99101 # to be able to run the resulting binary
100102 export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1
pkgs/applications/networking/syncthing/default.nix+2−2
@@ -3,14 +3,14 @@
33let
44 common = { stname, target, postInstall ? "" }:
55 buildGoPackage rec {
6− version = "1.1.1";
6+ version = "1.1.3";
77 name = "${stname}-${version}";
88
99 src = fetchFromGitHub {
1010 owner = "syncthing";
1111 repo = "syncthing";
1212 rev = "v${version}";
13− sha256 = "1nkc4ivc8mg9c1njqlkhb9i5f4c1via1rdqfbhwgkj86s6cnxrg7";
13+ sha256 = "00jshqa0nkwj06bfq16p359ss6nl6h49s31hag79wl9gwkca38va";
1414 };
1515
1616 goPackagePath = "github.com/syncthing/syncthing";
pkgs/applications/science/biology/eggnog-mapper/default.nix+2−2
@@ -12,8 +12,8 @@ python27Packages.buildPythonApplication rec {
1212 };
1313
1414 patches = (fetchpatch {
15− url = https://github.com/eggnogdb/eggnog-mapper/pull/125/commits/b7828e4c8c1c453e391aef050f06ff3f84ff9faf.patch;
16− sha256 = "0nz1a7ybm4j5c7vdm3annnxz9036iam2044hia341a0am9wydmzk";
15+ url = "https://github.com/eggnogdb/eggnog-mapper/commit/6972f601ade85b65090efca747d2302acb58507f.patch";
16+ sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf";
1717 });
1818
1919 buildInputs = [ makeWrapper ];
pkgs/applications/science/logic/symbiyosys/default.nix+4−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, yosys, python3 }:
1+{ stdenv, fetchFromGitHub, yosys, bash, python3 }:
22
33stdenv.mkDerivation rec {
44 name = "symbiyosys-${version}";
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
2626 substituteInPlace $out/bin/sby \
2727 --replace "##yosys-sys-path##" \
2828 "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
29+ substituteInPlace $out/share/yosys/python3/sby_core.py \
30+ --replace "/bin/bash" \
31+ "${bash}/bin/bash"
2932 '';
3033 meta = {
3134 description = "Tooling for Yosys-based verification flows";
pkgs/applications/science/math/cbc/default.nix+6−4
@@ -1,11 +1,12 @@
11{ lib, stdenv, fetchurl, zlib, bzip2 }:
22
3−stdenv.mkDerivation {
4− name = "cbc-2.9.9";
3+stdenv.mkDerivation rec {
4+ pname = "cbc";
5+ version = "2.10.2";
56
67 src = fetchurl {
7− url = "https://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz";
8− sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a";
8+ url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz";
9+ sha256 = "0frbxkh6nbh46kaxsx5bmzridgip3v7aq75l8yak5npiiq4jlwv3";
910 };
1011
1112 configureFlags = [ "-C" ];
@@ -23,6 +24,7 @@ stdenv.mkDerivation {
2324 license = lib.licenses.epl10;
2425 maintainers = [ lib.maintainers.eelco ];
2526 platforms = lib.platforms.linux ++ lib.platforms.darwin;
27+ broken = stdenv.isAarch64; # Missing <immintrin.h> after 2.10.0
2628 description = "A mixed integer programming solver";
2729 };
2830}
pkgs/applications/science/math/pynac/default.nix+2−2
@@ -9,14 +9,14 @@
99}:
1010
1111stdenv.mkDerivation rec {
12− version = "0.7.24";
12+ version = "0.7.25";
1313 pname = "pynac";
1414
1515 src = fetchFromGitHub {
1616 owner = "pynac";
1717 repo = "pynac";
1818 rev = "pynac-${version}";
19− sha256 = "0i3qxww28576jim0abgkqy9mi2k0lfllgyx8xpfqsqb75ai970ik";
19+ sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3";
2020 };
2121
2222 buildInputs = [
pkgs/applications/version-management/git-and-tools/fast-export/default.nix+26−25
@@ -1,41 +1,42 @@
1−{stdenv, fetchgit, mercurial, makeWrapper, subversion}:
1+{stdenv, fetchgit, mercurial, makeWrapper}:
22
3−with stdenv.lib;
4−stdenv.mkDerivation {
5− name = "fast-export";
3+stdenv.mkDerivation rec {
4+ pname = "fast-export";
5+ version = "190107";
66
77 src = fetchgit {
88 url = git://repo.or.cz/fast-export.git;
9− rev = "d202200fd9daa75cdb37d4cf067d4ca00e269535";
10− sha256 = "0m4llsg9rx4sza1kf39kxsdvhi6y87a18wm5k19c5r2h3vpylwcc";
9+ rev = "v${version}";
10+ sha256 = "14azfps9jd5anivcvfwflgsvqdyy6gm9jy284kzx2ng9f7871d14";
1111 };
1212
13− buildInputs = [mercurial.python mercurial makeWrapper subversion];
13+ buildInputs = [mercurial.python mercurial makeWrapper];
1414
15− dontBuild = true; # skip svn for now
16−
17− # TODO also support svn stuff
18− # moving .py files into lib directory so that you can't pick the wrong file from PATH.
19− # This requires redefining ROOT
2015 installPhase = ''
21− sed -i "s@/usr/bin/env.*@$(type -p python)@" *.py
22− l=$out/libexec/git-fast-export
23− mkdir -p $out/{bin,doc/git-fast-export} $l
24− sed -i "s@ROOT=.*@ROOT=$l@" *.sh
25− mv *.sh $out/bin
26− mv *.py $l
27− for p in $out/bin/*.sh; do
28− wrapProgram $p \
29− --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" \
30− --prefix PATH : "$(dirname $(type -p python))":$l
16+ binPath=$out/bin
17+ libexecPath=$out/libexec/${pname}
18+ sitepackagesPath=$out/${mercurial.python.sitePackages}
19+ mkdir -p $binPath $libexecPath $sitepackagesPath
20+
21+ # Patch shell scripts so they can execute the Python scripts
22+ sed -i "s|ROOT=.*|ROOT=$libexecPath|" *.sh
23+
24+ mv hg-fast-export.sh hg-reset.sh $binPath
25+ mv hg-fast-export.py hg-reset.py $libexecPath
26+ mv hg2git.py pluginloader plugins $sitepackagesPath
27+
28+ for script in $out/bin/*.sh; do
29+ wrapProgram $script \
30+ --prefix PATH : "${mercurial.python}/bin":$libexec \
31+ --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath
3132 done
3233 '';
3334
34− meta = {
35− description = "Import svn, mercurial into git";
35+ meta = with stdenv.lib; {
36+ description = "Import mercurial into git";
3637 homepage = https://repo.or.cz/w/fast-export.git;
3738 license = licenses.gpl2;
3839 maintainers = [ maintainers.koral ];
39− platforms = stdenv.lib.platforms.unix;
40+ platforms = platforms.unix;
4041 };
4142}
pkgs/applications/version-management/git-and-tools/git-crypt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, git, gnupg1compat, makeWrapper, openssl, stdenv }:
1+{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv }:
22
33stdenv.mkDerivation rec {
44 name = "git-crypt-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 installPhase = ''
2323 make install PREFIX=$out
24− wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg1compat}/bin
24+ wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin
2525 '';
2626
2727 meta = with stdenv.lib; {
pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, docutils, makeWrapper
2−, gnupg1compat, curl, rsync, coreutils
2+, gnupg, curl, rsync, coreutils
33, gawk, gnused, gnugrep
44}:
55
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 installPhase = ''
2323 prefix="$out" ./install.sh
2424 wrapProgram "$out/bin/git-remote-gcrypt" \
25− --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync coreutils
25+ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg curl rsync coreutils
2626 gawk gnused gnugrep ]}"
2727 '';
2828
pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:
22
33let
4− version = "1.0.13";
4+ version = "1.0.16";
55in
66stdenv.mkDerivation {
77 name = "svn-all-fast-export-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 owner = "svn-all-fast-export";
1111 repo = "svn2git";
1212 rev = version;
13− sha256 = "0f1qj0c4cdq46mz54wcy17g7rq1fy2q0bq3sswhr7r5a2s433x4f";
13+ sha256 = "1xs3gngjkna458liaqjsc8ryld03mdmvycnkzwsgyzfxsgjx1i3l";
1414 };
1515
1616 nativeBuildInputs = [ qmake qttools ];
pkgs/applications/version-management/src/default.nix+8−6
@@ -2,20 +2,21 @@
22
33stdenv.mkDerivation rec {
44 name = "src-${version}";
5− version = "1.24";
5+ version = "1.25";
66
77 src = fetchurl {
88 url = "http://www.catb.org/~esr/src/${name}.tar.gz";
9− sha256 = "0n9j2mywbm8c7mc5b3m7dvn6gff88wwwaygk4y1jivpg1f6s3k3l";
9+ sha256 = "0qd10w8fwbrgaj8sx49q6cfhqq3ylhwn7nl9v6kxi1yjlw2p098p";
1010 };
1111
12− buildInputs = [ python rcs git makeWrapper ];
12+ nativeBuildInputs = [ makeWrapper ];
13+ buildInputs = [ python rcs git ];
1314
1415 preConfigure = ''
1516 patchShebangs .
1617 '';
1718
18− makeFlags = [ "prefix=$(out)" ];
19+ makeFlags = [ "prefix=${placeholder "out"}" ];
1920
2021 postInstall = ''
2122 wrapProgram $out/bin/src \
@@ -32,8 +33,9 @@ stdenv.mkDerivation rec {
3233 will seem familiar to Subversion/Git/hg users, and no binary blobs
3334 anywhere.
3435 '';
35− homepage = http://www.catb.org/esr/src/;
36− license = licenses.bsd3;
36+ homepage = "http://www.catb.org/esr/src/";
37+ changelog = "https://gitlab.com/esr/src/raw/${version}/NEWS";
38+ license = licenses.bsd2;
3739 platforms = platforms.all;
3840 maintainers = with maintainers; [ calvertvl AndersonTorres ];
3941 };
pkgs/applications/video/mkclean/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ dos2unix, fetchurl, stdenv }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "mkclean";
5+ version = "0.8.10";
6+
7+ hardeningDisable = [ "format" ];
8+ nativeBuildInputs = [ dos2unix ];
9+
10+ src = fetchurl {
11+ url = "mirror://sourceforge/matroska/${pname}-${version}.tar.bz2";
12+ sha256 = "0zbpi4sm68zb20d53kbss93fv4aafhcmz7dsd0zdf01vj1r3wxwn";
13+ };
14+
15+ configurePhase = ''
16+ dos2unix ./mkclean/configure.compiled
17+ ./mkclean/configure.compiled
18+ '';
19+
20+ buildPhase = ''
21+ make -C mkclean
22+ '';
23+
24+ installPhase = ''
25+ mkdir -p $out/{bin,lib}
26+ mv release/gcc_linux_*/*.* $out/lib
27+ mv release/gcc_linux_*/* $out/bin
28+ '';
29+
30+ meta = with stdenv.lib; {
31+ description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed.";
32+ homepage = "https://www.matroska.org";
33+ license = licenses.bsdOriginal;
34+ maintainers = with maintainers; [ chrisaw ];
35+ platforms = [ "i686-linux" "x86_64-linux" ];
36+ };
37+}
pkgs/applications/virtualization/rkt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools,
1+{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools,
22 cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }:
33
44let
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
3030
3131 buildInputs = [
3232 glibc.out glibc.static
33− autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
33+ autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd
3434 makeWrapper
3535 ];
3636
pkgs/applications/window-managers/i3/wk-switch.nix+7−8
@@ -1,18 +1,17 @@
1−{ stdenv, fetchFromGitHub, python2Packages }:
1+{ stdenv, fetchFromGitHub, python3Packages }:
22
3−python2Packages.buildPythonApplication rec {
3+python3Packages.buildPythonApplication rec {
44 pname = "i3-wk-switch";
5− version = "2017-08-21";
5+ version = "2019-05-10";
66
7− # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb
87 src = fetchFromGitHub {
98 owner = "tmfink";
109 repo = pname;
11− rev = "484f840";
12− sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb";
10+ rev = "05a2d5d35e9841d2a26630f1866fc0a0e8e708eb";
11+ sha256 = "0ln192abdqrrs7rdazp9acbji2y6pf68z2d1by4nf2q529dh24dc";
1312 };
1413
15− propagatedBuildInputs = with python2Packages; [ i3-py ];
14+ propagatedBuildInputs = with python3Packages; [ i3ipc ];
1615
1716 dontBuild = true;
1817 doCheck = false;
@@ -23,7 +22,7 @@ python2Packages.buildPythonApplication rec {
2322 '';
2423
2524 meta = with stdenv.lib; {
26− description = "XMonad-like workspace switching for i3";
25+ description = "XMonad-like workspace switching for i3 and sway";
2726 maintainers = with maintainers; [ synthetica ];
2827 platforms = platforms.linux;
2928 license = licenses.mit;
pkgs/build-support/docker/default.nix+11−10
@@ -216,7 +216,7 @@ rec {
216216 find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
217217
218218 # Get the next lower directory and continue the loop.
219− lowerdir=$lowerdir''${lowerdir:+:}image/$extractionID/layer
219+ lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir
220220 done
221221
222222 mkdir work
@@ -585,9 +585,9 @@ rec {
585585 layerID=$(sha256sum "$layer/json" | cut -d ' ' -f 1)
586586 ln -s "$layer" "./image/$layerID"
587587
588− manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerID/layer.tar\"] + .")
589− imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${configJson})\"}] + .")
590− imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
588+ manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerID/layer.tar\"]")
589+ imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${configJson})\"}]")
590+ imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]")
591591 done
592592 imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
593593 echo "$imageJson" > "image/$imageJsonChecksum.json"
@@ -779,23 +779,24 @@ rec {
779779 # Use the temp folder we've been working on to create a new image.
780780 mv temp image/$layerID
781781
782− # Add the new layer ID to the beginning of the layer list
782+ # Add the new layer ID to the end of the layer list
783783 (
784+ cat layer-list
784785 # originally this used `sed -i "1i$layerID" layer-list`, but
785786 # would fail if layer-list was completely empty.
786787 echo "$layerID/layer.tar"
787− cat layer-list
788788 ) | ${pkgs.moreutils}/bin/sponge layer-list
789789
790790 # Create image json and image manifest
791791 imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
792792 manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
793793
794− for layerTar in $(tac ./layer-list); do
794+ for layerTar in $(cat ./layer-list); do
795795 layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
796− imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
797− imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
798− manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerTar\"] + .")
796+ imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${baseJson})\"}]")
797+ # diff_ids order is from the bottom-most to top-most layer
798+ imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]")
799+ manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerTar\"]")
799800 done
800801
801802 imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
pkgs/build-support/docker/examples.nix+39
@@ -187,4 +187,43 @@ rec {
187187 runAsRoot = "touch /example-file";
188188 fromImage = bash;
189189 };
190+
191+ # 13. example of 3 layers images This image is used to verify the
192+ # order of layers is correct.
193+ # It allows to validate
194+ # - the layer of parent are below
195+ # - the order of parent layer is preserved at image build time
196+ # (this is why there are 3 images)
197+ layersOrder = let
198+ l1 = pkgs.dockerTools.buildImage {
199+ name = "l1";
200+ tag = "latest";
201+ extraCommands = ''
202+ mkdir -p tmp
203+ echo layer1 > tmp/layer1
204+ echo layer1 > tmp/layer2
205+ echo layer1 > tmp/layer3
206+ '';
207+ };
208+ l2 = pkgs.dockerTools.buildImage {
209+ name = "l2";
210+ fromImage = l1;
211+ tag = "latest";
212+ extraCommands = ''
213+ mkdir -p tmp
214+ echo layer2 > tmp/layer2
215+ echo layer2 > tmp/layer3
216+ '';
217+ };
218+ in pkgs.dockerTools.buildImage {
219+ name = "l3";
220+ fromImage = l2;
221+ tag = "latest";
222+ contents = [ pkgs.coreutils ];
223+ extraCommands = ''
224+ mkdir -p tmp
225+ echo layer3 > tmp/layer3
226+ '';
227+ };
228+
190229}
pkgs/data/fonts/agave/default.nix+12−15
@@ -1,24 +1,21 @@
1−{ stdenv, fetchurl }:
1+{ lib, fetchurl }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "agave";
55 version = "009";
6+in fetchurl {
7+ name = "${pname}-${version}";
8+ url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf";
69
7− src = fetchurl {
8− url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf";
9− sha256 = "05766gp2glm1p2vknk1nncxigq28hg8s58kjwsbn8zpwy8ivywpk";
10− };
11−
12− sourceRoot = ".";
13−
14− unpackPhase = ":";
15− dontBuild = true;
16− installPhase = ''
17− mkdir -p $out/share/fonts/truetype
18− cp $src $out/share/fonts/truetype/
10+ downloadToTemp = true;
11+ recursiveHash = true;
12+ postFetch = ''
13+ install -D $downloadedFile $out/share/fonts/truetype/agave-r.ttf
1914 '';
2015
21− meta = with stdenv.lib; {
16+ sha256 = "16qvz3zpwiq2nw0gxygva5pssswcia5xp0q6ir5jfkackvqf3fql";
17+
18+ meta = with lib; {
2219 description = "truetype monospaced typeface designed for X environments";
2320 homepage = https://b.agaric.net/page/agave;
2421 license = licenses.mit;
pkgs/data/fonts/aileron/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = "http://dotcolon.net/font/${pname}/";
2222 description = "A helvetica font in nine weights";
2323 platforms = platforms.all;
pkgs/data/fonts/andagii/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "1.0.2";
@@ -17,7 +17,7 @@ in fetchzip {
1717 # There are multiple claims that the font is GPL, so I include the
1818 # package; but I cannot find the original source, so use it on your
1919 # own risk Debian claims it is GPL - good enough for me.
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = http://www.i18nguy.com/unicode/unicode-font.html;
2222 description = "Unicode Plane 1 Osmanya script font";
2323 maintainers = with maintainers; [ raskin rycee ];
pkgs/data/fonts/andika/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "5.000";
@@ -16,7 +16,7 @@ in
1616
1717 sha256 = "1jy9vpcprpd1k48p20wh6jhyn909ibia8lr5i747p41l0s8a7lqy";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://software.sil.org/andika;
2121 description = "A family designed especially for literacy use taking into account the needs of beginning readers";
2222 longDescription = ''
pkgs/data/fonts/ankacoder/condensed.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let version = "1.100"; in
44fetchzip rec {
@@ -13,7 +13,7 @@ fetchzip rec {
1313
1414 sha256 = "0i80zpr2y9368rg2i6x8jv0g7d03kdyr5h7w9yz7pjd7i9xd8439";
1515
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 description = "Anka/Coder Condensed font";
1818 homepage = https://code.google.com/archive/p/anka-coder-fonts;
1919 license = licenses.ofl;
pkgs/data/fonts/ankacoder/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let version = "1.100"; in
44fetchzip rec {
@@ -13,7 +13,7 @@ fetchzip rec {
1313
1414 sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85";
1515
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 description = "Anka/Coder fonts";
1818 homepage = https://code.google.com/archive/p/anka-coder-fonts;
1919 license = licenses.ofl;
pkgs/data/fonts/anonymous-pro/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "1.002";
@@ -13,7 +13,7 @@ in fetchzip rec {
1313 '';
1414 sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f";
1515
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 homepage = https://www.marksimonson.com/fonts/view/anonymous-pro;
1818 description = "TrueType font set intended for source code";
1919 longDescription = ''
pkgs/data/fonts/arkpandora/default.nix+1−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, fetchurl }:
22
33let
44 version = "2.04";
@@ -21,6 +21,5 @@ in fetchurl {
2121
2222 meta = {
2323 description = "Font, metrically identical to Arial and Times New Roman";
24− platforms = stdenv.lib.platforms.unix;
2524 };
2625}
pkgs/data/fonts/arphic/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, mkfontscale, mkfontdir }:
1+{ lib, fetchzip, mkfontscale, mkfontdir }:
22
33let
44 version = "0.2.20080216.2";
@@ -18,7 +18,7 @@ in {
1818
1919 sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl";
2020
21− meta = with stdenv.lib; {
21+ meta = with lib; {
2222 description = "CJK Unicode font Kai style";
2323 homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
2424
@@ -43,7 +43,7 @@ in {
4343
4444 sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d";
4545
46− meta = with stdenv.lib; {
46+ meta = with lib; {
4747 description = "CJK Unicode font Ming style";
4848 homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
4949
pkgs/data/fonts/aurulent-sans/default.nix+9−8
@@ -1,12 +1,13 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip rec {
3+fetchFromGitHub rec {
44 name = "aurulent-sans-0.1";
5−
6− url = "https://github.com/deepfire/hartke-aurulent-sans/archive/${name}.zip";
5+ owner = "deepfire";
6+ repo = "hartke-aurulent-sans";
7+ rev = name;
78 postFetch = ''
89 mkdir -p $out/share/fonts
9− unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
10+ tar xf $downloadedFile -C $out/share/fonts --strip=1
1011 '';
1112 sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li";
1213
@@ -14,8 +15,8 @@ fetchzip rec {
1415 description = "Aurulent Sans";
1516 longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font.";
1617 homepage = http://delubrum.org/;
17− maintainers = with stdenv.lib.maintainers; [ deepfire ];
18− license = stdenv.lib.licenses.ofl;
19− platforms = stdenv.lib.platforms.all;
18+ maintainers = with lib.maintainers; [ deepfire ];
19+ license = lib.licenses.ofl;
20+ platforms = lib.platforms.all;
2021 };
2122}
pkgs/data/fonts/b612/default.nix+9−8
@@ -1,20 +1,21 @@
1−{ stdenv, fetchzip, lib }:
1+{ lib, fetchFromGitHub }:
22
33let
44 version = "1.008";
55 pname = "b612";
6−in
7−
8−fetchzip rec {
6+in fetchFromGitHub {
97 name = "${pname}-font-${version}";
10− url = "https://github.com/polarsys/b612/archive/${version}.zip";
11− sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq";
8+ owner = "polarsys";
9+ repo = "b612";
10+ rev = version;
1211 postFetch = ''
12+ tar xf $downloadedFile --strip=1
1313 mkdir -p $out/share/fonts/truetype/${pname}
14− unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}
14+ cp fonts/ttf/*.ttf $out/share/fonts/truetype/${pname}
1515 '';
16+ sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq";
1617
17− meta = with stdenv.lib; {
18+ meta = with lib; {
1819 homepage = http://b612-font.com/;
1920 description = "Highly legible font family for use on aircraft cockpit screens";
2021 longDescription = ''
pkgs/data/fonts/babelstone-han/default.nix+4−4
@@ -1,7 +1,7 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
4− version = "11.0.3";
4+ version = "12.1.4";
55in fetchzip {
66 name = "babelstone-han-${version}";
77
@@ -10,9 +10,9 @@ in fetchzip {
1010 mkdir -p $out/share/fonts/truetype
1111 unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
1212 '';
13− sha256 = "0c8s21kllyilwivrb8gywq818y67w3zpann34hz36vy0wyiswn1c";
13+ sha256 = "1fypwk2i87jfrckvxg9wz4x84z7c6ifgzrjb8fylhac50lzi6kni";
1414
15− meta = with stdenv.lib; {
15+ meta = with lib; {
1616 description = "Unicode CJK font with over 36000 Han characters";
1717 homepage = http://www.babelstone.co.uk/Fonts/Han.html;
1818
pkgs/data/fonts/baekmuk-ttf/default.nix+3−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "baekmuk-ttf-2.2";
@@ -6,9 +6,8 @@ fetchzip rec {
66 url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
77 postFetch = ''
88 tar -xzvf $downloadedFile --strip-components=1
9− mkdir -p $out/share/fonts $out/share/doc/${name}
10− cp ttf/*.ttf $out/share/fonts
11− cp COPYRIGHT* $out/share/doc/${name}
9+ install -m444 -Dt $out/share/fonts ttf/*.ttf
10+ install -m444 -Dt $out/share/doc/${name} COPYRIGHT*
1211 '';
1312 sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g";
1413
@@ -16,7 +15,6 @@ fetchzip rec {
1615 description = "Korean font";
1716 homepage = http://kldp.net/projects/baekmuk/;
1817 license = "BSD-like";
19− platforms = stdenv.lib.platforms.linux;
2018 };
2119}
2220
pkgs/data/fonts/bakoma-ttf/default.nix+1−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "bakoma-ttf";
@@ -16,6 +16,5 @@ fetchzip {
1616 meta = {
1717 description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
1818 homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/;
19− platforms = stdenv.lib.platforms.unix;
2019 };
2120}
pkgs/data/fonts/behdad-fonts/default.nix+12−13
@@ -1,22 +1,21 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "behdad-fonts";
55 version = "0.0.3";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
8+ owner = "font-store";
9+ repo = "BehdadFont";
10+ rev = "v${version}";
611
7− src = fetchFromGitHub {
8− owner = "font-store";
9− repo = "BehdadFont";
10− rev = "v${version}";
11− sha256 = "0rlmyv82qmyy90zvkjnlva44ia7dyhiyk7axbq526v7zip3g79w0";
12− };
13−
14− installPhase = ''
15− mkdir -p $out/share/fonts/behdad-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/behdad-fonts
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
14+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/behrad-fonts {} \;
1715 '';
16+ sha256 = "0c57232462cv1jrfn0m2bl7jzcfkacirrdd2qimrc8iqhkz0ajfz";
1817
19− meta = with stdenv.lib; {
18+ meta = with lib; {
2019 homepage = https://github.com/font-store/BehdadFont;
2120 description = "A Persian/Arabic Open Source Font";
2221 license = licenses.ofl;
pkgs/data/fonts/cabin/default.nix+10−8
@@ -1,19 +1,21 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip rec {
3+fetchFromGitHub rec {
44 name = "cabin-1.005";
55
6− url = https://github.com/impallari/Cabin/archive/982839c790e9dc57c343972aa34c51ed3b3677fd.zip;
6+ owner = "impallari";
7+ repo = "Cabin";
8+ rev = "982839c790e9dc57c343972aa34c51ed3b3677fd";
79
810 postFetch = ''
9− mkdir -p $out/share/{doc,fonts}
10− unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
11− unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
11+ tar xf $downloadedFile --strip=1
12+ install -m444 -Dt $out/share/fonts/opentype fonts/OTF/*.otf
13+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
1214 '';
1315
14− sha256 = "1ax5c2iab48qsk9zn3gjvqaib2lnlm25f1wr0aysf5ngw0y0jkrd";
16+ sha256 = "1bl7h217m695jn4rbniialfk573aa44fslp2rjxnhkicakpcm44h";
1517
16− meta = with stdenv.lib; {
18+ meta = with lib; {
1719 description = "A humanist sans with 4 weights and true italics";
1820 longDescription = ''
1921 The Cabin font family is a humanist sans with 4 weights and true italics,
pkgs/data/fonts/caladea/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "20130214";
@@ -15,7 +15,7 @@ in fetchzip rec {
1515 '';
1616 sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 # This font doesn't appear to have any official web site but this
2020 # one provides some good information and samples.
2121 homepage = http://openfontlibrary.org/en/font/caladea;
pkgs/data/fonts/camingo-code/default.nix+5−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "1.0";
@@ -8,14 +8,12 @@ in fetchzip rec {
88 url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip;
99 postFetch = ''
1010 unzip $downloadedFile
11− mkdir -p $out/share/fonts/truetype
12− mkdir -p $out/share/doc/${name}
13− cp -v fonts/camingo-code/*.ttf $out/share/fonts/truetype/
14− cp -v fonts/camingo-code/*.txt $out/share/doc/${name}/
11+ install -m444 -Dt $out/share/fonts/truetype fonts/camingo-code/*.ttf
12+ install -m444 -Dt $out/share/doc/${name} fonts/camingo-code/*.txt
1513 '';
16− sha256 = "035z2k6lwwy2bysw27pirn3vjxnj2h23nyx8jr213rb2bl0m21x1";
14+ sha256 = "16iqjwwa7pnswvcc4w8nglkd0m0fz50qsz96i1kcpqip3nwwvw7y";
1715
18− meta = with stdenv.lib; {
16+ meta = with lib; {
1917 homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/;
2018 description = "A monospaced typeface designed for source-code editors";
2119 platforms = platforms.all;
pkgs/data/fonts/carlito/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "20130920";
@@ -17,7 +17,7 @@ in fetchzip rec {
1717
1818 sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv";
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 # This font doesn't appear to have any official web site but this
2222 # one provides some good information and samples.
2323 homepage = http://openfontlibrary.org/en/font/carlito;
pkgs/data/fonts/charis-sil/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "5.000";
@@ -16,7 +16,7 @@ in
1616
1717 sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://software.sil.org/charis;
2121 description = "A family of highly readable fonts for broad multilingual use";
2222 longDescription = ''
pkgs/data/fonts/clearlyU/default.nix+9−11
@@ -7,18 +7,17 @@ stdenv.mkDerivation {
77 url = https://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz;
88 sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
99 };
10−
10+
1111 nativeBuildInputs = [ mkfontdir mkfontscale ];
1212
13− installPhase =
14− ''
15− mkdir -p $out/share/fonts
16− cp *.bdf $out/share/fonts
17− cd $out/share/fonts
18− mkfontdir
19− mkfontscale
20− '';
21−
13+ installPhase = ''
14+ mkdir -p $out/share/fonts
15+ cp *.bdf $out/share/fonts
16+ cd $out/share/fonts
17+ mkfontdir
18+ mkfontscale
19+ '';
20+
2221 outputHashAlgo = "sha256";
2322 outputHashMode = "recursive";
2423 outputHash = "127zrg65s90ksj99kr9hxny40rbxvpai62mf5nqk853hcd1bzpr6";
@@ -26,6 +25,5 @@ stdenv.mkDerivation {
2625 meta = {
2726 description = "A Unicode font";
2827 maintainers = [stdenv.lib.maintainers.raskin];
29− platforms = stdenv.lib.platforms.unix;
3028 };
3129}
pkgs/data/fonts/cm-unicode/default.nix+4−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "0.7.0";
@@ -9,15 +9,13 @@ in fetchzip rec {
99
1010 postFetch = ''
1111 tar -xJvf $downloadedFile --strip-components=1
12− mkdir -p $out/share/fonts/opentype
13− mkdir -p $out/share/doc/${name}
14− cp -v *.otf $out/share/fonts/opentype/
15− cp -v README FontLog.txt $out/share/doc/${name}
12+ install -m444 -Dt $out/share/fonts/opentype *.otf
13+ install -m444 -Dt $out/share/doc/${name} README FontLog.txt
1614 '';
1715
1816 sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn";
1917
20− meta = with stdenv.lib; {
18+ meta = with lib; {
2119 homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/;
2220 description = "Computer Modern Unicode fonts";
2321 maintainers = with maintainers; [ raskin rycee ];
pkgs/data/fonts/comfortaa/default.nix+2−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "3.001";
@@ -8,13 +8,12 @@ in fetchzip rec {
88 url = "https://orig00.deviantart.net/40a3/f/2017/093/d/4/comfortaa___font_by_aajohan-d1qr019.zip";
99 postFetch = ''
1010 mkdir -p $out/share/fonts $out/share/doc
11− unzip -l $downloadedFile
1211 unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
1312 unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name}
1413 '';
1514 sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h";
1615
17− meta = with stdenv.lib; {
16+ meta = with lib; {
1817 homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949;
1918 description = "A clean and modern font suitable for headings and logos";
2019 license = licenses.ofl;
pkgs/data/fonts/comic-neue/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2.2";
@@ -19,7 +19,7 @@ in fetchzip rec {
1919
2020 sha256 = "1yypq5aqqzv3q1c6vx5130mi2iwihzzvrawhwqpwsfjl0p25sq9q";
2121
22− meta = with stdenv.lib; {
22+ meta = with lib; {
2323 homepage = http://comicneue.com/;
2424 description = "A casual type face: Make your lemonade stand look like a fortune 500 company";
2525 longDescription = ''
pkgs/data/fonts/comic-relief/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "1.1";
@@ -18,7 +18,7 @@ in fetchzip rec {
1818
1919 sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff";
2020
21− meta = with stdenv.lib; {
21+ meta = with lib; {
2222 homepage = http://loudifier.com/comic-relief/;
2323 description = "A font metric-compatible with Microsoft Comic Sans";
2424 longDescription = ''
pkgs/data/fonts/cooper-hewitt/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
3−fetchzip rec {
3+fetchzip {
44 name = "cooper-hewitt-2014-06-09";
55
66 url = https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip;
@@ -12,7 +12,7 @@ fetchzip rec {
1212
1313 sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd";
1414
15− meta = with stdenv.lib; {
15+ meta = with lib; {
1616 homepage = https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/;
1717 description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches";
1818 license = licenses.ofl;
pkgs/data/fonts/corefonts/default.nix+2−4
@@ -41,12 +41,10 @@ stdenv.mkDerivation {
4141
4242 cabextract --lowercase viewer1.cab
4343
44− fontDir=$out/share/fonts/truetype
45− mkdir -p $fontDir
46− cp *.ttf $fontDir
44+ install -m444 -Dt $out/share/fonts/truetype *.ttf
4745
4846 # Also put the EULA there to be on the safe side.
49− cp ${eula} $fontDir/eula.html
47+ cp ${eula} $out/share/fonts/truetype/eula.html
5048
5149 # Set up no-op font configs to override any aliases set up by
5250 # other packages.
pkgs/data/fonts/crimson/default.nix+4−7
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "2014.10";
@@ -9,16 +9,13 @@ in fetchzip rec {
99
1010 postFetch = ''
1111 tar -xzvf $downloadedFile --strip-components=1
12−
13− mkdir -p $out/share/fonts/opentype
14− mkdir -p $out/share/doc/${name}
15− cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype
16− cp -v README.md $out/share/doc/${name}
12+ install -m444 -Dt $out/share/fonts/opentype "Desktop Fonts/OTF/"*.otf
13+ install -m444 -Dt $out/share/doc/${name} README.md
1714 '';
1815
1916 sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842";
2017
21− meta = with stdenv.lib; {
18+ meta = with lib; {
2219 homepage = https://aldusleaf.org/crimson.html;
2320 description = "A font family inspired by beautiful oldstyle typefaces";
2421 license = licenses.ofl;
pkgs/data/fonts/culmus/default.nix+8−11
@@ -1,16 +1,12 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "0.133";
5−in stdenv.mkDerivation {
5+in fetchzip {
66 name = "culmus-${version}";
7−
8− src = fetchzip {
9− url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
10− sha256 = "0q80j3vixn364sc23hcy6098rkgy0kb4p91lky6224am1dwn2qmr";
11− };
12−
13− installPhase = ''
7+ url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
8+ postFetch = ''
9+ tar xf $downloadedFile --strip=1
1410 mkdir -p $out/share/fonts/{truetype,type1}
1511 cp -v *.pfa $out/share/fonts/type1/
1612 cp -v *.afm $out/share/fonts/type1/
@@ -19,12 +15,13 @@ in stdenv.mkDerivation {
1915 cp -v *.otf $out/share/fonts/truetype/
2016 cp -v fonts.scale-ttf $out/share/fonts/truetype/fonts.scale
2117 '';
18+ sha256 = "0zqqjcrqmbd4389hqz2dwymkkcxjrq9ylyriiv3gbmzl6l1ffk3g";
2219
2320 meta = {
2421 description = "Culmus Hebrew fonts";
2522 longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows.";
26− platforms = stdenv.lib.platforms.all;
27− license = stdenv.lib.licenses.gpl2;
23+ platforms = lib.platforms.all;
24+ license = lib.licenses.gpl2;
2825 homepage = http://culmus.sourceforge.net/;
2926 downloadPage = http://culmus.sourceforge.net/download.html;
3027 };
pkgs/data/fonts/d2coding/default.nix+3−3
@@ -1,10 +1,10 @@
1−{ stdenv, fetchzip, unzip }:
1+{ lib, fetchzip, unzip }:
22
33let
44 version = "1.3.2";
55 pname = "d2codingfont";
66
7−in fetchzip rec {
7+in fetchzip {
88 name = "${pname}-${version}";
99 url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip";
1010
@@ -15,7 +15,7 @@ in fetchzip rec {
1515
1616 sha256 = "1812r82530wzfki7k9cm35fy6k2lvis7j6w0w8svc784949m1wwj";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 description = "Monospace font with support for Korean and latin characters";
2020 longDescription = ''
2121 D2Coding is a monospace font developed by a Korean IT Company called Naver.
pkgs/data/fonts/dina-pcf/default.nix−1
@@ -60,6 +60,5 @@ stdenv.mkDerivation rec {
6060 downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/;
6161 license = licenses.free;
6262 maintainers = [ maintainers.prikhi ];
63− platforms = platforms.unix;
6463 };
6564}
pkgs/data/fonts/dina/default.nix+4−3
@@ -5,11 +5,13 @@ let
55in fetchzip rec {
66 name = "dina-font-${version}";
77
8− url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
8+ # `meta.homepage` has no direct download link
9+ url = "https://github.com/ProgrammingFonts/ProgrammingFonts/archive/b15ef365146be7eef4a46979cfe157c5aeefb7c0.zip";
910
1011 postFetch = ''
1112 mkdir -p $out/share/fonts
12− unzip -j $downloadedFile \*.bdf -d $out/share/fonts
13+ unzip -j $downloadedFile '*/Dina/*.bdf' -d $out/share/fonts
14+ chmod u-x $out/share/fonts/*
1315 '';
1416
1517 sha256 = "02a6hqbq18sw69npylfskriqhvj1nsk65hjjyd05nl913ycc6jl7";
@@ -25,6 +27,5 @@ in fetchzip rec {
2527 downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/;
2628 license = licenses.free;
2729 maintainers = [ maintainers.prikhi ];
28− platforms = platforms.unix;
2930 };
3031}
pkgs/data/fonts/dosemu-fonts/default.nix−1
@@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
3131
3232 meta = {
3333 description = "Various fonts from the DOSEmu project";
34− platforms = stdenv.lib.platforms.linux;
3534 };
3635}
pkgs/data/fonts/dosis/default.nix+10−8
@@ -1,19 +1,21 @@
1−{ stdenv, fetchzip}:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip rec {
3+fetchFromGitHub rec {
44 name = "dosis-1.007";
55
6− url = https://github.com/impallari/Dosis/archive/12df1e13e58768f20e0d48ff15651b703f9dd9dc.zip;
6+ owner = "impallari";
7+ repo = "Dosis";
8+ rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc";
79
810 postFetch = ''
9− mkdir -p $out/share/{doc,fonts}
10− unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
11− unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
11+ tar xf $downloadedFile --strip=1
12+ find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \;
13+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
1214 '';
1315
14− sha256 = "11a8jmgaly14l7rm3jxkwwv3ngr8fdlkp70nicjk2rg0nny2cvfq";
16+ sha256 = "0vz25w45i8flfvppymr5h83pa2n1r37da20v7691p44018fdsdny";
1517
16− meta = with stdenv.lib; {
18+ meta = with lib; {
1719 description = "A very simple, rounded, sans serif family";
1820 longDescription = ''
1921 Dosis is a very simple, rounded, sans serif family.
pkgs/data/fonts/doulos-sil/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "5.000";
@@ -16,7 +16,7 @@ in
1616
1717 sha256 = "04a9cr7jbw7d8llcj8xsqp9rp8w6gcgbd9sdwvi02kz7jhqa0vad";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://software.sil.org/doulos;
2121 description = "A font that provides complete support for the International Phonetic Alphabet";
2222 longDescription = ''
pkgs/data/fonts/eb-garamond/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "0.016";
@@ -15,7 +15,7 @@ in fetchzip rec {
1515
1616 sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 homepage = http://www.georgduffner.at/ebgaramond/;
2020 description = "Digitization of the Garamond shown on the Egenolff-Berner specimen";
2121 maintainers = with maintainers; [ relrod rycee ];
pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "3.2.0";
@@ -14,7 +14,7 @@ in fetchzip {
1414
1515 sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 description = "Icon fonts for emacs all-the-icons";
1919 longDescription = ''
2020 The emacs package all-the-icons provides icons to improve
pkgs/data/fonts/emojione/default.nix−1
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
2929 description = "Open source emoji set";
3030 homepage = http://emojione.com/;
3131 license = licenses.cc-by-40;
32− platforms = platforms.linux;
3332 maintainers = with maintainers; [ abbradar ];
3433 };
3534}
pkgs/data/fonts/encode-sans/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "encode-sans-1.002";
@@ -13,7 +13,7 @@ fetchzip rec {
1313
1414 sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p";
1515
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 description = "A versatile sans serif font family";
1818 longDescription = ''
1919 The Encode Sans family is a versatile workhorse. Featuring a huge range of
pkgs/data/fonts/eunomia/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = http://dotcolon.net/font/eunomia/;
2222 description = "A futuristic decorative font.";
2323 platforms = platforms.all;
pkgs/data/fonts/f5_6/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = "http://dotcolon.net/font/${pname}/";
2222 description = "A weighted decorative font.";
2323 platforms = platforms.all;
pkgs/data/fonts/fantasque-sans-mono/default.nix+2−4
@@ -1,9 +1,7 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
4−
54 version = "1.7.2";
6−
75in
86
97fetchzip rec {
@@ -19,7 +17,7 @@ fetchzip rec {
1917
2018 sha256 = "1fwvbqfrgb539xybwdawvwa8cg4f215kw905rgl9a6p0iwa1nxqk";
2119
22− meta = with stdenv.lib; {
20+ meta = with lib; {
2321 homepage = https://github.com/belluzj/fantasque-sans;
2422 description = "A font family with a great monospaced variant for programmers";
2523 license = licenses.ofl;
pkgs/data/fonts/ferrum/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = "http://dotcolon.net/font/${pname}/";
2222 description = "A decorative font.";
2323 platforms = platforms.all;
pkgs/data/fonts/fira/default.nix+12−7
@@ -1,18 +1,23 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip rec {
4− name = "fira-4.106";
3+let
4+ version = "4.106";
5+in fetchFromGitHub {
6+ name = "fira-${version}";
57
6− url = https://github.com/mozilla/Fira/archive/4.106.zip;
8+ owner = "mozilla";
9+ repo = "Fira";
10+ rev = version;
711
812 postFetch = ''
9− mkdir -p $out/share/fonts
10− unzip -j $downloadedFile Fira-4.106/otf/FiraSans\*.otf -d $out/share/fonts/opentype
13+ tar xf $downloadedFile --strip=1
14+ mkdir -p $out/share/fonts/opentype
15+ cp otf/*.otf $out/share/fonts/opentype
1116 '';
1217
1318 sha256 = "0c97nmihcq0ki7ywj8zn048a2bgrszc61lb9p0djfi65ar52jab4";
1419
15− meta = with stdenv.lib; {
20+ meta = with lib; {
1621 homepage = https://mozilla.github.io/Fira/;
1722 description = "Sans-serif font for Firefox OS";
1823 longDescription = ''
pkgs/data/fonts/fixedsys-excelsior/default.nix+12−20
@@ -1,33 +1,25 @@
11{ stdenv, fetchurl } :
22
3−let
3+let
44 major = "3";
55 minor = "00";
66 version = "${major}.${minor}";
7−
8−in
9−
10−stdenv.mkDerivation rec {
7+in fetchurl rec {
118 name = "fixedsys-excelsior-${version}";
129
13− src = fetchurl {
14− url = http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf;
15− sha256 = "6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d";
16− };
17−
18− phases = [ "installPhase" ];
19−
20− installPhase = ''
21− mkdir -p $out/share/fonts/truetype/
22− cp $src $out/share/fonts/truetype/${name}.ttf
10+ urls = [
11+ http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf
12+ https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf
13+ http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d
14+ ];
15+ downloadToTemp = true;
16+ recursiveHash = true;
17+ postFetch = ''
18+ install -m444 -D $downloadedFile $out/share/fonts/truetype/${name}.ttf
2319 '';
2420
25− outputHashMode = "recursive";
26−
27− outputHashAlgo = "sha256";
21+ sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37";
2822
29− outputHash = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37";
30−
3123 meta = {
3224 description = "Pan-unicode version of Fixedsys, a classic DOS font.";
3325 homepage = http://www.fixedsysexcelsior.com/;
pkgs/data/fonts/font-awesome-5/default.nix+8−6
@@ -1,20 +1,22 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
33let
44 version = "5.8.2";
5−in fetchzip rec {
5+in fetchFromGitHub rec {
66 name = "font-awesome-${version}";
77
8− url = "https://github.com/FortAwesome/Font-Awesome/archive/${version}.zip";
8+ owner = "FortAwesome";
9+ repo = "Font-Awesome";
10+ rev = version;
911
1012 postFetch = ''
11− mkdir -p $out/share/fonts
12− unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype
13+ tar xf $downloadedFile --strip=1
14+ install -m444 -Dt $out/share/fonts/opentype otfs/*.otf
1315 '';
1416
1517 sha256 = "1h0qhvkfyfs4579jvrk3gwc7dp4i9s46bkj406b493dvmxxhv986";
1618
17− meta = with stdenv.lib; {
19+ meta = with lib; {
1820 description = "Font Awesome - OTF font";
1921 longDescription = ''
2022 Font Awesome gives you scalable vector icons that can instantly be customized.
pkgs/data/fonts/fontconfig-penultimate/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip
1+{ lib, fetchzip
22, version ? "0.3.5"
33, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk"
44}:
@@ -14,7 +14,7 @@ fetchzip {
1414 unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d
1515 '';
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 homepage = https://github.com/ttuegel/fontconfig-penultimate;
1919 description = "Sensible defaults for Fontconfig";
2020 license = licenses.asl20;
pkgs/data/fonts/freefont-ttf/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "freefont-ttf-20120503";
@@ -20,8 +20,8 @@ fetchzip rec {
2020 10646/Unicode UCS (Universal Character Set).
2121 '';
2222 homepage = https://www.gnu.org/software/freefont/;
23− license = stdenv.lib.licenses.gpl3Plus;
24− platforms = stdenv.lib.platforms.all;
23+ license = lib.licenses.gpl3Plus;
24+ platforms = lib.platforms.all;
2525 maintainers = [];
2626 };
2727}
pkgs/data/fonts/gandom-fonts/default.nix+12−13
@@ -1,22 +1,21 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "gandom-fonts";
55 version = "0.6";
6+in fetchFromGitHub {
7+ name = "${pname}-${version}";
8+ owner = "rastikerdar";
9+ repo = "gandom-font";
10+ rev = "v${version}";
611
7− src = fetchFromGitHub {
8− owner = "rastikerdar";
9− repo = "gandom-font";
10− rev = "v${version}";
11− sha256 = "1pdbqhvcsz6aq3qgarhfd05ip0wmh7bxqkmxrwa0kgxsly6zxz9x";
12− };
13−
14− installPhase = ''
15− mkdir -p $out/share/fonts/gandom-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/gandom-fonts
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
14+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \;
1715 '';
16+ sha256 = "0zsq6s9ziyb5jz0v8aj00dlxd1aly0ibxgszd05dfvykmgz051lc";
1817
19− meta = with stdenv.lib; {
18+ meta = with lib; {
2019 homepage = https://github.com/rastikerdar/gandom-font;
2120 description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم";
2221 license = licenses.ofl;
pkgs/data/fonts/gdouros/default.nix+11−25
@@ -1,29 +1,16 @@
1−{stdenv, fetchzip, lib}:
1+{ fetchzip, lib }:
22
33let
44 fonts = {
5− symbola = { version = "9.17"; file = "Symbola.zip"; sha256 = "13z18lxx0py54nns61ihgxacpf1lg9s7g2sbpbnxpllqw7j73iq2";
6− description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
7− aegyptus = { version = "6.17"; file = "Aegyptus.zip"; sha256 = "19rkf89msqb076qjdfa75pqrx35c3slj64vxw08zqdvyavq7jc79";
8− description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
9− akkadian = { version = "7.17"; file = "AkkadianAssyrian.zip"; sha256 = "1xw2flrwb5r89sk7jd195v3svsb21brf1li2i3pdjcfqxfp5m0g7";
10− description = "Sumero-Akkadian Cuneiform"; };
11− anatolian = { version = "5.17"; file = "Anatolian.zip"; sha256 = "0dqcyjakc4fy076pjplm6psl8drpwxiwyq97xrf6a3qa098gc0qc";
12− description = "Anatolian Hieroglyphs"; };
13− maya = { version = "4.17"; file = "Maya.zip"; sha256 = "17s5c23wpqrcq5h6pgssbmzxiv4jvhdh2ssr99j9q6j32a51h9gh";
14− description = "Maya Hieroglyphs"; };
15− unidings = { version = "9.17"; file = "Unidings.zip"; sha256 = "0nzw8mrhk0hbjnl2cgi31b00vmi785win86kiz9d2yzdfz1is6sk";
16− description = "Glyphs and Icons for blocks of The Unicode Standard"; };
17− musica = { version = "3.17"; file = "Musica.zip"; sha256 = "0mnv61dxzs2npvxgs5l9q81q19xzzi1sn53x5qwpiirkmi6bg5y6";
18− description = "Musical Notation"; };
19− analecta = { version = "5.17"; file = "Analecta.zip"; sha256 = "13npnfscd9mz6vf89qxxbj383njf53a1smqjh0c1w2lvijgak3aj";
20− description = "Coptic, Gothic, Deseret"; };
21− textfonts = { version = "7.17"; file = "TextfontsFonts.zip"; sha256 = "1ggflqnslp81v8pzmzx6iwi2sa38l9bpivjjci7nvx3y5xynm6wl";
22− description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
23− aegan = { version = "9.17"; file = "AegeanFonts.zip"; sha256 = "0dm2ck3p11bc9izrh7xz3blqfqg1mgsvy4jsgmz9rcs4m74xrhsf";
24− description = "Aegean"; };
25− abydos = { version = "1.23"; file = "AbydosFont.zip"; sha256 = "04r7ysnjjq0nrr3m8lbz8ssyx6xaikqybjqxzl3ziywl9h6nxdj8";
26− description = "AbydosFont"; };
5+ aegan = { version = "10.00"; file = "Aegean.zip"; sha256 = "0k47nhzw4vx771ch3xx8mf6xx5vx0hg0cif5jdlmdaz4h2c3rawz"; description = "Aegean"; };
6+ aegyptus = { version = "8.00"; file = "Aegyptus.zip"; sha256 = "13h2pi641k9vxgqi9l11mjya10ym9ln54wrkwxx6gxq63zy7y5mj"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
7+ akkadian = { version = "7.18"; file = "Akkadian.zip"; sha256 = "1bplcvszbdrk85kqipn9lzhr62647wjibz1p8crzjvsw6f9ymxy3"; description = "Sumero-Akkadian Cuneiform"; };
8+ assyrian = { version = "2.00"; file = "AssyrianFont.zip"; sha256 = "0vdvb24vsnmwzd6bw14akqg0hbvsk8avgnbwk9fkybn1f801475k"; description = "Neo-Assyrian in Unicode with OpenType"; };
9+ eemusic = { version = "2.00"; file = "EEMusic.zip"; sha256 = "1y9jf105a2b689m7hdjmhhr7z5j0qd2w6dmb3iic9bwaczlrjy7j"; description = "Byzantine Musical Notation in Unicode with OpenType"; };
10+ maya = { version = "4.18"; file = "Maya.zip"; sha256 = "08z2ch0z2c43fjfg5m4yp3l1dp0cbk7lv5i7wzsr3cr9kr59wpi9"; description = "Maya Hieroglyphs"; };
11+ symbola = { version = "12.00"; file = "Symbola.zip"; sha256 = "1i3xra33xkj32vxs55xs2afrqyc822nk25669x78px5g5qd8gypm"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
12+ textfonts = { version = "9.00"; file = "Textfonts.zip"; sha256 = "0wzxz4j4fgk81b88d58715n1wvq2mqmpjpk4g5hi3vk77y2zxc4d"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
13+ unidings = { version = "9.19"; file = "Unidings.zip"; sha256 = "1bybzgdqhmq75hb12n3pjrsdcpw1a6sgryx464s68jlq4zi44g78"; description = "Glyphs and Icons for blocks of The Unicode Standard"; };
2714 };
2815
2916 mkpkg = name_: {version, file, sha256, description}: fetchzip rec {
@@ -42,9 +29,8 @@ let
4229 # In lieu of a license:
4330 # Fonts in this site are offered free for any use;
4431 # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
45− license = stdenv.lib.licenses.free;
32+ license = lib.licenses.free;
4633 homepage = http://users.teilar.gr/~g1951d/;
47− platforms = stdenv.lib.platforms.unix;
4834 };
4935 };
5036in
pkgs/data/fonts/gentium-book-basic/default.nix+2−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 major = "1";
@@ -11,14 +11,13 @@ in fetchzip rec {
1111
1212 postFetch = ''
1313 mkdir -p $out/share/{doc,fonts}
14− unzip -l $downloadedFile
1514 unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
1615 unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name}
1716 '';
1817
1918 sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd";
2019
21− meta = with stdenv.lib; {
20+ meta = with lib; {
2221 homepage = https://software.sil.org/gentium/;
2322 description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
2423 maintainers = with maintainers; [ ];
pkgs/data/fonts/gentium/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "5.000";
@@ -17,7 +17,7 @@ in fetchzip rec {
1717
1818 sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp";
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = https://software.sil.org/gentium/;
2222 description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
2323 longDescription = ''
pkgs/data/fonts/go-font/default.nix+9−13
@@ -1,26 +1,22 @@
11{ stdenv, fetchgit }:
22
3−stdenv.mkDerivation rec {
4− name = "go-font-${version}";
3+let
54 version = "2017-03-30";
5+in (fetchgit {
6+ name = "go-font-${version}";
7+ url = "https://go.googlesource.com/image";
8+ rev = "f03a046406d4d7fbfd4ed29f554da8f6114049fc";
69
7− src = fetchgit {
8− url = "https://go.googlesource.com/image";
9− rev = "f03a046406d4d7fbfd4ed29f554da8f6114049fc";
10− sha256 = "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d";
11− };
12−
13− installPhase = ''
10+ postFetch = ''
11+ mv $out/* .
1412 mkdir -p $out/share/fonts/truetype
1513 mkdir -p $out/share/doc/go-font
1614 cp font/gofont/ttfs/* $out/share/fonts/truetype
1715 mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE
1816 '';
1917
20− outputHashAlgo = "sha256";
21− outputHashMode = "recursive";
22− outputHash = "10hfm2cpxlx1ng7r2mbvykjhmy131qlgzpdzj7ibg9kr293bcjc0";
23−
18+ sha256 = "1488426ya2nzmwjas947fx9h5wzxrp9wasn8nkjqf0y0mpd4f1xz";
19+}) // {
2420 meta = with stdenv.lib; {
2521 homepage = https://blog.golang.org/go-fonts;
2622 description = "The Go font family";
pkgs/data/fonts/gohufont/default.nix−1
@@ -67,6 +67,5 @@ stdenv.mkDerivation rec {
6767 homepage = http://font.gohu.org/;
6868 license = licenses.wtfpl;
6969 maintainers = with maintainers; [ epitrochoid rnhmjoj ];
70− platforms = platforms.unix;
7170 };
7271}
pkgs/data/fonts/gyre/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 baseName = "gyre-fonts";
@@ -25,8 +25,8 @@ in fetchzip {
2525 covering all modern European languages and then some
2626 '';
2727 homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings";
28− license = stdenv.lib.licenses.lppl13c;
29− platforms = stdenv.lib.platforms.all;
30− maintainers = with stdenv.lib.maintainers; [ bergey ];
28+ license = lib.licenses.lppl13c;
29+ platforms = lib.platforms.all;
30+ maintainers = with lib.maintainers; [ bergey ];
3131 };
3232}
pkgs/data/fonts/hack/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "3.003";
@@ -14,7 +14,7 @@ in fetchzip rec {
1414
1515 sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 description = "A typeface designed for source code";
1919 longDescription = ''
2020 Hack is hand groomed and optically balanced to be a workhorse face for
pkgs/data/fonts/hanazono/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "20141012";
@@ -15,7 +15,7 @@ in fetchzip {
1515
1616 sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 description = "Free kanji font containing 96,327 characters";
2020 homepage = http://fonts.jp/hanazono/;
2121
pkgs/data/fonts/hasklig/default.nix+3−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "1.1";
@@ -9,13 +9,12 @@ in fetchzip {
99
1010 postFetch = ''
1111 unzip $downloadedFile
12− mkdir -p $out/share/fonts/opentype
13− cp *.otf $out/share/fonts/opentype
12+ install -m444 -Dt $out/share/fonts/opentype *.otf
1413 '';
1514
1615 sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq";
1716
18− meta = with stdenv.lib; {
17+ meta = with lib; {
1918 homepage = https://github.com/i-tu/Hasklig;
2019 description = "A font with ligatures for Haskell code based off Source Code Pro";
2120 license = licenses.ofl;
pkgs/data/fonts/helvetica-neue-lt-std/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2013.06.07"; # date of most recent file in distribution
@@ -28,8 +28,8 @@ in fetchzip rec {
2828 font. The numbers are well spaced and defined with high accuracy. The
2929 punctuation marks are heavily detailed as well.
3030 '';
31− license = stdenv.lib.licenses.unfree;
32− maintainers = [ stdenv.lib.maintainers.romildo ];
33− platforms = stdenv.lib.platforms.all;
31+ license = lib.licenses.unfree;
32+ maintainers = [ lib.maintainers.romildo ];
33+ platforms = lib.platforms.all;
3434 };
3535}
pkgs/data/fonts/hermit/default.nix+10−13
@@ -1,23 +1,20 @@
1−{ stdenv, fetchurl }:
1+{ lib, fetchzip }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "hermit";
55 version = "2.0";
6+in fetchzip rec {
7+ name = "${pname}-${version}";
68
7− src = fetchurl {
8− url = "https://pcaro.es/d/otf-${pname}-${version}.tar.gz";
9− sha256 = "09rmy3sbf1j1hr8zidighjgqc8kp0wsra115y27vrnlf10ml6jy0";
10− };
11−
12− sourceRoot = ".";
9+ url = "https://pcaro.es/d/otf-${name}.tar.gz";
1310
14− dontBuild = true;
15− installPhase = ''
16− mkdir -p $out/share/fonts/opentype
17− cp *.otf $out/share/fonts/opentype/
11+ postFetch = ''
12+ tar xf $downloadedFile
13+ install -m444 -Dt $out/share/fonts/opentype *.otf
1814 '';
15+ sha256 = "127hnpxicqya7v1wmzxxqafq3aj1n33i4j5ncflbw6gj5g3bizwl";
1916
20− meta = with stdenv.lib; {
17+ meta = with lib; {
2118 description = "monospace font designed to be clear, pragmatic and very readable";
2219 homepage = https://pcaro.es/p/hermit;
2320 license = licenses.ofl;
pkgs/data/fonts/hyperscrypt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, lib }:
1+{ fetchzip, lib }:
22
33let
44 version = "1.1";
@@ -15,7 +15,7 @@ fetchzip rec {
1515 unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf
1616 '';
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 homepage = http://velvetyne.fr/fonts/hyper-scrypt/;
2020 description = "A modern stencil typeface inspired by stained glass technique";
2121 longDescription = ''
pkgs/data/fonts/inriafonts/default.nix+11−15
@@ -1,26 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
2−
3−stdenv.mkDerivation rec {
1+{ lib, fetchFromGitHub }:
42
3+let
54 pname = "inriafonts";
65 version = "1.200";
6+in fetchFromGitHub rec {
77 name = "${pname}-${version}";
8−
9−src = fetchFromGitHub {
108 owner = "BlackFoundry";
119 repo = "InriaFonts";
1210 rev = "v${version}";
13− sha256 = "06775y99lyh6hj5hzvrx56iybdck8a8xfqkipqd5c4cldg0a9hh8";
14−};
1511
16−installPhase = ''
17− mkdir -p $out/share/fonts/truetype
18− cp fonts/*/TTF/*.ttf $out/share/fonts/truetype
19− mkdir -p $out/share/fonts/opentype
20− cp fonts/*/OTF/*.otf $out/share/fonts/opentype
21−'';
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
14+ install -m444 -Dt $out/share/fonts/truetype fonts/*/TTF/*.ttf
15+ install -m444 -Dt $out/share/fonts/opentype fonts/*/OTF/*.otf
16+ '';
17+ sha256 = "0wrwcyycyzvgvgnlmwi1ncdvwb8f6bbclynd1105rsyxgrz5dd70";
2218
23− meta = with stdenv.lib; {
19+ meta = with lib; {
2420 homepage = https://black-foundry.com/work/inria;
2521 description = "Inria Sans and Inria Serif";
2622 longDescription = ''
@@ -32,7 +28,7 @@ installPhase = ''
3228 typeface with a unapologetically contemporary design as the
3329 Sans-serif part and a more rational axis and drawing for the
3430 serif. Both members comes in 3 weights with matching italics.
35− '';
31+ '';
3632 license = licenses.ofl;
3733 maintainers = with maintainers; [ leenaars ];
3834 platforms = platforms.all;
pkgs/data/fonts/inter-ui/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33# XXX: IMPORTANT:
44# For compat, keep this at the last version that used the name "Inter UI"
@@ -18,7 +18,7 @@ in fetchzip {
1818
1919 sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4";
2020
21− meta = with stdenv.lib; {
21+ meta = with lib; {
2222 homepage = https://rsms.me/inter/;
2323 description = "A typeface specially designed for user interfaces";
2424 license = licenses.ofl;
pkgs/data/fonts/inter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "3.5";
@@ -14,7 +14,7 @@ in fetchzip {
1414
1515 sha256 = "0zqixzzbb3n1j4jvpjm0hlxc32j53hgq4j078gihjkhgvjhsklf2";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 homepage = https://rsms.me/inter/;
1919 description = "A typeface specially designed for user interfaces";
2020 license = licenses.ofl;
pkgs/data/fonts/ipaexfont/default.nix+4−5
@@ -1,9 +1,9 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
3−fetchzip rec {
3+fetchzip {
44 name = "ipaexfont-003.01";
55
6− url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
6+ url = "http://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
77
88 postFetch = ''
99 mkdir -p $out/share/fonts
@@ -12,7 +12,7 @@ fetchzip rec {
1212
1313 sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj";
1414
15− meta = with stdenv.lib; {
15+ meta = with lib; {
1616 description = "Japanese font package with Mincho and Gothic fonts";
1717 longDescription = ''
1818 IPAex font is a Japanese font developed by the Information-technology
@@ -24,6 +24,5 @@ fetchzip rec {
2424 homepage = http://ipafont.ipa.go.jp/;
2525 license = licenses.ipa;
2626 maintainers = with maintainers; [ gebner ];
27− platforms = with platforms; unix;
2827 };
2928}
pkgs/data/fonts/ipafont/default.nix+3−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "ipafont-003.03";
@@ -20,8 +20,7 @@ fetchzip {
2020 suitable for both display and printing.
2121 '';
2222 homepage = http://ipafont.ipa.go.jp/ipafont/;
23− license = stdenv.lib.licenses.ipa;
24− maintainers = [ stdenv.lib.maintainers.auntie ];
25− platforms = stdenv.lib.platforms.unix;
23+ license = lib.licenses.ipa;
24+ maintainers = [ lib.maintainers.auntie ];
2625 };
2726}
pkgs/data/fonts/ir-standard-fonts/default.nix+13−14
@@ -1,22 +1,21 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "ir-standard-fonts";
5− version= "unstable-2017-01-21";
5+ version = "unstable-2017-01-21";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
8+ owner = "morealaz";
9+ repo = pname;
10+ rev = "d36727d6c38c23c01b3074565667a2fe231fe18f";
611
7− src = fetchFromGitHub {
8− owner = "morealaz";
9− repo = pname;
10− rev = "d36727d6c38c23c01b3074565667a2fe231fe18f";
11− sha256 = "1ks9q1r1gk2517yfr1fbgrdbgw0w97i4am6jqn5ywpgm2xd03yg1";
12− };
13−
14− installPhase = ''
15− mkdir -p $out/share/fonts/ir-standard-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/ir-standard-fonts
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
14+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/ir-standard-fonts {} \;
1715 '';
16+ sha256 = "0i2vzhwk77pm6fx5z5gxl026z9f35rhh3cvl003mry2lcg1x5rhp";
1817
19− meta = with stdenv.lib; {
18+ meta = with lib; {
2019 homepage = https://github.com/morealaz/ir-standard-fonts;
2120 description = "Iran Supreme Council of Information and Communication Technology (SCICT) standard Persian fonts series";
2221 # License information is unavailable.
pkgs/data/fonts/iwona/default.nix+10−15
@@ -1,23 +1,18 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
3−stdenv.mkDerivation rec {
4− name = "iwona-${version}";
3+let
54 version = "0_995";
5+in fetchzip {
6+ name = "iwona-${version}";
7+ url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip";
68
7− src = fetchzip {
8− url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip";
9− sha256 = "1wj5bxbxpz5a8p3rhw708cyjc0lgqji8g0iv6brmmbrrkpb3jq2s";
10− };
11−
12− installPhase = ''
13− install -m 444 -D -t $out/share/fonts/opentype/ *.otf
9+ postFetch = ''
10+ mkdir -p $out/share/fonts/opentype
11+ unzip -j $downloadedFile *.otf -d $out/share/fonts/opentype
1412 '';
13+ sha256 = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa";
1514
16− outputHashAlgo = "sha256";
17− outputHashMode = "recursive";
18− outputHash = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa";
19−
20− meta = with stdenv.lib; {
15+ meta = with lib; {
2116 description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
2217 homepage = http://jmn.pl/en/kurier-i-iwona/;
2318 # "[...] GUST Font License (GFL), which is a free license, legally
pkgs/data/fonts/junicode/default.nix+2−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "junicode-0.7.8";
@@ -15,7 +15,6 @@ fetchzip {
1515 meta = {
1616 homepage = http://junicode.sourceforge.net/;
1717 description = "A Unicode font for medievalists";
18− platforms = stdenv.lib.platforms.unix;
19− license = stdenv.lib.licenses.gpl2Plus;
18+ license = lib.licenses.gpl2Plus;
2019 };
2120}
pkgs/data/fonts/kawkab-mono/default.nix+2−3
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "kawkab-mono-20151015";
@@ -15,8 +15,7 @@ fetchzip rec {
1515 meta = {
1616 description = "An arab fixed-width font";
1717 homepage = https://makkuk.com/kawkab-mono/;
18− license = stdenv.lib.licenses.ofl;
19− platforms = stdenv.lib.platforms.unix;
18+ license = lib.licenses.ofl;
2019 };
2120}
2221
pkgs/data/fonts/kochi-substitute-naga10/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let version = "20030809";
44in
@@ -26,7 +26,7 @@ fetchzip {
2626 Debian version.
2727 '';
2828 homepage = http://sourceforge.jp/projects/efont/;
29− license = stdenv.lib.licenses.unfreeRedistributable;
30− maintainers = [ stdenv.lib.maintainers.auntie ];
29+ license = lib.licenses.unfreeRedistributable;
30+ maintainers = [ lib.maintainers.auntie ];
3131 };
3232}
pkgs/data/fonts/kochi-substitute/default.nix−1
@@ -43,6 +43,5 @@ stdenv.mkDerivation {
4343 homepage = http://sourceforge.jp/projects/efont/;
4444 license = stdenv.lib.licenses.wadalab;
4545 maintainers = [ stdenv.lib.maintainers.auntie ];
46− platforms = stdenv.lib.platforms.linux;
4746 };
4847}
pkgs/data/fonts/lalezar-fonts/default.nix+11−11
@@ -1,22 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "lalezar-fonts";
55 version = "unstable-2017-02-28";
6+in fetchFromGitHub {
7+ name = "${pname}-${version}";
8+ owner = "BornaIz";
9+ repo = "Lalezar";
10+ rev = "238701c4241f207e92515f845a199be9131c1109";
611
7− src = fetchFromGitHub {
8− owner = "BornaIz";
9− repo = "Lalezar";
10− rev = "238701c4241f207e92515f845a199be9131c1109";
11− sha256 = "1j3zg9qw4ahw52i0i2c69gv5gjc1f4zsdla58kd9visk03qgk77p";
12− };
13−
14− installPhase = ''
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
1514 mkdir -p $out/share/fonts/lalezar-fonts
1615 cp -v $( find . -name '*.ttf') $out/share/fonts/lalezar-fonts
1716 '';
17+ sha256 = "0jmwhr2dqgj3vn0v26jh6c0id6n3wd6as3bq39xa870zlk7v307b";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://github.com/BornaIz/Lalezar;
2121 description = "A multi-script display typeface for popular culture";
2222 license = licenses.ofl;
pkgs/data/fonts/lato/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "lato-2.0";
@@ -12,7 +12,7 @@ fetchzip {
1212
1313 sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5";
1414
15− meta = with stdenv.lib; {
15+ meta = with lib; {
1616 homepage = http://www.latofonts.com/;
1717
1818 description = ''
pkgs/data/fonts/liberastika/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "1.1.5";
@@ -15,7 +15,7 @@ in fetchzip rec {
1515
1616 sha256 = "1a9dvl1pzch2vh8sqyyn1d1wz4n624ffazl6hzlc3s5k5lzrb6jp";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 description = "Liberation Sans fork with improved cyrillic support";
2020 homepage = https://sourceforge.net/projects/lib-ka/;
2121
pkgs/data/fonts/liberation-sans-narrow/default.nix+2−5
@@ -14,11 +14,8 @@ stdenv.mkDerivation rec {
1414 buildInputs = [ fontforge pythonPackages.fonttools python ];
1515
1616 installPhase = ''
17− mkdir -p $out/share/fonts/truetype
18− cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype
19−
20− mkdir -p "$out/doc/${pname}-${version}"
21− cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${pname}-${version}" || true
17+ find . -name '*Narrow*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
18+ install -m444 -Dt $out/doc/${pname}-${version} AUTHORS ChangeLog COPYING License.txt README.rst
2219 '';
2320
2421 meta = with stdenv.lib; {
pkgs/data/fonts/libertinus/default.nix+13−19
@@ -1,28 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
4− name = "libertinus-${version}";
3+let
54 version = "6.6";
5+in fetchFromGitHub rec {
6+ name = "libertinus-${version}";
67
7− src = fetchFromGitHub {
8− rev = "v${version}";
9− owner = "khaledhosny";
10− repo = "libertinus";
11− sha256 = "0syagjmwy6q1ysncchl9bgyfrm7f6fghj1aipbr6md7l6gafz7ji";
12− };
8+ owner = "khaledhosny";
9+ repo = "libertinus";
10+ rev = "v${version}";
1311
14− installPhase = ''
15− mkdir -p $out/share/fonts/opentype/
16− mkdir -p $out/share/doc/${name}/
17− cp *.otf $out/share/fonts/opentype/
18− cp *.txt $out/share/doc/${name}/
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
14+ install -m444 -Dt $out/share/fonts/opentype *.otf
15+ install -m444 -Dt $out/share/doc/${name} *.txt
1916 '';
17+ sha256 = "11pxb2zwvjlk06zbqrfv2pgwsl4awf68fak1ks4881i8xbl1910m";
2018
21− outputHashAlgo = "sha256";
22− outputHashMode = "recursive";
23− outputHash = "11pxb2zwvjlk06zbqrfv2pgwsl4awf68fak1ks4881i8xbl1910m";
24−
25− meta = with stdenv.lib; {
19+ meta = with lib; {
2620 description = "A fork of the Linux Libertine and Linux Biolinum fonts";
2721 longDescription = ''
2822 Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts
pkgs/data/fonts/libre-baskerville/default.nix+10−8
@@ -1,19 +1,21 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip rec {
3+fetchFromGitHub rec {
44 name = "libre-baskerville-1.000";
55
6− url = https://github.com/impallari/Libre-Baskerville/archive/2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f.zip;
6+ owner = "impallari";
7+ repo = "Libre-Baskerville";
8+ rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f";
79
810 postFetch = ''
9− mkdir -p $out/share/{doc,fonts}
10− unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
11− unzip -n -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
11+ tar xf $downloadedFile --strip=1
12+ install -m444 -Dt $out/share/fonts/truetype *.ttf
13+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
1214 '';
1315
14− sha256 = "0arlq89b3vmpw3n4wbllsdvqblhz6p09dm19z1cndicmcgk26w2a";
16+ sha256 = "1kpji85d1mgwq8b4fh1isznrhsrv32la3wf058rwjmhx5a3l7yaj";
1517
16− meta = with stdenv.lib; {
18+ meta = with lib; {
1719 description = "A webfont family optimized for body text";
1820 longDescription = ''
1921 Libre Baskerville is a webfont family optimized for body text. It's Based
pkgs/data/fonts/libre-bodoni/default.nix+10−8
@@ -1,19 +1,21 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip rec {
3+fetchFromGitHub rec {
44 name = "libre-bodoni-2.000";
55
6− url = https://github.com/impallari/Libre-Bodoni/archive/995a40e8d6b95411d660cbc5bb3f726ffd080c7d.zip;
6+ owner = "impallari";
7+ repo = "Libre-Bodoni";
8+ rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d";
79
810 postFetch = ''
9− mkdir -p $out/share/{doc,fonts}
10− unzip -j $downloadedFile \*/v2000\ -\ initial\ glyphs\ migration/OTF/\*.otf -d $out/share/fonts/opentype
11− unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
11+ tar xf $downloadedFile --strip=1
12+ install -m444 -Dt $out/share/fonts/opentype */v2000\ -\ initial\ glyphs\ migration/OTF/*.otf
13+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
1214 '';
1315
14− sha256 = "0pnb1xydpvcl9mkz095f566kz7yj061wbf40rwrbwmk706f6bsiw";
16+ sha256 = "0my0i5a7f0d27m6dcdirjmlcnswqqfp8gl3ccxa5f2wkn3qlzkvz";
1517
16− meta = with stdenv.lib; {
18+ meta = with lib; {
1719 description = "Bodoni fonts adapted for today's web requirements";
1820 longDescription = ''
1921 The Libre Bodoni fonts are based on the 19th century Morris Fuller
pkgs/data/fonts/libre-franklin/default.nix+10−8
@@ -1,19 +1,21 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip rec {
3+fetchFromGitHub rec {
44 name = "libre-franklin-1.014";
55
6− url = https://github.com/impallari/Libre-Franklin/archive/006293f34c47bd752fdcf91807510bc3f91a0bd3.zip;
6+ owner = "impallari";
7+ repo = "Libre-Franklin";
8+ rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3";
79
810 postFetch = ''
9− mkdir -p $out/share/{doc,fonts}
10− unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
11− unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
11+ tar xf $downloadedFile --strip=1
12+ install -m444 -Dt $out/share/fonts/opentype */OTF/*.otf
13+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
1214 '';
1315
14− sha256 = "1rkjp8x62cn4alw3lp7m45q34bih81j2hg15kg5c1nciyqq1qz0z";
16+ sha256 = "0aq280m01pbirkzga432340aknf2m5ggalw0yddf40sqz7falykf";
1517
16− meta = with stdenv.lib; {
18+ meta = with lib; {
1719 description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic.";
1820 homepage = https://github.com/impallari/Libre-Franklin;
1921 license = licenses.ofl;
pkgs/data/fonts/lm-math/default.nix+10−16
@@ -1,26 +1,20 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
3−stdenv.mkDerivation rec {
4− name = "latinmodern-math-${version}";
3+let
54 version = "1.959";
5+in fetchzip rec {
6+ name = "latinmodern-math-${version}";
67
7− src = fetchzip {
8− url = "www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
9− sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
10− };
11−
12− installPhase = ''
8+ url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
9+ postFetch = ''
1310 mkdir -p $out/share/fonts/opentype/
1411 mkdir -p $out/share/doc/${name}/
15− cp otf/*.otf $out/share/fonts/opentype/
16− cp doc/*.txt $out/share/doc/${name}/
12+ unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/
13+ unzip -f $downloadedFile doc/*.txt -d $out/share/doc/${name}/
1714 '';
15+ sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
1816
19− outputHashAlgo = "sha256";
20− outputHashMode = "recursive";
21− outputHash = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
22−
23− meta = with stdenv.lib; {
17+ meta = with lib; {
2418 description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth.";
2519 homepage = http://www.gust.org.pl/projects/e-foundry/lm-math;
2620 # "The Latin Modern Math font is licensed under the GUST Font License (GFL),
pkgs/data/fonts/lmodern/default.nix+1−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "lmodern-2.004.5";
@@ -21,7 +21,6 @@ fetchzip {
2121
2222 meta = {
2323 description = "Latin Modern font";
24− platforms = stdenv.lib.platforms.unix;
2524 };
2625}
2726
pkgs/data/fonts/lmodern/lmmath.nix+1−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "lmmath-0.903";
@@ -21,7 +21,6 @@ fetchzip {
2121
2222 meta = {
2323 description = "Latin Modern font";
24− platforms = stdenv.lib.platforms.unix;
2524 };
2625}
2726
pkgs/data/fonts/lobster-two/default.nix+2−1
@@ -70,10 +70,11 @@ in
7070 outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym";
7171
7272 meta = with stdenv.lib; {
73− homepage = http://www.impallari.com/lobstertwo;
73+ homepage = https://github.com/librefonts/lobstertwo;
7474 description = "Script font with many ligatures";
7575 license = licenses.ofl;
7676 platforms = platforms.all;
7777 maintainers = [maintainers.rycee];
78+ broken = true; # googlecode.com RIP; can be built from sources
7879 };
7980 }
pkgs/data/fonts/lohit-fonts/default.nix+1−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, lib }:
1+{ fetchzip, lib }:
22let
33 fonts = {
44 assamese = { label = "Assamese"; version = "2.91.5"; sha256 = "06cw416kgw0m6883n5ixmpniinsd747rdmacf06z83w1hqwj2js6"; };
@@ -51,7 +51,6 @@ let
5151 # Set a non-zero priority to allow easy overriding of the
5252 # fontconfig configuration files.
5353 priority = 5;
54− platforms = stdenv.lib.platforms.unix;
5554 };
5655 };
5756
pkgs/data/fonts/manrope/default.nix+11−11
@@ -1,19 +1,19 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "manrope";
55 version = "3";
6− src = fetchFromGitHub {
7− owner = "sharanda";
8− repo = pname;
9− rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9";
10− sha256 = "1k6nmczbl97b9j2a8vx6a1r3q4gd1c2qydv0y9gn8xyl7x8fcvhs";
11− };
12− dontBuild = true;
13− installPhase = ''
6+in fetchFromGitHub {
7+ name = "${pname}-${version}";
8+ owner = "sharanda";
9+ repo = pname;
10+ rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9";
11+ sha256 = "1h4chkfbp75hrrqqarf28ld4yb7hfrr7q4w5yz96ivg94lbwlnld";
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
1414 install -Dm644 -t $out/share/fonts/opentype "desktop font"/*
1515 '';
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 description = "Open-source modern sans-serif font family";
1818 homepage = https://github.com/sharanda/manrope;
1919 license = licenses.ofl;
pkgs/data/fonts/marathi-cursive/default.nix+5−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, p7zip }:
1+{ lib, fetchzip, p7zip }:
22
33let
44 version = "1.2";
@@ -11,15 +11,13 @@ in fetchzip rec {
1111 ${p7zip}/bin/7z x $downloadedFile
1212 cd MarathiCursive
1313
14− mkdir -p $out/share/fonts/marathi-cursive
15− cp -v *.otf *.ttf $out/share/fonts/marathi-cursive
16− mkdir -p $out/share/doc/${name}
17− cp -v README *.txt $out/share/doc/${name}
14+ install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf
15+ install -m444 -Dt $out/share/doc/${name} README *.txt
1816 '';
1917
20− sha256 = "0fhz2ixrkm523qlx5pnwyzxgb1cfiiwrhls98xg8a5l3sypn1g8v";
18+ sha256 = "0wq4w79x8r5w6ikm9amcmapf0jcdgifs9zf1pbnw3fk4ncz5s551";
2119
22− meta = with stdenv.lib; {
20+ meta = with lib; {
2321 homepage = https://github.com/MihailJP/MarathiCursive;
2422 description = "Modi script font with Graphite and OpenType support";
2523 maintainers = with maintainers; [ mathnerd314 ];
pkgs/data/fonts/material-design-icons/default.nix+11−12
@@ -1,17 +1,15 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
4− name = "material-design-icons-${version}";
3+let
54 version = "3.3.92";
5+in fetchFromGitHub {
6+ name = "material-design-icons-${version}";
7+ owner = "Templarian";
8+ repo = "MaterialDesign-Webfont";
9+ rev = "v${version}";
610
7− src = fetchFromGitHub {
8− owner = "Templarian";
9− repo = "MaterialDesign-Webfont";
10− rev = "v${version}";
11− sha256 = "0k8pv2nsp3al4i4awx5mv7cscpm8akjn567jl9dwzangcsai0l53";
12− };
13−
14− installPhase = ''
11+ postFetch = ''
12+ tar xf $downloadedFile --strip=1
1513 mkdir -p $out/share/fonts/{eot,svg,truetype,woff,woff2}
1614 cp fonts/*.eot $out/share/fonts/eot/
1715 cp fonts/*.svg $out/share/fonts/svg/
@@ -19,8 +17,9 @@ stdenv.mkDerivation rec {
1917 cp fonts/*.woff $out/share/fonts/woff/
2018 cp fonts/*.woff2 $out/share/fonts/woff2/
2119 '';
20+ sha256 = "0dbm4qfd0b91yrw3cv4i377pnm98fgj936nk1m5wlx8mx8jahz48";
2221
23− meta = with stdenv.lib; {
22+ meta = with lib; {
2423 description = "3200+ Material Design Icons from the Community";
2524 longDescription = ''
2625 Material Design Icons' growing icon collection allows designers and
pkgs/data/fonts/material-icons/default.nix+12−12
@@ -1,22 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
4− name = "material-icons-${version}";
3+let
54 version = "3.0.1";
5+in fetchFromGitHub {
6+ name = "material-icons-${version}";
67
7− src = fetchFromGitHub {
8− owner = "google";
9− repo = "material-design-icons";
10− rev = "${version}";
11− sha256 = "17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0";
12− };
8+ owner = "google";
9+ repo = "material-design-icons";
10+ rev = version;
1311
14− buildCommand = ''
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
1514 mkdir -p $out/share/fonts/truetype
16− cp $src/iconfont/*.ttf $out/share/fonts/truetype
15+ cp iconfont/*.ttf $out/share/fonts/truetype
1716 '';
17+ sha256 = "1syy6v941lb8nqxhdf7mfx28v05lwrfnq53r3c1ym13x05l9kchp";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 description = "System status icons by Google, featuring material design";
2121 homepage = https://material.io/icons;
2222 license = licenses.asl20;
pkgs/data/fonts/medio/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = "http://dotcolon.net/font/${pname}/";
2222 description = "Serif font designed by Sora Sagano";
2323 longDescription = ''
pkgs/data/fonts/migmix/default.nix+1−3
@@ -26,8 +26,7 @@ stdenv.mkDerivation rec {
2626 unpackPhase = ":";
2727
2828 installPhase = ''
29− mkdir -p $out/share/fonts/truetype/migmix
30− find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migmix
29+ find $srcs -name '*.ttf' -exec install -m644 -Dt $out/share/fonts/truetype/migmix {} \;
3130 '';
3231
3332 outputHashAlgo = "sha256";
@@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
3837 description = "A high-quality Japanese font based on M+ fonts and IPA fonts";
3938 homepage = http://mix-mplus-ipa.osdn.jp/migmix;
4039 license = licenses.ipa;
41− platforms = platforms.unix;
4240 maintainers = [ maintainers.mikoim ];
4341 };
4442}
pkgs/data/fonts/migu/default.nix−1
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
3737 description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts";
3838 homepage = http://mix-mplus-ipa.osdn.jp/migu/;
3939 license = licenses.ipa;
40− platforms = platforms.unix;
4140 maintainers = [ maintainers.mikoim ];
4241 };
4342}
pkgs/data/fonts/mononoki/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "1.2";
@@ -14,7 +14,7 @@ in fetchzip {
1414
1515 sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 homepage = https://github.com/madmalik/mononoki;
1919 description = "A font for programming and code review";
2020 license = licenses.ofl;
pkgs/data/fonts/montserrat/default.nix+2−2
@@ -2,7 +2,7 @@
22#
33# https://aur.archlinux.org/packages/ttf-montserrat/
44
5−{ stdenv, fetchzip }:
5+{ lib, fetchzip }:
66
77let
88 version = "1.0";
@@ -19,7 +19,7 @@ in fetchzip {
1919
2020 sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w";
2121
22− meta = with stdenv.lib; {
22+ meta = with lib; {
2323 description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
2424 homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat";
2525 license = licenses.ofl;
pkgs/data/fonts/mph-2b-damase/default.nix+1−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "MPH-2B-Damase-2";
@@ -13,6 +13,5 @@ fetchzip {
1313 sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql";
1414
1515 meta = {
16− platforms = stdenv.lib.platforms.unix;
1716 };
1817}
pkgs/data/fonts/mplus-outline-fonts/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "063";
@@ -15,7 +15,7 @@ in fetchzip rec {
1515
1616 sha256 = "0d485l2ihxfk039rrrnfviamlbj13cwky0c752m4ikwvgiqiq94y";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 description = "M+ Outline Fonts";
2020 homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html;
2121 license = licenses.mit;
pkgs/data/fonts/mro-unicode/default.nix+1−1
@@ -3,7 +3,7 @@
33fetchzip {
44 name = "mro-unicode-2013-05-25";
55
6− url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf";
6+ url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf";
77
88 postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf";
99
pkgs/data/fonts/nahid-fonts/default.nix+12−13
@@ -1,22 +1,21 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "nahid-fonts";
55 version = "0.3.0";
6+in fetchFromGitHub {
7+ name = "${pname}-${version}";
8+ owner = "rastikerdar";
9+ repo = "nahid-font";
10+ rev = "v${version}";
611
7− src = fetchFromGitHub {
8− owner = "rastikerdar";
9− repo = "nahid-font";
10− rev = "v${version}";
11− sha256 = "0n42sywi41zin9dilr8vabmcqvmx2f1a8b4yyybs6ms9zb9xdkxg";
12− };
13−
14− installPhase = ''
15− mkdir -p $out/share/fonts/nahid-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/nahid-fonts
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
14+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nahid-fonts {} \;
1715 '';
16+ sha256 = "0df169sibq14j2mj727sq86c00jm1nz8565v85hkvh4zgz2plb7c";
1817
19− meta = with stdenv.lib; {
18+ meta = with lib; {
2019 homepage = https://github.com/rastikerdar/nahid-font;
2120 description = "A Persian (Farsi) Font - قلم (فونت) فارسی ناهید";
2221 license = licenses.free;
pkgs/data/fonts/nanum-gothic-coding/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, unzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "VER2.5";
@@ -15,7 +15,7 @@ in fetchzip rec {
1515
1616 sha256 = "0b3pkhd6xn6393zi0dhj3ah08w1y1ji9fl6584bi0c8lanamf2pc";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 description = "A contemporary monospaced sans-serif typeface with a warm touch";
2020 homepage = https://github.com/naver/nanumfont;
2121 license = licenses.ofl;
pkgs/data/fonts/nerdfonts/default.nix−1
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
3030 homepage = https://github.com/ryanoasis/nerd-fonts;
3131 license = licenses.mit;
3232 maintainers = with maintainers; [ garbas ];
33− platforms = with platforms; unix;
3433 hydraPlatforms = []; # 'Output limit exceeded' on Hydra
3534 };
3635}
pkgs/data/fonts/nika-fonts/default.nix+12−13
@@ -1,22 +1,21 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "nika-fonts";
55 version = "1.0.0";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
8+ owner = "font-store";
9+ repo = "NikaFont";
10+ rev = "v${version}";
611
7− src = fetchFromGitHub {
8− owner = "font-store";
9− repo = "NikaFont";
10− rev = "v${version}";
11− sha256 = "16dhk87vmjnywl5wqsl9dzp12ddpfk57w08f7811m3ijqadscdwc";
12− };
13−
14− installPhase = ''
15− mkdir -p $out/share/fonts/nika-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/nika-fonts
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
14+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nika-fonts {} \;
1715 '';
16+ sha256 = "1x34b2dqn1dymi1vmj5vrjcy2z8s0f3rr6cniyrz85plvid6x40i";
1817
19− meta = with stdenv.lib; {
18+ meta = with lib; {
2019 homepage = https://github.com/font-store/NikaFont/;
2120 description = "Persian/Arabic Open Source Font";
2221 license = licenses.ofl;
pkgs/data/fonts/norwester/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "1.2";
@@ -15,7 +15,7 @@ in fetchzip rec {
1515
1616 sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 homepage = http://jamiewilson.io/norwester;
2020 description = "A condensed geometric sans serif by Jamie Wilson";
2121 maintainers = with maintainers; [ leenaars ];
pkgs/data/fonts/noto-fonts/tools.nix−1
@@ -27,6 +27,5 @@ pythonPackages.buildPythonPackage rec {
2727 description = "Noto fonts support tools and scripts plus web site generation";
2828 license = lib.licenses.asl20;
2929 homepage = https://github.com/googlei18n/nototools;
30− platforms = lib.platforms.unix;
3130 };
3231}
pkgs/data/fonts/office-code-pro/default.nix+13−17
@@ -1,26 +1,23 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "office-code-pro";
55 version = "1.004";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
68
7− src = fetchFromGitHub {
8− owner = "nathco";
9− repo = "Office-Code-Pro";
10− rev = version;
11− sha256 = "0znmjjyn5q83chiafy252bhsmw49r2nx2ls2cmhjp4ihidfr6cmb";
12− };
9+ owner = "nathco";
10+ repo = "Office-Code-Pro";
11+ rev = version;
1312
14− installPhase = ''
15− fontDir=$out/share/fonts/opentype
16− docDir=$out/share/doc/${pname}-${version}
17− mkdir -p $fontDir $docDir
18− install -Dm644 README.md $docDir
19− install -t $fontDir -m644 'Fonts/Office Code Pro/OTF/'*.otf
20− install -t $fontDir -m644 'Fonts/Office Code Pro D/OTF/'*.otf
13+ postFetch = ''
14+ tar xf $downloadedFile --strip=1
15+ install -m644 -Dt $out/share/doc/${name} README.md
16+ install -m444 -Dt $out/share/fonts/opentype 'Fonts/Office Code Pro/OTF/'*.otf 'Fonts/Office Code Pro D/OTF/'*.otf
2117 '';
18+ sha256 = "1bagwcaicn6q8qkqazz6wb3x30y4apmkga0mkv8fh6890hfhywr9";
2219
23− meta = with stdenv.lib; {
20+ meta = with lib; {
2421 description = "A customized version of Source Code Pro";
2522 longDescription = ''
2623 Office Code Pro is a customized version of Source Code Pro, the monospaced
@@ -31,6 +28,5 @@ stdenv.mkDerivation rec {
3128 homepage = https://github.com/nathco/Office-Code-Pro;
3229 license = licenses.ofl;
3330 maintainers = [ maintainers.AndersonTorres ];
34− platforms = platforms.unix;
3531 };
3632}
pkgs/data/fonts/oldsindhi/default.nix+5−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, p7zip }:
1+{ lib, fetchzip, p7zip }:
22
33let
44 version = "0.1";
@@ -10,15 +10,13 @@ in fetchzip rec {
1010 postFetch = ''
1111 ${p7zip}/bin/7z x $downloadedFile
1212
13− mkdir -p $out/share/fonts/truetype
14− mkdir -p $out/share/doc/${name}
15− cp -v OldSindhi/*.ttf $out/share/fonts/truetype/
16− cp -v OldSindhi/README OldSindhi/*.txt $out/share/doc/${name}
13+ install -m444 -Dt $out/share/fonts/truetype OldSindhi/*.ttf
14+ install -m444 -Dt $out/share/doc/${name} OldSindhi/README OldSindhi/*.txt
1715 '';
1816
19− sha256 = "1na3lxyz008fji5ln3fqzyr562k6kch1y824byhfs4y0rwwz3f3q";
17+ sha256 = "0d4l9cg2vmh2pvnqsla8mgcwvc7wjxzcabhlli6633h3ifj2yp7b";
2018
21− meta = with stdenv.lib; {
19+ meta = with lib; {
2220 homepage = https://github.com/MihailJP/oldsindhi;
2321 description = "Free Sindhi Khudabadi font";
2422 maintainers = with maintainers; [ mathnerd314 ];
pkgs/data/fonts/oldstandard/default.nix+11−19
@@ -1,29 +1,21 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
3−stdenv.mkDerivation rec {
4− name = "oldstandard-${version}";
3+let
54 version = "2.2";
5+in fetchzip rec {
6+ name = "oldstandard-${version}";
67
7− src = fetchzip {
8− stripRoot = false;
9− url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip";
10− sha256 = "1hl78jw5szdjq9dhbcv2ln75wpp2lzcxrnfc36z35v5wk4l7jc3h";
11− };
12−
13− phases = [ "unpackPhase" "installPhase" ];
8+ url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip";
149
15− installPhase = ''
16− mkdir -p $out/share/fonts/opentype
17− mkdir -p $out/share/doc/${name}
18− cp -v *.otf $out/share/fonts/opentype/
19− cp -v FONTLOG.txt $out/share/doc/${name}
10+ postFetch = ''
11+ unzip $downloadedFile
12+ install -m444 -Dt $out/share/fonts/opentype *.otf
13+ install -m444 -Dt $out/share/doc/${name} FONTLOG.txt
2014 '';
2115
22− outputHashAlgo = "sha256";
23− outputHashMode = "recursive";
24− outputHash = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n";
16+ sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n";
2517
26− meta = with stdenv.lib; {
18+ meta = with lib; {
2719 homepage = https://github.com/akryukov/oldstand;
2820 description = "An attempt to revive a specific type of Modern style of serif typefaces";
2921 maintainers = with maintainers; [ raskin rycee ];
pkgs/data/fonts/open-dyslexic/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "2016-06-23";
@@ -15,7 +15,7 @@ in fetchzip {
1515
1616 sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 homepage = https://opendyslexic.org/;
2020 description = "Font created to increase readability for readers with dyslexia";
2121 license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)";
pkgs/data/fonts/open-sans/default.nix+12−14
@@ -1,25 +1,23 @@
1−{ stdenv, fetchFromGitLab }:
1+{ lib, fetchFromGitLab }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "open-sans";
55 version = "1.11";
6+in fetchFromGitLab rec {
7+ name = "${pname}-${version}";
68
7− src = fetchFromGitLab {
8− domain = "salsa.debian.org";
9− owner = "fonts-team";
10− repo = "fonts-open-sans";
11− rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag
12− sha256 = "077hkvpmk3ghbqyb901w43b2m2a27lh8ddasyx1x7pdwyr2bjjl2";
13− };
14−
15− dontBuild = true;
16−
17− installPhase = ''
9+ domain = "salsa.debian.org";
10+ owner = "fonts-team";
11+ repo = "fonts-open-sans";
12+ rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag
13+ postFetch = ''
14+ tar xf $downloadedFile --strip=1
1815 mkdir -p $out/share/fonts/truetype
1916 cp *.ttf $out/share/fonts/truetype
2017 '';
18+ sha256 = "146ginwx18z624z582lrnhil8jvi9bjg6843265bgxxrfmf75vhp";
2119
22− meta = with stdenv.lib; {
20+ meta = with lib; {
2321 description = "Open Sans fonts";
2422 longDescription = ''
2523 Open Sans is a humanist sans serif typeface designed by Steve Matteson,
pkgs/data/fonts/orbitron/default.nix+9−9
@@ -1,23 +1,23 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
33let
44 version = "20110526";
5−in fetchzip {
5+in fetchFromGitHub {
66 name = "orbitron-${version}";
77
8− url = https://github.com/theleagueof/orbitron/archive/13e6a52.zip;
8+ owner = "theleagueof";
9+ repo = "orbitron";
10+ rev = "13e6a52";
911
1012 postFetch = ''
11− otfdir=$out/share/fonts/opentype/orbitron
12− ttfdir=$out/share/fonts/ttf/orbitron
13− mkdir -p $otfdir $ttfdir
14− unzip -j $downloadedFile \*/Orbitron\*.otf -d $otfdir
15− unzip -j $downloadedFile \*/Orbitron\*.ttf -d $ttfdir
13+ tar xf $downloadedFile --strip=1
14+ install -m444 -Dt $out/share/fonts/opentype/orbitron *.otf
15+ install -m444 -Dt $out/share/fonts/ttf/orbitron *.ttf
1616 '';
1717
1818 sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv";
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = https://www.theleagueofmoveabletype.com/orbitron;
2222 downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download";
2323 description = ''
pkgs/data/fonts/overpass/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "3.0.3";
@@ -14,7 +14,7 @@ in fetchzip rec {
1414
1515 sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 homepage = http://overpassfont.org/;
1919 description = "Font heavily inspired by Highway Gothic";
2020 license = licenses.ofl;
pkgs/data/fonts/oxygenfonts/default.nix+9−6
@@ -1,18 +1,21 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip rec {
3+fetchFromGitHub {
44 name = "oxygenfonts-20160824";
55
6− url = https://github.com/vernnobile/oxygenFont/archive/62db0ebe3488c936406685485071a54e3d18473b.zip;
6+ owner = "vernnobile";
7+ repo = "oxygenFont";
8+ rev = "62db0ebe3488c936406685485071a54e3d18473b";
79
810 postFetch = ''
9− mkdir -p $out/share/fonts
10− unzip -j $downloadedFile '*/Oxygen-Sans.ttf' '*/Oxygen-Sans-Bold.ttf' '*/OxygenMono-Regular.ttf' -d $out/share/fonts/truetype
11+ tar xf $downloadedFile --strip=1
12+ mkdir -p $out/share/fonts/truetype
13+ cp */Oxygen-Sans.ttf */Oxygen-Sans-Bold.ttf */OxygenMono-Regular.ttf $out/share/fonts/truetype
1114 '';
1215
1316 sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf";
1417
15− meta = with stdenv.lib; {
18+ meta = with lib; {
1619 description = "Desktop/gui font for integrated use with the KDE desktop";
1720 longDescription = ''
1821 Oxygen Font is a font family originally aimed as a desktop/gui
pkgs/data/fonts/parastoo-fonts/default.nix+12−12
@@ -1,22 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "parastoo-fonts";
55 version = "1.0.0-alpha5";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
68
7− src = fetchFromGitHub {
8− owner = "rastikerdar";
9− repo = "parastoo-font";
10− rev = "v${version}";
11− sha256 = "1nya9cbbs6sgv2w3zyah3lb1kqylf922q3fazh4l7bi6zgm8q680";
12− };
9+ owner = "rastikerdar";
10+ repo = "parastoo-font";
11+ rev = "v${version}";
1312
14− installPhase = ''
15− mkdir -p $out/share/fonts/parastoo-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/parastoo-fonts
13+ postFetch = ''
14+ tar xf $downloadedFile --strip=1
15+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \;
1716 '';
17+ sha256 = "10jbii6rskcy4akjl5yfcqv4mfwk3nqnx36l6sbxks43va9l04f4";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://github.com/rastikerdar/parastoo-font;
2121 description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو";
2222 license = licenses.ofl;
pkgs/data/fonts/paratype-pt/mono.nix+5−2
@@ -3,7 +3,10 @@
33fetchzip rec {
44 name = "paratype-pt-mono";
55
6− url = "http://www.paratype.ru/uni/public/PTMono.zip";
6+ url = [
7+ https://company.paratype.com/system/attachments/631/original/ptmono.zip
8+ http://rus.paratype.ru/system/attachments/631/original/ptmono.zip
9+ ];
710
811 postFetch = ''
912 mkdir -p $out/share/{doc,fonts}
@@ -14,7 +17,7 @@ fetchzip rec {
1417 sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm";
1518
1619 meta = with stdenv.lib; {
17− homepage = http://www.paratype.ru/public/;
20+ homepage = http://www.paratype.ru/public/;
1821 description = "An open Paratype font";
1922
2023 license = "Open Paratype license";
pkgs/data/fonts/paratype-pt/sans.nix+5−2
@@ -3,7 +3,10 @@
33fetchzip rec {
44 name = "paratype-pt-sans";
55
6− url = "http://www.paratype.ru/uni/public/PTSans.zip";
6+ url = [
7+ https://company.paratype.com/system/attachments/629/original/ptsans.zip
8+ http://rus.paratype.ru/system/attachments/629/original/ptsans.zip
9+ ];
710
811 postFetch = ''
912 mkdir -p $out/share/{doc,fonts}
@@ -14,7 +17,7 @@ fetchzip rec {
1417 sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0";
1518
1619 meta = with stdenv.lib; {
17− homepage = http://www.paratype.ru/public/;
20+ homepage = http://www.paratype.ru/public/;
1821 description = "An open Paratype font";
1922
2023 license = "Open Paratype license";
pkgs/data/fonts/paratype-pt/serif.nix+5−2
@@ -3,7 +3,10 @@
33fetchzip rec {
44 name = "paratype-pt-serif";
55
6− url = "http://www.paratype.ru/uni/public/PTSerif.zip";
6+ url = [
7+ https://company.paratype.com/system/attachments/634/original/ptserif.zip
8+ http://rus.paratype.ru/system/attachments/634/original/ptserif.zip
9+ ];
710
811 postFetch = ''
912 mkdir -p $out/share/{doc,fonts}
@@ -14,7 +17,7 @@ fetchzip rec {
1417 sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d";
1518
1619 meta = with stdenv.lib; {
17− homepage = http://www.paratype.ru/public/;
20+ homepage = http://www.paratype.ru/public/;
1821 description = "An open Paratype font";
1922
2023 license = "Open Paratype license";
pkgs/data/fonts/pecita/default.nix+2−4
@@ -1,9 +1,7 @@
1−{ stdenv, fetchurl }:
1+{ lib, fetchurl }:
22
33let
4−
54 version = "5.4";
6−
75in
86
97fetchurl rec {
@@ -21,7 +19,7 @@ fetchurl rec {
2119 recursiveHash = true;
2220 sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm";
2321
24− meta = with stdenv.lib; {
22+ meta = with lib; {
2523 homepage = http://pecita.eu/police-en.php;
2624 description = "Handwritten font with connected glyphs";
2725 license = licenses.ofl;
pkgs/data/fonts/penna/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = "http://dotcolon.net/font/${pname}/";
2222 description = "Geometric sans serif designed by Sora Sagano";
2323 longDescription = ''
pkgs/data/fonts/poly/default.nix−1
@@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
4646 homepage = http://www.fontsquirrel.com/fonts/poly;
4747 license = stdenv.lib.licenses.ofl;
4848 maintainers = with stdenv.lib.maintainers; [ relrod ];
49− platforms = with stdenv.lib.platforms; linux;
5049 };
5150}
pkgs/data/fonts/powerline-fonts/default.nix+12−18
@@ -1,30 +1,24 @@
1−{ stdenv, fetchzip}:
1+{ lib, fetchFromGitHub }:
22
3−fetchzip {
3+fetchFromGitHub {
44 name = "powerline-fonts-2018-11-11";
55
6− url = https://github.com/powerline/fonts/archive/e80e3eba9091dac0655a0a77472e10f53e754bb0.zip;
6+ owner = "powerline";
7+ repo = "fonts";
8+ rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0";
79
810 postFetch = ''
9− mkdir -p $out/share/fonts/opentype
10− unzip -j $downloadedFile '*.otf' -d $out/share/fonts/opentype
11−
12− mkdir -p $out/share/fonts/truetype
13− unzip -j $downloadedFile '*.ttf' -d $out/share/fonts/truetype
14−
15− mkdir -p $out/share/fonts/bdf
16− unzip -j $downloadedFile '*/BDF/*.bdf' -d $out/share/fonts/bdf
17−
18− mkdir -p $out/share/fonts/pcf
19− unzip -j $downloadedFile '*/PCF/*.pcf.gz' -d $out/share/fonts/pcf
20−
21− mkdir -p $out/share/fonts/psf
22− unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf
11+ tar xf $downloadedFile --strip=1
12+ find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \;
13+ find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \;
14+ find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \;
15+ find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \;
16+ find . -name '*.psf.gz' -exec install -Dt $out/share/fonts/psf {} \;
2317 '';
2418
2519 sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww";
2620
27− meta = with stdenv.lib; {
21+ meta = with lib; {
2822 homepage = https://github.com/powerline/fonts;
2923 description = "Patched fonts for Powerline users";
3024 longDescription = ''
pkgs/data/fonts/profont/default.nix+4−4
@@ -1,9 +1,9 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "profont";
55
6− url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
6+ url = "http://web.archive.org/web/20160707013914/http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
77
88 postFetch = ''
99 unzip -j $downloadedFile
@@ -19,10 +19,10 @@ fetchzip rec {
1919
2020 sha256 = "1calqmvrfv068w61f614la8mg8szas6m5i9s0lsmwjhb4qwjyxbw";
2121
22− meta = with stdenv.lib; {
22+ meta = with lib; {
2323 homepage = http://tobiasjung.name;
2424 description = "A monospaced font created to be a most readable font for programming";
25− maintainers = with stdenv.lib.maintainers; [ myrl ];
25+ maintainers = with lib.maintainers; [ myrl ];
2626 license = licenses.mit;
2727 platforms = platforms.all;
2828 };
pkgs/data/fonts/public-sans/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "1.003";
@@ -14,7 +14,7 @@ in fetchzip rec {
1414
1515 sha256 = "02ranwr1bw4n9n1ljw234nzhj2a0hgradniib37nh10maark5wg3";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 description = "A strong, neutral, principles-driven, open source typeface for text or display";
1919 homepage = https://public-sans.digital.gov/;
2020 license = licenses.ofl;
pkgs/data/fonts/quattrocento-sans/default.nix+3−3
@@ -1,11 +1,11 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "2.0";
55in fetchzip rec {
66 name = "quattrocento-sans-${version}";
77
8− url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
8+ url = "http://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
99
1010 postFetch = ''
1111 mkdir -p $out/share/{fonts,doc}
@@ -15,7 +15,7 @@ in fetchzip rec {
1515
1616 sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 homepage = http://www.impallari.com/quattrocentosans/;
2020 description = "A classic, elegant and sober sans-serif typeface";
2121 license = licenses.ofl;
pkgs/data/fonts/quattrocento/default.nix+3−3
@@ -1,11 +1,11 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "1.1";
55in fetchzip rec {
66 name = "quattrocento-${version}";
77
8− url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
8+ url = "http://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
99
1010 postFetch = ''
1111 mkdir -p $out/share/{fonts,doc}
@@ -15,7 +15,7 @@ in fetchzip rec {
1515
1616 sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 homepage = http://www.impallari.com/quattrocento/;
2020 description = "A classic, elegant, sober and strong serif typeface";
2121 license = licenses.ofl;
pkgs/data/fonts/raleway/default.nix+10−8
@@ -1,16 +1,18 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchFromGitHub }:
22
33let
44 version = "2016-08-30";
5−in fetchzip {
5+in fetchFromGitHub {
66 name = "raleway-${version}";
77
8− url = https://github.com/impallari/Raleway/archive/fa27f47b087fc093c6ae11cfdeb3999ac602929a.zip;
8+ owner = "impallari";
9+ repo = "Raleway";
10+ rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a";
911
1012 postFetch = ''
11− mkdir -p $out/share/fonts
12− unzip -j $downloadedFile \*-Original.otf -d $out/share/fonts/opentype
13− unzip -j $downloadedFile \*.txt \*.md -d $out
13+ tar xf $downloadedFile --strip=1
14+ find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \;
15+ cp *.txt *.md -d $out
1416 '';
1517
1618 sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60";
@@ -33,8 +35,8 @@ in fetchzip {
3335 '';
3436
3537 homepage = https://github.com/impallari/Raleway;
36− license = stdenv.lib.licenses.ofl;
38+ license = lib.licenses.ofl;
3739
38− maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
40+ maintainers = with lib.maintainers; [ Profpatsch ];
3941 };
4042}
pkgs/data/fonts/ricty/default.nix−1
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
3131 description = "A high-quality Japanese font based on Inconsolata and Migu 1M";
3232 homepage = https://www.rs.tus.ac.jp/yyusa/ricty.html;
3333 license = licenses.unfree;
34− platforms = platforms.unix;
3534 maintainers = [ maintainers.mikoim ];
3635 };
3736}
pkgs/data/fonts/roboto/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2.138";
@@ -22,8 +22,8 @@ in fetchzip rec {
2222 Chrome OS, and the recommended font for Google’s visual language,
2323 Material Design.
2424 '';
25− license = stdenv.lib.licenses.asl20;
26− platforms = stdenv.lib.platforms.all;
27− maintainers = [ stdenv.lib.maintainers.romildo ];
25+ license = lib.licenses.asl20;
26+ platforms = lib.platforms.all;
27+ maintainers = [ lib.maintainers.romildo ];
2828 };
2929}
pkgs/data/fonts/rounded-mgenplus/default.nix+7−21
@@ -1,33 +1,19 @@
1−{ stdenv, fetchurl, p7zip }:
1+{ lib, fetchzip, p7zip }:
22
33let
44 pname = "rounded-mgenplus";
55 version = "20150602";
6−
7−in
8−
9−stdenv.mkDerivation rec {
6+in fetchzip rec {
107 name = "${pname}-${version}";
11− inherit version;
12−
13− src = fetchurl {
14− url = "https://osdn.jp/downloads/users/8/8598/${name}.7z";
15− sha256 = "1k15xvzd3s5ppp151wv31wrfq2ri8v96xh7i71i974rxjxj6gspc";
16− };
17−
18− nativeBuildInputs = [ p7zip ];
19−
20− phases = [ "unpackPhase" "installPhase" ];
21−
22− unpackPhase = ''
23− 7z x $src
24− '';
258
26− installPhase = ''
9+ url = "https://osdn.jp/downloads/users/8/8598/${name}.7z";
10+ postFetch = ''
11+ ${p7zip}/bin/7z x $downloadedFile
2712 install -m 444 -D -t $out/share/fonts/${pname} ${pname}-*.ttf
2813 '';
14+ sha256 = "0vwdknagdrl5dqwpb1x5lxkbfgvbx8dpg7cb6yamgz71831l05v1";
2915
30− meta = with stdenv.lib; {
16+ meta = with lib; {
3117 description = "A Japanese font based on Rounded M+ and Noto Sans Japanese";
3218 homepage = http://jikasei.me/font/rounded-mgenplus/;
3319 license = licenses.ofl;
pkgs/data/fonts/route159/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "1";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = "http://dotcolon.net/font/${pname}/";
2222 description = "A weighted sans serif font";
2323 platforms = platforms.all;
pkgs/data/fonts/sahel-fonts/default.nix+12−12
@@ -1,22 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "sahel-fonts";
55 version = "1.0.0-alpha22";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
68
7− src = fetchFromGitHub {
8− owner = "rastikerdar";
9− repo = "sahel-font";
10− rev = "v${version}";
11− sha256 = "1kx7byzb5zxspq0i4cvgf4q7sm6xnhdnfyw9zrb1wfmdv3jzaz7p";
12− };
9+ owner = "rastikerdar";
10+ repo = "sahel-font";
11+ rev = "v${version}";
1312
14− installPhase = ''
15− mkdir -p $out/share/fonts/sahel-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/sahel-fonts
13+ postFetch = ''
14+ tar xf $downloadedFile --strip=1
15+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \;
1716 '';
17+ sha256 = "0vj8ydv50rjanb0favd7rh4r9rv5fl39vqwvzkpgfdcdawn0xjm7";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://github.com/rastikerdar/sahel-font;
2121 description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل";
2222 license = licenses.ofl;
pkgs/data/fonts/samim-fonts/default.nix+12−12
@@ -1,22 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "samim-fonts";
55 version = "3.1.0";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
68
7− src = fetchFromGitHub {
8− owner = "rastikerdar";
9− repo = "samim-font";
10− rev = "v${version}";
11− sha256 = "1mp0pgbn9r098ilajwzag7c21shwb13mq61ly9av0mfbpnhkkjqk";
12− };
9+ owner = "rastikerdar";
10+ repo = "samim-font";
11+ rev = "v${version}";
1312
14− installPhase = ''
15− mkdir -p $out/share/fonts/samim-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/samim-fonts
13+ postFetch = ''
14+ tar xf $downloadedFile --strip=1
15+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \;
1716 '';
17+ sha256 = "0mmhncqg48dp0d7l725dv909zswbkk22dlqzcdfh6k6cgk2gn08q";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://github.com/rastikerdar/samim-font;
2121 description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم";
2222 license = licenses.ofl;
pkgs/data/fonts/sarasa-gothic/default.nix+4−8
@@ -1,25 +1,21 @@
1−{ stdenv, fetchurl, p7zip }:
1+{ lib, fetchurl, p7zip }:
22
33let
44 version = "0.8.0";
5− sha256 = "0zafvzrh4180hmz351f1rvs29n8mfxf0qv6mdl7psf1f066dizs6";
65in fetchurl rec {
7− inherit sha256;
8−
96 name = "sarasa-gothic-${version}";
107
118 url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
9+ sha256 = "0zafvzrh4180hmz351f1rvs29n8mfxf0qv6mdl7psf1f066dizs6";
1210
1311 recursiveHash = true;
1412 downloadToTemp = true;
1513
1614 postFetch = ''
17− ${p7zip}/bin/7z x $downloadedFile
18− mkdir -p $out/share/fonts
19− install -m644 *.ttc $out/share/fonts/
15+ ${p7zip}/bin/7z x $downloadedFile -o$out/share/fonts
2016 '';
2117
22− meta = with stdenv.lib; {
18+ meta = with lib; {
2319 description = "SARASA GOTHIC is a Chinese & Japanese programming font based on Iosevka and Source Han Sans";
2420 homepage = https://github.com/be5invis/Sarasa-Gothic;
2521 license = licenses.ofl;
pkgs/data/fonts/scheherazade/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2.100";
@@ -17,7 +17,7 @@ in fetchzip rec {
1717
1818 sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z";
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = https://software.sil.org/scheherazade/;
2222 description = "A font designed in a similar style to traditional Naskh typefaces";
2323 longDescription = ''
pkgs/data/fonts/seshat/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = "http://dotcolon.net/font/${pname}/";
2222 description = "Roman body font designed for main text by Sora Sagano";
2323 longDescription = ''
pkgs/data/fonts/shabnam-fonts/default.nix+13−13
@@ -1,22 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
4− name = "shabnam-fonts";
3+let
4+ pname = "shabnam-fonts";
55 version = "4.0.0";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
68
7− src = fetchFromGitHub {
8− owner = "rastikerdar";
9− repo = "shabnam-font";
10− rev = "v${version}";
11− sha256 = "1y4w16if2y12028b9vyc5l5c5bvcglhxacv380ixb8fcc4hfakmb";
12− };
9+ owner = "rastikerdar";
10+ repo = "shabnam-font";
11+ rev = "v${version}";
1312
14− installPhase = ''
15− mkdir -p $out/share/fonts/shabnam-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/shabnam-fonts
13+ postFetch = ''
14+ tar xf $downloadedFile --strip=1
15+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \;
1716 '';
17+ sha256 = "0wfyaaj2pq2knz12l7rsc4wc703cbz0r8gkcya5x69p0aixch8ba";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://github.com/rastikerdar/shabnam-font;
2121 description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم";
2222 license = licenses.ofl;
pkgs/data/fonts/shrikhand/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2016-03-03";
@@ -11,7 +11,7 @@ in fetchzip {
1111
1212 sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs";
1313
14− meta = with stdenv.lib; {
14+ meta = with lib; {
1515 homepage = https://jonpinhorn.github.io/shrikhand/;
1616 description = "A vibrant and playful typeface for both Latin and Gujarati writing systems";
1717 maintainers = with maintainers; [ sternenseemann ];
pkgs/data/fonts/siji/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 date = "2016-05-13";
@@ -19,8 +19,8 @@ in fetchzip {
1919 meta = {
2020 homepage = https://github.com/stark/siji;
2121 description = "An iconic bitmap font based on Stlarch with additional glyphs";
22− license = stdenv.lib.licenses.gpl2;
23− platforms = stdenv.lib.platforms.all;
24− maintainers = [ stdenv.lib.maintainers.asymmetric ];
22+ license = lib.licenses.gpl2;
23+ platforms = lib.platforms.all;
24+ maintainers = [ lib.maintainers.asymmetric ];
2525 };
2626}
pkgs/data/fonts/source-code-pro/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2.030";
@@ -16,9 +16,9 @@ in fetchzip {
1616
1717 meta = {
1818 description = "A set of monospaced OpenType fonts designed for coding environments";
19− maintainers = with stdenv.lib.maintainers; [ relrod ];
20− platforms = with stdenv.lib.platforms; all;
19+ maintainers = with lib.maintainers; [ relrod ];
20+ platforms = with lib.platforms; all;
2121 homepage = https://adobe-fonts.github.io/source-code-pro/;
22− license = stdenv.lib.licenses.ofl;
22+ license = lib.licenses.ofl;
2323 };
2424}
pkgs/data/fonts/source-han-code-jp/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 pname = "source-han-code-jp";
@@ -17,9 +17,9 @@ in fetchzip {
1717
1818 meta = {
1919 description = "A monospaced Latin font suitable for coding";
20− maintainers = with stdenv.lib.maintainers; [ mt-caret ];
21− platforms = with stdenv.lib.platforms; all;
20+ maintainers = with lib.maintainers; [ mt-caret ];
21+ platforms = with lib.platforms; all;
2222 homepage = https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html;
23− license = stdenv.lib.licenses.ofl;
23+ license = lib.licenses.ofl;
2424 };
2525}
pkgs/data/fonts/source-han-sans/default.nix+3−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 makePackage = {variant, language, region, sha256}: let
@@ -19,9 +19,8 @@ let
1919 meta = {
2020 description = "${language} subset of an open source Pan-CJK sans-serif typeface";
2121 homepage = https://github.com/adobe-fonts/source-han-sans;
22− license = stdenv.lib.licenses.ofl;
23− platforms = stdenv.lib.platforms.unix;
24− maintainers = with stdenv.lib.maintainers; [ taku0 ];
22+ license = lib.licenses.ofl;
23+ maintainers = with lib.maintainers; [ taku0 ];
2524 };
2625 };
2726in
pkgs/data/fonts/source-han-serif/default.nix+3−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 makePackage = {variant, language, region, sha256}: let
@@ -19,9 +19,8 @@ let
1919 meta = {
2020 description = "${language} subset of an open source Pan-CJK serif typeface";
2121 homepage = https://github.com/adobe-fonts/source-han-sans;
22− license = stdenv.lib.licenses.ofl;
23− platforms = stdenv.lib.platforms.unix;
24− maintainers = with stdenv.lib.maintainers; [ taku0 ];
22+ license = lib.licenses.ofl;
23+ maintainers = with lib.maintainers; [ taku0 ];
2524 };
2625 };
2726in
pkgs/data/fonts/source-sans-pro/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "source-sans-pro-2.045";
@@ -14,7 +14,7 @@ fetchzip {
1414
1515 sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 homepage = https://adobe-fonts.github.io/source-sans-pro/;
1919 description = "A set of OpenType fonts designed by Adobe for UIs";
2020 license = licenses.ofl;
pkgs/data/fonts/source-serif-pro/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2.010";
@@ -16,7 +16,7 @@ in fetchzip {
1616
1717 sha256 = "1a3lmqk7hyxpfkb30s9z73lhs823dmq6xr5llp9w23g6bh332x2h";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://adobe-fonts.github.io/source-serif-pro/;
2121 description = "A set of OpenType fonts to complement Source Sans Pro";
2222 license = licenses.ofl;
pkgs/data/fonts/spleen/default.nix+12−10
@@ -1,23 +1,25 @@
1−{ stdenv, fetchurl, mkfontdir, mkfontscale }:
1+{ lib, fetchurl }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "spleen";
55 version = "1.0.4";
6+in fetchurl rec {
7+ name = "${pname}-${version}";
8+ url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
69
7− src = fetchurl {
8− url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
9− sha256 = "1x62a5ygn3rpgzbaacz64rp8mn7saymdnxci4l3xasvsjjp60s3g";
10− };
11−
12− buildPhase = "gzip -n9 *.pcf";
13− installPhase = ''
10+ downloadToTemp = true;
11+ recursiveHash = true;
12+ postFetch = ''
13+ tar xf $downloadedFile --strip=1
1414 d="$out/share/fonts/X11/misc/spleen"
15+ gzip -n9 *.pcf
1516 install -Dm644 *.pcf.gz -t $d
1617 install -Dm644 *.bdf -t $d
1718 install -m644 fonts.alias-spleen $d/fonts.alias
1819 '';
20+ sha256 = "0jab55h08gy7gpyxqfrfj30iinmknpllh3dp5g7ck5q3qfgdzh7m";
1921
20− meta = with stdenv.lib; {
22+ meta = with lib; {
2123 description = "Monospaced bitmap fonts";
2224 homepage = https://www.cambus.net/spleen-monospaced-bitmap-fonts;
2325 license = licenses.bsd2;
pkgs/data/fonts/stix-otf/default.nix+3−3
@@ -1,11 +1,11 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33let
44 version = "1.1.1";
55in fetchzip rec {
66 name = "stix-otf-${version}";
77
8− url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip";
8+ url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip";
99
1010 postFetch = ''
1111 mkdir -p $out/share/fonts
@@ -14,7 +14,7 @@ in fetchzip rec {
1414
1515 sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 homepage = http://www.stixfonts.org/;
1919 description = "Fonts for Scientific and Technical Information eXchange";
2020 license = licenses.ofl;
pkgs/data/fonts/stix-two/default.nix+2−2
@@ -5,11 +5,11 @@ let
55in fetchzip {
66 name = "stix-two-${version}";
77
8− url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip";
8+ url = "https://github.com/stipub/stixfonts/archive/${version}.zip";
99
1010 postFetch = ''
1111 mkdir -p $out/share/fonts
12− unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
12+ unzip -j $downloadedFile '*/OTF/*.otf' -d $out/share/fonts/opentype
1313 '';
1414
1515 sha256 = "19i30d2xjk52bjj7xva1hnlyh58yd5phas1njcc8ldcz87a1lhql";
pkgs/data/fonts/sudo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "0.37";
@@ -11,7 +11,7 @@ in fetchzip rec {
1111 mkdir -p $out/share/fonts/truetype/
1212 unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/
1313 '';
14− meta = with stdenv.lib; {
14+ meta = with lib; {
1515 description = "Font for programmers and command line users";
1616 homepage = https://www.kutilek.de/sudo-font/;
1717 license = licenses.ofl;
pkgs/data/fonts/tamsyn/default.nix+3−4
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, mkfontdir, mkfontscale }:
22
33let
4− version = "1.11";
4+ version = "1.11";
55in stdenv.mkDerivation {
66 pname = "tamsyn-font";
77 inherit version;
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
2222 fontDir="$out/share/fonts/tamsyn"
2323 mkdir -p "$fontDir"
2424 mv *.pcf "$fontDir"
25− mv *.psf.gz "$fontDir"
25+ mv *.psf.gz "$fontDir"
2626
2727 cd "$fontDir"
2828 mkfontdir
@@ -38,13 +38,12 @@ in stdenv.mkDerivation {
3838 longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at
3939 programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn
4040 font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and
41− Consolas.
41+ Consolas.
4242 '';
4343 homepage = http://www.fial.com/~scott/tamsyn-font/;
4444 downloadPage = http://www.fial.com/~scott/tamsyn-font/download;
4545 license = licenses.free;
4646 maintainers = [ maintainers.rps ];
47− platforms = platforms.linux;
4847 };
4948}
5049
pkgs/data/fonts/tempora-lgc/default.nix−1
@@ -38,6 +38,5 @@ stdenv.mkDerivation {
3838 description = ''Tempora font'';
3939 license = stdenv.lib.licenses.gpl2 ;
4040 maintainers = [stdenv.lib.maintainers.raskin];
41− platforms = stdenv.lib.platforms.linux;
4241 };
4342}
pkgs/data/fonts/tenderness/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
1717 unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
1818 '';
1919
20− meta = with stdenv.lib; {
20+ meta = with lib; {
2121 homepage = "http://dotcolon.net/font/${pname}/";
2222 description = "Serif font designed by Sora Sagano with old-style figures";
2323 platforms = platforms.all;
pkgs/data/fonts/terminus-font-ttf/default.nix+2−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "4.47.0";
@@ -20,7 +20,7 @@ in fetchzip rec {
2020
2121 sha256 = "1mnx3vlnl0r15yzsa4zb9qqab4hpi603gdwhlbw960wg03i3xn8z";
2222
23− meta = with stdenv.lib; {
23+ meta = with lib; {
2424 description = "A clean fixed width TTF font";
2525 longDescription = ''
2626 Monospaced bitmap font designed for long work with computers
@@ -29,6 +29,5 @@ in fetchzip rec {
2929 homepage = http://files.ax86.net/terminus-ttf;
3030 license = licenses.ofl;
3131 maintainers = with maintainers; [ okasu ];
32− platforms = platforms.unix;
3332 };
3433}
pkgs/data/fonts/terminus-font/default.nix−1
@@ -37,6 +37,5 @@ stdenv.mkDerivation rec {
3737 homepage = http://terminus-font.sourceforge.net/;
3838 license = licenses.gpl2Plus;
3939 maintainers = with maintainers; [ astsmtl ];
40− platforms = platforms.linux;
4140 };
4241}
pkgs/data/fonts/tewi/default.nix−1
@@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
4646 url = "https://www.gnu.org/licenses/gpl-faq.html#FontException";
4747 };
4848 maintainers = [ maintainers.fro_ozen ];
49− platforms = platforms.unix;
5049 };
5150}
pkgs/data/fonts/tex-gyre-math/default.nix+11−13
@@ -28,32 +28,30 @@ let
2828 };
2929 };
3030
31− mkVariant = variant: current:
32− let dotless_version = builtins.replaceStrings ["."] [""] current.version; in
31+ mkVariant = variant: {displayName, version, sha256, outputHash}:
32+ let dotless_version = builtins.replaceStrings ["."] [""] version; in
3333 stdenv.mkDerivation rec {
34− name = "tex-gyre-${variant}-math-${current.version}";
35− version = "${current.version}";
34+ name = "tex-gyre-${variant}-math-${version}";
35+ inherit version;
3636
3737 src = fetchzip {
38− url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip";
39− sha256 = current.sha256;
38+ url = "http://www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip";
39+ inherit sha256;
4040 };
4141
4242 installPhase = ''
43− mkdir -p $out/share/fonts/opentype/
44− mkdir -p $out/share/doc/${name}/
45− cp -v opentype/*.otf $out/share/fonts/opentype/
46− cp -v doc/*.txt $out/share/doc/${name}/
43+ install -m444 -Dt $out/share/fonts/opentype opentype/*.otf
44+ install -m444 -Dt $out/share/doc/${name} doc/*.txt
4745 '';
4846
4947 outputHashAlgo = "sha256";
5048 outputHashMode = "recursive";
51− outputHash = current.outputHash;
49+ inherit outputHash;
5250
5351 meta = with stdenv.lib; {
5452 longDescription = ''
55− TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre
56− ${current.displayName} family of fonts (see
53+ TeX Gyre ${displayName} Math is a math companion for the TeX Gyre
54+ ${displayName} family of fonts (see
5755 http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format.
5856 '';
5957 homepage = http://www.gust.org.pl/projects/e-foundry/tg-math;
pkgs/data/fonts/tex-gyre/default.nix+1−1
@@ -20,7 +20,7 @@ let
2020
2121 outputHashAlgo = "sha256";
2222 outputHashMode = "recursive";
23− outputHash = outputHash;
23+ inherit outputHash;
2424
2525 meta = with stdenv.lib; {
2626 homepage = http://www.gust.org.pl/projects/e-foundry/tex-gyre;
pkgs/data/fonts/theano/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2.0";
@@ -16,7 +16,7 @@ in fetchzip rec {
1616
1717 sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = https://github.com/akryukov/theano;
2121 description = "An old-style font designed from historic samples";
2222 maintainers = with maintainers; [ raskin rycee ];
pkgs/data/fonts/tipa/default.nix−1
@@ -22,7 +22,6 @@ stdenv.mkDerivation {
2222
2323 meta = {
2424 description = "Phonetic font for TeX";
25− platforms = stdenv.lib.platforms.unix;
2625 };
2726}
2827
pkgs/data/fonts/tlwg/default.nix−1
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
2121 description = "A collection of Thai scalable fonts available under free licenses";
2222 homepage = https://linux.thai.net/projects/fonts-tlwg;
2323 license = with licenses; [ gpl2 publicDomain lppl13c free ];
24− platforms = platforms.unix;
2524 maintainers = [ maintainers.yrashk ];
2625 };
2726}
pkgs/data/fonts/ttf-bitstream-vera/default.nix+2−5
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "ttf-bitstream-vera-1.10";
@@ -7,14 +7,11 @@ fetchzip {
77
88 postFetch = ''
99 tar -xjf $downloadedFile --strip-components=1
10− fontDir=$out/share/fonts/truetype
11− mkdir -p $fontDir
12− cp *.ttf $fontDir
10+ install -m444 -Dt $out/share/fonts/truetype *.ttf
1311 '';
1412
1513 sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m";
1614
1715 meta = {
18− platforms = stdenv.lib.platforms.unix;
1916 };
2017}
pkgs/data/fonts/ttf-envy-code-r/default.nix+2−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 pname = "ttf-envy-code-r";
@@ -16,11 +16,10 @@ in fetchzip {
1616
1717 sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z";
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 homepage = http://damieng.com/blog/tag/envy-code-r;
2121 description = "Free scalable coding font by DamienG";
2222 license = licenses.unfree;
23− platforms = platforms.unix;
2423 maintainers = [ maintainers.lyt ];
2524 };
2625}
pkgs/data/fonts/twemoji-color-font/default.nix−1
@@ -38,6 +38,5 @@ stdenv.mkDerivation rec {
3838 downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
3939 license = with licenses; [ cc-by-40 mit ];
4040 maintainers = [ maintainers.fgaz ];
41− platforms = platforms.linux;
4241 };
4342}
pkgs/data/fonts/ubuntu-font-family/default.nix+5−5
@@ -1,9 +1,9 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "ubuntu-font-family-0.83";
55
6− url = "http://font.ubuntu.com/download/${name}.zip";
6+ url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip";
77
88 postFetch = ''
99 mkdir -p $out/share/fonts
@@ -19,8 +19,8 @@ fetchzip rec {
1919 contemporary style and contains characteristics unique to
2020 the Ubuntu brand that convey a precise, reliable and free attitude.";
2121 homepage = http://font.ubuntu.com/;
22− license = stdenv.lib.licenses.free;
23− platforms = stdenv.lib.platforms.all;
24− maintainers = [ stdenv.lib.maintainers.antono ];
22+ license = lib.licenses.free;
23+ platforms = lib.platforms.all;
24+ maintainers = [ lib.maintainers.antono ];
2525 };
2626}
pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix+2−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "1.0";
@@ -13,10 +13,9 @@ fetchzip rec {
1313 unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
1414 '';
1515
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)";
1818 homepage = "http://int10h.org/oldschool-pc-fonts/";
19− platforms = platforms.unix;
2019 license = licenses.cc-by-sa-40;
2120 maintainers = [ maintainers.endgame ];
2221 };
pkgs/data/fonts/undefined-medium/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "undefined-medium-1.0";
@@ -10,9 +10,9 @@ fetchzip rec {
1010 unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype
1111 '';
1212
13− sha256 = "0v3p1g9f1c0d6b9lhrvm1grzivm7ddk7dvn96zl5hdzr2y60y1rw";
13+ sha256 = "1wa04jzbffshwcxm705yb5wja8wakn8j7fvim1mlih2z1sqw0njk";
1414
15− meta = with stdenv.lib; {
15+ meta = with lib; {
1616 homepage = https://undefined-medium.com/;
1717 description = "A pixel grid-based monospace typeface";
1818 longDescription = ''
pkgs/data/fonts/uni-vga/default.nix+1−2
@@ -20,13 +20,12 @@ stdenv.mkDerivation {
2020
2121 outputHashAlgo = "sha256";
2222 outputHashMode = "recursive";
23− sha256 = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7";
23+ outputHash = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7";
2424
2525 meta = {
2626 description = "Unicode VGA font";
2727 maintainers = [stdenv.lib.maintainers.ftrvxmtrx];
2828 homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/;
2929 license = stdenv.lib.licenses.mit;
30− platforms = stdenv.lib.platforms.linux;
3130 };
3231}
pkgs/data/fonts/unifont/default.nix+4−4
@@ -2,16 +2,16 @@
22
33stdenv.mkDerivation rec {
44 name = "unifont-${version}";
5− version = "12.0.01";
5+ version = "12.1.01";
66
77 ttf = fetchurl {
88 url = "mirror://gnu/unifont/${name}/${name}.ttf";
9− sha256 = "191vgddv5fksg7g01q692nfcb02ks2y28fi9fv8aghvs36q4iana";
9+ sha256 = "05knv3vlnk8ahaybwz6r95d3a1h7h7q9ll6ij2jl7zgjhcx4zy5d";
1010 };
1111
1212 pcf = fetchurl {
1313 url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
14− sha256 = "14xbrsdrnllly8h2afan3b4v486vd4y8iff8zqmcfliw0cipm8v4";
14+ sha256 = "0q7dlnfzk49m4pgf2s7jv05jysa6sfxx3w0y17yis9j7g18lyw1b";
1515 };
1616
1717 nativeBuildInputs = [ mkfontscale mkfontdir ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030
3131 outputHashAlgo = "sha256";
3232 outputHashMode = "recursive";
33− outputHash = "1jccbz7wyyk7rpyapgsppcgakgpm1l9fqqxs7fg9naav7i0nzzpg";
33+ outputHash = "0sgdr9dma4hkda3siydfvjrnzrpri8r7iqs2zqf77z9n4zn90qp5";
3434
3535 meta = with stdenv.lib; {
3636 description = "Unicode font for Base Multilingual Plane";
pkgs/data/fonts/unifont_upper/default.nix+4−4
@@ -1,7 +1,7 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
4− version = "12.0.01";
4+ version = "12.1.01";
55in fetchzip rec {
66 name = "unifont_upper-${version}";
77
@@ -9,9 +9,9 @@ in fetchzip rec {
99
1010 postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
1111
12− sha256 = "1mmbndyi91fcdj7ykk5y7rypmm5jf2zf5pp5ab8hq3aa9y7invw3";
12+ sha256 = "11b14ka2w16vssxdhgq7k9bx7xx0sr36hfi2vzyimmaibasi1r74";
1313
14− meta = with stdenv.lib; {
14+ meta = with lib; {
1515 description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
1616 homepage = http://unifoundry.com/unifont.html;
1717
pkgs/data/fonts/vazir-fonts/default.nix+13−14
@@ -1,23 +1,22 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
4− name = "vazir-fonts";
3+let
4+ pname = "vazir-fonts";
55 version = "19.2.0";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
68
7− src = fetchFromGitHub {
8− owner = "rastikerdar";
9− repo = "vazir-font";
10− rev = "v${version}";
11− sha256 = "0p96y4q20nhpv7hxca6rncfcb14iqy2vacv0xl55wkwqkm4wvzgr";
12− };
13−
14− installPhase = ''
15− mkdir -p $out/share/fonts/vazir-fonts
16− cp -v $( find . -name '*.ttf') $out/share/fonts/vazir-fonts
9+ owner = "rastikerdar";
10+ repo = "vazir-font";
11+ rev = "v${version}";
1712
13+ postFetch = ''
14+ tar xf $downloadedFile --strip=1
15+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/vazir-fonts {} \;
1816 '';
17+ sha256 = "008h095rjrcjhz9h02v6cf3gv64khj21lii4zffgpdlmvfs29f8l";
1918
20− meta = with stdenv.lib; {
19+ meta = with lib; {
2120 homepage = https://github.com/rastikerdar/vazir-font;
2221 description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
2322 license = licenses.ofl;
pkgs/data/fonts/vdrsymbols/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "vdrsymbols-20100612";
@@ -12,7 +12,7 @@ fetchzip rec {
1212 install -Dm444 -t "$out/share/fonts/truetype" */*.ttf
1313 '';
1414
15− meta = with stdenv.lib; {
15+ meta = with lib; {
1616 description = "DejaVu fonts with additional symbols used by VDR";
1717 homepage = http://andreas.vdr-developer.org/fonts/;
1818 platforms = platforms.all;
pkgs/data/fonts/vegur/default.nix+9−16
@@ -1,29 +1,22 @@
1−{ stdenv, rpmextract, fetchurl, unzip }:
1+{ lib, buildPackages, fetchzip }:
22
3−stdenv.mkDerivation rec {
3+let
44 version = "0.701";
5+in fetchzip {
56 name = "vegur-font-${version}";
67
78 # Upstream doesn't version their URLs.
89 # http://dotcolon.net/font/vegur/ → http://dotcolon.net/DL/font/vegur.zip
9− src = fetchurl {
10− url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm";
11− sha256 = "0ra3fds3b352rpzn0015km539c3l2ik2lqd5x6fr65ss9fg2xn34";
12− };
13−
14− nativeBuildInputs = [ rpmextract unzip ];
10+ url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm";
1511
16− unpackPhase = ''
17− rpmextract $src
12+ postFetch = ''
13+ ${buildPackages.rpmextract}/bin/rpmextract $downloadedFile
1814 unzip vegur.zip
15+ install -m444 -Dt $out/share/fonts/Vegur *.otf
1916 '';
17+ sha256 = "0iisi2scq72lyj7pc1f36fhfjnm676n5byl4zaavhbxpdrbc6d1v";
2018
21− installPhase = ''
22− mkdir -p $out/share/fonts/Vegur
23− cp *.otf $out/share/fonts/Vegur
24− '';
25−
26− meta = with stdenv.lib; {
19+ meta = with lib; {
2720 homepage = http://dotcolon.net/font/vegur/;
2821 description = "A humanist sans serif font.";
2922 platforms = platforms.all;
pkgs/data/fonts/vista-fonts-chs/default.nix+5−5
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip, cabextract}:
1+{ lib, fetchzip, buildPackages }:
22
33# Modified from vista-fonts
44
@@ -8,7 +8,7 @@ fetchzip {
88 url = http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE;
99
1010 postFetch = ''
11− ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile
11+ ${buildPackages.cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile
1212
1313 mkdir -p $out/share/fonts/truetype
1414 cp *.ttf $out/share/fonts/truetype
@@ -25,12 +25,12 @@ fetchzip {
2525 meta = {
2626 description = "TrueType fonts from Microsoft Windows Vista For Simplified Chinese (Microsoft YaHei)";
2727 homepage = https://www.microsoft.com/typography/fonts/family.aspx?FID=350;
28− license = stdenv.lib.licenses.unfree;
29− maintainers = [ stdenv.lib.maintainers.ChengCat ];
28+ license = lib.licenses.unfree;
29+ maintainers = [ lib.maintainers.ChengCat ];
3030
3131 # Set a non-zero priority to allow easy overriding of the
3232 # fontconfig configuration files.
3333 priority = 5;
34− platforms = stdenv.lib.platforms.all;
34+ platforms = lib.platforms.all;
3535 };
3636}
pkgs/data/fonts/vista-fonts/default.nix+1−1
@@ -31,6 +31,6 @@ fetchzip {
3131 # Set a non-zero priority to allow easy overriding of the
3232 # fontconfig configuration files.
3333 priority = 5;
34− platforms = stdenv.lib.platforms.unix;
34+ broken = true; # source url is 404
3535 };
3636}
pkgs/data/fonts/weather-icons/default.nix+3−3
@@ -1,8 +1,8 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "2.0.10";
5−in fetchzip rec {
5+in fetchzip {
66 name = "weather-icons-${version}";
77
88 url = "https://github.com/erikflowers/weather-icons/archive/${version}.zip";
@@ -14,7 +14,7 @@ in fetchzip rec {
1414
1515 sha256 = "10zny9987wybq55sm803hrjkp33dq1lgmnxc15kssr8yb81g6qrl";
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 description = "Weather Icons";
1919 longDescription = ''
2020 Weather Icons is the only icon font and CSS with 222 weather themed icons,
pkgs/data/fonts/wqy-microhei/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33fetchzip rec {
44 name = "wqy-microhei-0.2.0-beta";
@@ -15,9 +15,9 @@ fetchzip rec {
1515 meta = {
1616 description = "A (mainly) Chinese Unicode font";
1717 homepage = http://wenq.org;
18− license = stdenv.lib.licenses.asl20;
19− maintainers = [ stdenv.lib.maintainers.pkmx ];
20− platforms = stdenv.lib.platforms.all;
18+ license = lib.licenses.asl20;
19+ maintainers = [ lib.maintainers.pkmx ];
20+ platforms = lib.platforms.all;
2121 };
2222}
2323
pkgs/data/fonts/wqy-zenhei/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "0.9.45";
@@ -18,8 +18,8 @@ in fetchzip rec {
1818 meta = {
1919 description = "A (mainly) Chinese Unicode font";
2020 homepage = http://wenq.org;
21− license = stdenv.lib.licenses.gpl2; # with font embedding exceptions
22− maintainers = [ stdenv.lib.maintainers.pkmx ];
23− platforms = stdenv.lib.platforms.all;
21+ license = lib.licenses.gpl2; # with font embedding exceptions
22+ maintainers = [ lib.maintainers.pkmx ];
23+ platforms = lib.platforms.all;
2424 };
2525}
pkgs/data/fonts/xkcd-font/default.nix+11−12
@@ -1,24 +1,23 @@
1−{ stdenv, fetchFromGitHub }:
1+{ lib, fetchFromGitHub }:
22
3−stdenv.mkDerivation rec {
3+let
44 pname = "xkcd-font";
55 version = "unstable-2017-08-24";
6+in fetchFromGitHub rec {
7+ name = "${pname}-${version}";
68
7− src = fetchFromGitHub {
8− owner = "ipython";
9− repo = pname;
10− rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
11− sha256 = "01wpfc1yp93b37r472mx2b459il5gywnv5sl7pp9afpycb3i4f6l";
12− };
13−
14− phases = [ "unpackPhase" "installPhase" ];
9+ owner = "ipython";
10+ repo = pname;
11+ rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
1512
16− installPhase = ''
13+ postFetch = ''
14+ tar xf $downloadedFile --strip=1
1715 install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
1816 install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
1917 '';
18+ sha256 = "0xhwa53aiz20763jb9nvbr2zq9k6jl69p07dc4b0apwrrwz0jfr1";
2019
21− meta = with stdenv.lib; {
20+ meta = with lib; {
2221 description = "The xkcd font";
2322 homepage = https://github.com/ipython/xkcd-font;
2423 license = licenses.cc-by-nc-30;
pkgs/data/fonts/yanone-kaffeesatz/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchzip}:
1+{ lib, fetchzip }:
22
33fetchzip {
44 name = "yanone-kaffeesatz-2004";
@@ -14,9 +14,9 @@ fetchzip {
1414
1515 meta = {
1616 description = "The free font classic";
17− maintainers = with stdenv.lib.maintainers; [ mt-caret ];
18− platforms = with stdenv.lib.platforms; all;
17+ maintainers = with lib.maintainers; [ mt-caret ];
18+ platforms = with lib.platforms; all;
1919 homepage = https://yanone.de/fonts/kaffeesatz/;
20− license = stdenv.lib.licenses.ofl;
20+ license = lib.licenses.ofl;
2121 };
2222}
pkgs/data/fonts/zilla-slab/default.nix+3−4
@@ -1,8 +1,7 @@
1−{ stdenv, fetchzip }:
1+{ lib, fetchzip }:
22
33let
44 version = "1.002";
5− hash = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f";
65in fetchzip {
76 name = "zilla-slab-${version}";
87
@@ -12,9 +11,9 @@ in fetchzip {
1211 mkdir -p $out/share/fonts/truetype
1312 cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/
1413 '';
15− sha256 = hash;
14+ sha256 = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f";
1615
17− meta = with stdenv.lib; {
16+ meta = with lib; {
1817 homepage = https://github.com/mozilla/zilla-slab;
1918 description = "Zilla Slab fonts";
2019 longDescription = ''
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+2−2
@@ -6,13 +6,13 @@
66
77stdenv.mkDerivation rec {
88 name = "evolution-data-server-${version}";
9− version = "3.32.1";
9+ version = "3.32.2";
1010
1111 outputs = [ "out" "dev" ];
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "0jb8d2a4kzz7an7d3db8mfpvhb6r1wrp8dk11vpa3jby60cxbbyd";
15+ sha256 = "1jdk3az797kznkg40nbxb3ddyx8s6favzxlc4vr840zxcl84k9vy";
1616 };
1717
1818 patches = [
pkgs/development/compilers/ghc/8.6.4.nix+3−2
@@ -9,7 +9,7 @@
99, # GHC can be built with system libffi or a bundled one.
1010 libffi ? null
1111
12−, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
12+, useLLVM ? !stdenv.targetPlatform.isx86
1313, # LLVM is conceptually a run-time-only depedendency, but for
1414 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
1515 # build-time dependency too.
@@ -31,7 +31,8 @@
3131
3232, # What flavour to build. An empty string indicates no
3333 # specific flavour and falls back to ghc default values.
34− ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
34+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
35+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
3536
3637, # Whether to disable the large address space allocator
3738 # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
pkgs/development/compilers/ghc/8.6.5.nix+3−2
@@ -9,7 +9,7 @@
99, # GHC can be built with system libffi or a bundled one.
1010 libffi ? null
1111
12−, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
12+, useLLVM ? !stdenv.targetPlatform.isx86
1313, # LLVM is conceptually a run-time-only depedendency, but for
1414 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
1515 # build-time dependency too.
@@ -31,7 +31,8 @@
3131
3232, # What flavour to build. An empty string indicates no
3333 # specific flavour and falls back to ghc default values.
34− ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
34+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
35+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
3536
3637, # Whether to disable the large address space allocator
3738 # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
pkgs/development/compilers/ghc/8.8.1.nix+3−2
@@ -9,7 +9,7 @@
99, # GHC can be built with system libffi or a bundled one.
1010 libffi ? null
1111
12−, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
12+, useLLVM ? !stdenv.targetPlatform.isx86
1313, # LLVM is conceptually a run-time-only depedendency, but for
1414 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
1515 # build-time dependency too.
@@ -31,7 +31,8 @@
3131
3232, # What flavour to build. An empty string indicates no
3333 # specific flavour and falls back to ghc default values.
34− ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
34+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
35+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
3536
3637, # Whether to disable the large address space allocator
3738 # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
pkgs/development/compilers/ghc/head.nix+3−2
@@ -6,7 +6,7 @@
66
77, libiconv ? null, ncurses
88
9−, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
9+, useLLVM ? !stdenv.targetPlatform.isx86
1010, # LLVM is conceptually a run-time-only depedendency, but for
1111 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
1212 # build-time dependency too.
@@ -29,7 +29,8 @@
2929, version ? "8.7.20190115"
3030, # What flavour to build. An empty string indicates no
3131 # specific flavour and falls back to ghc default values.
32− ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
32+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
33+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
3334
3435, # Whether to disable the large address space allocator
3536 # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
pkgs/development/compilers/llvm/7/lldb.nix+6
@@ -27,6 +27,9 @@ stdenv.mkDerivation {
2727 cmake/modules/LLDBStandalone.cmake
2828 sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \
2929 cmake/modules/LLDBStandalone.cmake
30+ sed -i -e 's,message(SEND_ERROR "Cannot find debugserver on system."),,' \
31+ -e 's,string(STRIP ''${XCODE_DEV_DIR} XCODE_DEV_DIR),,' \
32+ tools/debugserver/source/CMakeLists.txt
3033 '';
3134
3235 nativeBuildInputs = [ cmake python which swig ];
@@ -36,8 +39,11 @@ stdenv.mkDerivation {
3639 CXXFLAGS = "-fno-rtti";
3740 hardeningDisable = [ "format" ];
3841
42+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2";
43+
3944 cmakeFlags = [
4045 "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
46+ "-DSKIP_DEBUGSERVER=ON"
4147 ];
4248
4349 enableParallelBuilding = true;
pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patchdeleted−36
@@ -1,36 +0,0 @@
1−From f3db284516105fd30b5513a5528104574a7b8545 Mon Sep 17 00:00:00 2001
2−From: Samuel Dionne-Riel <samuel@dionne-riel.com>
3−Date: Thu, 9 Aug 2018 19:07:45 -0400
4−Subject: [PATCH] Disables `IO#isatty` test for sandboxed builds.
5−
6−---
7− mrbgems/mruby-io/test/io.rb | 13 -------------
8− 1 file changed, 13 deletions(-)
9−
10−diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb
11−index e06b1499..e8a54736 100644
12−--- a/mrbgems/mruby-io/test/io.rb
13−+++ b/mrbgems/mruby-io/test/io.rb
14−@@ -342,19 +342,6 @@ assert('IO#_read_buf') do
15− io.closed?
16− end
17−
18−-assert('IO#isatty') do
19−- skip "isatty is not supported on this platform" if MRubyIOTestUtil.win?
20−- f1 = File.open("/dev/tty")
21−- f2 = File.open($mrbtest_io_rfname)
22−-
23−- assert_true f1.isatty
24−- assert_false f2.isatty
25−-
26−- f1.close
27−- f2.close
28−- true
29−-end
30−-
31− assert('IO#pos=, IO#seek') do
32− fd = IO.sysopen $mrbtest_io_rfname
33− io = IO.new fd
34−--
35−2.16.4
36−
pkgs/development/compilers/mruby/default.nix+3−7
@@ -1,20 +1,16 @@
11{ stdenv, ruby, bison, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
4− name = "mruby-${version}";
5− version = "2.0.0";
4+ pname = "mruby";
5+ version = "2.0.1";
66
77 src = fetchFromGitHub {
88 owner = "mruby";
99 repo = "mruby";
1010 rev = version;
11− sha256 = "1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5";
11+ sha256 = "1zm2d5kj9fnfx8ifj8ysrrr838ipwmvz35byzjhprakrg64911p9";
1212 };
1313
14− patches = [
15− ./0001-Disables-IO-isatty-test-for-sandboxed-builds.patch
16− ];
17−
1814 nativeBuildInputs = [ ruby bison ];
1915
2016 # Necessary so it uses `gcc` instead of `ld` for linking.
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+39−3
@@ -41,8 +41,30 @@ self: super: {
4141 unix = null;
4242 xhtml = null;
4343
44− # Use our native version of the Cabal library.
45− cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; });
44+ # Use the current git version of cabal-install.
45+ cabal-install = overrideCabal (super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal-git; })) (drv: {
46+ src = pkgs.fetchFromGitHub {
47+ owner = "haskell";
48+ repo = "cabal";
49+ rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386";
50+ sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i";
51+ };
52+ version = "20190510-git";
53+ editedCabalFile = null;
54+ postUnpack = "sourceRoot+=/cabal-install";
55+ jailbreak = true;
56+ });
57+ Cabal-git = overrideCabal super.Cabal_2_4_1_0 (drv: {
58+ src = pkgs.fetchFromGitHub {
59+ owner = "haskell";
60+ repo = "cabal";
61+ rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386";
62+ sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i";
63+ };
64+ version = "20190510-git";
65+ editedCabalFile = null;
66+ postUnpack = "sourceRoot+=/Cabal";
67+ });
4668
4769 # Ignore overly restrictive upper version bounds.
4870 async = doJailbreak super.async;
@@ -56,10 +78,12 @@ self: super: {
5678 lucid = doJailbreak super.lucid;
5779 parallel = doJailbreak super.parallel;
5880 quickcheck-instances = doJailbreak super.quickcheck-instances;
81+ setlocale = doJailbreak super.setlocale;
5982 split = doJailbreak super.split;
6083 tasty-expected-failure = doJailbreak super.tasty-expected-failure;
6184 test-framework = doJailbreak super.test-framework;
6285 th-lift = self.th-lift_0_8_0_1;
86+ hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3
6387
6488 # These packages don't work and need patching and/or an update.
6589 primitive = overrideSrc (doJailbreak super.primitive) {
@@ -160,9 +184,21 @@ self: super: {
160184 url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
161185 sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
162186 });
163− aeson = appendPatch super.aeson (pkgs.fetchpatch {
187+ aeson = appendPatch (dontCheck super.aeson) (pkgs.fetchpatch { # the test suite breaks the compiler
164188 url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/aeson-1.4.3.0.patch";
165189 sha256 = "1z6wmsmc682qs3y768r0zx493dxardwbsp0wdc4dsx83c0m5x66f";
166190 });
191+ cassava = appendPatch super.cassava (pkgs.fetchpatch {
192+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
193+ sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
194+ });
195+ shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch {
196+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
197+ sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
198+ });
199+ lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch {
200+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch";
201+ sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1";
202+ });
167203
168204}
pkgs/development/haskell-modules/configuration-hackage2nix.yaml+17
@@ -3750,6 +3750,7 @@ broken-packages:
37503750 - cparsing
37513751 - CPBrainfuck
37523752 - cpio-conduit
3753+ - cpkg
37533754 - cplusplus-th
37543755 - cprng-aes-effect
37553756 - cpuperf
@@ -3956,6 +3957,7 @@ broken-packages:
39563957 - dead-simple-json
39573958 - Deadpan-DDP
39583959 - debian
3960+ - debug
39593961 - debug-me
39603962 - debug-trace-var
39613963 - decepticons
@@ -5083,6 +5085,7 @@ broken-packages:
50835085 - hakismet
50845086 - hakka
50855087 - hako
5088+ - hakyll
50865089 - hakyll-agda
50875090 - hakyll-blaze-templates
50885091 - hakyll-contrib
@@ -5091,9 +5094,16 @@ broken-packages:
50915094 - hakyll-contrib-hyphenation
50925095 - hakyll-contrib-links
50935096 - hakyll-convert
5097+ - hakyll-dhall
5098+ - hakyll-dir-list
5099+ - hakyll-favicon
50945100 - hakyll-filestore
5101+ - hakyll-images
50955102 - hakyll-ogmarkup
50965103 - hakyll-R
5104+ - hakyll-sass
5105+ - hakyll-series
5106+ - hakyll-shakespeare
50975107 - hakyll-shortcode
50985108 - hakyll-shortcut-links
50995109 - halberd
@@ -5627,6 +5637,7 @@ broken-packages:
56275637 - hocker
56285638 - hodatime
56295639 - HODE
5640+ - Hoed
56305641 - hog
56315642 - hogg
56325643 - hoggl
@@ -6335,6 +6346,7 @@ broken-packages:
63356346 - katip-syslog
63366347 - katt
63376348 - kawaii
6349+ - kazura-queue
63386350 - kd-tree
63396351 - kdesrc-build-extra
63406352 - kdt
@@ -6442,6 +6454,7 @@ broken-packages:
64426454 - language-c-comments
64436455 - language-c-inline
64446456 - language-conf
6457+ - language-csharp
64456458 - language-css
64466459 - language-dart
64476460 - language-dockerfile
@@ -7470,6 +7483,7 @@ broken-packages:
74707483 - parsec-pratt
74717484 - parseerror-eq
74727485 - parsely
7486+ - parser-combinators-tests
74737487 - parser-helper
74747488 - parser241
74757489 - parsergen
@@ -8203,6 +8217,7 @@ broken-packages:
82038217 - RNAlien
82048218 - RNAwolf
82058219 - rncryptor
8220+ - rob
82068221 - robin
82078222 - robots-txt
82088223 - roc-cluster
@@ -8453,6 +8468,7 @@ broken-packages:
84538468 - servant-streaming-docs
84548469 - servant-streaming-server
84558470 - servant-waargonaut
8471+ - servant-xml
84568472 - servant-zeppelin
84578473 - servant-zeppelin-client
84588474 - servant-zeppelin-server
@@ -9741,6 +9757,7 @@ broken-packages:
97419757 - wiring
97429758 - withdependencies
97439759 - wkt
9760+ - wkt-geom
97449761 - wl-pprint-ansiterm
97459762 - wl-pprint-terminfo
97469763 - WL500gPControl
pkgs/development/haskell-modules/configuration-nix.nix+20
@@ -128,6 +128,26 @@ self: super: builtins.intersectAttrs super {
128128 # the system-fileio tests use canonicalizePath, which fails in the sandbox
129129 system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
130130
131+ # Prevents needing to add `security_tool` as a run-time dependency for
132+ # everything using x509-system to give access to the `security` executable.
133+ x509-system =
134+ if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
135+ then
136+ # darwin.security_tool is broken in Mojave (#45042)
137+
138+ # We will use the system provided security for now.
139+ # Beware this WILL break in sandboxes!
140+
141+ # TODO(matthewbauer): If someone really needs this to work in sandboxes,
142+ # I think we can add a propagatedImpureHost dep here, but I’m hoping to
143+ # get a proper fix available soonish.
144+ overrideCabal super.x509-system (drv: {
145+ postPatch = (drv.postPatch or "") + ''
146+ substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
147+ '';
148+ })
149+ else super.x509-system;
150+
131151 # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
132152 gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
133153 glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
pkgs/development/haskell-modules/hackage-packages.nix+106−9
@@ -10169,6 +10169,8 @@ self: {
1016910169 testHaskellDepends = [ base process QuickCheck ];
1017010170 description = "Lightweight algorithmic debugging";
1017110171 license = stdenv.lib.licenses.bsd3;
10172+ hydraPlatforms = stdenv.lib.platforms.none;
10173+ broken = true;
1017210174 }) {};
1017310175
1017410176 "HoleyMonoid" = callPackage
@@ -44208,8 +44210,8 @@ self: {
4420844210 }:
4420944211 mkDerivation {
4421044212 pname = "cabal-cache";
44211− version = "1.0.0.7";
44212− sha256 = "1r1qz3nrh2k4gx6j6iiw3gvcflkl9l5yk81nj0c2snrz8wgsq28b";
44213+ version = "1.0.0.9";
44214+ sha256 = "1h7wp30gmggsrjgspsahn6b045njy6c23mhgkmhz6nn5s4wa1hak";
4421344215 isLibrary = true;
4421444216 isExecutable = true;
4421544217 libraryHaskellDepends = [
@@ -58088,6 +58090,8 @@ self: {
5808858090 testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
5808958091 description = "Build tool for C";
5809058092 license = stdenv.lib.licenses.bsd3;
58093+ hydraPlatforms = stdenv.lib.platforms.none;
58094+ broken = true;
5809158095 }) {};
5809258096
5809358097 "cplex-hs" = callPackage
@@ -64785,6 +64789,8 @@ self: {
6478564789 ];
6478664790 description = "Simple trace-based debugger";
6478764791 license = stdenv.lib.licenses.bsd3;
64792+ hydraPlatforms = stdenv.lib.platforms.none;
64793+ broken = true;
6478864794 }) {};
6478964795
6479064796 "debug-diff" = callPackage
@@ -66627,6 +66633,8 @@ self: {
6662766633 pname = "dhall-bash";
6662866634 version = "1.0.20";
6662966635 sha256 = "1nqiyvyj0dw1a6shy9bb1qxzjrnh8544hsa2c6rwg2j36f0lk73d";
66636+ revision = "1";
66637+ editedCabalFile = "0rld0k17lprd8ibwbk0aan94lbd5ffsx5a5apjgk4d4cs3jchycp";
6663066638 isLibrary = true;
6663166639 isExecutable = true;
6663266640 libraryHaskellDepends = [
@@ -66696,6 +66704,8 @@ self: {
6669666704 pname = "dhall-json";
6669766705 version = "1.2.8";
6669866706 sha256 = "0s5iygh9rfmhx3v62dnfr55xz60rjvnicrq9ydspy129mhf0zzgd";
66707+ revision = "1";
66708+ editedCabalFile = "04gbbjns1vgafvc10zx4vrk130kww0a6c4lcqcmapa8yi7vz9670";
6669966709 isLibrary = true;
6670066710 isExecutable = true;
6670166711 libraryHaskellDepends = [
@@ -66763,6 +66773,8 @@ self: {
6676366773 pname = "dhall-text";
6676466774 version = "1.0.17";
6676566775 sha256 = "0bs246857r801qnqvh8cb5wm1rplr7grynl4h989i61qz7vcqf53";
66776+ revision = "1";
66777+ editedCabalFile = "1avvybk495zngswlnjiqj8nk7iycwzzhxx3cml4w2yhqlic3xx2g";
6676666778 isLibrary = false;
6676766779 isExecutable = true;
6676866780 executableHaskellDepends = [
@@ -92221,12 +92233,13 @@ self: {
9222192233 bup curl git gnupg lsof openssh perl rsync wget which
9222292234 ];
9222392235 preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
92224− postBuild = ''
92236+ installPhase = "make PREFIX=$out BUILDER=: install";
92237+ checkPhase = ''
9222592238 ln -sf dist/build/git-annex/git-annex git-annex
9222692239 ln -sf git-annex git-annex-shell
92240+ export PATH+=":$PWD"
92241+ git-annex test
9222792242 '';
92228− installPhase = "make PREFIX=$out BUILDER=: install install-completions";
92229− checkPhase = ''PATH+=":$PWD" git-annex test'';
9223092243 enableSharedExecutables = false;
9223192244 description = "manage files with git, without checking their contents into git";
9223292245 license = stdenv.lib.licenses.agpl3;
@@ -99881,6 +99894,19 @@ self: {
9988199894 license = stdenv.lib.licenses.gpl3;
9988299895 }) {};
9988399896
99897+ "gw" = callPackage
99898+ ({ mkDerivation, base, unix }:
99899+ mkDerivation {
99900+ pname = "gw";
99901+ version = "0.1";
99902+ sha256 = "055pkk3gg74r4yzh3fxq1zvp1fv3i8cd53jscy1b2n3mmzhbzahv";
99903+ isLibrary = false;
99904+ isExecutable = true;
99905+ executableHaskellDepends = [ base unix ];
99906+ description = "ghcWithPackages cmdline util";
99907+ license = stdenv.lib.licenses.bsd3;
99908+ }) {};
99909+
9988499910 "gyah-bin" = callPackage
9988599911 ({ mkDerivation, base, extra, GiveYouAHead }:
9988699912 mkDerivation {
@@ -102234,6 +102260,8 @@ self: {
102234102260 testToolDepends = [ utillinux ];
102235102261 description = "A static website compiler library";
102236102262 license = stdenv.lib.licenses.bsd3;
102263+ hydraPlatforms = stdenv.lib.platforms.none;
102264+ broken = true;
102237102265 }) {inherit (pkgs) utillinux;};
102238102266
102239102267 "hakyll-R" = callPackage
@@ -102413,6 +102441,8 @@ self: {
102413102441 executableHaskellDepends = [ base dhall hakyll ];
102414102442 description = "Dhall compiler for Hakyll";
102415102443 license = stdenv.lib.licenses.bsd3;
102444+ hydraPlatforms = stdenv.lib.platforms.none;
102445+ broken = true;
102416102446 }) {};
102417102447
102418102448 "hakyll-dir-list" = callPackage
@@ -102427,6 +102457,8 @@ self: {
102427102457 ];
102428102458 description = "Allow Hakyll to create hierarchical menues from directories";
102429102459 license = stdenv.lib.licenses.bsd3;
102460+ hydraPlatforms = stdenv.lib.platforms.none;
102461+ broken = true;
102430102462 }) {};
102431102463
102432102464 "hakyll-elm" = callPackage
@@ -102455,6 +102487,8 @@ self: {
102455102487 executableHaskellDepends = [ base hakyll ];
102456102488 testHaskellDepends = [ base ];
102457102489 license = stdenv.lib.licenses.bsd3;
102490+ hydraPlatforms = stdenv.lib.platforms.none;
102491+ broken = true;
102458102492 }) {};
102459102493
102460102494 "hakyll-filestore" = callPackage
@@ -102494,6 +102528,8 @@ self: {
102494102528 ];
102495102529 description = "Hakyll utilities to work with images";
102496102530 license = stdenv.lib.licenses.bsd3;
102531+ hydraPlatforms = stdenv.lib.platforms.none;
102532+ broken = true;
102497102533 }) {};
102498102534
102499102535 "hakyll-ogmarkup" = callPackage
@@ -102522,6 +102558,8 @@ self: {
102522102558 ];
102523102559 description = "Hakyll SASS compiler over hsass";
102524102560 license = stdenv.lib.licenses.mit;
102561+ hydraPlatforms = stdenv.lib.platforms.none;
102562+ broken = true;
102525102563 }) {};
102526102564
102527102565 "hakyll-series" = callPackage
@@ -102533,6 +102571,8 @@ self: {
102533102571 libraryHaskellDepends = [ base containers hakyll ];
102534102572 description = "Adds series functionality to hakyll";
102535102573 license = stdenv.lib.licenses.mit;
102574+ hydraPlatforms = stdenv.lib.platforms.none;
102575+ broken = true;
102536102576 }) {};
102537102577
102538102578 "hakyll-shakespeare" = callPackage
@@ -102550,6 +102590,8 @@ self: {
102550102590 ];
102551102591 description = "Hakyll Hamlet compiler";
102552102592 license = stdenv.lib.licenses.mit;
102593+ hydraPlatforms = stdenv.lib.platforms.none;
102594+ broken = true;
102553102595 }) {};
102554102596
102555102597 "hakyll-shortcode" = callPackage
@@ -119173,6 +119215,29 @@ self: {
119173119215 license = stdenv.lib.licenses.bsd3;
119174119216 }) {inherit (pkgs) ruby;};
119175119217
119218+ "hruby_0_3_7" = callPackage
119219+ ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
119220+ , process, QuickCheck, ruby, scientific, stm, text
119221+ , unordered-containers, vector
119222+ }:
119223+ mkDerivation {
119224+ pname = "hruby";
119225+ version = "0.3.7";
119226+ sha256 = "1i77gmkggm6l17zr1jrn65rjgh3m47f7wz5j9c715mi2ilr01qfx";
119227+ setupHaskellDepends = [ base Cabal process ];
119228+ libraryHaskellDepends = [
119229+ aeson attoparsec base bytestring scientific stm text
119230+ unordered-containers vector
119231+ ];
119232+ librarySystemDepends = [ ruby ];
119233+ testHaskellDepends = [
119234+ aeson attoparsec base QuickCheck text vector
119235+ ];
119236+ description = "Embed a Ruby intepreter in your Haskell program !";
119237+ license = stdenv.lib.licenses.bsd3;
119238+ hydraPlatforms = stdenv.lib.platforms.none;
119239+ }) {inherit (pkgs) ruby;};
119240+
119176119241 "hs-GeoIP" = callPackage
119177119242 ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
119178119243 mkDerivation {
@@ -137709,6 +137774,8 @@ self: {
137709137774 ];
137710137775 description = "Fast concurrent queues much inspired by unagi-chan";
137711137776 license = stdenv.lib.licenses.bsd3;
137777+ hydraPlatforms = stdenv.lib.platforms.none;
137778+ broken = true;
137712137779 }) {};
137713137780
137714137781 "kbq-gu" = callPackage
@@ -140522,6 +140589,8 @@ self: {
140522140589 libraryToolDepends = [ alex ];
140523140590 description = "C# source code manipulation";
140524140591 license = stdenv.lib.licenses.bsd3;
140592+ hydraPlatforms = stdenv.lib.platforms.none;
140593+ broken = true;
140525140594 }) {};
140526140595
140527140596 "language-css" = callPackage
@@ -172143,6 +172212,8 @@ self: {
172143172212 testToolDepends = [ hspec-discover ];
172144172213 description = "Test suite of parser-combinators";
172145172214 license = stdenv.lib.licenses.bsd3;
172215+ hydraPlatforms = stdenv.lib.platforms.none;
172216+ broken = true;
172146172217 }) {};
172147172218
172148172219 "parser-helper" = callPackage
@@ -192469,12 +192540,16 @@ self: {
192469192540 }) {};
192470192541
192471192542 "relation" = callPackage
192472− ({ mkDerivation, array, base, containers, groom }:
192543+ ({ mkDerivation, base, containers, hedgehog, hspec, hspec-discover
192544+ , hw-hspec-hedgehog
192545+ }:
192473192546 mkDerivation {
192474192547 pname = "relation";
192475− version = "0.2.1";
192476− sha256 = "03h6l8v3ppxbwg9ddgg121yx3i2v4vbcpwrv1vg3mgbw5pwq7x4c";
192477− libraryHaskellDepends = [ array base containers groom ];
192548+ version = "0.4";
192549+ sha256 = "1jy5m0jih6ik05zagngrskk1ibiiblxsydxgdq6kjx1aa2pqnmqi";
192550+ libraryHaskellDepends = [ base containers ];
192551+ testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
192552+ testToolDepends = [ hspec-discover ];
192478192553 description = "A data structure representing Relations on Sets";
192479192554 license = stdenv.lib.licenses.bsd3;
192480192555 hydraPlatforms = stdenv.lib.platforms.none;
@@ -195640,6 +195715,8 @@ self: {
195640195715 testHaskellDepends = [ base directory ];
195641195716 description = "Simple projects generator";
195642195717 license = stdenv.lib.licenses.mit;
195718+ hydraPlatforms = stdenv.lib.platforms.none;
195719+ broken = true;
195643195720 }) {};
195644195721
195645195722 "robin" = callPackage
@@ -204334,6 +204411,8 @@ self: {
204334204411 ];
204335204412 description = "Servant support for the XML Content-Type";
204336204413 license = stdenv.lib.licenses.bsd3;
204414+ hydraPlatforms = stdenv.lib.platforms.none;
204415+ broken = true;
204337204416 }) {};
204338204417
204339204418 "servant-yaml" = callPackage
@@ -223107,6 +223186,22 @@ self: {
223107223186 broken = true;
223108223187 }) {};
223109223188
223189+ "tasty-lua" = callPackage
223190+ ({ mkDerivation, base, bytestring, directory, file-embed, hslua
223191+ , tasty, tasty-hunit, text
223192+ }:
223193+ mkDerivation {
223194+ pname = "tasty-lua";
223195+ version = "0.1.0";
223196+ sha256 = "199zhrd48ixyi32spnm85v0dj6i09sl3rwi42kaxdlxkkmc54i1z";
223197+ libraryHaskellDepends = [
223198+ base bytestring file-embed hslua tasty text
223199+ ];
223200+ testHaskellDepends = [ base directory hslua tasty tasty-hunit ];
223201+ description = "Write tests in Lua, integrate into tasty";
223202+ license = stdenv.lib.licenses.mit;
223203+ }) {};
223204+
223110223205 "tasty-program" = callPackage
223111223206 ({ mkDerivation, base, deepseq, directory, filepath, process, tasty
223112223207 }:
@@ -245543,6 +245638,8 @@ self: {
245543245638 ];
245544245639 description = "A parser of WKT, WKB and eWKB";
245545245640 license = stdenv.lib.licenses.asl20;
245641+ hydraPlatforms = stdenv.lib.platforms.none;
245642+ broken = true;
245546245643 }) {};
245547245644
245548245645 "wl-pprint" = callPackage
pkgs/development/libraries/alkimia/default.nix+6−5
@@ -1,19 +1,20 @@
11{ mkDerivation, fetchurl, lib
2−, extra-cmake-modules, doxygen, graphviz, qtbase, mpir
2+, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebkit, mpir
3+, kdelibs4support, plasma-framework, knewstuff, kpackage
34}:
45
56mkDerivation rec {
67 name = "alkimia-${version}";
7− version = "7.0.1";
8+ version = "8.0.1";
89
910 src = fetchurl {
10− url = "mirror://kde/stable/alkimia/${version}/src/${name}.tar.xz";
11− sha256 = "1fri76465058fgsyrmdrc3hj1javz4g10mfzqp5rsj7qncjr1i22";
11+ url = "mirror://kde/stable/alkimia/${version}/${name}.tar.xz";
12+ sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m";
1213 };
1314
1415 nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
1516
16− buildInputs = [ qtbase ];
17+ buildInputs = [ qtbase qtwebkit kdelibs4support plasma-framework knewstuff kpackage ];
1718 propagatedBuildInputs = [ mpir ];
1819
1920 meta = {
pkgs/development/libraries/ctl/default.nix+22−13
@@ -1,22 +1,31 @@
1−{ stdenv, callPackage, cmake, pkgconfig, ilmbase, libtiff, openexr }:
1+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, ilmbase, libtiff, openexr }:
22
3−let
4− source = callPackage ./source.nix { };
5−in
6−stdenv.mkDerivation {
7− name = "ctl-${source.version}";
3+stdenv.mkDerivation rec {
4+ pname = "ctl";
5+ version = "1.5.2";
86
9− src = source.src;
7+ src = fetchFromGitHub {
8+ owner = "ampas";
9+ repo = pname;
10+ rev = "${pname}-${version}";
11+ sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx";
12+ };
13+
14+ patches = [
15+ (fetchpatch {
16+ name = "ctl-1.5.2-ilm_230.patch";
17+ url = "https://src.fedoraproject.org/rpms/CTL/raw/9d7c15a91bccdc0a9485d463bf2789be72e6b17d/f/ctl-1.5.2-ilm_230.patch";
18+ sha256 = "0mdx7llwrm0q8ai53zhyxi40i9h5s339dbkqpqv30yzi2xpnfj3d";
19+ })
20+ ];
1021
11− nativeBuildInputs = [ pkgconfig ];
12− buildInputs = [ cmake libtiff ilmbase openexr ];
22+ nativeBuildInputs = [ cmake pkgconfig ];
23+ buildInputs = [ libtiff ilmbase openexr ];
1324
1425 meta = with stdenv.lib; {
1526 description = "Color Transformation Language";
16− homepage = http://ampasctl.sourceforge.net;
17− license = "A.M.P.A.S";
27+ homepage = "https://github.com/ampas/CTL";
28+ license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible
1829 platforms = platforms.all;
1930 };
20−
21− passthru.source = source;
2231}
pkgs/development/libraries/ctl/source.nixdeleted−11
@@ -1,11 +0,0 @@
1−{ fetchFromGitHub }:
2−rec {
3− version = "1.5.2";
4−
5− src = fetchFromGitHub {
6− owner = "ampas";
7− repo = "CTL";
8− rev = "ctl-${version}";
9− sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx";
10− };
11−}
pkgs/development/libraries/gtksourceview/3.x.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "gtksourceview-${version}";
6− version = "3.24.10";
6+ version = "3.24.11";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b";
10+ sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9";
1111 };
1212
1313 propagatedBuildInputs = [
pkgs/development/libraries/java/lombok/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
4− name = "lombok-1.18.4";
4+ name = "lombok-1.18.8";
55
66 src = fetchurl {
77 url = "https://projectlombok.org/downloads/${name}.jar";
8− sha256 = "0hlpycnmzd71ihn59hzf445dvwky2lkv57jimx91i6v7xcnr5wrr";
8+ sha256 = "1z14rc3fh03qvn2xkjrb7ha0hddv3f3vsp781xm336sp4cl9b5h3";
99 };
1010
1111 buildCommand = ''
pkgs/development/libraries/libdazzle/default.nix+2−2
@@ -2,7 +2,7 @@
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }:
33
44let
5− version = "3.32.1";
5+ version = "3.32.2";
66 pname = "libdazzle";
77in
88stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313
1414 src = fetchurl {
1515 url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
16− sha256 = "0wprqgn480r31pcgmpyk9l6cfvlczfcx10fpqaq9pbn3vjgs3393";
16+ sha256 = "0hgi7gnkna9n42nh7p81crrw0jjj22yr8acych60wxh6hzxqsgs1";
1717 };
1818
1919 nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ];
pkgs/development/libraries/libgda/default.nix+2−2
@@ -9,11 +9,11 @@ assert postgresSupport -> postgresql != null;
99
1010(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
1111 pname = "libgda";
12− version = "5.2.8";
12+ version = "5.2.9";
1313
1414 src = fetchurl {
1515 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
16− sha256 = "0id4my5wh2m6rd7ijqp2azsjdb4l4yjrv3imq71kly00gjc6v1z2";
16+ sha256 = "16vxv2qvysh22s8h9h6irx96sacagxkz0i4qgi1wc6ibly6fvjjr";
1717 };
1818 configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ]
1919 ++ (optional (mysqlSupport) "--with-mysql=yes")
pkgs/development/libraries/linbox/default.nix+3−2
@@ -12,13 +12,13 @@
1212stdenv.mkDerivation rec {
1313 name = "${pname}-${version}";
1414 pname = "linbox";
15− version = "1.6.0";
15+ version = "1.6.1";
1616
1717 src = fetchFromGitHub {
1818 owner = "linbox-team";
1919 repo = "${pname}";
2020 rev = "v${version}";
21− sha256 = "0rmk474hvgkggmhxwa5i52wdnbvipx9n8mpsc41j1c96q4v8fl22";
21+ sha256 = "11mgj7pkppvzmhx5g6wfnzisk36z00gqzzq9p14hzh5dbdhk3693";
2222 };
2323
2424 nativeBuildInputs = [
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
6161 license = stdenv.lib.licenses.lgpl21Plus;
6262 maintainers = [stdenv.lib.maintainers.timokau];
6363 platforms = stdenv.lib.platforms.unix;
64+ broken = stdenv.isDarwin || stdenv.isAarch64; # https://trac.sagemath.org/ticket/26932#comment:21
6465 homepage = http://linalg.org/;
6566 };
6667}
pkgs/development/libraries/oniguruma/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "onig-${version}";
5− version = "6.9.1";
5+ version = "6.9.2";
66
77 src = fetchFromGitHub {
88 owner = "kkos";
99 repo = "oniguruma";
1010 rev = "v${version}";
11− sha256 = "0dbdd9r15fsqn0rimkjwlv8v68v4i1830h0m7dw56b335wwl6bbg";
11+ sha256 = "15asc9v6ylal8fwzlnrh673mp62wngxvv9jx7h86vhljjdap6yfc";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/portaudio/default.nix+2
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515
1616 configureFlags = [ "--disable-mac-universal --enable-cxx" ];
1717
18+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays";
19+
1820 propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
1921
2022 patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
pkgs/development/libraries/range-v3/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "range-v3-${version}";
5− version = "0.4.0";
5+ version = "0.5.0";
66
77 src = fetchFromGitHub {
88 owner = "ericniebler";
99 repo = "range-v3";
1010 rev = version;
11− sha256 = "1s5gj799aa94nfg3r24whq7ck69g0zypf70w14wx64pgwg0424vf";
11+ sha256 = "0fzbpaa4vwlivi417zxm1d6v4lkp5c9f5bd706nn2fmw3zxjj815";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/tbb/default.nix+2−2
@@ -2,13 +2,13 @@
22
33with stdenv.lib; stdenv.mkDerivation rec {
44 name = "tbb-${version}";
5− version = "2019_U5";
5+ version = "2019_U6";
66
77 src = fetchFromGitHub {
88 owner = "01org";
99 repo = "tbb";
1010 rev = version;
11− sha256 = "0390da1iya2mvn3ribjb1f8yvzsqsf5b16wn6dqbjxcz0crmwlzk";
11+ sha256 = "1zbf06l659vq6s5wp3ln96ycwcd42caffan5vilqvqyxqvjljyic";
1212 };
1313
1414 makeFlags = concatStringsSep " " (
pkgs/development/python-modules/ansible-runner/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "ansible-runner";
16− version = "1.3.3";
16+ version = "1.3.4";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "2a2b83e63b830de3ff01c2992342cfe09f96e410953c85904ee7e301b21fa513";
20+ sha256 = "087jk00kv0qsqqspyn015nicvbl627wck3fgx2qhqawvrgqk3xb0";
2121 };
2222
2323 checkInputs = [ pytest mock ];
pkgs/development/python-modules/av/default.nix+3−4
@@ -1,7 +1,6 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, nose
54, numpy
65, ffmpeg_4
76, libav
@@ -10,14 +9,14 @@
109
1110buildPythonPackage rec {
1211 pname = "av";
13− version = "6.1.2";
12+ version = "6.2.0";
1413
1514 src = fetchPypi {
1615 inherit pname version;
17− sha256 = "eebbb56eeae650b1fc551f94d51aee39b487bf4df73c39daea186c5d2950650f";
16+ sha256 = "1wm33qajxcpl9rn7zfb2pwwqn87idb7ic7h5zwy2hgbpjnh3vc2g";
1817 };
1918
20− checkInputs = [ nose numpy ];
19+ checkInputs = [ numpy ];
2120
2221 nativeBuildInputs = [ pkgconfig ];
2322 buildInputs = [ ffmpeg_4 ];
pkgs/development/python-modules/holoviews/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616buildPythonPackage rec {
1717 pname = "holoviews";
18− version = "1.11.3";
18+ version = "1.12.2";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "cb03053bfcb96ccef181405b6d3482a5b868f0c7fbaa68b52d25e0071dafd1bc";
22+ sha256 = "0i4lfnajz685hlp9m0bjn7s279bv6mm5118b1qmldzqdnvw4s032";
2323 };
2424
2525 propagatedBuildInputs = [
pkgs/development/python-modules/latexcodec/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "latexcodec";
5− version = "1.0.6";
5+ version = "1.0.7";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0s4wdbg0w2l8pj3i0y4510i0s04p8nhxcsa2z41bjsv0k66npb81";
9+ sha256 = "0wnp3yqcgx0rpy8dz51vh75lbp2qif67da19zi7m3ca98n887hgb";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/phonenumbers/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "phonenumbers";
5− version = "8.10.10";
5+ version = "8.10.11";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "dabc8cfcff96446b0787ea337739ea286ec3949ec27a4790a9b4587817da5c5f";
9+ sha256 = "1rd46dryxkwlha9lfqqwywazlh908ngh6076zz3myhzf8h3dmxnz";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/py-radix/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv
2+, buildPythonPackage
3+, fetchFromGitHub
4+, coverage
5+, nose
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "py-radix";
10+ version = "0.10.0";
11+
12+ src = fetchFromGitHub {
13+ owner = "mjschultz";
14+ repo = "py-radix";
15+ rev = "v${version}";
16+ sha256 = "01xyn9lg6laavnzczf5bck1l1c2718ihxx0hvdkclnnxjqhbrqis";
17+ };
18+
19+ doCheck = true;
20+ checkInputs = [ coverage nose ];
21+
22+ meta = with stdenv.lib; {
23+ description = "Python radix tree for IPv4 and IPv6 prefix matching";
24+ homepage = https://github.com/mjschultz/py-radix;
25+ license = with licenses; [ isc bsdOriginal ];
26+ maintainers = with maintainers; [ mkg ];
27+ };
28+}
pkgs/development/python-modules/pyopenssl/default.nix+14−1
@@ -32,12 +32,25 @@ let
3232 "test_set_notBefore"
3333 ];
3434
35+ # these tests are extremely tightly wed to the exact output of the openssl cli tool,
36+ # including exact punctuation.
37+ failingOpenSSL_1_1Tests = [
38+ "test_dump_certificate"
39+ "test_dump_privatekey_text"
40+ "test_dump_certificate_request"
41+ "test_export_text"
42+ ];
43+
3544 disabledTests = [
3645 # https://github.com/pyca/pyopenssl/issues/692
3746 # These tests, we disable always.
3847 "test_set_default_verify_paths"
3948 "test_fallback_default_verify_paths"
40− ] ++ (optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests);
49+ ] ++ (
50+ optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
51+ ) ++ (
52+ optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
53+ );
4154
4255 # Compose the final string expression, including the "-k" and the single quotes.
4356 testExpression = optionalString (disabledTests != [])
pkgs/development/python-modules/python-gnupg/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, gnupg1 }:
1+{ stdenv, buildPythonPackage, fetchPypi, gnupg }:
22
33buildPythonPackage rec {
44 pname = "python-gnupg";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
1212 # Let's make the library default to our gpg binary
1313 patchPhase = ''
1414 substituteInPlace gnupg.py \
15− --replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'"
15+ --replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'"
1616 substituteInPlace test_gnupg.py \
17− --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'" \
17+ --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg}/bin/gpg'" \
1818 --replace "test_search_keys" "disabled__test_search_keys"
1919 '';
2020
pkgs/development/python-modules/qdarkstyle/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "qdarkstyle";
5− version = "2.6.6";
5+ version = "2.6.8";
66
77 src = fetchPypi {
88 inherit version;
99 pname = "QDarkStyle";
10− sha256 = "1jbvvg36fnbvpzvg4ns7zx5jj8h1xsqdr05v5m98a0a9r8awdx3m";
10+ sha256 = "18l2ynq2x8jd380nr47xy947c3qdmhv8nnxnan03y5d51azm8yh3";
1111 };
1212
1313 # No tests available
pkgs/development/python-modules/qtconsole/default.nix+2−2
@@ -14,11 +14,11 @@
1414
1515buildPythonPackage rec {
1616 pname = "qtconsole";
17− version = "4.4.3";
17+ version = "4.4.4";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "1b03n1ixzscm0jw97l4dq5iy4fslnqxq5bb8287xb7n2a1gs26xw";
21+ sha256 = "1qqyk5wlaps1m2hb5n2q1gynw2ayqn31dvxwwni4450ygf65arx6";
2222 };
2323
2424 checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
pkgs/development/python-modules/qtpy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "QtPy";
5− version = "1.7.0";
5+ version = "1.7.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0gjg7farw6mkmrwqcg6ms7j74g8py2msvawddji4wy8yfvql1ifl";
9+ sha256 = "17pdn4d77gjjrsq7m1i6dz9px0dfi6wgaqz2v3sa3crl15spawp9";
1010 };
1111
1212 # no concrete propagatedBuildInputs as multiple backends are supposed
pkgs/development/python-modules/shodan/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "shodan";
12− version = "1.12.1";
12+ version = "1.13.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "0fd68yaqhpay7jxhyc6xkdrak88wdblxs0phgdkngbakx2yaw2y3";
16+ sha256 = "06z9h5vxrvqns3yr4jfrxifw0iqdn6ijlnznpmyi8nc18h8yma2a";
1717 };
1818
1919 propagatedBuildInputs = [
pkgs/development/python-modules/smart_open/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "smart_open";
15− version = "1.8.2";
15+ version = "1.8.3";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "d3c16477ad7e8f94ab033630ea31993670ad21153172367db1acb143077d501c";
19+ sha256 = "029b0ns6q9vl4pyk1w7jp4dvif1mfgr53a58z1p8zipwnhkfwnih";
2020 };
2121
2222 # nixpkgs version of moto is >=1.2.0, remove version pin to fix build
pkgs/development/python-modules/typed-ast/default.nix+2−2
@@ -1,10 +1,10 @@
11{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
22buildPythonPackage rec {
33 pname = "typed-ast";
4− version = "1.3.4";
4+ version = "1.3.5";
55 src = fetchPypi{
66 inherit pname version;
7− sha256 = "68c362848d9fb71d3c3e5f43c09974a0ae319144634e7a47db62f0f2a54a7fa7";
7+ sha256 = "1m7pr6qpana3cvqwiw7mlvrgvmw27ch5mx1592572xhlki8g85ak";
88 };
99 # Only works with Python 3.3 and newer;
1010 disabled = pythonOlder "3.3";
pkgs/development/tools/analysis/radare2/default.nix+6−6
@@ -110,12 +110,12 @@ in {
110110 #<generated>
111111 # DO NOT EDIT! Automatically generated by ./update.py
112112 radare2 = generic {
113− version_commit = "21276";
114− gittap = "3.4.1";
115− gittip = "da30e593718d5149f2a3d520c7f79fe1c7ca46ef";
116− rev = "3.4.1";
117− version = "3.4.1";
118− sha256 = "02qfj11j8f37hl46m8h4x9pv161glgdr7q3rfhwmq46px9y7f17p";
113+ version_commit = "21707";
114+ gittap = "3.5.0";
115+ gittip = "75cfab37c6cfd0caffb9a90a949f5e60282bbd6c";
116+ rev = "3.5.0";
117+ version = "3.5.0";
118+ sha256 = "03zm74a4vpip4pzj1s3gm2bdihw0iz47w8sxbhjf74074x1ylpzv";
119119 cs_ver = "4.0.1";
120120 cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
121121 };
pkgs/development/tools/build-managers/bazel/default.nix+2−2
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
153153 sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m
154154
155155 # don't use system installed Xcode to run clang, use Nix clang instead
156− sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
156+ sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
157157 scripts/bootstrap/compile.sh \
158158 src/tools/xcode/realpath/BUILD \
159159 src/tools/xcode/stdredirect/BUILD \
@@ -256,7 +256,7 @@ stdenv.mkDerivation rec {
256256 makeWrapper
257257 which
258258 customBash
259− ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ];
259+ ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
260260
261261 # Bazel makes extensive use of symlinks in the WORKSPACE.
262262 # This causes problems with infinite symlinks if the build output is in the same location as the
pkgs/development/tools/build-managers/buck/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "buck";
5− version = "2019.01.10.01";
5+ version = "2019.05.06.01";
66
77 src = fetchFromGitHub {
88 owner = "facebook";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0987s399v4ba2a3crca12vsg9001xcb5drhqi564ninpa5vxamr2";
11+ sha256 = "0bcj1g8hmcpdgz3c2sxglxxq1jn1x0p9dk6hml8ajkn4h82kw12y";
1212 };
1313
1414 patches = [ ./pex-mtime.patch ];
pkgs/development/tools/build-managers/leiningen/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeWrapper
2−, coreutils, jdk, rlwrap, gnupg1compat }:
2+, coreutils, jdk, rlwrap, gnupg }:
33
44stdenv.mkDerivation rec {
55 pname = "leiningen";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
4141 wrapProgram $out/bin/lein \
4242 --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \
43− --set LEIN_GPG ${gnupg1compat}/bin/gpg \
43+ --set LEIN_GPG ${gnupg}/bin/gpg \
4444 --set JAVA_CMD ${jdk}/bin/java
4545 '';
4646
pkgs/development/tools/chit/default.nixnew file+47
@@ -0,0 +1,47 @@
1+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl
2+, darwin
3+}:
4+
5+with rustPlatform;
6+
7+buildRustPackage rec {
8+ pname = "chit";
9+ version = "0.1.12";
10+
11+ src = fetchFromGitHub {
12+ owner = "peterheesterman";
13+ repo = pname;
14+ rev = version;
15+ sha256 = "17g2p07zhf4n4pjmws0ssfy2mrn0v933ih0vnlr1z2cv9mx8srsl";
16+ };
17+
18+ cargoSha256 = "1jqnnf4jgjpm1i310hda15423nxfw9frgpmc2kbrs66qcsj7avaw";
19+
20+ nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ];
21+ buildInputs = []
22+ ++ stdenv.lib.optionals stdenv.isLinux [ openssl ]
23+ ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ])
24+ ;
25+
26+ # Tests require network access
27+ doCheck = false;
28+
29+ meta = with stdenv.lib; {
30+ description = "Crate help in terminal: A tool for looking up details about rust crates without going to crates.io";
31+ longDescription = ''
32+ Chit helps answer these questions:
33+
34+ * Who wrote this crate? What else did they write?
35+ * What alternatives are there?
36+ * How old is this crate?
37+ * What versions are there? When did they come out?
38+ * What are the downloads over time?
39+ * Should i use this crate?
40+ * How mature is it?
41+ '';
42+ homepage = https://github.com/peterheesterman/chit;
43+ license = licenses.mit;
44+ maintainers = [ maintainers.lilyball ];
45+ platforms = platforms.all;
46+ };
47+}
pkgs/development/tools/react-native-debugger/default.nix+2−2
@@ -38,11 +38,11 @@ let
3838 ];
3939in stdenv.mkDerivation rec {
4040 name = "react-native-debugger-${version}";
41− version = "0.9.7";
41+ version = "0.9.8";
4242
4343 src = fetchurl {
4444 url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
45− sha256 = "0f1wvk1550z4imcs60sv229zllcxpykx4b60bw658idr1xc3c0ix";
45+ sha256 = "07mcliy5f3kcqr76izqirqzwb2rwbnl3k1al9dln1izim0lhx06r";
4646 };
4747
4848 buildInputs = [ unzip ];
pkgs/development/tools/scalafmt/default.nix+4−3
@@ -2,7 +2,7 @@
22
33let
44 baseName = "scalafmt";
5− version = "2.0.0-RC5";
5+ version = "2.0.0-RC7";
66 deps = stdenv.mkDerivation {
77 name = "${baseName}-deps-${version}";
88 buildCommand = ''
@@ -13,13 +13,14 @@ let
1313 '';
1414 outputHashMode = "recursive";
1515 outputHashAlgo = "sha256";
16− outputHash = "0y2nja4dj3l7f7m9dxr8xwda8vv27dwj090gfsa78a20vq1d3xxw";
16+ outputHash = "0scz3pp63z6xfj69kvsfr8l3ll9rq95j4xlhlyrzg1vfl1gf41ig";
1717 };
1818in
1919stdenv.mkDerivation rec {
2020 name = "${baseName}-${version}";
2121
22− buildInputs = [ jdk makeWrapper deps ];
22+ nativeBuildInputs = [ makeWrapper ];
23+ buildInputs = [ jdk deps ];
2324
2425 doCheck = true;
2526
pkgs/development/tools/wabt/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "wabt-${version}";
5− version = "1.0.10";
5+ version = "1.0.11";
66
77 src = fetchFromGitHub {
88 owner = "WebAssembly";
99 repo = "wabt";
1010 rev = version;
11− sha256 = "0vki02317mbk5f2w9fxyslcrn5rl2sk845rrs318i37wsz6ismp3";
11+ sha256 = "0hn88vlqyclpk79v3wg3lrssd9vwhjdgvb41g03jqakygxxgnmp5";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/games/azimuth/default.nixnew file+64
@@ -0,0 +1,64 @@
1+{ stdenv, fetchFromGitHub, SDL }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "azimuth";
5+ version = "1.0.2";
6+
7+ src = fetchFromGitHub {
8+ owner = "mdsteele";
9+ repo = "azimuth";
10+ rev = "v${version}";
11+ sha256 = "0yh52i3vfmj5zd7fs1r2xpjy2mknycr5xz6kyixj2qncb25xsm7z";
12+ };
13+
14+ preConfigure = ''
15+ substituteInPlace data/azimuth.desktop \
16+ --replace Exec=azimuth "Exec=$out/bin/azimuth" \
17+ --replace "Version=%AZ_VERSION_NUMBER" "Version=${version}"
18+ '';
19+
20+ makeFlags = [
21+ "BUILDTYPE=release"
22+ ];
23+
24+ buildInputs = [ SDL ];
25+
26+ enableParallelBuilding = true;
27+
28+ # the game doesn't have an installation procedure
29+ installPhase = ''
30+ mkdir -p $out/bin
31+ cp out/release/host/bin/azimuth $out/bin/azimuth
32+ cp out/release/host/bin/editor $out/bin/azimuth-editor
33+ cp out/release/host/bin/muse $out/bin/azimuth-muse
34+ cp out/release/host/bin/zfxr $out/bin/azimuth-zfxr
35+ mkdir -p $out/share/doc/azimuth
36+ cp doc/* README.md LICENSE $out/share/doc/azimuth
37+ mkdir -p $out/share/icons/hicolor/128x128/apps $out/share/icons/hicolor/64x64/apps $out/share/icons/hicolor/48x48/apps $out/share/icons/hicolor/32x32/apps
38+ cp data/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/azimuth.png
39+ cp data/icons/icon_64x64.png $out/share/icons/hicolor/64x64/apps/azimuth.png
40+ cp data/icons/icon_48x48.png $out/share/icons/hicolor/48x48/apps/azimuth.png
41+ cp data/icons/icon_32x32.png $out/share/icons/hicolor/32x32/apps/azimuth.png
42+ mkdir -p $out/share/applications
43+ cp data/azimuth.desktop $out/share/applications
44+ '';
45+
46+ meta = {
47+ description = "A metroidvania game using only vectorial graphic";
48+ longDescription = ''
49+ Azimuth is a metroidvania game, and something of an homage to the previous
50+ greats of the genre (Super Metroid in particular). You will need to pilot
51+ your ship, explore the inside of the planet, fight enemies, overcome
52+ obstacles, and uncover the storyline piece by piece. Azimuth features a
53+ huge game world to explore, lots of little puzzles to solve, dozens of
54+ weapons and upgrades to find and use, and a wide variety of enemies and
55+ bosses to tangle with.
56+ '';
57+
58+ license = stdenv.lib.licenses.gpl3Plus;
59+ homepage = https://mdsteele.games/azimuth/index.html;
60+ maintainers = with stdenv.lib.maintainers; [ marius851000 ];
61+ platforms = stdenv.lib.platforms.linux;
62+ };
63+
64+}
pkgs/misc/emulators/wine/sources.nix+3−3
@@ -39,16 +39,16 @@ in rec {
3939
4040 unstable = fetchurl rec {
4141 # NOTE: Don't forget to change the SHA256 for staging as well.
42− version = "4.7";
42+ version = "4.8";
4343 url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz";
44− sha256 = "1c5swx6jj0hz9w2jgyl30pdjcq9n62qp1rmqyq1d4q2a6n291jiv";
44+ sha256 = "0dd1vw3bq47ypdpflgmmbi68pjw5z3wz26kfwvnkxqbp28fapfa8";
4545 inherit (stable) mono gecko32 gecko64;
4646 };
4747
4848 staging = fetchFromGitHub rec {
4949 # https://github.com/wine-staging/wine-staging/releases
5050 inherit (unstable) version;
51− sha256 = "1sgyq57dyzchwnvkgx96bcx5rv821s0vidzdyz7x5711j7xmiv70";
51+ sha256 = "0npm44zdys78qbqqyvjczqqjdgacpsfds3jxyy1y4yj2xjqzagsq";
5252 owner = "wine-staging";
5353 repo = "wine-staging";
5454 rev = "v${version}";
pkgs/misc/screensavers/xautolock/default.nix+2−2
@@ -4,7 +4,7 @@
44
55stdenv.mkDerivation rec {
66 name = "xautolock-${version}";
7− version = "2.2-6-ge68d0ed";
7+ version = "2.2-7-ga23dd5c";
88
99 # This repository contains xautolock-2.2 plus various useful patches that
1010 # were collected from Debian, etc.
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 owner = "peti";
1313 repo = "xautolock";
1414 rev = "v${version}";
15− sha256 = "1131ki6zwk94s8j6zqywf8r5kanx3nrjm692rxh8pcz4hv9qp1mz";
15+ sha256 = "10j61rl0sx9sh84rjyfyddl73xb5i2cpb17fyrli8kwj39nw0v2g";
1616 };
1717
1818 nativeBuildInputs = [ imake gccmakedep ];
pkgs/misc/vscode-extensions/cpptools/default.nix+2−2
@@ -68,8 +68,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
6868 mktplcRef = {
6969 name = "cpptools";
7070 publisher = "ms-vscode";
71− version = "0.22.1";
72− sha256 = "1f79vbp19k1zm2y5djr4vim0h5y5rnm96rg8fx2h9zb8i559230k";
71+ version = "0.23.0";
72+ sha256 = "1c7qia60fgak5pisl1qzp2kvm1cs30b29rxpydk7j3lqcpqr5ixj";
7373 };
7474
7575 buildInputs = [
pkgs/misc/vscode-extensions/wakatime/default.nix+2−2
@@ -8,8 +8,8 @@ in
88 mktplcRef = {
99 name = "vscode-wakatime";
1010 publisher = "WakaTime";
11− version = "2.0.9";
12− sha256 = "0fbliim80ydq90c606jhl79fdcmmpb9fs402mvy3g9zmjixspnpb";
11+ version = "2.1.0";
12+ sha256 = "0a23l8vaj0yghfh9lbi453vjghaxgjmphfjy2s4lgrvq38j4bv9n";
1313 };
1414
1515 postPatch = ''
pkgs/os-specific/linux/bpftool/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ stdenv, fetchurl
2+, libopcodes, libbfd, libelf
3+, linuxPackages_latest
4+}:
5+
6+stdenv.mkDerivation rec {
7+ pname = "bpftool";
8+ inherit (linuxPackages_latest.kernel) version src;
9+
10+ buildInputs = [ libopcodes libbfd libelf ];
11+
12+ preConfigure = ''
13+ cd tools/bpf/bpftool
14+ substituteInPlace ./Makefile \
15+ --replace '/usr/local' "$out" \
16+ --replace '/usr' "$out" \
17+ --replace '/sbin' '/bin'
18+ '';
19+
20+ meta = with stdenv.lib; {
21+ description = "Debugging/program analysis tool for the eBPF subsystem";
22+ license = [ licenses.gpl2 licenses.bsd2 ];
23+ platforms = platforms.linux;
24+ maintainers = with maintainers; [ thoughtpolice ];
25+ };
26+}
pkgs/os-specific/linux/kernel/common-config.nix+6
@@ -427,6 +427,12 @@ let
427427
428428 VFIO_PCI_VGA = mkIf stdenv.is64bit yes;
429429
430+ # VirtualBox guest drivers in the kernel conflict with the ones in the
431+ # official additions package and prevent the vboxsf module from loading,
432+ # so disable them for now.
433+ VBOXGUEST = option no;
434+ DRM_VBOXVIDEO = option no;
435+
430436 } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
431437 XEN = option yes;
432438
pkgs/os-specific/linux/usbutils/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }:
22
33stdenv.mkDerivation rec {
4− name = "usbutils-010";
4+ name = "usbutils-012";
55
66 src = fetchurl {
77 url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
8− sha256 = "06aag4jfgsfjxk563xsp9ik9nadihmasrr37a1gb0vwqni5kdiv1";
8+ sha256 = "0iiy0q7fzikavmdsjsb0sl9kp3gfh701qwyjjccvqh0qz4jlcqw8";
99 };
1010
1111 patches = [
pkgs/os-specific/linux/zfs/default.nix+2−2
@@ -182,9 +182,9 @@ in {
182182 # incompatibleKernelVersion = "4.19";
183183
184184 # this package should point to a version / git revision compatible with the latest kernel release
185− version = "0.8.0-rc4";
185+ version = "0.8.0-rc5";
186186
187− sha256 = "02cdxf62758smbqy723yqv8lkch1043alvcwhdnvya21ygcgycnw";
187+ sha256 = "1944w36rk33mn44zfvc1qbn2sv9h90r25zxnanwvyhss0vgqw73v";
188188 isUnstable = true;
189189
190190 extraPatches = [
pkgs/servers/http/nginx/modules.nix+93−20
@@ -6,8 +6,8 @@ let
66 src = fetchFromGitHub {
77 owner = "chobits";
88 repo = "ngx_http_proxy_connect_module";
9− rev = "8201639082cba702211585b03d4cc7bc51c65167";
10− sha256 = "0z71x3xnlczrr2kq43w3drxj9g14fkk4jz66x921v0yb8r9mnn5a";
9+ rev = "18e2520b361ffebde6c08c8119ecfba113a3b53c";
10+ sha256 = "1nyil5n2a97nqsqarvnp4bazw4vnxifqizzw5aank4vi9xlq90b2";
1111 };
1212
1313 patches = [
@@ -32,12 +32,21 @@ in
3232 inputs = [ pkgs.brotli ];
3333 };
3434
35+ coolkit = {
36+ src = fetchFromGitHub {
37+ owner = "FRiCKLE";
38+ repo = "ngx_coolkit";
39+ rev = "0.2";
40+ sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh";
41+ };
42+ };
43+
3544 dav = {
3645 src = fetchFromGitHub {
3746 owner = "arut";
3847 repo = "nginx-dav-ext-module";
39− rev = "v0.1.0";
40− sha256 = "1ifahd69vz715g3zim618jbmxb7kcmzykc696grskxm0svpy294k";
48+ rev = "v3.0.0";
49+ sha256 = "000dm5zk0m1hm1iq60aff5r6y8xmqd7djrwhgnz9ig01xyhnjv9w";
4150 };
4251 inputs = [ pkgs.expat ];
4352 };
@@ -87,6 +96,14 @@ in
8796 };
8897 };
8998
99+ http_proxy_connect_module_v15 = http_proxy_connect_module_generic "proxy_connect_rewrite_1015" // {
100+ supports = with lib.versions; version: major version == "1" && minor version == "15";
101+ };
102+
103+ http_proxy_connect_module_v14 = http_proxy_connect_module_generic "proxy_connect_rewrite_1014" // {
104+ supports = with lib.versions; version: major version == "1" && minor version == "14";
105+ };
106+
90107 ipscrub = {
91108 src = fetchFromGitHub {
92109 owner = "masonicboom";
@@ -97,12 +114,30 @@ in
97114 inputs = [ pkgs.libbsd ];
98115 };
99116
117+ limit-speed = {
118+ src = fetchFromGitHub {
119+ owner = "yaoweibin";
120+ repo = "nginx_limit_speed_module";
121+ rev = "f77ad4a56fbb134878e75827b40cf801990ed936";
122+ sha256 = "0kkrd08zpcwx938i2is07vq6pgjkvn97xzjab0g4zaz8bivgmjp8";
123+ };
124+ };
125+
126+ live ={
127+ src = fetchFromGitHub {
128+ owner = "arut";
129+ repo = "nginx-live-module";
130+ rev = "5e4a1e3a718e65e5206c24eba00d42b0d1c4b7dd";
131+ sha256 = "1kpnhl4b50zim84z22ahqxyxfq4jv8ab85kzsy2n5ciqbyg491lz";
132+ };
133+ };
134+
100135 lua = {
101136 src = fetchFromGitHub {
102137 owner = "openresty";
103138 repo = "lua-nginx-module";
104− rev = "v0.10.13";
105− sha256 = "19mpc76lfhyyvkfs2n08b4rc9cf2v7rm8fskkf60hsdcf6qna822";
139+ rev = "v0.10.14";
140+ sha256 = "1vg6pp9n8z42p6f3jqk15gvdyy7mfvs5ssfbiy83bydjx42fq7g0";
106141 };
107142 inputs = [ pkgs.luajit ];
108143 preConfigure = ''
@@ -148,6 +183,24 @@ in
148183 };
149184 };
150185
186+ mpeg-ts ={
187+ src = fetchFromGitHub {
188+ owner = "arut";
189+ repo = "nginx-ts-module";
190+ rev = "v0.1.1";
191+ sha256 = "12dxcyy6wna1fccl3a9lnsbymd6p4apnwz6c24w74v97qvpfdxqd";
192+ };
193+ };
194+
195+ naxsi ={
196+ src = fetchFromGitHub {
197+ owner = "nbs-system";
198+ repo = "naxsi";
199+ rev = "0.56";
200+ sha256 = "12kn6wbl8xqc19fi05ffprqps4pplg4a6i1cf01xc0d6brx1fg8v";
201+ } + "/naxsi_src";
202+ };
203+
151204 ngx_aws_auth = {
152205 src = fetchFromGitHub {
153206 owner = "anomalizer";
@@ -254,6 +307,24 @@ in
254307 };
255308 };
256309
310+ slowfs-cache = {
311+ src = fetchFromGitHub {
312+ owner = "FRiCKLE";
313+ repo = "ngx_slowfs_cache";
314+ rev = "1.10";
315+ sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr";
316+ };
317+ };
318+
319+ sorted-querystring = {
320+ src = fetchFromGitHub {
321+ owner = "wandenberg";
322+ repo = "nginx-sorted-querystring-module";
323+ rev = "0.3";
324+ sha256 = "0p6b0hcws39n27fx4xp9k4hb3pcv7b6kah4qqaj0pzjy3nbp4gj7";
325+ };
326+ };
327+
257328 statsd = {
258329 src = fetchFromGitHub {
259330 owner = "apcera";
@@ -285,8 +356,8 @@ in
285356 src = fetchFromGitHub {
286357 owner = "yaoweibin";
287358 repo = "ngx_http_substitutions_filter_module";
288− rev = "v0.6.4";
289− sha256 = "0q86cv0mfffh43id5xanywyhpd7b0jijrmk8y311c13l9ajrd2rx";
359+ rev = "bc58cb11844bc42735bbaef7085ea86ace46d05b";
360+ sha256 = "1q5hr3sqys4f365gzjci549rn9ylhgj4xb29ril04zr5vkhzlnar";
290361 };
291362 };
292363
@@ -303,8 +374,8 @@ in
303374 src = fetchFromGitHub {
304375 owner = "yaoweibin";
305376 repo = "nginx_upstream_check_module";
306− rev = "9aecf15ec379fe98f62355c57b60c0bc83296f04";
307− sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y";
377+ rev = "007f76f7adbcbd6abd9352502af1a4ae463def85";
378+ sha256 = "1qcg7c9rcl70wr1qf188shnn9s2f7cxnlw05s6scbvlgnf6ik6in";
308379 };
309380 };
310381
@@ -312,8 +383,8 @@ in
312383 src = fetchFromGitHub {
313384 owner = "tarantool";
314385 repo = "nginx_upstream_module";
315− rev = "v2.7";
316− sha256 = "05dwj0caj910p7kan2qjvm6x2x601igryhny2xzr47hhsk5q1cnx";
386+ rev = "v2.7.1";
387+ sha256 = "0ya4330in7zjzqw57djv4icpk0n1j98nvf0f8v296yi9rjy054br";
317388 };
318389 inputs = [ pkgs.msgpuck.dev pkgs.yajl ];
319390 };
@@ -327,6 +398,16 @@ in
327398 };
328399 };
329400
401+ video-thumbextractor = {
402+ src = fetchFromGitHub {
403+ owner = "wandenberg";
404+ repo = "nginx-video-thumbextractor-module";
405+ rev = "0.9.0";
406+ sha256 = "1b0v471mzbcys73pzr7gpvzzhff0cva0l5ff32cv7z1v9c0ypji7";
407+ };
408+ inputs = [ pkgs.ffmpeg ];
409+ };
410+
330411 vts = {
331412 src = fetchFromGitHub {
332413 owner = "vozlt";
@@ -335,12 +416,4 @@ in
335416 sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7";
336417 };
337418 };
338−
339− http_proxy_connect_module_v15 = http_proxy_connect_module_generic "proxy_connect_rewrite_1015" // {
340− supports = with lib.versions; version: major version == "1" && minor version == "15";
341− };
342−
343− http_proxy_connect_module_v14 = http_proxy_connect_module_generic "proxy_connect_rewrite_1014" // {
344− supports = with lib.versions; version: major version == "1" && minor version == "14";
345− };
346419}
pkgs/servers/mail/spamassassin/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg1 }:
1+{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg }:
22
33perlPackages.buildPerlPackage rec {
44 name = "SpamAssassin-3.4.2";
@@ -27,7 +27,7 @@ perlPackages.buildPerlPackage rec {
2727 mv "rules/"* $out/share/spamassassin/
2828
2929 for n in "$out/bin/"*; do
30− wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg1}/bin"
30+ wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg}/bin"
3131 done
3232 '';
3333
pkgs/servers/search/elasticsearch/5.x.nix+3−2
@@ -1,4 +1,5 @@
1−{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }:
1+{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless
2+, utillinux, gnugrep, coreutils }:
23
34with stdenv.lib;
45
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
2324
2425 wrapProgram $out/bin/elasticsearch \
2526 --prefix ES_CLASSPATH : "$out/lib/*" \
26− --prefix PATH : "${utillinux}/bin" \
27+ --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
2728 --set JAVA_HOME "${jre_headless}" \
2829 --set ES_JVM_OPTIONS "$out/config/jvm.options"
2930
pkgs/servers/search/elasticsearch/6.x.nix+2−2
@@ -4,7 +4,7 @@
44, fetchurl
55, makeWrapper
66, jre_headless
7−, utillinux
7+, utillinux, gnugrep, coreutils
88, autoPatchelfHook
99, zlib
1010}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
4545 chmod -x $out/bin/*.*
4646
4747 wrapProgram $out/bin/elasticsearch \
48− --prefix PATH : "${utillinux}/bin/" \
48+ --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
4949 --set JAVA_HOME "${jre_headless}"
5050
5151 wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
pkgs/servers/search/elasticsearch/7.x.nix+2−2
@@ -4,7 +4,7 @@
44, fetchurl
55, makeWrapper
66, jre_headless
7−, utillinux
7+, utillinux, gnugrep, coreutils
88, autoPatchelfHook
99, zlib
1010}:
@@ -56,7 +56,7 @@ stdenv.mkDerivation (rec {
5656 chmod +x $out/bin/*
5757
5858 wrapProgram $out/bin/elasticsearch \
59− --prefix PATH : "${utillinux}/bin/" \
59+ --prefix PATH : "${makeBinPath [ utillinux coreutils gnugrep ]}" \
6060 --set JAVA_HOME "${jre_headless}"
6161
6262 wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
pkgs/shells/tcsh/default.nix+2−2
@@ -3,7 +3,7 @@
33
44stdenv.mkDerivation rec {
55 name = "tcsh-${version}";
6− version = "6.20.00";
6+ version = "6.21.00";
77
88 src = fetchurl {
99 urls = [
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz"
1212 "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"
1313 ];
14− sha256 = "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq";
14+ sha256 = "0wp9cqkzdj5ahfyg9bn5z1wnyblqyv9vz4sc5aqmj7rp91a34f64";
1515 };
1616
1717 buildInputs = [ ncurses ];
pkgs/tools/backup/duply/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg1, bash
1+{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash
22, gnugrep, txt2man, makeWrapper, which
33}:
44
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 mkdir -p "$out/share/man/man1"
2121 install -vD duply "$out/bin"
2222 wrapProgram "$out/bin/duply" --set PATH \
23− ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg1 bash gnugrep txt2man which ]}
23+ ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]}
2424 "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
2525 '';
2626
pkgs/tools/misc/aptly/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }:
1+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg, bzip2, xz, graphviz }:
22
33let
44
@@ -34,7 +34,7 @@ buildGoPackage {
3434 mkdir -p $bin/share/bash-completion/completions
3535 ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions
3636 wrapProgram "$bin/bin/aptly" \
37− --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}"
37+ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
3838 '';
3939
4040 meta = with stdenv.lib; {
pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patchnew file+1153
@@ -0,0 +1,1153 @@
1+From 453ff940449bbbde9ec00f0bbf82a359c5598fc7 Mon Sep 17 00:00:00 2001
2+From: Bruno Haible <bruno@clisp.org>
3+Date: Sat, 23 Mar 2019 23:00:52 +0100
4+Subject: [PATCH 1/1] Support cross-compilation to musl libc.
5+
6+Reported by Necktwi Ozfguah <necktwi@ferryfair.com>.
7+
8+* m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Add cross-compilation guesses for
9+musl libc.
10+* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Likewise.
11+* m4/chown.m4 (gl_FUNC_CHOWN): Likewise.
12+* m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Likewise.
13+* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Likewise.
14+* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Likewise.
15+* m4/fpurge.m4 (gl_FUNC_FPURGE): Likewise.
16+* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Likewise.
17+* m4/getcwd-abort-bug.m4 (gl_FUNC_GETCWD_ABORT_BUG): Likewise.
18+* m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise.
19+* m4/getgroups.m4 (AC_FUNC_GETGROUPS, gl_FUNC_GETGROUPS): Likewise.
20+* m4/getline.m4 (gl_FUNC_GETLINE): Likewise.
21+* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY_CLOBBER): Likewise.
22+* m4/hypot.m4 (gl_FUNC_HYPOT): Likewise. // removed
23+* m4/hypotf.m4 (gl_FUNC_HYPOTF): Likewise. // removed
24+* m4/hypotl.m4 (gl_FUNC_HYPOTL): Likewise. // removed
25+* m4/iconv_open-utf.m4 (gl_FUNC_ICONV_OPEN_UTF_SUPPORT): Likewise. // removed
26+* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise.
27+* m4/log.m4 (gl_FUNC_LOG): Likewise. // removed
28+* m4/logf.m4 (gl_FUNC_LOGF): Likewise. // removed
29+* m4/logl.m4 (gl_FUNC_LOGL_WORKS): Likewise. // removed
30+* m4/log10.m4 (gl_FUNC_LOG10): Likewise. // removed
31+* m4/log10f.m4 (gl_FUNC_LOG10F): Likewise. // removed
32+* m4/log10l.m4 (gl_FUNC_LOG10L): Likewise. // removed
33+* m4/log1p.m4 (gl_FUNC_LOG1P): Likewise. // removed
34+* m4/log1pf.m4 (gl_FUNC_LOG1PF): Likewise. // removed
35+* m4/log1pl.m4 (gl_FUNC_LOG1PL): Likewise. // removed
36+* m4/log2.m4 (gl_FUNC_LOG2): Likewise. // removed
37+* m4/log2f.m4 (gl_FUNC_LOG2F): Likewise. // removed
38+* m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Likewise.
39+* m4/mkdir.m4 (gl_FUNC_MKDIR): Likewise.
40+* m4/mkstemp.m4 (gl_FUNC_MKSTEMP): Likewise.
41+* m4/modf.m4 (gl_FUNC_MODF): Likewise. // removed
42+* m4/modff.m4 (gl_FUNC_MODFF): Likewise. // removed
43+* m4/modfl.m4 (gl_FUNC_MODFL): Likewise. // removed
44+* m4/perror.m4 (gl_FUNC_PERROR): Likewise.
45+* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_INFINITE,
46+gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_A,
47+gl_PRINTF_DIRECTIVE_F, gl_PRINTF_FLAG_ZERO, gl_SNPRINTF_TRUNCATION_C99,
48+gl_SNPRINTF_RETVAL_C99, gl_SNPRINTF_DIRECTIVE_N,
49+gl_VSNPRINTF_ZEROSIZE_C99): Likewise.
50+* m4/ptsname.m4 (gl_FUNC_PTSNAME): Likewise. // removed
51+* m4/putenv.m4 (gl_FUNC_PUTENV): Likewise.
52+* m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise.
53+* m4/remainder.m4 (gl_FUNC_REMAINDER): Likewise. // removed
54+* m4/remainderf.m4 (gl_FUNC_REMAINDERF): Likewise. // removed
55+* m4/remainderl.m4 (gl_FUNC_REMAINDERL): Likewise. // removed
56+* m4/rintl.m4 (gl_FUNC_RINTL): Likewise. // removed
57+* m4/round.m4 (gl_FUNC_ROUND): Likewise. // removed
58+* m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. // removed
59+* m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. // removed
60+* m4/setenv.m4 (gl_FUNC_SETENV): Likewise.
61+* m4/signbit.m4 (gl_SIGNBIT): Likewise.
62+* m4/sleep.m4 (gl_FUNC_SLEEP): Likewise.
63+* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Likewise.
64+* m4/strerror.m4 (gl_FUNC_STRERROR, gl_FUNC_STRERROR_0): Likewise.
65+* m4/strtod.m4 (gl_FUNC_STRTOD): Likewise.
66+* m4/strtold.m4 (gl_FUNC_STRTOLD): Likewise.
67+* m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. // removed
68+* m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. // removed
69+* m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. // removed
70+* m4/tzset.m4 (gl_FUNC_TZSET_CLOBBER): Likewise.
71+* m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Likewise.
72+* m4/usleep.m4 (gl_FUNC_USLEEP): Likewise.
73+* m4/utimes.m4 (gl_FUNC_UTIMES): Likewise.
74+* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise.
75+---
76+ m4/calloc.m4 | 4 ++-
77+ m4/canonicalize.m4 | 4 ++-
78+ m4/chown.m4 | 22 +++++++------
79+ m4/d-ino.m4 | 16 +++++-----
80+ m4/fdopendir.m4 | 12 ++++---
81+ m4/fnmatch.m4 | 18 ++++++++---
82+ m4/fpurge.m4 | 24 +++++++++-----
83+ m4/getcwd-abort-bug.m4 | 11 +++++--
84+ m4/getcwd.m4 | 4 ++-
85+ m4/getdelim.m4 | 40 ++++++++++++++----------
86+ m4/getgroups.m4 | 6 +++-
87+ m4/getline.m4 | 38 +++++++++++++---------
88+ m4/gettimeofday.m4 | 4 ++-
89+ m4/link-follow.m4 | 4 ++-
90+ m4/malloc.m4 | 4 +--
91+ m4/mkdir.m4 | 4 ++-
92+ m4/mkstemp.m4 | 4 ++-
93+ m4/perror.m4 | 12 ++++---
94+ m4/printf.m4 | 22 ++++++++++++-
95+ m4/putenv.m4 | 4 ++-
96+ m4/realloc.m4 | 4 +--
97+ m4/setenv.m4 | 4 ++-
98+ m4/signbit.m4 | 6 +++-
99+ m4/sleep.m4 | 4 ++-
100+ m4/stpncpy.m4 | 14 +++++++--
101+ m4/strerror.m4 | 6 +++-
102+ m4/strtod.m4 | 10 +++---
103+ m4/strtold.m4 | 9 ++++--
104+ m4/tzset.m4 | 4 ++-
105+ m4/ungetc.m4 | 18 ++++++-----
106+ m4/usleep.m4 | 4 ++-
107+ m4/utimes.m4 | 10 +++---
108+ m4/wcwidth.m4 | 12 ++++---
109+ 76 files changed, 461 insertions(+), 157 deletions(-)
110+
111+diff --git a/m4/calloc.m4 b/m4/calloc.m4
112+index 012a5bf..d76535d 100644
113+--- a/m4/calloc.m4
114++++ b/m4/calloc.m4
115+@@ -1,4 +1,4 @@
116+-# calloc.m4 serial 18
117++# calloc.m4 serial 19
118+
119+ # Copyright (C) 2004-2019 Free Software Foundation, Inc.
120+ # This file is free software; the Free Software Foundation
121+@@ -40,6 +40,8 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF],
122+ [case "$host_os" in
123+ # Guess yes on glibc systems.
124+ *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
125++ # Guess yes on musl systems.
126++ *-musl*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
127+ # Guess yes on native Windows.
128+ mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
129+ # If we don't know, assume the worst.
130+diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
131+index 5b6e25d..b61747b 100644
132+--- a/m4/canonicalize.m4
133++++ b/m4/canonicalize.m4
134+@@ -1,4 +1,4 @@
135+-# canonicalize.m4 serial 29
136++# canonicalize.m4 serial 30
137+
138+ dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
139+
140+@@ -113,6 +113,8 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
141+ [case "$host_os" in
142+ # Guess yes on glibc systems.
143+ *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
144++ # Guess yes on musl systems.
145++ *-musl*) gl_cv_func_realpath_works="guessing yes" ;;
146+ # Guess no on native Windows.
147+ mingw*) gl_cv_func_realpath_works="guessing no" ;;
148+ # If we don't know, assume the worst.
149+diff --git a/m4/chown.m4 b/m4/chown.m4
150+index ecfc0c0..b798325 100644
151+--- a/m4/chown.m4
152++++ b/m4/chown.m4
153+@@ -1,4 +1,4 @@
154+-# serial 30
155++# serial 32
156+ # Determine whether we need the chown wrapper.
157+
158+ dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2019 Free Software
159+@@ -109,10 +109,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
160+ [gl_cv_func_chown_slash_works=yes],
161+ [gl_cv_func_chown_slash_works=no],
162+ [case "$host_os" in
163+- # Guess yes on glibc systems.
164+- *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;;
165+- # If we don't know, assume the worst.
166+- *) gl_cv_func_chown_slash_works="guessing no" ;;
167++ # Guess yes on glibc systems.
168++ *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;;
169++ # Guess yes on musl systems.
170++ *-musl*) gl_cv_func_chown_slash_works="guessing yes" ;;
171++ # If we don't know, assume the worst.
172++ *) gl_cv_func_chown_slash_works="guessing no" ;;
173+ esac
174+ ])
175+ rm -f conftest.link conftest.file])
176+@@ -145,10 +147,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
177+ [gl_cv_func_chown_ctime_works=yes],
178+ [gl_cv_func_chown_ctime_works=no],
179+ [case "$host_os" in
180+- # Guess yes on glibc systems.
181+- *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;;
182+- # If we don't know, assume the worst.
183+- *) gl_cv_func_chown_ctime_works="guessing no" ;;
184++ # Guess yes on glibc systems.
185++ *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;;
186++ # Guess yes on musl systems.
187++ *-musl*) gl_cv_func_chown_ctime_works="guessing yes" ;;
188++ # If we don't know, assume the worst.
189++ *) gl_cv_func_chown_ctime_works="guessing no" ;;
190+ esac
191+ ])
192+ rm -f conftest.file])
193+diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
194+index f1420cc..87dcacc 100644
195+--- a/m4/d-ino.m4
196++++ b/m4/d-ino.m4
197+@@ -1,4 +1,4 @@
198+-# serial 18
199++# serial 19
200+
201+ dnl From Jim Meyering.
202+ dnl
203+@@ -40,12 +40,14 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
204+ [gl_cv_struct_dirent_d_ino=yes],
205+ [gl_cv_struct_dirent_d_ino=no],
206+ [case "$host_os" in
207+- # Guess yes on glibc systems with Linux kernel.
208+- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
209+- # Guess no on native Windows.
210+- mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;;
211+- # If we don't know, assume the worst.
212+- *) gl_cv_struct_dirent_d_ino="guessing no" ;;
213++ # Guess yes on glibc systems with Linux kernel.
214++ linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
215++ # Guess yes on musl systems with Linux kernel.
216++ linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
217++ # Guess no on native Windows.
218++ mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;;
219++ # If we don't know, assume the worst.
220++ *) gl_cv_struct_dirent_d_ino="guessing no" ;;
221+ esac
222+ ])])
223+ case "$gl_cv_struct_dirent_d_ino" in
224+diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
225+index 0490551..b2b3b03 100644
226+--- a/m4/fdopendir.m4
227++++ b/m4/fdopendir.m4
228+@@ -1,4 +1,4 @@
229+-# serial 10
230++# serial 11
231+ # See if we need to provide fdopendir.
232+
233+ dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
234+@@ -45,10 +45,12 @@ DIR *fdopendir (int);
235+ [gl_cv_func_fdopendir_works=yes],
236+ [gl_cv_func_fdopendir_works=no],
237+ [case "$host_os" in
238+- # Guess yes on glibc systems.
239+- *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;;
240+- # If we don't know, assume the worst.
241+- *) gl_cv_func_fdopendir_works="guessing no" ;;
242++ # Guess yes on glibc systems.
243++ *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;;
244++ # Guess yes on musl systems.
245++ *-musl*) gl_cv_func_fdopendir_works="guessing yes" ;;
246++ # If we don't know, assume the worst.
247++ *) gl_cv_func_fdopendir_works="guessing no" ;;
248+ esac
249+ ])])
250+ case "$gl_cv_func_fdopendir_works" in
251+diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
252+index c264ca7..75ba55b 100644
253+--- a/m4/fnmatch.m4
254++++ b/m4/fnmatch.m4
255+@@ -1,4 +1,4 @@
256+-# Check for fnmatch - serial 13. -*- coding: utf-8 -*-
257++# Check for fnmatch - serial 14. -*- coding: utf-8 -*-
258+
259+ # Copyright (C) 2000-2007, 2009-2019 Free Software Foundation, Inc.
260+ # This file is free software; the Free Software Foundation
261+@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
262+ m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX])
263+
264+ AC_REQUIRE([gl_FNMATCH_H])
265++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
266+ gl_fnmatch_required_lowercase=`
267+ echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]'
268+ `
269+@@ -117,12 +118,19 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
270+ ]])],
271+ [eval "$gl_fnmatch_cache_var=yes"],
272+ [eval "$gl_fnmatch_cache_var=no"],
273+- [eval "$gl_fnmatch_cache_var=\"guessing no\""])
274++ [case "$host_os" in
275++ # Guess yes on musl systems.
276++ *-musl*) eval "$gl_fnmatch_cache_var=\"guessing yes\"" ;;
277++ # Guess no otherwise, even on glibc systems.
278++ *) eval "$gl_fnmatch_cache_var=\"guessing no\"" ;;
279++ esac
280++ ])
281+ ])
282+ eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
283+- if test "$gl_fnmatch_result" != yes; then
284+- REPLACE_FNMATCH=1
285+- fi
286++ case "$gl_fnmatch_result" in
287++ *yes) ;;
288++ *) REPLACE_FNMATCH=1 ;;
289++ esac
290+ fi
291+ if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
292+ gl_REPLACE_FNMATCH_H
293+diff --git a/m4/fpurge.m4 b/m4/fpurge.m4
294+index cb21f56..6c5b3e9 100644
295+--- a/m4/fpurge.m4
296++++ b/m4/fpurge.m4
297+@@ -1,4 +1,4 @@
298+-# fpurge.m4 serial 8
299++# fpurge.m4 serial 9
300+ dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
301+ dnl This file is free software; the Free Software Foundation
302+ dnl gives unlimited permission to copy and/or distribute it,
303+@@ -7,12 +7,13 @@ dnl with or without modifications, as long as this notice is preserved.
304+ AC_DEFUN([gl_FUNC_FPURGE],
305+ [
306+ AC_REQUIRE([gl_STDIO_H_DEFAULTS])
307++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
308+ AC_CHECK_FUNCS_ONCE([fpurge])
309+ AC_CHECK_FUNCS_ONCE([__fpurge])
310+ AC_CHECK_DECLS([fpurge], , , [[#include <stdio.h>]])
311+ if test "x$ac_cv_func_fpurge" = xyes; then
312+ HAVE_FPURGE=1
313+- # Detect BSD bug. Only cygwin 1.7 is known to be immune.
314++ # Detect BSD bug. Only cygwin 1.7 and musl are known to be immune.
315+ AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works],
316+ [AC_RUN_IFELSE(
317+ [AC_LANG_PROGRAM(
318+@@ -48,11 +49,20 @@ AC_DEFUN([gl_FUNC_FPURGE],
319+ return 13;
320+ return 0;
321+ ])],
322+- [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no],
323+- [gl_cv_func_fpurge_works='guessing no'])])
324+- if test "x$gl_cv_func_fpurge_works" != xyes; then
325+- REPLACE_FPURGE=1
326+- fi
327++ [gl_cv_func_fpurge_works=yes],
328++ [gl_cv_func_fpurge_works=no],
329++ [case "$host_os" in
330++ # Guess yes on musl systems.
331++ *-musl*) gl_cv_func_fpurge_works="guessing yes" ;;
332++ # Guess no otherwise.
333++ *) gl_cv_func_fpurge_works="guessing no" ;;
334++ esac
335++ ])
336++ ])
337++ case "$gl_cv_func_fpurge_works" in
338++ *yes) ;;
339++ *) REPLACE_FPURGE=1 ;;
340++ esac
341+ else
342+ HAVE_FPURGE=0
343+ fi
344+diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
345+index f0f24a5..7227f08 100644
346+--- a/m4/getcwd-abort-bug.m4
347++++ b/m4/getcwd-abort-bug.m4
348+@@ -1,4 +1,4 @@
349+-# serial 9
350++# serial 11
351+ # Determine whether getcwd aborts when the length of the working directory
352+ # name is unusually large. Any length between 4k and 16k trigger the bug
353+ # when using glibc-2.4.90-9 or older.
354+@@ -13,6 +13,7 @@
355+ # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
356+ AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG],
357+ [
358++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
359+ AC_CHECK_DECLS_ONCE([getcwd])
360+ AC_CHECK_HEADERS_ONCE([unistd.h])
361+ AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ])
362+@@ -142,7 +143,13 @@ main ()
363+ else
364+ gl_cv_func_getcwd_abort_bug=no
365+ fi],
366+- [gl_cv_func_getcwd_abort_bug=yes])
367++ [case "$host_os" in
368++ # Guess no on musl systems.
369++ *-musl*) gl_cv_func_getcwd_abort_bug="guessing no" ;;
370++ # Guess yes otherwise, even on glibc systems.
371++ *) gl_cv_func_getcwd_abort_bug="guessing yes"
372++ esac
373++ ])
374+ ])
375+ AS_IF([test $gl_cv_func_getcwd_abort_bug = yes], [$1], [$2])
376+ ])
377+diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
378+index 4929b51..625171a 100644
379+--- a/m4/getcwd.m4
380++++ b/m4/getcwd.m4
381+@@ -6,7 +6,7 @@
382+ # with or without modifications, as long as this notice is preserved.
383+
384+ # Written by Paul Eggert.
385+-# serial 16
386++# serial 17
387+
388+ AC_DEFUN([gl_FUNC_GETCWD_NULL],
389+ [
390+@@ -50,6 +50,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
391+ [[case "$host_os" in
392+ # Guess yes on glibc systems.
393+ *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";;
394++ # Guess yes on musl systems.
395++ *-musl*) gl_cv_func_getcwd_null="guessing yes";;
396+ # Guess yes on Cygwin.
397+ cygwin*) gl_cv_func_getcwd_null="guessing yes";;
398+ # If we don't know, assume the worst.
399+diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
400+index bf17c57..e77c379 100644
401+--- a/m4/getdelim.m4
402++++ b/m4/getdelim.m4
403+@@ -1,4 +1,4 @@
404+-# getdelim.m4 serial 12
405++# getdelim.m4 serial 13
406+
407+ dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
408+ dnl
409+@@ -11,6 +11,7 @@ AC_PREREQ([2.59])
410+ AC_DEFUN([gl_FUNC_GETDELIM],
411+ [
412+ AC_REQUIRE([gl_STDIO_H_DEFAULTS])
413++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
414+
415+ dnl Persuade glibc <stdio.h> to declare getdelim().
416+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
417+@@ -21,9 +22,10 @@ AC_DEFUN([gl_FUNC_GETDELIM],
418+ if test $ac_cv_func_getdelim = yes; then
419+ HAVE_GETDELIM=1
420+ dnl Found it in some library. Verify that it works.
421+- AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim],
422+- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
423+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
424++ AC_CACHE_CHECK([for working getdelim function],
425++ [gl_cv_func_working_getdelim],
426++ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
427++ AC_RUN_IFELSE([AC_LANG_SOURCE([[
428+ # include <stdio.h>
429+ # include <stdlib.h>
430+ # include <string.h>
431+@@ -53,25 +55,31 @@ AC_DEFUN([gl_FUNC_GETDELIM],
432+ fclose (in);
433+ return 0;
434+ }
435+- ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works.
436+- , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work.
437+- , dnl We're cross compiling. Assume it works on glibc2 systems.
438+- [AC_EGREP_CPP([Lucky GNU user],
439+- [
440++ ]])],
441++ [gl_cv_func_working_getdelim=yes],
442++ [gl_cv_func_working_getdelim=no],
443++ [dnl We're cross compiling.
444++ dnl Guess it works on glibc2 systems and musl systems.
445++ AC_EGREP_CPP([Lucky GNU user],
446++ [
447+ #include <features.h>
448+ #ifdef __GNU_LIBRARY__
449+ #if (__GLIBC__ >= 2) && !defined __UCLIBC__
450+ Lucky GNU user
451+ #endif
452+ #endif
453+- ],
454+- [gl_cv_func_working_getdelim="guessing yes"],
455+- [gl_cv_func_working_getdelim="guessing no"])]
456+- )])
457++ ],
458++ [gl_cv_func_working_getdelim="guessing yes"],
459++ [case "$host_os" in
460++ *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
461++ *) gl_cv_func_working_getdelim="guessing no" ;;
462++ esac
463++ ])
464++ ])
465++ ])
466+ case "$gl_cv_func_working_getdelim" in
467+- *no)
468+- REPLACE_GETDELIM=1
469+- ;;
470++ *yes) ;;
471++ *) REPLACE_GETDELIM=1 ;;
472+ esac
473+ else
474+ HAVE_GETDELIM=0
475+diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
476+index 2ce986e..c93447b 100644
477+--- a/m4/getgroups.m4
478++++ b/m4/getgroups.m4
479+@@ -1,4 +1,4 @@
480+-# serial 21
481++# serial 22
482+
483+ dnl From Jim Meyering.
484+ dnl A wrapper around AC_FUNC_GETGROUPS.
485+@@ -42,6 +42,8 @@ AC_DEFUN([AC_FUNC_GETGROUPS],
486+ [case "$host_os" in # ((
487+ # Guess yes on glibc systems.
488+ *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
489++ # Guess yes on musl systems.
490++ *-musl*) ac_cv_func_getgroups_works="guessing yes" ;;
491+ # If we don't know, assume the worst.
492+ *) ac_cv_func_getgroups_works="guessing no" ;;
493+ esac
494+@@ -95,6 +97,8 @@ AC_DEFUN([gl_FUNC_GETGROUPS],
495+ [case "$host_os" in
496+ # Guess yes on glibc systems.
497+ *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
498++ # Guess yes on musl systems.
499++ *-musl*) gl_cv_func_getgroups_works="guessing yes" ;;
500+ # If we don't know, assume the worst.
501+ *) gl_cv_func_getgroups_works="guessing no" ;;
502+ esac
503+diff --git a/m4/getline.m4 b/m4/getline.m4
504+index 5b2ead2..32f771c 100644
505+--- a/m4/getline.m4
506++++ b/m4/getline.m4
507+@@ -1,4 +1,4 @@
508+-# getline.m4 serial 28
509++# getline.m4 serial 29
510+
511+ dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation,
512+ dnl Inc.
513+@@ -16,6 +16,7 @@ dnl to do with the function we need.
514+ AC_DEFUN([gl_FUNC_GETLINE],
515+ [
516+ AC_REQUIRE([gl_STDIO_H_DEFAULTS])
517++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
518+
519+ dnl Persuade glibc <stdio.h> to declare getline().
520+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
521+@@ -28,9 +29,10 @@ AC_DEFUN([gl_FUNC_GETLINE],
522+ gl_getline_needs_run_time_check=yes],
523+ [am_cv_func_working_getline=no])
524+ if test $gl_getline_needs_run_time_check = yes; then
525+- AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline],
526+- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
527+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
528++ AC_CACHE_CHECK([for working getline function],
529++ [am_cv_func_working_getline],
530++ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
531++ AC_RUN_IFELSE([AC_LANG_SOURCE([[
532+ # include <stdio.h>
533+ # include <stdlib.h>
534+ # include <string.h>
535+@@ -61,21 +63,28 @@ AC_DEFUN([gl_FUNC_GETLINE],
536+ fclose (in);
537+ return 0;
538+ }
539+- ]])], [am_cv_func_working_getline=yes] dnl The library version works.
540+- , [am_cv_func_working_getline=no] dnl The library version does NOT work.
541+- , dnl We're cross compiling. Assume it works on glibc2 systems.
542+- [AC_EGREP_CPP([Lucky GNU user],
543+- [
544++ ]])],
545++ [am_cv_func_working_getline=yes],
546++ [am_cv_func_working_getline=no],
547++ [dnl We're cross compiling.
548++ dnl Guess it works on glibc2 systems and musl systems.
549++ AC_EGREP_CPP([Lucky GNU user],
550++ [
551+ #include <features.h>
552+ #ifdef __GNU_LIBRARY__
553+ #if (__GLIBC__ >= 2) && !defined __UCLIBC__
554+ Lucky GNU user
555+ #endif
556+ #endif
557+- ],
558+- [am_cv_func_working_getline="guessing yes"],
559+- [am_cv_func_working_getline="guessing no"])]
560+- )])
561++ ],
562++ [am_cv_func_working_getline="guessing yes"],
563++ [case "$host_os" in
564++ *-musl*) am_cv_func_working_getline="guessing yes" ;;
565++ *) am_cv_func_working_getline="guessing no" ;;
566++ esac
567++ ])
568++ ])
569++ ])
570+ fi
571+
572+ if test $ac_cv_have_decl_getline = no; then
573+@@ -83,7 +92,8 @@ AC_DEFUN([gl_FUNC_GETLINE],
574+ fi
575+
576+ case "$am_cv_func_working_getline" in
577+- *no)
578++ *yes) ;;
579++ *)
580+ dnl Set REPLACE_GETLINE always: Even if we have not found the broken
581+ dnl getline function among $LIBS, it may exist in libinet and the
582+ dnl executable may be linked with -linet.
583+diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
584+index d29b4bf..5e2ef6f 100644
585+--- a/m4/gettimeofday.m4
586++++ b/m4/gettimeofday.m4
587+@@ -1,4 +1,4 @@
588+-# serial 25
589++# serial 26
590+
591+ # Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc.
592+ # This file is free software; the Free Software Foundation
593+@@ -105,6 +105,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
594+ case "$host_os" in
595+ # Guess all is fine on glibc systems.
596+ *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
597++ # Guess all is fine on musl systems.
598++ *-musl*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
599+ # Guess no on native Windows.
600+ mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
601+ # If we don't know, assume the worst.
602+diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
603+index cbd2dca..8ac7301 100644
604+--- a/m4/link-follow.m4
605++++ b/m4/link-follow.m4
606+@@ -1,4 +1,4 @@
607+-# serial 20
608++# serial 21
609+ dnl Run a program to determine whether link(2) follows symlinks.
610+ dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
611+
612+@@ -88,6 +88,8 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
613+ case "$host_os" in
614+ # On glibc/Linux we know the result.
615+ linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
616++ # On musl/Linux we know the result.
617++ linux*-musl*) gl_cv_func_link_follows_symlink="guessing no" ;;
618+ # Otherwise, we don't know.
619+ *) gl_cv_func_link_follows_symlink=unknown ;;
620+ esac
621+diff --git a/m4/malloc.m4 b/m4/malloc.m4
622+index b9b8d4b..c469c45 100644
623+--- a/m4/malloc.m4
624++++ b/m4/malloc.m4
625+@@ -1,4 +1,4 @@
626+-# malloc.m4 serial 17
627++# malloc.m4 serial 19
628+ dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
629+ dnl This file is free software; the Free Software Foundation
630+ dnl gives unlimited permission to copy and/or distribute it,
631+@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
632+ [ac_cv_func_malloc_0_nonnull=no],
633+ [case "$host_os" in
634+ # Guess yes on platforms where we know the result.
635+- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
636++ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
637+ | hpux* | solaris* | cygwin* | mingw*)
638+ ac_cv_func_malloc_0_nonnull="guessing yes" ;;
639+ # If we don't know, assume the worst.
640+diff --git a/m4/mkdir.m4 b/m4/mkdir.m4
641+index 4cd9590..366a3cd 100644
642+--- a/m4/mkdir.m4
643++++ b/m4/mkdir.m4
644+@@ -1,4 +1,4 @@
645+-# serial 14
646++# serial 15
647+
648+ # Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc.
649+ # This file is free software; the Free Software Foundation
650+@@ -62,6 +62,8 @@ AC_DEFUN([gl_FUNC_MKDIR],
651+ [case "$host_os" in
652+ # Guess yes on glibc systems.
653+ *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
654++ # Guess yes on musl systems.
655++ *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
656+ # Guess no on native Windows.
657+ mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
658+ # If we don't know, assume the worst.
659+diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
660+index ae24c3b..1b15c2e 100644
661+--- a/m4/mkstemp.m4
662++++ b/m4/mkstemp.m4
663+@@ -1,4 +1,4 @@
664+-#serial 25
665++#serial 26
666+
667+ # Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
668+ # This file is free software; the Free Software Foundation
669+@@ -59,6 +59,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP],
670+ [case "$host_os" in
671+ # Guess yes on glibc systems.
672+ *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;;
673++ # Guess yes on musl systems.
674++ *-musl*) gl_cv_func_working_mkstemp="guessing yes" ;;
675+ # Guess no on native Windows.
676+ mingw*) gl_cv_func_working_mkstemp="guessing no" ;;
677+ # If we don't know, assume the worst.
678+diff --git a/m4/perror.m4 b/m4/perror.m4
679+index 335be72..08e2db1 100644
680+--- a/m4/perror.m4
681++++ b/m4/perror.m4
682+@@ -1,4 +1,4 @@
683+-# perror.m4 serial 7
684++# perror.m4 serial 8
685+ dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
686+ dnl This file is free software; the Free Software Foundation
687+ dnl gives unlimited permission to copy and/or distribute it,
688+@@ -48,10 +48,12 @@ AC_DEFUN([gl_FUNC_PERROR],
689+ rm -rf conftest.txt1 conftest.txt2],
690+ [gl_cv_func_perror_works=no],
691+ [case "$host_os" in
692+- # Guess yes on native Windows.
693+- mingw*) gl_cv_func_perror_works="guessing yes" ;;
694+- # Otherwise guess no.
695+- *) gl_cv_func_perror_works="guessing no" ;;
696++ # Guess yes on musl systems.
697++ *-musl*) gl_cv_func_perror_works="guessing yes" ;;
698++ # Guess yes on native Windows.
699++ mingw*) gl_cv_func_perror_works="guessing yes" ;;
700++ # Otherwise guess no.
701++ *) gl_cv_func_perror_works="guessing no" ;;
702+ esac
703+ ])
704+ ])
705+diff --git a/m4/printf.m4 b/m4/printf.m4
706+index cbf6ae4..6d2280e 100644
707+--- a/m4/printf.m4
708++++ b/m4/printf.m4
709+@@ -1,4 +1,4 @@
710+-# printf.m4 serial 60
711++# printf.m4 serial 61
712+ dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
713+ dnl This file is free software; the Free Software Foundation
714+ dnl gives unlimited permission to copy and/or distribute it,
715+@@ -62,6 +62,8 @@ int main ()
716+ changequote(,)dnl
717+ # Guess yes on glibc systems.
718+ *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";;
719++ # Guess yes on musl systems.
720++ *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";;
721+ # Guess yes on FreeBSD >= 5.
722+ freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";;
723+ freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
724+@@ -240,6 +242,8 @@ int main ()
725+ changequote(,)dnl
726+ # Guess yes on glibc systems.
727+ *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";;
728++ # Guess yes on musl systems.
729++ *-musl*) gl_cv_func_printf_infinite="guessing yes";;
730+ # Guess yes on FreeBSD >= 6.
731+ freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";;
732+ freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
733+@@ -457,6 +461,8 @@ int main ()
734+ changequote(,)dnl
735+ # Guess yes on glibc systems.
736+ *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";;
737++ # Guess yes on musl systems.
738++ *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";;
739+ # Guess yes on FreeBSD >= 6.
740+ freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";;
741+ freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
742+@@ -575,6 +581,8 @@ int main ()
743+ [gl_cv_func_printf_directive_a="guessing yes"],
744+ [gl_cv_func_printf_directive_a="guessing no"])
745+ ;;
746++ # Guess yes on musl systems.
747++ *-musl*) gl_cv_func_printf_directive_a="guessing yes";;
748+ # Guess no on Android.
749+ linux*-android*) gl_cv_func_printf_directive_a="guessing no";;
750+ # Guess no on native Windows.
751+@@ -625,6 +633,8 @@ int main ()
752+ changequote(,)dnl
753+ # Guess yes on glibc systems.
754+ *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";;
755++ # Guess yes on musl systems.
756++ *-musl*) gl_cv_func_printf_directive_f="guessing yes";;
757+ # Guess yes on FreeBSD >= 6.
758+ freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";;
759+ freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
760+@@ -960,6 +970,8 @@ changequote(,)dnl
761+ case "$host_os" in
762+ # Guess yes on glibc systems.
763+ *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
764++ # Guess yes on musl systems.
765++ *-musl*) gl_cv_func_printf_flag_zero="guessing yes";;
766+ # Guess yes on BeOS.
767+ beos*) gl_cv_func_printf_flag_zero="guessing yes";;
768+ # Guess no on Android.
769+@@ -1206,6 +1218,8 @@ changequote(,)dnl
770+ case "$host_os" in
771+ # Guess yes on glibc systems.
772+ *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
773++ # Guess yes on musl systems.
774++ *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
775+ # Guess yes on FreeBSD >= 5.
776+ freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";;
777+ freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
778+@@ -1308,6 +1322,8 @@ int main ()
779+ changequote(,)dnl
780+ # Guess yes on glibc systems.
781+ *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
782++ # Guess yes on musl systems.
783++ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";;
784+ # Guess yes on FreeBSD >= 5.
785+ freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
786+ freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
787+@@ -1400,6 +1416,8 @@ changequote(,)dnl
788+ case "$host_os" in
789+ # Guess yes on glibc systems.
790+ *-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";;
791++ # Guess yes on musl systems.
792++ *-musl*) gl_cv_func_snprintf_directive_n="guessing yes";;
793+ # Guess yes on FreeBSD >= 5.
794+ freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";;
795+ freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
796+@@ -1554,6 +1572,8 @@ changequote(,)dnl
797+ case "$host_os" in
798+ # Guess yes on glibc systems.
799+ *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
800++ # Guess yes on musl systems.
801++ *-musl*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
802+ # Guess yes on FreeBSD >= 5.
803+ freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
804+ freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
805+diff --git a/m4/putenv.m4 b/m4/putenv.m4
806+index f8960f6..342ba26 100644
807+--- a/m4/putenv.m4
808++++ b/m4/putenv.m4
809+@@ -1,4 +1,4 @@
810+-# putenv.m4 serial 22
811++# putenv.m4 serial 23
812+ dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
813+ dnl This file is free software; the Free Software Foundation
814+ dnl gives unlimited permission to copy and/or distribute it,
815+@@ -36,6 +36,8 @@ AC_DEFUN([gl_FUNC_PUTENV],
816+ [case "$host_os" in
817+ # Guess yes on glibc systems.
818+ *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
819++ # Guess yes on musl systems.
820++ *-musl*) gl_cv_func_svid_putenv="guessing yes" ;;
821+ # Guess no on native Windows.
822+ mingw*) gl_cv_func_svid_putenv="guessing no" ;;
823+ # If we don't know, assume the worst.
824+diff --git a/m4/realloc.m4 b/m4/realloc.m4
825+index f9f15ad..93066e8 100644
826+--- a/m4/realloc.m4
827++++ b/m4/realloc.m4
828+@@ -1,4 +1,4 @@
829+-# realloc.m4 serial 15
830++# realloc.m4 serial 17
831+ dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
832+ dnl This file is free software; the Free Software Foundation
833+ dnl gives unlimited permission to copy and/or distribute it,
834+@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF],
835+ [ac_cv_func_realloc_0_nonnull=no],
836+ [case "$host_os" in
837+ # Guess yes on platforms where we know the result.
838+- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
839++ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
840+ | hpux* | solaris* | cygwin* | mingw*)
841+ ac_cv_func_realloc_0_nonnull="guessing yes" ;;
842+ # If we don't know, assume the worst.
843+diff --git a/m4/setenv.m4 b/m4/setenv.m4
844+index 6101274..a8f83d6 100644
845+--- a/m4/setenv.m4
846++++ b/m4/setenv.m4
847+@@ -1,4 +1,4 @@
848+-# setenv.m4 serial 27
849++# setenv.m4 serial 28
850+ dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
851+ dnl This file is free software; the Free Software Foundation
852+ dnl gives unlimited permission to copy and/or distribute it,
853+@@ -37,6 +37,8 @@ AC_DEFUN([gl_FUNC_SETENV],
854+ [case "$host_os" in
855+ # Guess yes on glibc systems.
856+ *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
857++ # Guess yes on musl systems.
858++ *-musl*) gl_cv_func_setenv_works="guessing yes" ;;
859+ # If we don't know, assume the worst.
860+ *) gl_cv_func_setenv_works="guessing no" ;;
861+ esac
862+diff --git a/m4/signbit.m4 b/m4/signbit.m4
863+index bf5bce5..f7f2f3d 100644
864+--- a/m4/signbit.m4
865++++ b/m4/signbit.m4
866+@@ -1,4 +1,4 @@
867+-# signbit.m4 serial 16
868++# signbit.m4 serial 17
869+ dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
870+ dnl This file is free software; the Free Software Foundation
871+ dnl gives unlimited permission to copy and/or distribute it,
872+@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT],
873+ [case "$host_os" in
874+ # Guess yes on glibc systems.
875+ *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;;
876++ # Guess yes on musl systems.
877++ *-musl*) gl_cv_func_signbit="guessing yes" ;;
878+ # Guess yes on native Windows.
879+ mingw*) gl_cv_func_signbit="guessing yes" ;;
880+ # If we don't know, assume the worst.
881+@@ -62,6 +64,8 @@ AC_DEFUN([gl_SIGNBIT],
882+ [case "$host_os" in
883+ # Guess yes on glibc systems.
884+ *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;;
885++ # Guess yes on musl systems.
886++ *-musl*) gl_cv_func_signbit_gcc="guessing yes" ;;
887+ # Guess yes on mingw, no on MSVC.
888+ mingw*) if test -n "$GCC"; then
889+ gl_cv_func_signbit_gcc="guessing yes"
890+diff --git a/m4/sleep.m4 b/m4/sleep.m4
891+index 5f71cc7..7bab467 100644
892+--- a/m4/sleep.m4
893++++ b/m4/sleep.m4
894+@@ -1,4 +1,4 @@
895+-# sleep.m4 serial 9
896++# sleep.m4 serial 10
897+ dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
898+ dnl This file is free software; the Free Software Foundation
899+ dnl gives unlimited permission to copy and/or distribute it,
900+@@ -48,6 +48,8 @@ handle_alarm (int sig)
901+ [case "$host_os" in
902+ # Guess yes on glibc systems.
903+ *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;;
904++ # Guess yes on musl systems.
905++ *-musl*) gl_cv_func_sleep_works="guessing yes" ;;
906+ # Guess no on native Windows.
907+ mingw*) gl_cv_func_sleep_works="guessing no" ;;
908+ # If we don't know, assume the worst.
909+diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
910+index 83425dd..f8e1a7c 100644
911+--- a/m4/stpncpy.m4
912++++ b/m4/stpncpy.m4
913+@@ -1,4 +1,4 @@
914+-# stpncpy.m4 serial 16
915++# stpncpy.m4 serial 17
916+ dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation,
917+ dnl Inc.
918+ dnl This file is free software; the Free Software Foundation
919+@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
920+
921+ AC_DEFUN([gl_FUNC_STPNCPY],
922+ [
923++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
924++
925+ dnl Persuade glibc <string.h> to declare stpncpy().
926+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
927+
928+@@ -69,12 +71,18 @@ int main ()
929+ ]])],
930+ [gl_cv_func_stpncpy=yes],
931+ [gl_cv_func_stpncpy=no],
932+- [AC_EGREP_CPP([Thanks for using GNU], [
933++ [dnl Guess yes on glibc systems and musl systems.
934++ AC_EGREP_CPP([Thanks for using GNU], [
935+ #include <features.h>
936+ #ifdef __GNU_LIBRARY__
937+ Thanks for using GNU
938+ #endif
939+-], [gl_cv_func_stpncpy="guessing yes"], [gl_cv_func_stpncpy="guessing no"])
940++], [gl_cv_func_stpncpy="guessing yes"],
941++ [case "$host_os" in
942++ *-musl*) gl_cv_func_stpncpy="guessing yes" ;;
943++ *) gl_cv_func_stpncpy="guessing no" ;;
944++ esac
945++ ])
946+ ])
947+ ])
948+ case "$gl_cv_func_stpncpy" in
949+diff --git a/m4/strerror.m4 b/m4/strerror.m4
950+index b452f7f..2c90f31 100644
951+--- a/m4/strerror.m4
952++++ b/m4/strerror.m4
953+@@ -1,4 +1,4 @@
954+-# strerror.m4 serial 19
955++# strerror.m4 serial 20
956+ dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc.
957+ dnl This file is free software; the Free Software Foundation
958+ dnl gives unlimited permission to copy and/or distribute it,
959+@@ -26,6 +26,8 @@ AC_DEFUN([gl_FUNC_STRERROR],
960+ [case "$host_os" in
961+ # Guess yes on glibc systems.
962+ *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
963++ # Guess yes on musl systems.
964++ *-musl*) gl_cv_func_working_strerror="guessing yes" ;;
965+ # If we don't know, assume the worst.
966+ *) gl_cv_func_working_strerror="guessing no" ;;
967+ esac
968+@@ -80,6 +82,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0],
969+ [case "$host_os" in
970+ # Guess yes on glibc systems.
971+ *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
972++ # Guess yes on musl systems.
973++ *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;;
974+ # Guess yes on native Windows.
975+ mingw*) gl_cv_func_strerror_0_works="guessing yes" ;;
976+ # If we don't know, assume the worst.
977+diff --git a/m4/strtod.m4 b/m4/strtod.m4
978+index 9912217..d68ab75 100644
979+--- a/m4/strtod.m4
980++++ b/m4/strtod.m4
981+@@ -1,4 +1,4 @@
982+-# strtod.m4 serial 24
983++# strtod.m4 serial 25
984+ dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
985+ dnl This file is free software; the Free Software Foundation
986+ dnl gives unlimited permission to copy and/or distribute it,
987+@@ -115,9 +115,11 @@ numeric_equal (double x, double y)
988+ ],
989+ [gl_cv_func_strtod_works="guessing yes"],
990+ [case "$host_os" in
991+- # Guess yes on native Windows.
992+- mingw*) gl_cv_func_strtod_works="guessing yes" ;;
993+- *) gl_cv_func_strtod_works="guessing no" ;;
994++ # Guess yes on musl systems.
995++ *-musl*) gl_cv_func_strtod_works="guessing yes" ;;
996++ # Guess yes on native Windows.
997++ mingw*) gl_cv_func_strtod_works="guessing yes" ;;
998++ *) gl_cv_func_strtod_works="guessing no" ;;
999+ esac
1000+ ])
1001+ ])
1002+diff --git a/m4/strtold.m4 b/m4/strtold.m4
1003+index 16b4eda..17125fe 100644
1004+--- a/m4/strtold.m4
1005++++ b/m4/strtold.m4
1006+@@ -1,4 +1,4 @@
1007+-# strtold.m4 serial 2
1008++# strtold.m4 serial 4
1009+ dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
1010+ dnl This file is free software; the Free Software Foundation
1011+ dnl gives unlimited permission to copy and/or distribute it,
1012+@@ -98,7 +98,12 @@ numeric_equal (long double x, long double y)
1013+ #endif
1014+ ],
1015+ [gl_cv_func_strtold_works="guessing yes"],
1016+- [gl_cv_func_strtod_works="guessing no"])
1017++ [case "$host_os" in
1018++ # Guess yes on musl systems.
1019++ *-musl*) gl_cv_func_strtold_works="guessing yes" ;;
1020++ *) gl_cv_func_strtold_works="guessing no" ;;
1021++ esac
1022++ ])
1023+ ])
1024+ ])
1025+ case "$gl_cv_func_strtold_works" in
1026+diff --git a/m4/tzset.m4 b/m4/tzset.m4
1027+index 1278801..afdfa8e 100644
1028+--- a/m4/tzset.m4
1029++++ b/m4/tzset.m4
1030+@@ -1,4 +1,4 @@
1031+-# serial 11
1032++# serial 12
1033+
1034+ # Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
1035+ # This file is free software; the Free Software Foundation
1036+@@ -70,6 +70,8 @@ main ()
1037+ [case "$host_os" in
1038+ # Guess all is fine on glibc systems.
1039+ *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;;
1040++ # Guess all is fine on musl systems.
1041++ *-musl*) gl_cv_func_tzset_clobber="guessing no" ;;
1042+ # Guess no on native Windows.
1043+ mingw*) gl_cv_func_tzset_clobber="guessing no" ;;
1044+ # If we don't know, assume the worst.
1045+diff --git a/m4/ungetc.m4 b/m4/ungetc.m4
1046+index ab8757b..08baf33 100644
1047+--- a/m4/ungetc.m4
1048++++ b/m4/ungetc.m4
1049+@@ -1,4 +1,4 @@
1050+-# ungetc.m4 serial 6
1051++# ungetc.m4 serial 7
1052+ dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
1053+ dnl This file is free software; the Free Software Foundation
1054+ dnl gives unlimited permission to copy and/or distribute it,
1055+@@ -41,12 +41,16 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
1056+ remove ("conftest.tmp");])],
1057+ [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
1058+ [case "$host_os" in
1059+- # Guess yes on glibc and bionic systems.
1060+- *-gnu* | gnu* | *-android*) gl_cv_func_ungetc_works="guessing yes" ;;
1061+- # Guess yes on native Windows.
1062+- mingw*) gl_cv_func_ungetc_works="guessing yes" ;;
1063+- # If we don't know, assume the worst.
1064+- *) gl_cv_func_ungetc_works="guessing no" ;;
1065++ # Guess yes on glibc systems.
1066++ *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;;
1067++ # Guess yes on musl systems.
1068++ *-musl*) gl_cv_func_ungetc_works="guessing yes" ;;
1069++ # Guess yes on bionic systems.
1070++ *-android*) gl_cv_func_ungetc_works="guessing yes" ;;
1071++ # Guess yes on native Windows.
1072++ mingw*) gl_cv_func_ungetc_works="guessing yes" ;;
1073++ # If we don't know, assume the worst.
1074++ *) gl_cv_func_ungetc_works="guessing no" ;;
1075+ esac
1076+ ])
1077+ ])
1078+diff --git a/m4/usleep.m4 b/m4/usleep.m4
1079+index 59605a8..4a6bff0 100644
1080+--- a/m4/usleep.m4
1081++++ b/m4/usleep.m4
1082+@@ -1,4 +1,4 @@
1083+-# usleep.m4 serial 5
1084++# usleep.m4 serial 6
1085+ dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
1086+ dnl This file is free software; the Free Software Foundation
1087+ dnl gives unlimited permission to copy and/or distribute it,
1088+@@ -31,6 +31,8 @@ AC_DEFUN([gl_FUNC_USLEEP],
1089+ [case "$host_os" in
1090+ # Guess yes on glibc systems.
1091+ *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;;
1092++ # Guess yes on musl systems.
1093++ *-musl*) gl_cv_func_usleep_works="guessing yes" ;;
1094+ # Guess no on native Windows.
1095+ mingw*) gl_cv_func_usleep_works="guessing no" ;;
1096+ # If we don't know, assume the worst.
1097+diff --git a/m4/utimes.m4 b/m4/utimes.m4
1098+index 7209b6d..5806d8f 100644
1099+--- a/m4/utimes.m4
1100++++ b/m4/utimes.m4
1101+@@ -1,5 +1,5 @@
1102+ # Detect some bugs in glibc's implementation of utimes.
1103+-# serial 5
1104++# serial 6
1105+
1106+ dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc.
1107+ dnl This file is free software; the Free Software Foundation
1108+@@ -143,9 +143,11 @@ main ()
1109+ [gl_cv_func_working_utimes=yes],
1110+ [gl_cv_func_working_utimes=no],
1111+ [case "$host_os" in
1112+- # Guess no on native Windows.
1113+- mingw*) gl_cv_func_working_utimes="guessing no" ;;
1114+- *) gl_cv_func_working_utimes="guessing no" ;;
1115++ # Guess yes on musl systems.
1116++ *-musl*) gl_cv_func_working_utimes="guessing yes" ;;
1117++ # Guess no on native Windows.
1118++ mingw*) gl_cv_func_working_utimes="guessing no" ;;
1119++ *) gl_cv_func_working_utimes="guessing no" ;;
1120+ esac
1121+ ])
1122+ ])
1123+diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
1124+index baa2002..3952fd2 100644
1125+--- a/m4/wcwidth.m4
1126++++ b/m4/wcwidth.m4
1127+@@ -1,4 +1,4 @@
1128+-# wcwidth.m4 serial 27
1129++# wcwidth.m4 serial 28
1130+ dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
1131+ dnl This file is free software; the Free Software Foundation
1132+ dnl gives unlimited permission to copy and/or distribute it,
1133+@@ -98,9 +98,13 @@ int main ()
1134+ [
1135+ changequote(,)dnl
1136+ case "$host_os" in
1137+- # Guess yes on glibc and AIX 7 systems.
1138+- *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
1139+- *) gl_cv_func_wcwidth_works="guessing no";;
1140++ # Guess yes on glibc systems.
1141++ *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";;
1142++ # Guess yes on musl systems.
1143++ *-musl*) gl_cv_func_wcwidth_works="guessing yes";;
1144++ # Guess yes on AIX 7 systems.
1145++ aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
1146++ *) gl_cv_func_wcwidth_works="guessing no";;
1147+ esac
1148+ changequote([,])dnl
1149+ ])
1150+--
1151+1.9.1
1152+
1153+
pkgs/tools/misc/coreutils/default.nix+10−4
@@ -1,5 +1,5 @@
11{ stdenv, lib, buildPackages
2−, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
2+, autoreconfHook, bison, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
33, aclSupport ? stdenv.isLinux, acl ? null
44, attrSupport ? stdenv.isLinux, attr ? null
55, selinuxSupport? false, libselinux ? null, libsepol ? null
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
2424 sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz";
2525 };
2626
27− patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
27+ patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
28+ # Fix compilation in musl-cross environments. To be removed in coreutils-8.32.
29+ ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch;
2830
2931 postPatch = ''
3032 # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
@@ -55,7 +57,9 @@ stdenv.mkDerivation rec {
5557
5658 outputs = [ "out" "info" ];
5759
58− nativeBuildInputs = [ perl xz.bin ];
60+ nativeBuildInputs = [ perl xz.bin ]
61+ ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch
62+ ++ optionals stdenv.hostPlatform.isMusl [ autoreconfHook bison ]; # due to patch
5963 configureFlags = [ "--with-packager=https://NixOS.org" ]
6064 ++ optional (singleBinary != false)
6165 ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
@@ -73,7 +77,6 @@ stdenv.mkDerivation rec {
7377 ++ optional aclSupport acl
7478 ++ optional attrSupport attr
7579 ++ optional withOpenssl openssl
76− ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch
7780 ++ optionals selinuxSupport [ libselinux libsepol ]
7881 # TODO(@Ericson2314): Investigate whether Darwin could benefit too
7982 ++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
@@ -132,4 +135,7 @@ stdenv.mkDerivation rec {
132135 maintainers = [ maintainers.eelco ];
133136 };
134137
138+} // optionalAttrs stdenv.hostPlatform.isMusl {
139+ # Work around a bogus warning in conjunction with musl.
140+ NIX_CFLAGS_COMPILE = "-Wno-error";
135141}
pkgs/tools/misc/diffoscope/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchgit, python3Packages, docutils, help2man
22, acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
3−, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg1, gnutar
3+, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
44, gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
55, squashfsTools, tcpdump, unoconv, unzip, xxd, xz
66, enableBloat ? false
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
4141 dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
4242 libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz
4343 ] ++ lib.optionals enableBloat [
44− apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 gnumeric imagemagick
44+ apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg gnumeric imagemagick
4545 llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
4646 python3Packages.guestfs
4747 ];
pkgs/tools/misc/qt5ct/default.nix+2−2
@@ -4,11 +4,11 @@ let inherit (stdenv.lib) getDev; in
44
55stdenv.mkDerivation rec {
66 pname = "qt5ct";
7− version = "0.38";
7+ version = "0.39";
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
11− sha256 = "0p0317z79h906qwaf0p8ga6lmr1dlabkx12gn31bv9lnp9f55jwg";
11+ sha256 = "069y6c17gfics8rz3rdsn2x2hb39m4qka08ygwpxa8gqppffqs9p";
1212 };
1313
1414 nativeBuildInputs = [ qmake qttools ];
pkgs/tools/misc/shell-hist/default.nixnew file+23
@@ -0,0 +1,23 @@
1+{ lib, fetchFromGitHub, rustPlatform }:
2+
3+rustPlatform.buildRustPackage {
4+ pname = "shell-hist";
5+ version = "0.1.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "jamesmunns";
9+ repo = "shell-hist";
10+ rev = "158de8c3908b49530ecd76bf6e65c210f351ef82";
11+ sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf";
12+ };
13+
14+ cargoSha256 = "1nqnkzwqk879qy1261g1gds668xz6islhzq7chzhilaqpmvf6039";
15+
16+ meta = with lib; {
17+ description = "Inspect your shell history";
18+ homepage = "https://github.com/jamesmunns/shell-hist";
19+ license = with licenses; [ mit /* or */ asl20 ];
20+ maintainers = [ maintainers.spacekookie ];
21+ platforms = platforms.all;
22+ };
23+}
pkgs/tools/misc/tlp/default.nix+2−2
@@ -15,13 +15,13 @@ let
1515
1616in stdenv.mkDerivation rec {
1717 name = "tlp-${version}";
18− version = "1.2.1";
18+ version = "1.2.2";
1919
2020 src = fetchFromGitHub {
2121 owner = "linrunner";
2222 repo = "TLP";
2323 rev = version;
24− sha256 = "1msldl6y8fpvxa9p87lv3hvgxwk2vpiahqmapq485ihdjkshc558";
24+ sha256 = "0vm31ca6kdak9xzwskz7a8hvdp67drfh2zcdwlz3260r8r2ypgg1";
2525 };
2626
2727 outRef = placeholder "out";
pkgs/tools/misc/ttyplot/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "ttyplot-${version}";
5− version = "1.2";
5+ version = "1.4";
66
77 src = fetchFromGitHub {
88 owner = "tenox7";
99 repo = "ttyplot";
1010 rev = version;
11− sha256 = "1xaqzm71w2n0q532wpa3w818mvjvch3h34m2aq7pldkyk09frjxh";
11+ sha256 = "19qm0hx9ljdw9qg78lydn3c627xy7xnx3knq5f7caw9lf0cdp7kf";
1212 };
1313
1414 buildInputs = [ ncurses ];
pkgs/tools/misc/uutils-coreutils/default.nix+4−4
@@ -1,18 +1,18 @@
11{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }:
22
33rustPlatform.buildRustPackage {
4− name = "uutils-coreutils-2018-09-30";
4+ name = "uutils-coreutils-2019-05-03";
55 src = fetchFromGitHub {
66 owner = "uutils";
77 repo = "coreutils";
8− rev = "a161b7e803aef08455ae0547dccd9210e38a4574";
9− sha256 = "19j40cma7rz6yf5j6nyid8qslbcmrnxdk6by53hflal2qx3g555z";
8+ rev = "036dd812958ace22d973acf7b370f58072049dac";
9+ sha256 = "0d9w3iiphhsk7l5l34682wayp90rgq5a3d94l3qdvhcqkfmpg727";
1010 };
1111
1212 # too many impure/platform-dependent tests
1313 doCheck = false;
1414
15− cargoSha256 = "1a9k7i4829plkxgsflmpji3mrw2i1vln6jsnhxmkl14h554yi5j4";
15+ cargoSha256 = "0qnpx2xhckb45q8cgn0xh31dg5k73hqp5mz5zg3micmg7as4b621";
1616
1717 makeFlags =
1818 [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
pkgs/tools/misc/youtube-dl/default.nix+2−2
@@ -19,11 +19,11 @@ buildPythonPackage rec {
1919 # The websites youtube-dl deals with are a very moving target. That means that
2020 # downloads break constantly. Because of that, updates should always be backported
2121 # to the latest stable release.
22− version = "2019.04.30";
22+ version = "2019.05.11";
2323
2424 src = fetchurl {
2525 url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
26− sha256 = "1s43adnky8ayhjwmgmiqy6rmmygd4c23v36jhy2lzr2jpn8l53z1";
26+ sha256 = "1y272jgdqwhf2njzqfln80zb2pmw83rvp6lxza6wghb7cld249j1";
2727 };
2828
2929 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/networking/axel/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "axel-${version}";
5− version = "2.16.1";
5+ version = "2.17.1";
66
77 src = fetchurl {
8− url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
9− sha256 = "0v3hgqrpqqqkj8ghaky88a0wpnpwqd72vd04ywlbhgfzfkfrllk4";
8+ url = "https://github.com/axel-download-accelerator/axel/releases/download/v${version}/${name}.tar.xz";
9+ sha256 = "1mwyps6yvrjxp7mpzc0a2hwr2pw050c63fc9aqjzdzjjw123dfrn";
1010 };
1111
1212 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/tools/networking/i2pd/default.nix+2−2
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
1111
1212 name = pname + "-" + version;
1313 pname = "i2pd";
14− version = "2.24.0";
14+ version = "2.25.0";
1515
1616 src = fetchFromGitHub {
1717 owner = "PurpleI2P";
1818 repo = pname;
1919 rev = version;
20− sha256 = "1gn8i3jxy6zwrqxmkzc1n55sw29jxdjr4ihv33q2kcp7b90b4wsq";
20+ sha256 = "1jqfgpwg83prikjg67farl854mhyjiy4lz6i8kahp765m6kp8gaq";
2121 };
2222
2323 buildInputs = with stdenv.lib; [ boost zlib openssl ]
pkgs/tools/networking/tgt/default.nix+2−2
@@ -2,7 +2,7 @@
22, docbook_xsl }:
33
44let
5− version = "1.0.76";
5+ version = "1.0.77";
66in stdenv.mkDerivation rec {
77 name = "tgt-${version}";
88
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
1010 owner = "fujita";
1111 repo = "tgt";
1212 rev = "v${version}";
13− sha256 = "1q01ay0zn5gmy6df1iw1ic11p8zygxlp0r3nd887vvvjvlp3xrvc";
13+ sha256 = "1qhck8v5057wn9nb1nsq6dzhvqzz51x8i3n0p1x36zbsmdjy2ajw";
1414 };
1515
1616 buildInputs = [ libxslt systemd libaio docbook_xsl ];
pkgs/tools/security/signing-party/default.nix+15−15
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitLab, autoconf, automake, makeWrapper
22, python3, perl, perlPackages
3−, libmd, gnupg1, which, getopt, libpaper, nettools, qprint
3+, libmd, gnupg, which, getopt, libpaper, nettools, qprint
44, sendmailPath ? "/run/wrappers/bin/sendmail" }:
55
66let
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
4545 # Perl is required for it's pod2man.
4646 # Python and Perl are required for patching the script interpreter paths.
4747 nativeBuildInputs = [ autoconf automake makeWrapper ];
48− buildInputs = [ python3 perl perlPackages.GnuPGInterface libmd gnupg1 ];
48+ buildInputs = [ python3 perl perlPackages.GnuPGInterface libmd gnupg ];
4949
5050 postInstall = ''
5151 # Install all tools which aren't handled by 'make install'.
@@ -126,59 +126,59 @@ in stdenv.mkDerivation rec {
126126 TextTemplate MIMETools MailTools TimeDate NetIDNEncode ]
127127 ++ GnuPGInterfaceRuntimeDependencies)} \
128128 --prefix PATH ":" \
129− "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}"
129+ "${stdenv.lib.makeBinPath [ nettools gnupg ]}"
130130
131131 wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \
132132 ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
133133 --prefix PATH ":" \
134− "${stdenv.lib.makeBinPath [ gnupg1 libpaper ]}"
134+ "${stdenv.lib.makeBinPath [ gnupg libpaper ]}"
135135
136136 wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \
137− "${stdenv.lib.makeBinPath [ which gnupg1 libpaper ]}"
137+ "${stdenv.lib.makeBinPath [ which gnupg libpaper ]}"
138138
139139 wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \
140− "${stdenv.lib.makeBinPath [ gnupg1 qprint ]}"
140+ "${stdenv.lib.makeBinPath [ gnupg qprint ]}"
141141
142142 wrapProgram $out/bin/gpgdir --set PERL5LIB \
143143 ${with perlPackages; makePerlPath ([
144144 TermReadKey ]
145145 ++ GnuPGInterfaceRuntimeDependencies)} \
146146 --prefix PATH ":" \
147− "${stdenv.lib.makeBinPath [ gnupg1 ]}"
147+ "${stdenv.lib.makeBinPath [ gnupg ]}"
148148
149149 wrapProgram $out/bin/gpglist --prefix PATH ":" \
150− "${stdenv.lib.makeBinPath [ gnupg1 ]}"
150+ "${stdenv.lib.makeBinPath [ gnupg ]}"
151151
152152 wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \
153− "${stdenv.lib.makeBinPath [ getopt gnupg1 ]}"
153+ "${stdenv.lib.makeBinPath [ getopt gnupg ]}"
154154
155155# wrapProgram $out/bin/gpgparticipants-prefill
156156
157157 wrapProgram $out/bin/gpgsigs --set PERL5LIB \
158158 ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
159159 --prefix PATH ":" \
160− "${stdenv.lib.makeBinPath [ gnupg1 ]}"
160+ "${stdenv.lib.makeBinPath [ gnupg ]}"
161161
162162 wrapProgram $out/bin/gpgwrap --prefix PATH ":" \
163− "${stdenv.lib.makeBinPath [ gnupg1 ]}"
163+ "${stdenv.lib.makeBinPath [ gnupg ]}"
164164
165165# wrapProgram $out/bin/keyanalyze --set PERL5LIB \
166166
167167 wrapProgram $out/bin/keyart --prefix PATH ":" \
168− "${stdenv.lib.makeBinPath [ gnupg1 ]}"
168+ "${stdenv.lib.makeBinPath [ gnupg ]}"
169169
170170 wrapProgram $out/bin/keylookup --prefix PATH ":" \
171− "${stdenv.lib.makeBinPath [ gnupg1 ]}"
171+ "${stdenv.lib.makeBinPath [ gnupg ]}"
172172
173173 wrapProgram $out/bin/pgp-clean --set PERL5LIB \
174174 ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
175175 --prefix PATH ":" \
176− "${stdenv.lib.makeBinPath [ gnupg1 ]}"
176+ "${stdenv.lib.makeBinPath [ gnupg ]}"
177177
178178 wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \
179179 ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
180180 --prefix PATH ":" \
181− "${stdenv.lib.makeBinPath [ gnupg1 ]}"
181+ "${stdenv.lib.makeBinPath [ gnupg ]}"
182182
183183# wrapProgram $out/bin/pgpring
184184
pkgs/tools/security/tboot/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "tboot-${version}";
5− version = "1.9.6";
5+ version = "1.9.8";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/tboot/${name}.tar.gz";
9− sha256 = "0f9afz260xhycpd0x5zz6jn8ha14i8j98rck0fhb55l1rbbfwm8v";
9+ sha256 = "06f0ggl6vrb5ghklblvh2ixgmmjv31rkp1vfj9qm497iqwq9ac00";
1010 };
1111
1212 patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ];
pkgs/tools/security/vault/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "vault-${version}";
5− version = "1.1.0";
5+ version = "1.1.2";
66
77 src = fetchFromGitHub {
88 owner = "hashicorp";
99 repo = "vault";
1010 rev = "v${version}";
11− sha256 = "11hyqqpfz839ipqv534vvljyarnr9wn98rzvyfwnx2lq76h2adqn";
11+ sha256 = "1916zqmh4cam9nw3k95wiqizlpkbbm5qhfz4lblqba8pzc2y9v32";
1212 };
1313
1414 nativeBuildInputs = [ go gox removeReferencesTo ];
pkgs/tools/security/yara/default.nix+2−2
@@ -5,14 +5,14 @@
55}:
66
77stdenv.mkDerivation rec {
8− version = "3.9.0";
8+ version = "3.10.0";
99 name = "yara-${version}";
1010
1111 src = fetchFromGitHub {
1212 owner = "VirusTotal";
1313 repo = "yara";
1414 rev = "v${version}";
15− sha256 = "1a707nx1py1q1z9fc18c93gjd4k5k6k53a93qw09jlcc67xk2sz7";
15+ sha256 = "1qxqk324cyvi4n09s79786ciig1gdyhs9dnsm07hf95a3kh6w5z2";
1616 };
1717
1818 buildInputs = [ autoconf automake libtool pcre]
pkgs/tools/system/stress-ng/default.nix+32−18
@@ -3,12 +3,12 @@
33}:
44
55stdenv.mkDerivation rec {
6− name = "stress-ng-${version}";
7− version = "0.09.57";
6+ pname = "stress-ng";
7+ version = "0.09.58";
88
99 src = fetchurl {
10− url = "https://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz";
11− sha256 = "0xp55m1kif8hcjdcdhgaarghqf1gz5fa24qwl6zpmxkzl6bn002x";
10+ url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
11+ sha256 = "1rlll6wl0i0m21idfr3xr99pfgnb9wf9i35hsb0frmrpcvls06za";
1212 };
1313
1414 # All platforms inputs then Linux-only ones
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 attr keyutils libaio libapparmor libcap lksctp-tools
1818 ];
1919
20− patchPhase = ''
20+ postPatch = ''
2121 substituteInPlace Makefile --replace "/usr" ""
2222 '';
2323
@@ -27,25 +27,39 @@ stdenv.mkDerivation rec {
2727 # mystery, though. :-(
2828 enableParallelBuilding = (!stdenv.isi686);
2929
30− installFlags = [ "DESTDIR=$(out)" ];
30+ installFlags = [ "DESTDIR=${placeholder "out"}" ];
3131
3232 meta = with stdenv.lib; {
3333 description = "Stress test a computer system";
3434 longDescription = ''
35− Stress test a system in various selectable ways, exercising both various
36− physical subsystems and various operating system kernel interfaces:
37− - over 130 different stress tests
38− - over 70 CPU specific stress tests that exercise floating point,
39− integer, bit manipulation and control flow
40− - over 20 virtual memory stress tests
41− stress-ng was originally intended to make a machine work hard and trip
42− hardware issues such as thermal overruns as well as operating system
43− bugs that only occur when a system is being thrashed hard.
35+ stress-ng will stress test a computer system in various selectable ways. It
36+ was designed to exercise various physical subsystems of a computer as well as
37+ the various operating system kernel interfaces. Stress-ng features:
38+
39+ * over 210 stress tests
40+ * over 50 CPU specific stress tests that exercise floating point, integer,
41+ bit manipulation and control flow
42+ * over 20 virtual memory stress tests
43+ * portable: builds on Linux, Solaris, *BSD, Minix, Android, MacOS X,
44+ Debian Hurd, Haiku, Windows Subsystem for Linux and SunOs/Dilos with
45+ gcc, clang, tcc and pcc.
46+
47+ stress-ng was originally intended to make a machine work hard and trip hardware
48+ issues such as thermal overruns as well as operating system bugs that only
49+ occur when a system is being thrashed hard. Use stress-ng with caution as some
50+ of the tests can make a system run hot on poorly designed hardware and also can
51+ cause excessive system thrashing which may be difficult to stop.
52+
53+ stress-ng can also measure test throughput rates; this can be useful to observe
54+ performance changes across different operating system releases or types of
55+ hardware. However, it has never been intended to be used as a precise benchmark
56+ test suite, so do NOT use it in this manner.
4457 '';
45− homepage = https://kernel.ubuntu.com/~cking/stress-ng/;
46− downloadPage = https://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
58+ homepage = "https://kernel.ubuntu.com/~cking/stress-ng/";
59+ downloadPage = "https://kernel.ubuntu.com/~cking/tarballs/stress-ng/";
60+ changelog = "https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/debian/changelog?h=V${version}";
4761 license = licenses.gpl2Plus;
4862 maintainers = with maintainers; [ c0bw3b ];
49− platforms = platforms.linux; # TODO: fix https://github.com/NixOS/nixpkgs/pull/50506#issuecomment-439635963
63+ platforms = platforms.unix;
5064 };
5165}
pkgs/top-level/all-packages.nix+33−7
@@ -1762,6 +1762,8 @@ in
17621762
17631763 shab = callPackage ../tools/text/shab { };
17641764
1765+ shell-hist = callPackage ../tools/misc/shell-hist { };
1766+
17651767 simg2img = callPackage ../tools/filesystems/simg2img { };
17661768
17671769 snipes = callPackage ../games/snipes { };
@@ -2032,6 +2034,8 @@ in
20322034
20332035 checkinstall = callPackage ../tools/package-management/checkinstall { };
20342036
2037+ chit = callPackage ../development/tools/chit { };
2038+
20352039 chkrootkit = callPackage ../tools/security/chkrootkit { };
20362040
20372041 chrony = callPackage ../tools/networking/chrony { };
@@ -2658,14 +2662,22 @@ in
26582662 elk6Version = "6.7.2";
26592663 elk7Version = "7.0.1";
26602664
2661− elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
2662− elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { };
2665+ elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix {
2666+ utillinux = utillinuxMinimal;
2667+ };
2668+ elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
2669+ utillinux = utillinuxMinimal;
2670+ };
26632671 elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
26642672 enableUnfree = false;
2673+ utillinux = utillinuxMinimal;
2674+ };
2675+ elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
2676+ utillinux = utillinuxMinimal;
26652677 };
2666− elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { };
26672678 elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
26682679 enableUnfree = false;
2680+ utillinux = utillinuxMinimal;
26692681 };
26702682 elasticsearch = elasticsearch6;
26712683 elasticsearch-oss = elasticsearch6-oss;
@@ -4517,6 +4529,8 @@ in
45174529 withMinimal = false;
45184530 };
45194531
4532+ mkclean = callPackage ../applications/video/mkclean {};
4533+
45204534 mkcue = callPackage ../tools/cd-dvd/mkcue { };
45214535
45224536 mkp224o = callPackage ../tools/security/mkp224o { };
@@ -8748,13 +8762,16 @@ in
87488762
87498763 bam = callPackage ../development/tools/build-managers/bam {};
87508764
8751− bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { };
8765+ bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix {
8766+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
8767+ };
87528768 bazel = callPackage ../development/tools/build-managers/bazel {
87538769 inherit (darwin) cctools;
87548770 inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
87558771 buildJdk = jdk8;
87568772 buildJdkName = "jdk8";
87578773 runJdk = jdk11;
8774+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
87588775 };
87598776
87608777 bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
@@ -8816,6 +8833,8 @@ in
88168833 buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { };
88178834 buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { };
88188835
8836+ bpftool = callPackage ../os-specific/linux/bpftool { };
8837+
88198838 byacc = callPackage ../development/tools/parsing/byacc { };
88208839
88218840 cadre = callPackage ../development/tools/cadre { };
@@ -16422,7 +16441,7 @@ in
1642216441 stix-two = callPackage ../data/fonts/stix-two { };
1642316442
1642416443 inherit (callPackages ../data/fonts/gdouros { })
16425− symbola aegyptus akkadian anatolian maya unidings musica analecta textfonts aegan abydos;
16444+ aegan aegyptus akkadian assyrian eemusic maya symbola textfonts unidings;
1642616445
1642716446 iana-etc = callPackage ../data/misc/iana-etc { };
1642816447
@@ -21110,6 +21129,8 @@ in
2111021129
2111121130 atanks = callPackage ../games/atanks {};
2111221131
21132+ azimuth = callPackage ../games/azimuth {};
21133+
2111321134 ballAndPaddle = callPackage ../games/ball-and-paddle {
2111421135 guile = guile_1_8;
2111521136 };
@@ -21457,7 +21478,10 @@ in
2145721478
2145821479 nethack = callPackage ../games/nethack { };
2145921480
21460− nethack-qt = callPackage ../games/nethack { qtMode = true; };
21481+ nethack-qt = callPackage ../games/nethack {
21482+ qtMode = true;
21483+ stdenv = gccStdenv;
21484+ };
2146121485
2146221486 nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
2146321487
@@ -24006,8 +24030,10 @@ in
2400624030 stdenv = crossLibcStdenv;
2400724031 };
2400824032
24009− omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { };
24033+ omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { };
2401024034
2401124035 wasmtime = callPackage ../development/interpreters/wasmtime {};
2401224036
24037+ bemenu = callPackage ../applications/misc/bemenu { };
24038+
2401324039}
pkgs/top-level/php-packages.nix+2−2
@@ -347,12 +347,12 @@ let
347347 };
348348
349349 phpstan = mkDerivation rec {
350− version = "0.11.5";
350+ version = "0.11.6";
351351 pname = "phpstan";
352352
353353 src = pkgs.fetchurl {
354354 url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
355− sha256 = "13akllfr5dav0y61i4ym5ww8z32ynwj5lpvsfiwx6z52avmcrc29";
355+ sha256 = "016zm9ynh0zi40kclvzql7zxs3pl69cacln2c7n3gsicpswr0qa4";
356356 };
357357
358358 phases = [ "installPhase" ];
pkgs/top-level/python-packages.nix+2
@@ -665,6 +665,8 @@ in {
665665
666666 py-lru-cache = callPackage ../development/python-modules/py-lru-cache { };
667667
668+ py-radix = callPackage ../development/python-modules/py-radix { };
669+
668670 pydbus = callPackage ../development/python-modules/pydbus { };
669671
670672 pydocstyle = callPackage ../development/python-modules/pydocstyle { };
pkgs/top-level/release-cross.nix+1−1
@@ -31,7 +31,7 @@ let
3131 buildPackages.gcc = nativePlatforms;
3232 coreutils = nativePlatforms;
3333 haskell.packages.ghcHEAD.hello = nativePlatforms;
34− haskell.packages.ghc844.hello = nativePlatforms;
34+ haskellPackages.hello = nativePlatforms;
3535 };
3636
3737 linuxCommon = lib.recursiveUpdate gnuCommon {