git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit4cf394ea3f173946363c40439b03ebcd92eb2bb4 authorFrederik Rietdijk <fridh@fridh.nl> dateTue 18 Aug 2020, 17:55 (6 years ago) parent9da079c0a84375
113 files changed+1559−702
doc/languages-frameworks/python.section.md+117−2 lib/licenses.nix+5 lib/modules.nix+2−2 maintainers/maintainer-list.nix+11−4 nixos/modules/config/fonts/fontconfig-penultimate.nix−292 nixos/modules/config/fonts/fontconfig.nix+5−3 nixos/modules/module-list.nix+1−1 nixos/modules/rename.nix+1 nixos/modules/services/networking/bitcoind.nix+1−1 nixos/modules/services/networking/blockbook-frontend.nix+1−1 nixos/modules/services/networking/trickster.nix+1−2 nixos/modules/services/networking/xandikos.nix+1−1 nixos/modules/services/torrent/transmission.nix+18−4 nixos/modules/services/web-apps/dokuwiki.nix+1−1 nixos/modules/services/web-apps/rss-bridge.nix+127 nixos/modules/testing/test-instrumentation.nix+1−10 nixos/tests/bitcoind.nix+1−1 nixos/tests/blockbook-frontend.nix+1−1 nixos/tests/dokuwiki.nix+1−1 nixos/tests/trezord.nix+1−1 nixos/tests/trickster.nix+1−1 nixos/tests/xandikos.nix+1−1 pkgs/applications/audio/bchoppr/default.nix+28 pkgs/applications/audio/bschaffl/default.nix+28 pkgs/applications/audio/bslizr/default.nix+2−2 pkgs/applications/audio/freqtweak/default.nix+30 pkgs/applications/audio/geonkick/default.nix+27 pkgs/applications/audio/gwc/default.nix+47 pkgs/applications/audio/kapitonov-plugins-pack/default.nix+43 pkgs/applications/audio/uhhyou.lv2/default.nix+67 pkgs/applications/editors/neovim/default.nix+10−4 pkgs/applications/graphics/gimp/default.nix+15−15 pkgs/applications/misc/direwolf/default.nix−43 pkgs/applications/misc/pdfsam-basic/default.nix+1−1 pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+2−2 pkgs/applications/networking/instant-messengers/element/element-desktop.nix+2−2 pkgs/applications/networking/instant-messengers/element/element-web.nix+2−2 pkgs/applications/networking/mailreaders/meli/default.nix+1−1 pkgs/applications/networking/protonvpn-cli-ng/default.nix−36 pkgs/applications/networking/protonvpn-cli/default.nix+25−32 pkgs/applications/networking/protonvpn-gui/default.nix+86 pkgs/applications/qubes/qubes-core-vchan-xen/default.nix+1−2 pkgs/applications/radio/direwolf/default.nix+57 pkgs/applications/science/logic/vampire/default.nix+2−2 pkgs/applications/video/screenkey/default.nix+41−28 pkgs/applications/video/screenkey/paths.patch−20 pkgs/applications/window-managers/cwm/default.nix+1−1 pkgs/data/documentation/bgnet/default.nix+15−12 pkgs/data/fonts/fontconfig-penultimate/default.nix−24 pkgs/data/fonts/source-han/default.nix+2−1 pkgs/desktops/gnome-3/core/mutter/default.nix+2−2 pkgs/desktops/gnome-3/games/aisleriot/default.nix+53−12 pkgs/development/compilers/ghc/8.10.2.nix+5 pkgs/development/compilers/ghc/issue-18549.patch+296 pkgs/development/compilers/llvm/10/llvm.nix+1 pkgs/development/libraries/redkite/default.nix+25 pkgs/development/python-modules/aiojobs/default.nix+45 pkgs/development/python-modules/azure-storage-blob/default.nix+7−2 pkgs/development/python-modules/binwalk/default.nix+3−2 pkgs/development/python-modules/blis/default.nix+2−2 pkgs/development/python-modules/canonicaljson/default.nix+4−3 pkgs/development/python-modules/dask/default.nix+1 pkgs/development/python-modules/finalfusion/default.nix+56 pkgs/development/python-modules/prawcore/default.nix+2−2 pkgs/development/python-modules/pylint-django/default.nix+15−4 pkgs/development/python-modules/shamir-mnemonic/default.nix+1−1 pkgs/development/python-modules/spacy/default.nix+1 pkgs/development/python-modules/thinc/default.nix+1 pkgs/development/python-modules/trezor/default.nix+1−1 pkgs/development/tools/analysis/tflint/default.nix+3−3 pkgs/development/tools/continuous-integration/jenkins/default.nix+2−2 pkgs/development/tools/gocode-gomod/default.nix+7−11 pkgs/development/tools/gocode-gomod/deps.nix−11 pkgs/development/tools/rust/cargo-crev/default.nix+14−5 pkgs/development/tools/rust/rust-analyzer/default.nix+3−3 pkgs/development/web/postman/default.nix+2−2 pkgs/development/web/shopify-themekit/default.nix+1−1 pkgs/games/eidolon/default.nix+1−1 pkgs/games/factorio/default.nix+5−5 pkgs/games/ninvaders/default.nix+1−1 pkgs/games/steam/runtime.nix+2−2 pkgs/misc/vim-plugins/generated.nix+36 pkgs/misc/vim-plugins/vim-plugin-names+3 pkgs/os-specific/darwin/smimesign/default.nix+11−14 pkgs/os-specific/linux/crda/default.nix+2−3 pkgs/os-specific/linux/gobi_loader/default.nix+1−1 pkgs/os-specific/linux/kernel/linux-testing.nix+3−3 pkgs/servers/blockbook/default.nix+1−1 pkgs/servers/computing/slurm/default.nix+5−5 pkgs/servers/matrix-synapse/default.nix+2−2 pkgs/servers/misc/navidrome/default.nix+2−2 pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix+1−1 pkgs/servers/monitoring/prometheus/process-exporter.nix+1−1 pkgs/servers/monitoring/timescale-prometheus/default.nix+1−1 pkgs/servers/routinator/default.nix+1−1 pkgs/servers/tacacsplus/default.nix+1−1 pkgs/servers/trezord/default.nix+1−1 pkgs/servers/trickster/trickster.nix+1−1 pkgs/servers/web-apps/dokuwiki/default.nix+1−1 pkgs/servers/web-apps/rss-bridge/default.nix+33 pkgs/servers/xandikos/default.nix+1−2 pkgs/shells/zsh/oh-my-zsh/default.nix+3−3 pkgs/tools/admin/azure-cli/python-packages.nix+4−1 pkgs/tools/filesystems/squashfs-tools-ng/default.nix+2−2 pkgs/tools/misc/broot/default.nix+3−3 pkgs/tools/networking/pmacct/default.nix+1−1 pkgs/tools/networking/tayga/default.nix+1−1 pkgs/tools/nix/nixpkgs-fmt/default.nix+3−3 pkgs/tools/security/john/default.nix+3−2 pkgs/tools/system/inxi/default.nix+2−2 pkgs/top-level/aliases.nix+4 pkgs/top-level/all-packages.nix+23−5 pkgs/top-level/python-packages.nix+6
doc/languages-frameworks/python.section.md+117−2
@@ -538,8 +538,123 @@ buildPythonPackage rec {
538538```
539539Note also the line `doCheck = false;`, we explicitly disabled running the test-suite.
540540
541+#### Testing Python Packages
542+
543+It is highly encouraged to have testing as part of the package build. This
544+helps to avoid situations where the package was able to build and install,
545+but is not usable at runtime. Currently, all packages will use the `test`
546+command provided by the setup.py (i.e. `python setup.py test`). However,
547+this is currently deprecated https://github.com/pypa/setuptools/pull/1878
548+and your package should provide its own checkPhase.
549+
550+*NOTE:* The `checkPhase` for python maps to the `installCheckPhase` on a
551+normal derivation. This is due to many python packages not behaving well
552+to the pre-installed version of the package. Version info, and natively
553+compiled extensions generally only exist in the install directory, and
554+thus can cause issues when a test suite asserts on that behavior.
555+
556+*NOTE:* Tests should only be disabled if they don't agree with nix
557+(e.g. external dependencies, network access, flakey tests), however,
558+as many tests should be enabled as possible. Failing tests can still be
559+a good indication that the package is not in a valid state.
560+
561+#### Using pytest
562+
563+Pytest is the most common test runner for python repositories. A trivial
564+test run would be:
565+```
566+ checkInputs = [ pytest ];
567+ checkPhase = "pytest";
568+```
569+
570+However, many repositories' test suites do not translate well to nix's build
571+sandbox, and will generally need many tests to be disabled.
572+
573+To filter tests using pytest, one can do the following:
574+```
575+ checkInputs = [ pytest ];
576+ # avoid tests which need additional data or touch network
577+ checkPhase = ''
578+ pytest tests/ --ignore=tests/integration -k 'not download and not update'
579+ '';
580+```
581+
582+`--ignore` will tell pytest to ignore that file or directory from being
583+collected as part of a test run. This is useful is a file uses a package
584+which is not available in nixpkgs, thus skipping that test file is much
585+easier than having to create a new package.
586+
587+`-k` is used to define a predicate for test names. In this example, we are
588+filtering out tests which contain `download` or `update` in their test case name.
589+Only one `-k` argument is allows, and thus a long predicate should be concatenated
590+with "\" and wrapped to the next line.
591+
592+*NOTE:* In pytest==6.0.1, the use of "\" to continue a line (e.g. `-k 'not download \'`) has
593+been removed, in this case, it's recommended to use `pytestCheckHook`.
594+
595+#### Using pytestCheckHook
596+
597+`pytestCheckHook` is a convenient hook which will substitute the setuptools
598+`test` command for a checkPhase which runs `pytest`. This is also beneficial
599+when a package may need many items disabled to run the test suite.
600+
601+Using the example above, the analagous pytestCheckHook usage would be:
602+```
603+ checkInputs = [ pytestCheckHook ];
604+
605+ # requires additional data
606+ pytestFlagsArray = [ "tests/" "--ignore=tests/integration" ];
607+
608+ disabledTests = [
609+ # touches network
610+ "download"
611+ "update"
612+ ];
613+```
614+
615+This is expecially useful when tests need to be conditionallydisabled,
616+for example:
617+
618+```
619+ disabledTests = [
620+ # touches network
621+ "download"
622+ "update"
623+ ] ++ lib.optionals (pythonAtLeast "3.8") [
624+ # broken due to python3.8 async changes
625+ "async"
626+ ] ++ lib.optionals stdenv.isDarwin [
627+ # can fail when building with other packages
628+ "socket"
629+ ];
630+```
631+Trying to concatenate the related strings to disable tests in a regular checkPhase
632+would be much harder to read. This also enables us to comment on why specific tests
633+are disabled.
634+
635+#### Using pythonImportsCheck
636+
637+Although unit tests are highly prefered to valid correctness of a package. Not
638+all packages have test suites that can be ran easily, and some have none at all.
639+To help ensure the package still works, `pythonImportsCheck` can attempt to import
640+the listed modules.
641+
642+```
643+ pythonImportsCheck = [ "requests" "urllib" ];
644+```
645+roughly translates to:
646+```
647+ postCheck = ''
648+ PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
649+ python -c "import requests; import urllib"
650+ '';
651+```
652+However, this is done in it's own phase, and not dependent on whether `doCheck = true;`
653+
654+This can also be useful in verifying that the package doesn't assume commonly
655+present packages (e.g. `setuptools`)
541656
542−#### Develop local package
657+### Develop local package
543658
544659As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode)
545660(`python setup.py develop`); instead of installing the package this command
@@ -1017,7 +1132,7 @@ are used in `buildPythonPackage`.
10171132- `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system
10181133 (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`.
10191134- `pipInstallHook` to install wheels.
1020−- `pytestCheckHook` to run tests with `pytest`.
1135+- `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook).
10211136- `pythonCatchConflictsHook` to check whether a Python package is not already existing.
10221137- `pythonImportsCheckHook` to check whether importing the listed modules works.
10231138- `pythonRemoveBinBytecode` to remove bytecode from the `/bin` folder.
lib/licenses.nix+5
@@ -85,6 +85,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
8585 fullName = ''Beerware License'';
8686 };
8787
88+ blueOak100 = spdx {
89+ spdxId = "BlueOak-1.0.0";
90+ fullName = "Blue Oak Model License 1.0.0";
91+ };
92+
8893 bsd0 = spdx {
8994 spdxId = "0BSD";
9095 fullName = "BSD Zero Clause License";
lib/modules.nix+2−2
@@ -115,8 +115,8 @@ rec {
115115
116116 checkUnmatched =
117117 if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then
118− let inherit (head merged.unmatchedDefns) file prefix;
119− in throw "The option `${showOption prefix}' defined in `${file}' does not exist."
118+ let firstDef = head merged.unmatchedDefns;
119+ in throw "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist."
120120 else null;
121121
122122 result = builtins.seq checkUnmatched {
maintainers/maintainer-list.nix+11−4
@@ -26,6 +26,13 @@
2626
2727 `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
2828
29+ If `github` begins with a numeral, `handle` should be prefixed with an underscore.
30+ ```nix
31+ _1example = {
32+ github = "1example";
33+ };
34+ ```
35+
2936 Add PGP/GPG keys only if you actually use them to sign commits and/or mail.
3037
3138 To get the required PGP/GPG values for a key run
@@ -41,7 +48,7 @@
4148 See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
4249*/
4350{
44− "0x4A6F" = {
51+ _0x4A6F = {
4552 email = "mail-maintainer@0x4A6F.dev";
4653 name = "Joachim Ernst";
4754 github = "0x4A6F";
@@ -51,7 +58,7 @@
5158 fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D";
5259 }];
5360 };
54− "1000101" = {
61+ _1000101 = {
5562 email = "b1000101@pm.me";
5663 github = "1000101";
5764 githubId = 791309;
@@ -1884,7 +1891,7 @@
18841891 githubId = 4971975;
18851892 name = "Janne Heß";
18861893 };
1887− "dasj19" = {
1894+ dasj19 = {
18881895 email = "daniel@serbanescu.dk";
18891896 github = "dasj19";
18901897 githubId = 7589338;
@@ -8198,7 +8205,7 @@
81988205 githubId = 8547242;
81998206 name = "Stefan Rohrbacher";
82008207 };
8201− "thelegy" = {
8208+ thelegy = {
82028209 email = "mail+nixos@0jb.de";
82038210 github = "thelegy";
82048211 githubId = 3105057;
nixos/modules/config/fonts/fontconfig-penultimate.nixdeleted−292
@@ -1,292 +0,0 @@
1−{ config, pkgs, lib, ... }:
2−
3−with lib;
4−
5−let
6− cfg = config.fonts.fontconfig;
7−
8− fcBool = x: "<bool>" + (boolToString x) + "</bool>";
9−
10− # back-supported fontconfig version and package
11− # version is used for font cache generation
12− supportVersion = "210";
13− supportPkg = pkgs."fontconfig_${supportVersion}";
14−
15− # latest fontconfig version and package
16− # version is used for configuration folder name, /etc/fonts/VERSION/
17− # note: format differs from supportVersion and can not be used with makeCacheConf
18− latestVersion = pkgs.fontconfig.configVersion;
19− latestPkg = pkgs.fontconfig;
20−
21− # supported version fonts.conf
22− supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; };
23−
24− # configuration file to read fontconfig cache
25− # version dependent
26− # priority 0
27− cacheConfSupport = makeCacheConf { version = supportVersion; };
28− cacheConfLatest = makeCacheConf {};
29−
30− # generate the font cache setting file for a fontconfig version
31− # use latest when no version is passed
32− makeCacheConf = { version ? null }:
33− let
34− fcPackage = if version == null
35− then "fontconfig"
36− else "fontconfig_${version}";
37− makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
38− cache = makeCache pkgs.${fcPackage};
39− cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage};
40− in
41− pkgs.writeText "fc-00-nixos-cache.conf" ''
42− <?xml version='1.0'?>
43− <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
44− <fontconfig>
45− <!-- Font directories -->
46− ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}
47− <!-- Pre-generated font caches -->
48− <cachedir>${cache}</cachedir>
49− ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) ''
50− <cachedir>${cache32}</cachedir>
51− ''}
52− </fontconfig>
53− '';
54−
55− # local configuration file
56− localConf = pkgs.writeText "fc-local.conf" cfg.localConf;
57−
58− # rendering settings configuration files
59− # priority 10
60− hintingConf = pkgs.writeText "fc-10-hinting.conf" ''
61− <?xml version='1.0'?>
62− <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
63− <fontconfig>
64−
65− <!-- Default rendering settings -->
66− <match target="pattern">
67− <edit mode="append" name="hinting">
68− ${fcBool cfg.hinting.enable}
69− </edit>
70− <edit mode="append" name="autohint">
71− ${fcBool cfg.hinting.autohint}
72− </edit>
73− <edit mode="append" name="hintstyle">
74− <const>hintslight</const>
75− </edit>
76− </match>
77−
78− </fontconfig>
79− '';
80−
81− antialiasConf = pkgs.writeText "fc-10-antialias.conf" ''
82− <?xml version='1.0'?>
83− <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
84− <fontconfig>
85−
86− <!-- Default rendering settings -->
87− <match target="pattern">
88− <edit mode="append" name="antialias">
89− ${fcBool cfg.antialias}
90− </edit>
91− </match>
92−
93− </fontconfig>
94− '';
95−
96− subpixelConf = pkgs.writeText "fc-10-subpixel.conf" ''
97− <?xml version='1.0'?>
98− <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
99− <fontconfig>
100−
101− <!-- Default rendering settings -->
102− <match target="pattern">
103− <edit mode="append" name="rgba">
104− <const>${cfg.subpixel.rgba}</const>
105− </edit>
106− <edit mode="append" name="lcdfilter">
107− <const>lcd${cfg.subpixel.lcdfilter}</const>
108− </edit>
109− </match>
110−
111− </fontconfig>
112− '';
113−
114− dpiConf = pkgs.writeText "fc-11-dpi.conf" ''
115− <?xml version='1.0'?>
116− <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
117− <fontconfig>
118−
119− <match target="pattern">
120− <edit name="dpi" mode="assign">
121− <double>${toString cfg.dpi}</double>
122− </edit>
123− </match>
124−
125− </fontconfig>
126− '';
127−
128− # default fonts configuration file
129− # priority 52
130− defaultFontsConf =
131− let genDefault = fonts: name:
132− optionalString (fonts != []) ''
133− <alias>
134− <family>${name}</family>
135− <prefer>
136− ${concatStringsSep ""
137− (map (font: ''
138− <family>${font}</family>
139− '') fonts)}
140− </prefer>
141− </alias>
142− '';
143− in
144− pkgs.writeText "fc-52-nixos-default-fonts.conf" ''
145− <?xml version='1.0'?>
146− <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
147− <fontconfig>
148−
149− <!-- Default fonts -->
150− ${genDefault cfg.defaultFonts.sansSerif "sans-serif"}
151−
152− ${genDefault cfg.defaultFonts.serif "serif"}
153−
154− ${genDefault cfg.defaultFonts.monospace "monospace"}
155−
156− </fontconfig>
157− '';
158−
159− # reject Type 1 fonts
160− # priority 53
161− rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''
162− <?xml version="1.0"?>
163− <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
164− <fontconfig>
165−
166− <!-- Reject Type 1 fonts -->
167− <selectfont>
168− <rejectfont>
169− <pattern>
170− <patelt name="fontformat"><string>Type 1</string></patelt>
171− </pattern>
172− </rejectfont>
173− </selectfont>
174−
175− </fontconfig>
176− '';
177−
178− # The configuration to be included in /etc/font/
179− penultimateConf = pkgs.runCommand "fontconfig-penultimate-conf" {
180− preferLocalBuild = true;
181− } ''
182− support_folder=$out/etc/fonts/conf.d
183− latest_folder=$out/etc/fonts/${latestVersion}/conf.d
184−
185− mkdir -p $support_folder
186− mkdir -p $latest_folder
187−
188− # fonts.conf
189− ln -s ${supportFontsConf} $support_folder/../fonts.conf
190− ln -s ${latestPkg.out}/etc/fonts/fonts.conf \
191− $latest_folder/../fonts.conf
192−
193− # fontconfig-penultimate various configuration files
194− ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
195− $support_folder
196− ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
197− $latest_folder
198−
199− ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf
200− ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf
201−
202− rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf
203− ln -s ${antialiasConf} $support_folder/10-antialias.conf
204− ln -s ${antialiasConf} $latest_folder/10-antialias.conf
205−
206− rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf
207− ln -s ${hintingConf} $support_folder/10-hinting.conf
208− ln -s ${hintingConf} $latest_folder/10-hinting.conf
209−
210− ${optionalString cfg.useEmbeddedBitmaps ''
211− rm $support_folder/10-no-embedded-bitmaps.conf
212− rm $latest_folder/10-no-embedded-bitmaps.conf
213− ''}
214−
215− rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf
216− ln -s ${subpixelConf} $support_folder/10-subpixel.conf
217− ln -s ${subpixelConf} $latest_folder/10-subpixel.conf
218−
219− ${optionalString (cfg.dpi != 0) ''
220− ln -s ${dpiConf} $support_folder/11-dpi.conf
221− ln -s ${dpiConf} $latest_folder/11-dpi.conf
222− ''}
223−
224− # 50-user.conf
225− ${optionalString (!cfg.includeUserConf) ''
226− rm $support_folder/50-user.conf
227− rm $latest_folder/50-user.conf
228− ''}
229−
230− # 51-local.conf
231− rm $latest_folder/51-local.conf
232− substitute \
233− ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \
234− $latest_folder/51-local.conf \
235− --replace local.conf /etc/fonts/${latestVersion}/local.conf
236−
237− # local.conf (indirect priority 51)
238− ${optionalString (cfg.localConf != "") ''
239− ln -s ${localConf} $support_folder/../local.conf
240− ln -s ${localConf} $latest_folder/../local.conf
241− ''}
242−
243− # 52-nixos-default-fonts.conf
244− ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
245− ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
246−
247− # 53-no-bitmaps.conf
248− ${optionalString cfg.allowBitmaps ''
249− rm $support_folder/53-no-bitmaps.conf
250− rm $latest_folder/53-no-bitmaps.conf
251− ''}
252−
253− ${optionalString (!cfg.allowType1) ''
254− # 53-nixos-reject-type1.conf
255− ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf
256− ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf
257− ''}
258− '';
259−
260−in
261−{
262−
263− options = {
264−
265− fonts = {
266−
267− fontconfig = {
268−
269− penultimate = {
270− enable = mkOption {
271− type = types.bool;
272− default = false;
273− description = ''
274− Enable fontconfig-penultimate settings to supplement the
275− NixOS defaults by providing per-font rendering defaults and
276− metric aliases.
277− '';
278− };
279− };
280−
281− };
282− };
283−
284− };
285−
286− config = mkIf (config.fonts.fontconfig.enable && config.fonts.fontconfig.penultimate.enable) {
287−
288− fonts.fontconfig.confPackages = [ penultimateConf ];
289−
290− };
291−
292−}
nixos/modules/config/fonts/fontconfig.nix+5−3
@@ -204,8 +204,10 @@ let
204204 ln -s ${renderConf} $dst/10-nixos-rendering.conf
205205
206206 # 50-user.conf
207− ${optionalString (!cfg.includeUserConf) ''
208− rm $dst/50-user.conf
207+ # Since latest fontconfig looks for default files inside the package,
208+ # we had to move this one elsewhere to be able to exclude it here.
209+ ${optionalString cfg.includeUserConf ''
210+ ln -s ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf $dst/50-user.conf
209211 ''}
210212
211213 # local.conf (indirect priority 51)
@@ -455,7 +457,7 @@ in
455457 environment.systemPackages = [ pkgs.fontconfig ];
456458 environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/";
457459 })
458− (mkIf (cfg.enable && !cfg.penultimate.enable) {
460+ (mkIf cfg.enable {
459461 fonts.fontconfig.confPackages = [ confPkg ];
460462 })
461463 ];
nixos/modules/module-list.nix+1−1
@@ -1,7 +1,6 @@
11[
22 ./config/debug-info.nix
33 ./config/fonts/fontconfig.nix
4− ./config/fonts/fontconfig-penultimate.nix
54 ./config/fonts/fontdir.nix
65 ./config/fonts/fonts.nix
76 ./config/fonts/ghostscript.nix
@@ -866,6 +865,7 @@
866865 ./services/web-apps/moinmoin.nix
867866 ./services/web-apps/restya-board.nix
868867 ./services/web-apps/sogo.nix
868+ ./services/web-apps/rss-bridge.nix
869869 ./services/web-apps/tt-rss.nix
870870 ./services/web-apps/trac.nix
871871 ./services/web-apps/trilium.nix
nixos/modules/rename.nix+1
@@ -17,6 +17,7 @@ with lib;
1717 (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
1818
1919 # Completely removed modules
20+ (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.")
2021 (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
2122 (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
2223 (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
nixos/modules/services/networking/bitcoind.nix+1−1
@@ -256,6 +256,6 @@ in
256256
257257 };
258258
259− meta.maintainers = with maintainers; [ maintainers."1000101" ];
259+ meta.maintainers = with maintainers; [ _1000101 ];
260260
261261}
nixos/modules/services/networking/blockbook-frontend.nix+1−1
@@ -270,6 +270,6 @@ in
270270 nameValuePair "${cfg.group}" { })) eachBlockbook;
271271 };
272272
273− meta.maintainers = with maintainers; [ maintainers."1000101" ];
273+ meta.maintainers = with maintainers; [ _1000101 ];
274274
275275}
nixos/modules/services/networking/trickster.nix+1−2
@@ -108,7 +108,6 @@ in
108108 };
109109 };
110110
111− meta.maintainers = with maintainers; [ maintainers."1000101" ];
111+ meta.maintainers = with maintainers; [ _1000101 ];
112112
113113}
114−
nixos/modules/services/networking/xandikos.nix+1−1
@@ -90,7 +90,7 @@ in
9090 config = mkIf cfg.enable (
9191 mkMerge [
9292 {
93− meta.maintainers = [ lib.maintainers."0x4A6F" ];
93+ meta.maintainers = with lib.maintainers; [ _0x4A6F ];
9494
9595 systemd.services.xandikos = {
9696 description = "A Simple Calendar and Contact Server";
nixos/modules/services/torrent/transmission.nix+18−4
@@ -11,6 +11,7 @@ let
1111 settingsDir = ".config/transmission-daemon";
1212 downloadsDir = "Downloads";
1313 incompleteDir = ".incomplete";
14+ watchDir = "watchdir";
1415 # TODO: switch to configGen.json once RFC0042 is implemented
1516 settingsFile = pkgs.writeText "settings.json" (builtins.toJSON cfg.settings);
1617in
@@ -35,6 +36,8 @@ in
3536 download-dir = "${cfg.home}/${downloadsDir}";
3637 incomplete-dir = "${cfg.home}/${incompleteDir}";
3738 incomplete-dir-enabled = true;
39+ watch-dir = "${cfg.home}/${watchDir}";
40+ watch-dir-enabled = false;
3841 message-level = 1;
3942 peer-port = 51413;
4043 peer-port-random-high = 65535;
@@ -161,6 +164,9 @@ in
161164 { assertion = types.path.check cfg.settings.incomplete-dir;
162165 message = "`services.transmission.settings.incomplete-dir' must be an absolute path.";
163166 }
167+ { assertion = types.path.check cfg.settings.watch-dir;
168+ message = "`services.transmission.settings.watch-dir' must be an absolute path.";
169+ }
164170 { assertion = cfg.settings.script-torrent-done-filename == "" || types.path.check cfg.settings.script-torrent-done-filename;
165171 message = "`services.transmission.settings.script-torrent-done-filename' must be an absolute path.";
166172 }
@@ -220,14 +226,16 @@ in
220226 cfg.settings.download-dir
221227 ] ++
222228 optional cfg.settings.incomplete-dir-enabled
223− cfg.settings.incomplete-dir;
229+ cfg.settings.incomplete-dir
230+ ++
231+ optional cfg.settings.watch-dir-enabled
232+ cfg.settings.watch-dir
233+ ;
224234 BindReadOnlyPaths = [
225235 # No confinement done of /nix/store here like in systemd-confinement.nix,
226236 # an AppArmor profile is provided to get a confinement based upon paths and rights.
227237 builtins.storeDir
228− "-/etc/hosts"
229− "-/etc/ld-nix.so.preload"
230− "-/etc/localtime"
238+ "/etc"
231239 ] ++
232240 optional (cfg.settings.script-torrent-done-enabled &&
233241 cfg.settings.script-torrent-done-filename != "")
@@ -410,11 +418,17 @@ in
410418 ${optionalString cfg.settings.incomplete-dir-enabled ''
411419 rw ${cfg.settings.incomplete-dir}/**,
412420 ''}
421+ ${optionalString cfg.settings.watch-dir-enabled ''
422+ rw ${cfg.settings.watch-dir}/**,
423+ ''}
413424 profile dirs {
414425 rw ${cfg.settings.download-dir}/**,
415426 ${optionalString cfg.settings.incomplete-dir-enabled ''
416427 rw ${cfg.settings.incomplete-dir}/**,
417428 ''}
429+ ${optionalString cfg.settings.watch-dir-enabled ''
430+ rw ${cfg.settings.watch-dir}/**,
431+ ''}
418432 }
419433
420434 ${optionalString (cfg.settings.script-torrent-done-enabled &&
nixos/modules/services/web-apps/dokuwiki.nix+1−1
@@ -383,6 +383,6 @@ in
383383 };
384384 };
385385
386− meta.maintainers = with maintainers; [ maintainers."1000101" ];
386+ meta.maintainers = with maintainers; [ _1000101 ];
387387
388388}
nixos/modules/services/web-apps/rss-bridge.nixnew file+127
@@ -0,0 +1,127 @@
1+{ config, lib, pkgs, ... }:
2+with lib;
3+let
4+ cfg = config.services.rss-bridge;
5+
6+ poolName = "rss-bridge";
7+
8+ whitelist = pkgs.writeText "rss-bridge_whitelist.txt"
9+ (concatStringsSep "\n" cfg.whitelist);
10+in
11+{
12+ options = {
13+ services.rss-bridge = {
14+ enable = mkEnableOption "rss-bridge";
15+
16+ user = mkOption {
17+ type = types.str;
18+ default = "nginx";
19+ example = "nginx";
20+ description = ''
21+ User account under which both the service and the web-application run.
22+ '';
23+ };
24+
25+ group = mkOption {
26+ type = types.str;
27+ default = "nginx";
28+ example = "nginx";
29+ description = ''
30+ Group under which the web-application run.
31+ '';
32+ };
33+
34+ pool = mkOption {
35+ type = types.str;
36+ default = poolName;
37+ description = ''
38+ Name of existing phpfpm pool that is used to run web-application.
39+ If not specified a pool will be created automatically with
40+ default values.
41+ '';
42+ };
43+
44+ dataDir = mkOption {
45+ type = types.str;
46+ default = "/var/lib/rss-bridge";
47+ description = ''
48+ Location in which cache directory will be created.
49+ You can put <literal>config.ini.php</literal> in here.
50+ '';
51+ };
52+
53+ virtualHost = mkOption {
54+ type = types.nullOr types.str;
55+ default = "rss-bridge";
56+ description = ''
57+ Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost.
58+ '';
59+ };
60+
61+ whitelist = mkOption {
62+ type = types.listOf types.str;
63+ default = [];
64+ example = options.literalExample ''
65+ [
66+ "Facebook"
67+ "Instagram"
68+ "Twitter"
69+ ]
70+ '';
71+ description = ''
72+ List of bridges to be whitelisted.
73+ If the list is empty, rss-bridge will use whitelist.default.txt.
74+ Use <literal>[ "*" ]</literal> to whitelist all.
75+ '';
76+ };
77+ };
78+ };
79+
80+ config = mkIf cfg.enable {
81+ services.phpfpm.pools = mkIf (cfg.pool == poolName) {
82+ ${poolName} = {
83+ user = cfg.user;
84+ settings = mapAttrs (name: mkDefault) {
85+ "listen.owner" = cfg.user;
86+ "listen.group" = cfg.user;
87+ "listen.mode" = "0600";
88+ "pm" = "dynamic";
89+ "pm.max_children" = 75;
90+ "pm.start_servers" = 10;
91+ "pm.min_spare_servers" = 5;
92+ "pm.max_spare_servers" = 20;
93+ "pm.max_requests" = 500;
94+ "catch_workers_output" = 1;
95+ };
96+ };
97+ };
98+ systemd.tmpfiles.rules = [
99+ "d '${cfg.dataDir}/cache' 0750 ${cfg.user} ${cfg.group} - -"
100+ (mkIf (cfg.whitelist != []) "L+ ${cfg.dataDir}/whitelist.txt - - - - ${whitelist}")
101+ "z '${cfg.dataDir}/config.ini.php' 0750 ${cfg.user} ${cfg.group} - -"
102+ ];
103+
104+ services.nginx = mkIf (cfg.virtualHost != null) {
105+ enable = true;
106+ virtualHosts = {
107+ ${cfg.virtualHost} = {
108+ root = "${pkgs.rss-bridge}";
109+
110+ locations."/" = {
111+ tryFiles = "$uri /index.php$is_args$args";
112+ };
113+
114+ locations."~ ^/index.php(/|$)" = {
115+ extraConfig = ''
116+ include ${pkgs.nginx}/conf/fastcgi_params;
117+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
118+ fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
119+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
120+ fastcgi_param RSSBRIDGE_DATA ${cfg.dataDir};
121+ '';
122+ };
123+ };
124+ };
125+ };
126+ };
127+}
nixos/modules/testing/test-instrumentation.nix+1−10
@@ -1,22 +1,13 @@
11# This module allows the test driver to connect to the virtual machine
22# via a root shell attached to port 514.
33
4−{ config, lib, pkgs, ... }:
4+{ options, config, lib, pkgs, ... }:
55
66with lib;
77with import ../../lib/qemu-flags.nix { inherit pkgs; };
88
99{
1010
11− # This option is a dummy that if used in conjunction with
12− # modules/virtualisation/qemu-vm.nix gets merged with the same option defined
13− # there and only is declared here because some modules use
14− # test-instrumentation.nix but not qemu-vm.nix.
15− #
16− # One particular example are the boot tests where we want instrumentation
17− # within the images but not other stuff like setting up 9p filesystems.
18− options.virtualisation.qemu = { };
19−
2011 config = {
2112
2213 systemd.services.backdoor =
nixos/tests/bitcoind.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "bitcoind";
33 meta = with pkgs.stdenv.lib; {
4− maintainers = with maintainers; [ maintainers."1000101" ];
4+ maintainers = with maintainers; [ _1000101 ];
55 };
66
77 machine = { ... }: {
nixos/tests/blockbook-frontend.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "blockbook-frontend";
33 meta = with pkgs.stdenv.lib; {
4− maintainers = with maintainers; [ maintainers."1000101" ];
4+ maintainers = with maintainers; [ _1000101 ];
55 };
66
77 machine = { ... }: {
nixos/tests/dokuwiki.nix+1−1
@@ -33,7 +33,7 @@ let
3333in {
3434 name = "dokuwiki";
3535 meta = with pkgs.stdenv.lib; {
36− maintainers = with maintainers; [ maintainers."1000101" ];
36+ maintainers = with maintainers; [ _1000101 ];
3737 };
3838 machine = { ... }: {
3939 services.dokuwiki."site1.local" = {
nixos/tests/trezord.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "trezord";
33 meta = with pkgs.stdenv.lib; {
4− maintainers = with maintainers; [ mmahut maintainers."1000101" ];
4+ maintainers = with maintainers; [ mmahut _1000101 ];
55 };
66 nodes = {
77 machine = { ... }: {
nixos/tests/trickster.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "trickster";
33 meta = with pkgs.stdenv.lib; {
4− maintainers = with maintainers; [ maintainers."1000101" ];
4+ maintainers = with maintainers; [ _1000101 ];
55 };
66
77 nodes = {
nixos/tests/xandikos.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix (
44 {
55 name = "xandikos";
66
7− meta.maintainers = [ lib.maintainers."0x4A6F" ];
7+ meta.maintainers = with lib.maintainers; [ _0x4A6F ];
88
99 nodes = {
1010 xandikos_client = {};
pkgs/applications/audio/bchoppr/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "bchoppr";
5+ version = "1.6.4";
6+
7+ src = fetchFromGitHub {
8+ owner = "sjaehn";
9+ repo = pname;
10+ rev = "${version}";
11+ sha256 = "16b0sg7q2b8l4y4bp5s3yzsj9j6jayjy2mlvqkby6l7hcgjcj493";
12+ };
13+
14+ nativeBuildInputs = [ pkg-config ];
15+ buildInputs = [ cairo libX11 lv2 ];
16+
17+ installFlags = [ "PREFIX=$(out)" ];
18+
19+ enableParallelBuilding = true;
20+
21+ meta = with stdenv.lib; {
22+ homepage = https://github.com/sjaehn/BChoppr;
23+ description = "An audio stream chopping LV2 plugin";
24+ maintainers = [ maintainers.magnetophon ];
25+ platforms = platforms.linux;
26+ license = licenses.gpl3Plus;
27+ };
28+}
pkgs/applications/audio/bschaffl/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "bschaffl";
5+ version = "0.3";
6+
7+ src = fetchFromGitHub {
8+ owner = "sjaehn";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "1pcch7j1wgsb77mjy58hl3z43p83dv0vcmyh129m9k216b09gy29";
12+ };
13+
14+ nativeBuildInputs = [ pkg-config ];
15+ buildInputs = [ cairo libX11 lv2 ];
16+
17+ installFlags = [ "PREFIX=$(out)" ];
18+
19+ enableParallelBuilding = true;
20+
21+ meta = with stdenv.lib; {
22+ homepage = "https://github.com/sjaehn/BSchaffl";
23+ description = "Pattern-controlled MIDI amp & time stretch LV2 plugin";
24+ maintainers = [ maintainers.magnetophon ];
25+ platforms = platforms.linux;
26+ license = licenses.gpl3;
27+ };
28+}
pkgs/applications/audio/bslizr/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "BSlizr";
5− version = "1.2.6";
5+ version = "1.2.8";
66
77 src = fetchFromGitHub {
88 owner = "sjaehn";
99 repo = pname;
1010 rev = "${version}";
11− sha256 = "1l0znwvvqd2s24c652q54pkizlh86mvmr8h0qqp9xma0i575fcrh";
11+ sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig ];
pkgs/applications/audio/freqtweak/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, fftwFloat, libjack2, libsigcxx, libxml2, wxGTK }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "freqtweak";
5+ version = "unstable-2019-08-03";
6+
7+ src = fetchFromGitHub {
8+ owner = "essej";
9+ repo = pname;
10+ rev = "d4205337558d36657a4ee6b3afb29358aa18c0fd";
11+ sha256 = "10cq27mdgrrc54a40al9ahi0wqd0p2c1wxbdg518q8pzfxaxs5fi";
12+ };
13+
14+ nativeBuildInputs = [ autoconf automake pkg-config ];
15+ buildInputs = [ fftwFloat libjack2 libsigcxx libxml2 wxGTK ];
16+
17+ preConfigure = ''
18+ sh autogen.sh
19+ '';
20+
21+ enableParallelBuilding = true;
22+
23+ meta = with stdenv.lib; {
24+ homepage = http://essej.net/freqtweak/;
25+ description = "Realtime audio frequency spectral manipulation";
26+ maintainers = [ maintainers.magnetophon ];
27+ platforms = platforms.linux;
28+ license = licenses.gpl2Plus;
29+ };
30+}
pkgs/applications/audio/geonkick/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson, libjack2, lv2, libX11, cairo }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "geonkick";
5+ version = "2.3.3";
6+
7+ src = fetchFromGitLab {
8+ owner = "iurie-sw";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "0h1abb6q2bmi01a3v37adkc4zc03j47jpvffz8p2lpp33xhljghs";
12+ };
13+
14+ nativeBuildInputs = [ cmake pkg-config ];
15+
16+ buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
17+
18+ cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" ];
19+
20+ meta = {
21+ homepage = "https://gitlab.com/iurie-sw/geonkick";
22+ description = "A free software percussion synthesizer";
23+ license = stdenv.lib.licenses.gpl3Plus;
24+ platforms = stdenv.lib.platforms.linux;
25+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
26+ };
27+}
pkgs/applications/audio/gwc/default.nixnew file+47
@@ -0,0 +1,47 @@
1+{ stdenv
2+, fetchFromGitHub
3+, autoreconfHook
4+, pkg-config
5+, alsaLib
6+, libpulseaudio
7+, gtk2
8+, hicolor-icon-theme
9+, libsndfile
10+, fftw
11+}:
12+
13+stdenv.mkDerivation rec {
14+ pname = "gwc";
15+ version = "0.22-04";
16+
17+ src = fetchFromGitHub {
18+ owner = "AlisterH";
19+ repo = pname;
20+ rev = version;
21+ sha256 = "0xvfra32dchnnyf9kj5s5xmqhln8jdrc9f0040hjr2dsb58y206p";
22+ };
23+
24+ nativeBuildInputs = [
25+ autoreconfHook
26+ pkg-config
27+ ];
28+
29+ buildInputs = [
30+ alsaLib
31+ libpulseaudio
32+ gtk2
33+ hicolor-icon-theme
34+ libsndfile
35+ fftw
36+ ];
37+
38+ enableParallelBuilding = false; # Fails to generate machine.h in time.
39+
40+ meta = with stdenv.lib; {
41+ description = "GUI application for removing noise (hiss, pops and clicks) from audio files";
42+ homepage = "https://github.com/AlisterH/gwc/";
43+ license = licenses.gpl2Plus;
44+ maintainers = with maintainers; [ magnetophon ];
45+ platforms = platforms.linux;
46+ };
47+}
pkgs/applications/audio/kapitonov-plugins-pack/default.nixnew file+43
@@ -0,0 +1,43 @@
1+{ stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config
2+, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm
3+, zita-convolver, zita-resampler
4+ }:
5+
6+stdenv.mkDerivation rec {
7+ pname = "kapitonov-plugins-pack";
8+ version = "1.2.1";
9+
10+ src = fetchFromGitHub {
11+ owner = "olegkapitonov";
12+ repo = pname;
13+ rev = version;
14+ sha256 = "1mxi7b1vrzg25x85lqk8c77iziqrqyz18mqkfjlz09sxp5wfs9w4";
15+ };
16+
17+ nativeBuildInputs = [
18+ faust
19+ meson
20+ ninja
21+ pkg-config
22+ ];
23+
24+ buildInputs = [
25+ boost
26+ cairo
27+ fftw
28+ ladspa-sdk
29+ libxcb
30+ lv2
31+ xcbutilwm
32+ zita-convolver
33+ zita-resampler
34+ ];
35+
36+ meta = with stdenv.lib; {
37+ description = "Set of LADSPA and LV2 plugins for guitar sound processing";
38+ homepage = https://github.com/olegkapitonov/Kapitonov-Plugins-Pack;
39+ license = licenses.gpl3;
40+ platforms = platforms.linux;
41+ maintainers = with maintainers; [ magnetophon ];
42+ };
43+}
pkgs/applications/audio/uhhyou.lv2/default.nixnew file+67
@@ -0,0 +1,67 @@
1+{ stdenv
2+, fetchFromGitHub
3+, pkg-config
4+, python3
5+, fftw
6+, libGL
7+, libX11
8+, libjack2
9+, liblo
10+, lv2
11+}:
12+
13+stdenv.mkDerivation rec {
14+ # this is what upstream calls the package, see:
15+ # https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2
16+ pname = "uhhyou.lv2";
17+ version = "unstable-2020-07-31";
18+
19+ src = fetchFromGitHub {
20+ owner = "ryukau";
21+ repo = "LV2Plugins";
22+ rev = "6189be67acaeb95452f8adab73a731d94a7b6f47";
23+ fetchSubmodules = true;
24+ sha256 = "049gigx2s89z8vf17gscs00c150lmcdwya311nbrwa18fz4bx242";
25+ };
26+
27+ nativeBuildInputs = [ pkg-config python3 ];
28+
29+ buildInputs = [ fftw libGL libX11 libjack2 liblo lv2 ];
30+
31+ makeFlags = [ "PREFIX=$(out)" ];
32+
33+ prePatch = ''
34+ patchShebangs generate-ttl.sh
35+ cp patch/NanoVG.cpp lib/DPF/dgl/src/NanoVG.cpp
36+ '';
37+
38+ enableParallelBuilding = true;
39+
40+ meta = with stdenv.lib; {
41+ description = "Audio plugins for Linux";
42+ longDescription = ''
43+ Plugin List:
44+ - CubicPadSynth
45+ - EnvelopedSine
46+ - EsPhaser
47+ - FDNCymbal
48+ - FoldShaper
49+ - IterativeSinCluster
50+ - L3Reverb
51+ - L4Reverb
52+ - LatticeReverb
53+ - LightPadSynth
54+ - ModuloShaper
55+ - OddPowShaper
56+ - SevenDelay
57+ - SoftClipper
58+ - SyncSawSynth
59+ - TrapezoidSynth
60+ - WaveCymbal
61+ '';
62+ homepage = "https://github.com/ryukau/LV2Plugins/";
63+ license = licenses.gpl3Plus;
64+ platforms = platforms.linux;
65+ maintainers = [ maintainers.magnetophon ];
66+ };
67+}
pkgs/applications/editors/neovim/default.nix+10−4
@@ -20,6 +20,14 @@ let
2020 ));
2121
2222 pyEnv = python.withPackages(ps: [ ps.pynvim ps.msgpack ]);
23+
24+ # FIXME: this is verry messy and strange.
25+ # see https://github.com/NixOS/nixpkgs/pull/80528
26+ luv = lua.pkgs.luv;
27+ luvpath = with builtins ; if stdenv.isDarwin
28+ then "${luv.libluv}/lib/lua/${lua.luaversion}/libluv.${head (match "([0-9.]+).*" luv.version)}.dylib"
29+ else "${luv}/lib/lua/${lua.luaversion}/luv.so";
30+
2331in
2432 stdenv.mkDerivation rec {
2533 pname = "neovim-unwrapped";
@@ -47,7 +55,7 @@ in
4755 libtermkey
4856 libuv
4957 libvterm-neovim
50− lua.pkgs.luv.libluv
58+ luv.libluv
5159 msgpack
5260 ncurses
5361 neovimLuaEnv
@@ -88,10 +96,8 @@ in
8896 cmakeFlags = [
8997 "-DGPERF_PRG=${gperf}/bin/gperf"
9098 "-DLUA_PRG=${neovimLuaEnv.interpreter}"
99+ "-DLIBLUV_LIBRARY=${luvpath}"
91100 ]
92− # FIXME: this is verry messy and strange.
93− ++ optional (!stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
94− ++ optional (stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv.libluv}/lib/lua/${lua.luaversion}/libluv.dylib"
95101 ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
96102 ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
97103 ;
pkgs/applications/graphics/gimp/default.nix+15−15
@@ -131,6 +131,21 @@ in stdenv.mkDerivation rec {
131131 gegl
132132 ];
133133
134+ configureFlags = [
135+ "--without-webkit" # old version is required
136+ "--disable-check-update"
137+ "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
138+ "--with-icc-directory=/run/current-system/sw/share/color/icc"
139+ # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
140+ "--libdir=\${exec_prefix}/lib"
141+ ];
142+
143+ enableParallelBuilding = true;
144+
145+ # on Darwin,
146+ # test-eevl.c:64:36: error: initializer element is not a compile-time constant
147+ doCheck = !stdenv.isDarwin;
148+
134149 # Check if librsvg was built with --disable-pixbuf-loader.
135150 PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
136151
@@ -155,21 +170,6 @@ in stdenv.mkDerivation rec {
155170 gtk = gtk2;
156171 };
157172
158− configureFlags = [
159− "--without-webkit" # old version is required
160− "--disable-check-update"
161− "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
162− "--with-icc-directory=/run/current-system/sw/share/color/icc"
163− # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
164− "--libdir=\${exec_prefix}/lib"
165− ];
166−
167− # on Darwin,
168− # test-eevl.c:64:36: error: initializer element is not a compile-time constant
169− doCheck = !stdenv.isDarwin;
170−
171− enableParallelBuilding = true;
172−
173173 meta = with lib; {
174174 description = "The GNU Image Manipulation Program";
175175 homepage = "https://www.gimp.org/";
pkgs/applications/misc/direwolf/default.nixdeleted−43
@@ -1,43 +0,0 @@
1−{ stdenv, fetchFromGitHub
2−, espeak, alsaLib, perl
3−, python }:
4−
5−with stdenv.lib;
6−
7−stdenv.mkDerivation rec {
8− pname = "direwolf";
9− version = "1.4";
10−
11− src = fetchFromGitHub {
12− owner = "wb2osz";
13− repo = "direwolf";
14− rev = version;
15− sha256 = "033sffjs2dz48077hc58jr4lxxs8md1fyfh4lig6ib7pyigiv1y0";
16− };
17−
18− buildInputs = [
19− espeak perl python
20− ] ++ (optional stdenv.isLinux alsaLib);
21−
22− postPatch = ''
23− for i in Makefile.*; do
24− substituteInPlace "$i" \
25− --replace /usr/share $out/share
26− done
27−
28− substituteInPlace dwespeak.sh \
29− --replace espeak ${espeak}/bin/espeak
30− '';
31−
32− preInstall = ''
33− mkdir -p $out/bin
34− '';
35− installFlags = [ "INSTALLDIR=$(out)" ];
36−
37− meta = {
38− description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
39− homepage = "https://github.com/wb2osz/direwolf/";
40− license = licenses.gpl2;
41− platforms = platforms.unix;
42− };
43−}
pkgs/applications/misc/pdfsam-basic/default.nix+1−1
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
4444 description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";
4545 license = licenses.agpl3;
4646 platforms = platforms.all;
47− maintainers = with maintainers; [ maintainers."1000101" ];
47+ maintainers = with maintainers; [ _1000101 ];
4848 };
4949}
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+2−2
@@ -2,7 +2,7 @@
22 "name": "element-desktop",
33 "productName": "Element",
44 "main": "src/electron-main.js",
5− "version": "1.7.3",
5+ "version": "1.7.4",
66 "description": "A feature-rich client for Matrix.org",
77 "author": "Element",
88 "repository": {
@@ -61,7 +61,7 @@
6161 },
6262 "build": {
6363 "appId": "im.riot.app",
64− "electronVersion": "9.0.5",
64+ "electronVersion": "9.1.2",
6565 "files": [
6666 "package.json",
6767 {
pkgs/applications/networking/instant-messengers/element/element-desktop.nix+2−2
@@ -8,12 +8,12 @@
88
99let
1010 executableName = "element-desktop";
11− version = "1.7.3";
11+ version = "1.7.4";
1212 src = fetchFromGitHub {
1313 owner = "vector-im";
1414 repo = "riot-desktop";
1515 rev = "v${version}";
16− sha256 = "1qr00g2a8dibnkxn4pv9qkv09wwalfbgi2jq4wkq66anbgj9f39g";
16+ sha256 = "16ilkf5b8mz74x1r9fym5xjb4plxzhg3g5njj1sl4qvsbrkk6r9a";
1717 };
1818 electron = electron_9;
1919
pkgs/applications/networking/instant-messengers/element/element-web.nix+2−2
@@ -12,11 +12,11 @@ let
1212
1313in stdenv.mkDerivation rec {
1414 pname = "element-web";
15− version = "1.7.3";
15+ version = "1.7.4";
1616
1717 src = fetchurl {
1818 url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
19− sha256 = "0vlh89kilnpg90kdxlikfak03zdwhwj754xskgb27jal0iaw0r8s";
19+ sha256 = "0ssyd5b9yrxidivr3rcjsd8ixkmppsmmr7a8k0sv16yk7hjnvz5b";
2020 };
2121
2222 installPhase = ''
pkgs/applications/networking/mailreaders/meli/default.nix+1−1
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
4444 description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults";
4545 homepage = "https://meli.delivery";
4646 license = licenses.gpl3;
47− maintainers = with maintainers; [ maintainers."0x4A6F" matthiasbeyer erictapen ];
47+ maintainers = with maintainers; [ _0x4A6F matthiasbeyer erictapen ];
4848 platforms = platforms.linux;
4949 };
5050}
pkgs/applications/networking/protonvpn-cli-ng/default.nixdeleted−36
@@ -1,36 +0,0 @@
1−{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }:
2−
3−python3Packages.buildPythonApplication rec {
4− pname = "protonvpn-cli-ng";
5− version = "2.2.4";
6−
7− src = fetchFromGitHub {
8− owner = "protonvpn";
9− repo = "${pname}";
10− rev = "v${version}";
11− sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw";
12− };
13−
14− propagatedBuildInputs = (with python3Packages; [
15− requests
16− docopt
17− setuptools
18− jinja2
19− pythondialog
20− ]) ++ [
21− dialog
22− openvpn
23− iptables
24− ];
25−
26− # No tests
27− doCheck = false;
28−
29− meta = with lib; {
30− description = "Linux command-line client for ProtonVPN";
31− homepage = "https://github.com/protonvpn/protonvpn-cli-ng";
32− maintainers = with maintainers; [ jtcoolen jefflabonte ];
33− license = licenses.gpl3;
34− platforms = platforms.unix;
35− };
36−}
pkgs/applications/networking/protonvpn-cli/default.nix+25−32
@@ -1,43 +1,36 @@
1−{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils
2−, openvpn, python, dialog, wget, update-resolv-conf }:
1+{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }:
32
4−let
5− expectedUpdateResolvPath = "/etc/openvpn/update-resolv-conf";
6− actualUpdateResolvePath = "${update-resolv-conf}/libexec/openvpn/update-resolv-conf";
7−
8−in stdenv.mkDerivation rec {
9− name = "protonvpn-cli";
10− version = "1.1.2";
3+python3Packages.buildPythonApplication rec {
4+ pname = "protonvpn-linux-cli";
5+ version = "2.2.4";
116
127 src = fetchFromGitHub {
13− owner = "ProtonVPN";
14− repo = "protonvpn-cli";
8+ owner = "protonvpn";
9+ repo = "linux-cli";
1510 rev = "v${version}";
16− sha256 = "0xvflr8zf267n3dv63nkk4wjxhbckw56sqmyca3krf410vrd7zlv";
11+ sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw";
1712 };
1813
19− nativeBuildInputs = [ makeWrapper ];
14+ propagatedBuildInputs = (with python3Packages; [
15+ requests
16+ docopt
17+ setuptools
18+ jinja2
19+ pythondialog
20+ ]) ++ [
21+ dialog
22+ openvpn
23+ iptables
24+ ];
2025
21− installPhase = ''
22− mkdir -p "$out/bin"
23− substituteInPlace protonvpn-cli.sh \
24− --replace ${expectedUpdateResolvPath} ${actualUpdateResolvePath} \
25− --replace \$UID 0 \
26− --replace /etc/resolv.conf /dev/null \
27− --replace \
28− " echo \"Connecting...\"" \
29− " sed -ri 's@${expectedUpdateResolvPath}@${actualUpdateResolvePath}@g' \"\$openvpn_config\"; echo \"Connecting...\""
30− cp protonvpn-cli.sh "$out/bin/protonvpn-cli"
31− wrapProgram $out/bin/protonvpn-cli \
32− --prefix PATH : ${lib.makeBinPath [ coreutils openvpn python dialog wget update-resolv-conf ]}
33− ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn"
34− '';
26+ # No tests
27+ doCheck = false;
3528
36− meta = with stdenv.lib; {
37− description = "ProtonVPN Command-Line Tool";
38− homepage = "https://github.com/ProtonVPN/protonvpn-cli";
39− maintainers = with maintainers; [ caugner ];
40− license = licenses.mit;
29+ meta = with lib; {
30+ description = "Linux command-line client for ProtonVPN";
31+ homepage = "https://github.com/protonvpn/linux-cli";
32+ maintainers = with maintainers; [ jtcoolen jefflabonte ];
33+ license = licenses.gpl3;
4134 platforms = platforms.unix;
4235 };
4336}
pkgs/applications/networking/protonvpn-gui/default.nixnew file+86
@@ -0,0 +1,86 @@
1+{ lib, fetchFromGitHub, makeDesktopItem, makeWrapper, imagemagick
2+, python3Packages, wrapGAppsHook, protonvpn-cli, gtk3, pango
3+, gobject-introspection, libnotify, libappindicator-gtk3
4+, procps, openvpn }:
5+
6+let
7+ extraPath = lib.makeBinPath [ procps openvpn ];
8+
9+in python3Packages.buildPythonApplication rec {
10+ pname = "protonvpn-linux-gui";
11+ version = "2.1.1";
12+
13+ src = fetchFromGitHub {
14+ owner = "protonvpn";
15+ repo = "linux-gui";
16+ rev = "v${version}";
17+ sha256 = "avo5/2eq53HSHCnnjtxrsmpURtHvxmLZn2BxActImGY=";
18+ };
19+
20+ desktopItem = makeDesktopItem {
21+ name = "ProtonVPN";
22+ desktopName = "ProtonVPN GUI";
23+ type = "Application";
24+ exec = "protonvpn-gui";
25+ icon = "protonvpn";
26+ categories = "Network;";
27+ terminal = "false";
28+ };
29+
30+ trayDesktopItem = makeDesktopItem {
31+ name = "ProtonVPN Tray";
32+ desktopName = "ProtonVPN Tray";
33+ type = "Application";
34+ exec = "protonvpn-tray";
35+ icon = "protonvpn";
36+ categories = "Network;";
37+ terminal = "false";
38+ };
39+
40+ nativeBuildInputs = [ wrapGAppsHook makeWrapper imagemagick ];
41+
42+ propagatedBuildInputs = (with python3Packages; [
43+ pygobject3
44+ pycairo
45+ requests
46+ configparser
47+ ]) ++ [
48+ protonvpn-cli
49+ gtk3
50+ gobject-introspection
51+ libnotify
52+ libappindicator-gtk3
53+ ];
54+
55+ prePatch = ''
56+ # if pkexec is used, we want to have more time to enter password
57+ substituteInPlace linux_gui/services/login_service.py --replace 'timeout=8' 'timeout=30'
58+ '';
59+
60+ postInstall = ''
61+ # wrap binaries with extra required path
62+ wrapProgram "$out/bin/protonvpn-tray" --prefix PATH ":" ${extraPath}
63+ wrapProgram "$out/bin/protonvpn-gui" --prefix PATH ":" ${extraPath}
64+
65+ # install desktop files
66+ mkdir -p $out/share/applications
67+ cp "$desktopItem/share/applications/ProtonVPN.desktop" $out/share/applications/protonvpn-gui.desktop
68+ cp "$trayDesktopItem/share/applications/ProtonVPN Tray.desktop" $out/share/applications/protonvpn-tray.desktop
69+
70+ # create icons
71+ for size in 16 32 48 64 72 96 128 192 512 1024; do
72+ mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
73+ convert -resize "$size"x"$size" \
74+ linux_gui/resources/img/logo/protonvpn_logo.png \
75+ $out/share/icons/hicolor/"$size"x"$size"/apps/protonvpn.png
76+ done
77+ '';
78+
79+ meta = with lib; {
80+ description = "Linux GUI for ProtonVPN, written in Python.";
81+ homepage = "https://github.com/ProtonVPN/linux-gui";
82+ maintainers = with maintainers; [ offline ];
83+ license = licenses.gpl3;
84+ platforms = platforms.linux;
85+ };
86+}
pkgs/applications/qubes/qubes-core-vchan-xen/default.nix+1−2
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
2323 description = "Libraries required for the higher-level Qubes daemons and tools";
2424 homepage = "https://qubes-os.org";
2525 license = licenses.gpl2Plus;
26− maintainers = [ maintainers."0x4A6F" ];
26+ maintainers = with maintainers; [ _0x4A6F ];
2727 platforms = platforms.linux;
2828 };
2929}
30−
pkgs/applications/radio/direwolf/default.nixnew file+57
@@ -0,0 +1,57 @@
1+{ stdenv, fetchFromGitHub
2+, alsaLib, espeak, glibc, gpsd
3+, hamlib, perl, python, udev }:
4+
5+with stdenv.lib;
6+
7+stdenv.mkDerivation rec {
8+ pname = "direwolf";
9+ version = "1.5";
10+
11+ src = fetchFromGitHub {
12+ owner = "wb2osz";
13+ repo = "direwolf";
14+ rev = version;
15+ sha256 = "1w55dv9xqgc9mpincsj017838vmvdy972fhis3ddskyfvhhzgcsk";
16+ };
17+
18+ buildInputs = [
19+ espeak gpsd hamlib perl python
20+ ] ++ (optionals stdenv.isLinux [alsaLib udev]);
21+
22+ makeFlags = [ "DESTDIR=$(out)" ];
23+
24+ postPatch = ''
25+ substituteInPlace symbols.c \
26+ --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
27+ --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
28+ substituteInPlace decode_aprs.c \
29+ --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
30+ --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
31+ substituteInPlace dwespeak.sh \
32+ --replace espeak ${espeak}/bin/espeak
33+ '' + (optionalString stdenv.isLinux ''
34+ substituteInPlace Makefile.linux \
35+ --replace /usr/include/pthread.h ${stdenv.glibc.dev}/include/pthread.h \
36+ --replace /usr/include/alsa ${alsaLib.dev}/include/alsa \
37+ --replace /usr/include/gps.h ${gpsd}/include/gps.h \
38+ --replace /usr/include/hamlib ${hamlib}/include/hamlib \
39+ --replace /usr/include/libudev.h ${udev.dev}/include/libudev.h \
40+ --replace /etc/udev $out/etc/udev \
41+ --replace 'Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"' "Exec=$out/bin/direwolf" \
42+ --replace '#Terminal=true' 'Terminal=true' \
43+ --replace 'Path=$(HOME)' '#Path='
44+ '');
45+
46+ preInstall = ''
47+ mkdir -p $out/bin
48+ '';
49+
50+ meta = {
51+ description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
52+ homepage = "https://github.com/wb2osz/direwolf/";
53+ license = licenses.gpl2;
54+ platforms = platforms.unix;
55+ maintainers = with maintainers; [ lasandell ];
56+ };
57+}
pkgs/applications/science/logic/vampire/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "vampire";
5− version = "4.4";
5+ version = "4.5.1";
66
77 src = fetchFromGitHub {
88 owner = "vprover";
99 repo = "vampire";
1010 rev = version;
11− sha256 = "0v2fdfnk7l5xr5c4y54r25g1nbp4vi85zv29nbklh3r7aws3w9q1";
11+ sha256 = "0q9gqyq96amdnhxgwjyv0r2sxakikp3jvmizgj2h0spfz643p8db";
1212 };
1313
1414 buildInputs = [ z3 zlib ];
pkgs/applications/video/screenkey/default.nix+41−28
@@ -1,53 +1,66 @@
11{ lib
2−, substituteAll
3−, buildPythonApplication
4−, fetchFromGitHub
5−, distutils_extra
6−, setuptools-git
2+, fetchFromGitLab
3+# native
74, intltool
8−, pygtk
9−, libX11
10−, libXtst
115, wrapGAppsHook
12−, gnome3
6+, file
7+# not native
8+, xorg
9+, gobject-introspection
10+, gtk3
11+, python3
1312}:
14−buildPythonApplication rec {
13+
14+python3.pkgs.buildPythonApplication rec {
1515 pname = "screenkey";
16− version = "0.9";
16+ version = "1.2";
1717
18− src = fetchFromGitHub {
19− owner = "wavexx";
18+ src = fetchFromGitLab {
19+ owner = "screenkey";
2020 repo = "screenkey";
21− rev = "screenkey-${version}";
22− sha256 = "14g7fiv9n7m03djwz1pp5034pffi87ssvss9bc1q8vq0ksn23vrw";
21+ rev = "v${version}";
22+ sha256 = "1x13n57iy2pg3h3r994q3g5nbmh2gwk3qidmmcv0g7qa89n2gwbj";
2323 };
2424
25− patches = [
26− (substituteAll {
27− src = ./paths.patch;
28− inherit libX11 libXtst;
29− })
30− ];
31−
3225 nativeBuildInputs = [
33− distutils_extra
34− setuptools-git
26+ python3.pkgs.distutils_extra
27+ # Shouldn't be needed once https://gitlab.com/screenkey/screenkey/-/issues/122 is fixed.
3528 intltool
36−
29+ # We are not sure why is this needed, but without it we get "file: command
30+ # not found" errors during build.
31+ file
3732 wrapGAppsHook
33+ # for setup hook
34+ gobject-introspection
3835 ];
3936
4037 buildInputs = [
41− gnome3.adwaita-icon-theme
38+ gtk3
4239 ];
4340
44− propagatedBuildInputs = [
45− pygtk
41+ propagatedBuildInputs = with python3.pkgs; [
42+ pycairo
43+ pygobject3
4644 ];
4745
46+ # Prevent double wrapping because of wrapGAppsHook
47+ dontWrapGApps = true;
48+ # https://github.com/NixOS/nixpkgs/issues/56943
49+ strictDeps = false;
50+ preFixup = ''
51+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
52+ '';
53+
4854 # screenkey does not have any tests
4955 doCheck = false;
5056
57+ # Fix CDLL python calls for non absolute paths of xorg libraries
58+ postPatch = ''
59+ substituteInPlace Screenkey/xlib.py \
60+ --replace libX11.so.6 ${lib.getLib xorg.libX11}/lib/libX11.so.6 \
61+ --replace libXtst.so.6 ${lib.getLib xorg.libXtst}/lib/libXtst.so.6
62+ '';
63+
5164 meta = with lib; {
5265 homepage = "https://www.thregr.org/~wavexx/software/screenkey/";
5366 description = "A screencast tool to display your keys inspired by Screenflick";
pkgs/applications/video/screenkey/paths.patchdeleted−20
@@ -1,20 +0,0 @@
1−--- a/Screenkey/xlib.py
2−+++ b/Screenkey/xlib.py
3−@@ -6,7 +6,7 @@
4− from ctypes import *
5−
6− ## base X11
7−-libX11 = CDLL('libX11.so.6')
8−+libX11 = CDLL('@libX11@/lib/libX11.so.6')
9−
10− # types
11− Atom = c_ulong
12−@@ -278,7 +278,7 @@
13−
14−
15− ## record extensions
16−-libXtst = CDLL('libXtst.so.6')
17−+libXtst = CDLL('@libXtst@/lib/libXtst.so.6')
18−
19− # types
20− XPointer = String
pkgs/applications/window-managers/cwm/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 meta = with stdenv.lib; {
2121 description = "A lightweight and efficient window manager for X11";
2222 homepage = "https://github.com/leahneukirchen/cwm";
23− maintainers = with maintainers; [ maintainers."0x4A6F" mkf ];
23+ maintainers = with maintainers; [ _0x4A6F mkf ];
2424 license = licenses.isc;
2525 platforms = platforms.linux;
2626 };
pkgs/data/documentation/bgnet/default.nix+15−12
@@ -1,27 +1,30 @@
1−{ stdenv, lib, fetchurl, python, zip, fop }:
1+{ stdenv, lib, fetchFromGitHub, python3, pandoc }:
22
33stdenv.mkDerivation {
44 pname = "bgnet";
5− version = "3.0.21";
5+ # to be found in the Makefile
6+ version = "3.1.2";
67
7− src = fetchurl {
8− url = "https://beej.us/guide/bgnet/bgnet.tgz";
9− sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv";
8+ src = fetchFromGitHub {
9+ owner = "beejjorgensen";
10+ repo = "bgnet";
11+ rev = "782a785a35d43c355951b8151628d7c64e4d0346";
12+ sha256 = "19w0r3zr71ydd29amqwn8q3npgrpy5kkshyshyji2hw5hky6iy92";
1013 };
1114
12− buildInputs = [ python zip fop ];
13−
14− preBuild = ''
15− sed -i "s/#disable=1/disable=1/" bin/bgvalidate
15+ buildPhase = ''
1616 # build scripts need some love
17− patchShebangs .
17+ patchShebangs bin/preproc
18+
19+ make -C src bgnet.html
1820 '';
1921
2022 installPhase = ''
21− mkdir -p $out
22− mv * $out/
23+ install -Dm644 src/bgnet.html $out/share/doc/bgnet/html/index.html
2324 '';
2425
26+ nativeBuildInputs = [ python3 pandoc ];
27+
2528 meta = {
2629 description = "Beej’s Guide to Network Programming";
2730 homepage = "https://beej.us/guide/bgnet/";
pkgs/data/fonts/fontconfig-penultimate/default.nixdeleted−24
@@ -1,24 +0,0 @@
1−{ lib, fetchzip
2−, version ? "0.3.5"
3−, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk"
4−}:
5−
6−fetchzip {
7− name = "fontconfig-penultimate-${version}";
8−
9− url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip";
10− inherit sha256;
11−
12− postFetch = ''
13− mkdir -p $out/etc/fonts/conf.d
14− unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d
15− '';
16−
17− meta = with lib; {
18− homepage = "https://github.com/ttuegel/fontconfig-penultimate";
19− description = "Sensible defaults for Fontconfig";
20− license = licenses.asl20;
21− maintainers = [ maintainers.ttuegel ];
22− platforms = platforms.all;
23− };
24−}
pkgs/data/fonts/source-han/default.nix+2−1
@@ -19,7 +19,8 @@ let
1919 version = lib.removeSuffix "R" rev;
2020
2121 buildCommand = ''
22− install -m444 -Dt $out/share/fonts/opentype/source-han-${family} ${ttc}
22+ mkdir -p $out/share/fonts/opentype/source-han-${family}
23+ ln -s ${ttc} $out/share/fonts/opentype/source-han-${family}/SourceHan${Family}.ttc
2324 '';
2425
2526 meta = {
pkgs/desktops/gnome-3/core/mutter/default.nix+2−2
@@ -42,13 +42,13 @@
4242
4343let self = stdenv.mkDerivation rec {
4444 pname = "mutter";
45− version = "3.36.4";
45+ version = "3.36.5";
4646
4747 outputs = [ "out" "dev" "man" ];
4848
4949 src = fetchurl {
5050 url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
51− sha256 = "0p3jglw6f2h67kwk89qz1rz23y25lip8m2mp2xshf2vrg4a930as";
51+ sha256 = "1py7sqrpvg2qvswxclshysx7hd9jk65i6cwqsagd6rg6rnjhblp0";
5252 };
5353
5454 patches = [
pkgs/desktops/gnome-3/games/aisleriot/default.nix+53−12
@@ -1,23 +1,64 @@
1−{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
2−, wrapGAppsHook, librsvg, libxml2, desktop-file-utils
3−, guile_2_0, libcanberra-gtk3 }:
1+{ stdenv
2+, fetchFromGitLab
3+, pkg-config
4+, gnome3
5+, itstool
6+, gtk3
7+, wrapGAppsHook
8+, meson
9+, librsvg
10+, libxml2
11+, desktop-file-utils
12+, pysolfc
13+, guile
14+, libcanberra-gtk3
15+, ninja
16+, appstream-glib
17+, yelp-tools
18+}:
419
520stdenv.mkDerivation rec {
621 pname = "aisleriot";
7− version = "3.22.9";
22+ version = "3.22.11";
823
9− src = fetchurl {
10− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji";
24+ src = fetchFromGitLab {
25+ owner = "GNOME";
26+ repo = pname;
27+ domain = "gitlab.gnome.org";
28+ rev = "${version}";
29+ sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1";
1230 };
1331
14− configureFlags = [
15− "--with-card-theme-formats=svg"
16− "--with-platform=gtk-only" # until they remove GConf
32+ nativeBuildInputs = [
33+ wrapGAppsHook
34+ meson
35+ ninja
36+ appstream-glib
37+ pkg-config
38+ itstool
39+ libxml2
40+ desktop-file-utils
41+ yelp-tools
1742 ];
1843
19− nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ];
20− buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ];
44+ buildInputs = [
45+ gtk3
46+ librsvg
47+ guile
48+ libcanberra-gtk3
49+ pysolfc
50+ ];
51+
52+ prePatch = ''
53+ patchShebangs cards/meson_svgz.sh
54+ patchShebangs data/meson_desktopfile.py
55+ patchShebangs data/icons/meson_updateiconcache.py
56+ patchShebangs src/lib/meson_compileschemas.py
57+ '';
58+
59+ mesonFlags = [
60+ "-Dtheme_kde=false"
61+ ];
2162
2263 passthru = {
2364 updateScript = gnome3.updateScript {
pkgs/development/compilers/ghc/8.10.2.nix+5
@@ -107,6 +107,11 @@ stdenv.mkDerivation (rec {
107107
108108 outputs = [ "out" "doc" ];
109109
110+ # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
111+ patches = [
112+ ./issue-18549.patch
113+ ];
114+
110115 postPatch = "patchShebangs .";
111116
112117 # GHC is a bit confused on its cross terminology.
pkgs/development/compilers/ghc/issue-18549.patchnew file+296
@@ -0,0 +1,296 @@
1+From fac083e7ac8a37b61a4082bbbca2848e52fd1bb2 Mon Sep 17 00:00:00 2001
2+From: Ben Gamari <ben@smart-cactus.org>
3+Date: Sun, 9 Aug 2020 09:15:16 -0400
4+Subject: [PATCH] Revert "[linker/rtsSymbols] More linker symbols"
5+
6+This reverts commit aa2e5863699306920513b216f337de09e29b5bb8.
7+---
8+ rts/RtsSymbols.c | 224 ++++-------------------------------------------
9+ 1 file changed, 17 insertions(+), 207 deletions(-)
10+
11+diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
12+index d10a6900db..b2f90a892d 100644
13+--- a/rts/RtsSymbols.c
14++++ b/rts/RtsSymbols.c
15+@@ -58,6 +58,7 @@
16+ SymI_HasProto(signal_handlers) \
17+ SymI_HasProto(stg_sig_install) \
18+ SymI_HasProto(rtsTimerSignal) \
19++ SymI_HasProto(atexit) \
20+ SymI_NeedsDataProto(nocldstop)
21+ #endif
22+
23+@@ -976,213 +977,29 @@
24+ RTS_USER_SIGNALS_SYMBOLS \
25+ RTS_INTCHAR_SYMBOLS
26+
27++
28+ // 64-bit support functions in libgcc.a
29+-// See https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc
30+-#define RTS_LIBGCC_SYMBOLS_32 \
31+- SymI_NeedsProto(__fixunsdfdi) \
32+- /* 4 The GCC low-level runtime library */\
33+- /* 4.1.1 Arithmetic functions */\
34+- /* SymI_NeedsProto(__ashlsi3) */\
35+- SymI_NeedsProto(__ashldi3) \
36+- /* SymI_NeedsProto(__ashlti3) */\
37+- /* These functions return the result of shifting a left by b bits. */\
38+- /* SymI_NeedsProto(__ashrsi3) */\
39+- SymI_NeedsProto(__ashrdi3) \
40+- /* SymI_NeedsProto(__ashrti3) */\
41+- /* These functions return the result of arithmetically shifting a right by b bits. */\
42+- /* SymI_NeedsProto(__divsi3) */\
43+- SymI_NeedsProto(__divdi3) \
44+- /* SymI_NeedsProto(__divti3) */\
45+- /* These functions return the quotient of the signed division of a and b. */\
46+- /* SymI_NeedsProto(__lshrsi3) */ \
47+- SymI_NeedsProto(__lshrdi3) \
48+- /* SymI_NeedsProto(__lshrti3) */ \
49+- /* These functions return the result of logically shifting a right by b bits. */\
50+- /* SymI_NeedsProto(__modsi3) */ \
51+- SymI_NeedsProto(__moddi3) \
52+- /* SymI_NeedsProto(__modti3) */ \
53+- /* These functions return the remainder of the signed division of a and b. */\
54+- /* SymI_NeedsProto(__mulsi3) */ \
55+- SymI_NeedsProto(__muldi3) \
56+- /* SymI_NeedsProto(__multi3) */ \
57+- /* These functions return the product of a and b. */\
58+- SymI_NeedsProto(__negdi2) \
59+- /* SymI_NeedsProto(__negti2) */ \
60+- /* These functions return the negation of a. */\
61+- /* SymI_NeedsProto(__udivsi3) */ \
62+- SymI_NeedsProto(__udivdi3) \
63+- /* SymI_NeedsProto(__udivti3) */ \
64+- /* These functions return the quotient of the unsigned division of a and b. */\
65+- SymI_NeedsProto(__udivmoddi4) \
66+- /* SymI_NeedsProto(__udivmodti4) */ \
67+- /* These functions calculate both the quotient and remainder of the unsigned division of a and b. The return value is the quotient, and the remainder is placed in variable pointed to by c. */\
68+- /* SymI_NeedsProto(__umodsi3) */ \
69+- SymI_NeedsProto(__umoddi3) \
70+- /* SymI_NeedsProto(__umodti3) */ \
71+- /* These functions return the remainder of the unsigned division of a and b. */\
72+- /* 4.1.2 Comparison functions */\
73+- /* The following functions implement integral comparisons. These functions implement a low-level compare, upon which the higher level comparison operators (such as less than and greater than or equal to) can be constructed. The returned values lie in the range zero to two, to allow the high-level operators to be implemented by testing the returned result using either signed or unsigned comparison. */\
74+- SymI_NeedsProto(__cmpdi2) \
75+- /* SymI_NeedsProto(__cmpti2) */ \
76+- /* These functions perform a signed comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
77+- SymI_NeedsProto(__ucmpdi2) \
78+- /* SymI_NeedsProto(__ucmpti2) */ \
79+- /* These functions perform an unsigned comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
80+- /* 4.1.3 Trapping arithmetic functions */\
81+- /* The following functions implement trapping arithmetic. These functions call the libc function abort upon signed arithmetic overflow. */\
82+- SymI_NeedsProto(__absvsi2) \
83+- SymI_NeedsProto(__absvdi2) \
84+- /* These functions return the absolute value of a. */\
85+- /* SymI_NeedsProto(__addvsi3) */ \
86+- SymI_NeedsProto(__addvdi3) \
87+- /* These functions return the sum of a and b; that is a + b. */\
88+- /* SymI_NeedsProto(__mulvsi3) */ \
89+- SymI_NeedsProto(__mulvdi3) \
90+- /* The functions return the product of a and b; that is a * b. */\
91+- SymI_NeedsProto(__negvsi2) \
92+- SymI_NeedsProto(__negvdi2) \
93+- /* These functions return the negation of a; that is -a. */\
94+- /* SymI_NeedsProto(__subvsi3) */ \
95+- SymI_NeedsProto(__subvdi3) \
96+- /* These functions return the difference between b and a; that is a - b. */\
97+- /* 4.1.4 Bit operations */\
98+- SymI_NeedsProto(__clzsi2) \
99+- SymI_NeedsProto(__clzdi2) \
100+- /* SymI_NeedsProto(__clzti2) */ \
101+- /* These functions return the number of leading 0-bits in a, starting at the most significant bit position. If a is zero, the result is undefined. */\
102+- SymI_NeedsProto(__ctzsi2) \
103+- SymI_NeedsProto(__ctzdi2) \
104+- /* SymI_NeedsProto(__ctzti2) */ \
105+- /* These functions return the number of trailing 0-bits in a, starting at the least significant bit position. If a is zero, the result is undefined. */\
106+- SymI_NeedsProto(__ffsdi2) \
107+- /* SymI_NeedsProto(__ffsti2) */ \
108+- /* These functions return the index of the least significant 1-bit in a, or the value zero if a is zero. The least significant bit is index one. */\
109+- SymI_NeedsProto(__paritysi2) \
110+- SymI_NeedsProto(__paritydi2) \
111+- /* SymI_NeedsProto(__parityti2) */\
112+- /* These functions return the value zero if the number of bits set in a is even, and the value one otherwise. */\
113+- SymI_NeedsProto(__popcountsi2) \
114+- SymI_NeedsProto(__popcountdi2) \
115+- /* SymI_NeedsProto(__popcountti2) */ \
116+- /* These functions return the number of bits set in a. */\
117+- SymI_NeedsProto(__bswapsi2) \
118+- SymI_NeedsProto(__bswapdi2)
119+-#define RTS_LIBGCC_SYMBOLS_aarch32 \
120+- /* armv6l */\
121+- /* TODO: should check for __ARM_EABI__ */\
122+- SymI_NeedsProto(__aeabi_d2f) \
123+- SymI_NeedsProto(__aeabi_d2iz) \
124+- SymI_NeedsProto(__aeabi_d2lz) \
125+- SymI_NeedsProto(__aeabi_d2uiz) \
126+- SymI_NeedsProto(__aeabi_d2ulz) \
127+- SymI_NeedsProto(__aeabi_dadd) \
128+- SymI_NeedsProto(__aeabi_dcmpeq) \
129+- SymI_NeedsProto(__aeabi_dcmpge) \
130+- SymI_NeedsProto(__aeabi_dcmpgt) \
131+- SymI_NeedsProto(__aeabi_dcmple) \
132+- SymI_NeedsProto(__aeabi_dcmplt) \
133+- SymI_NeedsProto(__aeabi_dcmpun) \
134+- SymI_NeedsProto(__aeabi_ddiv) \
135+- SymI_NeedsProto(__aeabi_dmul) \
136+- SymI_NeedsProto(__aeabi_dneg) \
137+- SymI_NeedsProto(__aeabi_dsub) \
138+- SymI_NeedsProto(__aeabi_f2d) \
139+- SymI_NeedsProto(__aeabi_f2iz) \
140+- SymI_NeedsProto(__aeabi_f2lz) \
141+- SymI_NeedsProto(__aeabi_f2uiz) \
142+- SymI_NeedsProto(__aeabi_f2ulz) \
143+- SymI_NeedsProto(__aeabi_fadd) \
144+- SymI_NeedsProto(__aeabi_fcmpeq) \
145+- SymI_NeedsProto(__aeabi_fcmpge) \
146+- SymI_NeedsProto(__aeabi_fcmpgt) \
147+- SymI_NeedsProto(__aeabi_fcmple) \
148+- SymI_NeedsProto(__aeabi_fcmplt) \
149+- SymI_NeedsProto(__aeabi_fcmpun) \
150+- SymI_NeedsProto(__aeabi_fdiv) \
151+- SymI_NeedsProto(__aeabi_fmul) \
152+- SymI_NeedsProto(__aeabi_fneg) \
153+- SymI_NeedsProto(__aeabi_fsub) \
154+- SymI_NeedsProto(__aeabi_i2d) \
155+- SymI_NeedsProto(__aeabi_i2f) \
156+- SymI_NeedsProto(__aeabi_idiv) \
157+- SymI_NeedsProto(__aeabi_idivmod) \
158+- SymI_NeedsProto(__aeabi_l2d) \
159+- SymI_NeedsProto(__aeabi_l2f) \
160+- SymI_NeedsProto(__aeabi_lasr) \
161+- SymI_NeedsProto(__aeabi_lcmp) \
162+- SymI_NeedsProto(__aeabi_ldivmod) \
163+- SymI_NeedsProto(__aeabi_llsl) \
164+- SymI_NeedsProto(__aeabi_llsr) \
165+- SymI_NeedsProto(__aeabi_lmul) \
166+- SymI_NeedsProto(__aeabi_ui2d) \
167+- SymI_NeedsProto(__aeabi_ui2f) \
168+- SymI_NeedsProto(__aeabi_uidiv) \
169+- SymI_NeedsProto(__aeabi_uidivmod) \
170+- SymI_NeedsProto(__aeabi_ul2d) \
171+- SymI_NeedsProto(__aeabi_ul2f) \
172+- SymI_NeedsProto(__aeabi_ulcmp) \
173+- SymI_NeedsProto(__aeabi_uldivmod)
174+-#define RTS_LIBGCC_SYMBOLS_64 \
175++#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
176++#define RTS_LIBGCC_SYMBOLS \
177++ SymI_NeedsProto(__divdi3) \
178++ SymI_NeedsProto(__udivdi3) \
179++ SymI_NeedsProto(__moddi3) \
180++ SymI_NeedsProto(__umoddi3) \
181++ SymI_NeedsProto(__muldi3) \
182++ SymI_NeedsProto(__ashldi3) \
183++ SymI_NeedsProto(__ashrdi3) \
184++ SymI_NeedsProto(__lshrdi3) \
185++ SymI_NeedsProto(__fixunsdfdi)
186++#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
187++#define RTS_LIBGCC_SYMBOLS \
188+ SymI_NeedsProto(__udivti3) \
189+ SymI_NeedsProto(__umodti3)
190+-
191+-/* for aarch64 */
192+-#define RTS_LIBGCC_SYMBOLS_aarch64 \
193+- SymI_NeedsProto(__netf2) \
194+- SymI_NeedsProto(__addtf3) \
195+- SymI_NeedsProto(__subtf3) \
196+- SymI_NeedsProto(__multf3) \
197+- SymI_NeedsProto(__extenddftf2) \
198+- SymI_NeedsProto(__fixtfsi) \
199+- SymI_NeedsProto(__fixunstfsi) \
200+- SymI_NeedsProto(__floatsitf) \
201+- SymI_NeedsProto(__floatunsitf)
202+-
203+-#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS)
204+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32
205+-#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
206+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32
207+-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS)
208+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64
209+-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
210+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64
211+ #else
212+ #define RTS_LIBGCC_SYMBOLS
213+ #endif
214+
215+-#if !defined(mingw32_HOST_OS) && !defined(DYNAMIC) && (defined(_FORTIFY_SOURCE) || defined(__SSP__))
216+-#define RTS_SSP_SYMBOLS \
217+- SymI_NeedsProto(__stack_chk_guard) \
218+- SymI_NeedsProto(__stack_chk_fail)
219+-#else
220+-#define RTS_SSP_SYMBOLS
221+-#endif
222+-#if !defined(DYNAMIC) && defined(linux_HOST_OS)
223+-// we need these for static musl builds. However when
224+-// linking shared objects (DLLs) this will fail, hence
225+-// we do not include them when building with -DDYNAMIC
226+-#define RTS_LINKER_SYMBOLS \
227+- SymI_NeedsProto(__fini_array_start) \
228+- SymI_NeedsProto(__fini_array_end)
229+-#else
230+-#define RTS_LINKER_SYMBOLS
231+-#endif
232+-
233+-#if defined(darwin_HOST_OS) && defined(powerpc_HOST_ARCH)
234+- // Symbols that don't have a leading underscore
235+- // on Mac OS X. They have to receive special treatment,
236+- // see machoInitSymbolsWithoutUnderscore()
237+-#define RTS_MACHO_NOUNDERLINE_SYMBOLS \
238+- SymI_NeedsProto(saveFP) \
239+- SymI_NeedsProto(restFP)
240+-#endif
241+-
242+ /* entirely bogus claims about types of these symbols */
243+-/* to prevent a bit of define expansion, SymI_NeedsProto is a variadic
244+- * macro. And we'll concat vvv with the __VA_ARGS__. This prevents
245+- * vvv from getting macro expanded.
246+- */
247+-#define SymI_NeedsProto(vvv,...) extern void vvv ## __VA_ARGS__ (void);
248++#define SymI_NeedsProto(vvv) extern void vvv(void);
249+ #define SymI_NeedsDataProto(vvv) extern StgWord vvv[];
250+ #if defined(COMPILING_WINDOWS_DLL)
251+ #define SymE_HasProto(vvv) SymE_HasProto(vvv);
252+@@ -1209,8 +1026,6 @@ RTS_DARWIN_ONLY_SYMBOLS
253+ RTS_OPENBSD_ONLY_SYMBOLS
254+ RTS_LIBGCC_SYMBOLS
255+ RTS_LIBFFI_SYMBOLS
256+-RTS_SSP_SYMBOLS
257+-RTS_LINKER_SYMBOLS
258+ #undef SymI_NeedsProto
259+ #undef SymI_NeedsDataProto
260+ #undef SymI_HasProto
261+@@ -1230,7 +1045,7 @@ RTS_LINKER_SYMBOLS
262+ #define SymE_HasDataProto(vvv) \
263+ SymE_HasProto(vvv)
264+
265+-#define SymI_NeedsProto(vvv,...) SymI_HasProto(vvv ## __VA_ARGS__)
266++#define SymI_NeedsProto(vvv) SymI_HasProto(vvv)
267+ #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv)
268+ #define SymE_NeedsProto(vvv) SymE_HasProto(vvv)
269+ #define SymE_NeedsDataProto(vvv) SymE_HasDataProto(vvv)
270+@@ -1251,8 +1066,6 @@ RTS_LINKER_SYMBOLS
271+ #define SymI_HasProto_deprecated(vvv) \
272+ { #vvv, (void*)0xBAADF00D, true },
273+
274+-void *RTS_DYNAMIC = NULL;
275+-
276+ RtsSymbolVal rtsSyms[] = {
277+ RTS_SYMBOLS
278+ RTS_RET_SYMBOLS
279+@@ -1264,14 +1077,11 @@ RtsSymbolVal rtsSyms[] = {
280+ RTS_LIBGCC_SYMBOLS
281+ RTS_LIBFFI_SYMBOLS
282+ SymI_HasDataProto(nonmoving_write_barrier_enabled)
283+- RTS_SSP_SYMBOLS
284+- RTS_LINKER_SYMBOLS
285+ #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
286+ // dyld stub code contains references to this,
287+ // but it should never be called because we treat
288+ // lazy pointers as nonlazy.
289+ { "dyld_stub_binding_helper", (void*)0xDEADBEEF, false },
290+ #endif
291+- { "_DYNAMIC", (void*)(&RTS_DYNAMIC), false },
292+ { 0, 0, false } /* sentinel */
293+ };
294+--
295+2.25.4
296+
pkgs/development/compilers/llvm/10/llvm.nix+1
@@ -81,6 +81,7 @@ in stdenv.mkDerivation (rec {
8181 rm test/DebugInfo/X86/convert-debugloc.ll
8282 rm test/DebugInfo/X86/convert-inlined.ll
8383 rm test/DebugInfo/X86/convert-linked.ll
84+ rm test/DebugInfo/X86/debug_addr.ll
8485 rm test/tools/dsymutil/X86/op-convert.test
8586 '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
8687 # Seems to require certain floating point hardware (NEON?)
pkgs/development/libraries/redkite/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ stdenv, fetchFromGitLab, cmake, cairo }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "redkite";
5+ version = "1.0.1";
6+
7+ src = fetchFromGitLab {
8+ owner = "iurie-sw";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "1qd4r7ps0fg2m1vx3j48chfdh2c5909j4f9wip4af59inrid4w6a";
12+ };
13+
14+ nativeBuildInputs = [ cmake ];
15+
16+ buildInputs = [ cairo ];
17+
18+ meta = {
19+ homepage = "https://gitlab.com/iurie-sw/redkite";
20+ description = "A small GUI toolkit";
21+ license = stdenv.lib.licenses.gpl3Plus;
22+ platforms = stdenv.lib.platforms.linux;
23+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
24+ };
25+}
pkgs/development/python-modules/aiojobs/default.nixnew file+45
@@ -0,0 +1,45 @@
1+{ buildPythonPackage
2+, fetchPypi
3+, isPy27
4+, aiohttp
5+, pytest
6+, pytest-aiohttp
7+, pygments
8+, lib
9+}:
10+
11+buildPythonPackage rec {
12+ pname = "aiojobs";
13+ version = "0.2.2";
14+ format = "flit";
15+ disabled = isPy27;
16+
17+ src = fetchPypi {
18+ inherit pname version;
19+ sha256 = "01a0msjh4w58fd7jplmblh0hwgpzwjs5xkgqz3d0p5yv3cykwjwf";
20+ };
21+
22+ nativeBuildInputs = [
23+ pygments
24+ ];
25+
26+ propagatedBuildInputs = [
27+ aiohttp
28+ ];
29+
30+ checkInputs = [
31+ pytest
32+ pytest-aiohttp
33+ ];
34+
35+ checkPhase = ''
36+ pytest tests
37+ '';
38+
39+ meta = with lib; {
40+ homepage = "https://github.com/aio-libs/aiojobs";
41+ description = "Jobs scheduler for managing background task (asyncio)";
42+ license = licenses.asl20;
43+ maintainers = with maintainers; [ cmcdragonkai ];
44+ };
45+}
pkgs/development/python-modules/azure-storage-blob/default.nix+7−2
@@ -2,23 +2,28 @@
22, buildPythonPackage
33, fetchPypi
44, azure-common
5+, azure-core
56, azure-storage-common
7+, msrest
68, isPy3k
79, futures
810}:
911
1012buildPythonPackage rec {
1113 pname = "azure-storage-blob";
12− version = "2.1.0";
14+ version = "12.4.0";
1315
1416 src = fetchPypi {
1517 inherit pname version;
16− sha256 = "b90323aad60f207f9f90a0c4cf94c10acc313c20b39403398dfba51f25f7b454";
18+ extension = "zip";
19+ sha256 = "1s03daq5mxh9acbv8qpa55c2wmjvdf8jq071cwv65mrly8prp84n";
1720 };
1821
1922 propagatedBuildInputs = [
2023 azure-common
24+ azure-core
2125 azure-storage-common
26+ msrest
2227 ] ++ lib.optional (!isPy3k) futures;
2328
2429 # has no tests
pkgs/development/python-modules/binwalk/default.nix+3−2
@@ -12,12 +12,13 @@
1212, cramfsprogs
1313, cramfsswap
1414, lzma
15+, matplotlib
1516, nose
1617, pycrypto
1718, pyqtgraph ? null }:
1819
1920let
20− visualizationSupport = (pyqtgraph != null);
21+ visualizationSupport = (pyqtgraph != null) && (matplotlib != null);
2122 version = "2.2.0";
2223in
2324buildPythonPackage {
@@ -32,7 +33,7 @@ buildPythonPackage {
3233 };
3334
3435 propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ]
35− ++ stdenv.lib.optional visualizationSupport pyqtgraph;
36+ ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
3637
3738 # setup.py only installs version.py during install, not test
3839 postPatch = ''
pkgs/development/python-modules/blis/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "blis";
12− version = "0.4.1";
12+ version = "0.7.1";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "d69257d317e86f34a7f230a2fd1f021fd2a1b944137f40d8cdbb23bd334cd0c4";
16+ sha256 = "014771a0f753a64ef5610c5b3d4a090b263073bdd59b8ad0d872ce1e06e7315a";
1717 };
1818
1919 nativeBuildInputs = [
pkgs/development/python-modules/canonicaljson/default.nix+4−3
@@ -1,14 +1,15 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, frozendict, simplejson, six
2+, frozendict, simplejson, six, isPy27
33}:
44
55buildPythonPackage rec {
66 pname = "canonicaljson";
7− version = "1.1.4";
7+ version = "1.3.0";
8+ disabled = isPy27;
89
910 src = fetchPypi {
1011 inherit pname version;
11− sha256 = "45bce530ff5fd0ca93703f71bfb66de740a894a3b5dd6122398c6d8f18539725";
12+ sha256 = "0v2b72n28fi763xxv9vrf4qc61anl2ys9njy7hlm719fdaq3sxml";
1213 };
1314
1415 propagatedBuildInputs = [
pkgs/development/python-modules/dask/default.nix+1
@@ -60,6 +60,7 @@ buildPythonPackage rec {
6060 "test_argwhere_str"
6161 "test_count_nonzero_str"
6262 "rolling_methods" # floating percision error ~0.1*10^8 small
63+ "num_workers_config" # flaky
6364 ];
6465
6566 meta = {
pkgs/development/python-modules/finalfusion/default.nixnew file+56
@@ -0,0 +1,56 @@
1+{ buildPythonPackage
2+, fetchFromGitHub
3+, lib
4+, isPy3k
5+, cython
6+, numpy
7+, toml
8+, pytest
9+}:
10+
11+buildPythonPackage rec {
12+ pname = "finalfusion";
13+ version = "0.7.1";
14+
15+ disabled = !isPy3k;
16+
17+ src = fetchFromGitHub {
18+ owner = "finalfusion";
19+ repo = "finalfusion-python";
20+ rev = version;
21+ sha256 = "0pwzflamxqvpl1wcz0zbhhd6aa4xn18rmza6rggaic3ckidhyrh4";
22+ };
23+
24+ nativeBuildInputs = [
25+ cython
26+ ];
27+
28+ propagatedBuildInputs = [
29+ numpy
30+ toml
31+ ];
32+
33+ checkInputs = [
34+ pytest
35+ ];
36+
37+ postPatch = ''
38+ patchShebangs tests/integration
39+ '';
40+
41+ checkPhase = ''
42+ # Regular unit tests.
43+ pytest
44+
45+ # Integration tests for command-line utilities.
46+ PATH=$PATH:$out/bin tests/integration/all.sh
47+ '';
48+
49+ meta = with lib; {
50+ description = "Python module for using finalfusion, word2vec, and fastText word embeddings";
51+ homepage = "https://github.com/finalfusion/finalfusion-python/";
52+ maintainers = with maintainers; [ danieldk ];
53+ platforms = platforms.all;
54+ license = licenses.blueOak100;
55+ };
56+}
pkgs/development/python-modules/prawcore/default.nix+2−2
@@ -6,12 +6,12 @@
66
77buildPythonPackage rec {
88 pname = "prawcore";
9− version = "1.4.0";
9+ version = "1.5.0";
1010 disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "cf71388d869becbcbdfd90258b19d2173c197a457f2dd0bef0566b6cfb9b95a1";
14+ sha256 = "1f1eafc8a65d671f9892354f73142014fbb5d3a9ee621568c662d0a354e0578b";
1515 };
1616
1717 propagatedBuildInputs = [
pkgs/development/python-modules/pylint-django/default.nix+15−4
@@ -6,18 +6,23 @@
66# pythonPackages
77, django
88, pylint-plugin-utils
9+
10+# pythonPackages for checkInputs
11+, coverage
12+, factory_boy
13+, pytest
914}:
1015
1116buildPythonPackage rec {
1217 pname = "pylint-django";
13− version = "2.1.0";
18+ version = "2.3.0";
1419 disabled = !isPy3k;
1520
1621 src = fetchFromGitHub {
1722 owner = "PyCQA";
1823 repo = pname;
1924 rev = "v${version}";
20− sha256 = "1gvbh2a480x3ddrq6xzray7kdsz8nb8n16xm2lf03w2nqnsdbkwy";
25+ sha256 = "1088waraiigi2bnlighn7bvnvqmpx5fbw70c8jd8sh25mj38wgly";
2126 };
2227
2328 propagatedBuildInputs = [
@@ -25,8 +30,14 @@ buildPythonPackage rec {
2530 pylint-plugin-utils
2631 ];
2732
28− # Testing requires checkout from other repositories
29− doCheck = false;
33+ checkInputs = [ coverage factory_boy pytest ];
34+
35+ # Check command taken from scripts/test.sh
36+ # Skip test external_django_tables2_noerror_meta_class:
37+ # requires an unpackaged django_tables2
38+ checkPhase = ''
39+ python pylint_django/tests/test_func.py -v -k "not tables2"
40+ '';
3041
3142 meta = with lib; {
3243 description = "A Pylint plugin to analyze Django applications";
pkgs/development/python-modules/shamir-mnemonic/default.nix+1−1
@@ -17,6 +17,6 @@ buildPythonPackage rec {
1717 description = "Reference implementation of SLIP-0039";
1818 homepage = "https://github.com/trezor/python-shamir-mnemonic";
1919 license = licenses.mit;
20− maintainers = with maintainers; [ maintainers."1000101" ];
20+ maintainers = with maintainers; [ _1000101 ];
2121 };
2222}
pkgs/development/python-modules/spacy/default.nix+1
@@ -55,6 +55,7 @@ buildPythonPackage rec {
5555
5656 postPatch = ''
5757 substituteInPlace setup.cfg \
58+ --replace "blis>=0.4.0,<0.5.0" "blis>=0.4.0,<1.0" \
5859 --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \
5960 --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \
6061 --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \
pkgs/development/python-modules/thinc/default.nix+1
@@ -60,6 +60,7 @@ buildPythonPackage rec {
6060
6161 postPatch = ''
6262 substituteInPlace setup.py \
63+ --replace "blis>=0.4.0,<0.5.0" "blis>=0.4.0,<1.0" \
6364 --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \
6465 --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \
6566 --replace "srsly>=0.0.6,<1.1.0" "srsly>=0.0.6,<3.0"
pkgs/development/python-modules/trezor/default.nix+1−1
@@ -55,6 +55,6 @@ buildPythonPackage rec {
5555 description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
5656 homepage = "https://github.com/trezor/trezor-firmware/tree/master/python";
5757 license = licenses.gpl3;
58− maintainers = with maintainers; [ np prusnak mmahut maintainers."1000101" ];
58+ maintainers = with maintainers; [ np prusnak mmahut _1000101 ];
5959 };
6060}
pkgs/development/tools/analysis/tflint/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "tflint";
5− version = "0.18.0";
5+ version = "0.19.0";
66
77 src = fetchFromGitHub {
88 owner = "terraform-linters";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0644hzb7cpcqksl7j6v11dcq26la7g5l1svkmgm9c674gbv7argv";
11+ sha256 = "14pgsx136ibaf1mqkwn8ibnn4g6q5xx0r7xbijj521v12m145i8g";
1212 };
1313
14− vendorSha256 = "1khb8rdy5agj904nig6dfhagckvfcx79f028wcvwr625la3pcjfc";
14+ vendorSha256 = "0bzd58ry5k100mjgvl1mxz7aysm75s4vkilcykrqy1s5sc0h3ng5";
1515
1616 doCheck = false;
1717
pkgs/development/tools/continuous-integration/jenkins/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "jenkins";
5− version = "2.235.3";
5+ version = "2.235.5";
66
77 src = fetchurl {
88 url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
9− sha256 = "109rycgy8bg3na173vz5f3bq7w33a6kap8158kx6zhignni451p8";
9+ sha256 = "02zpnqhdkhg8p8cddkqklgihjpwcbnybkcw5rspipz6kiyqzg1n7";
1010 };
1111
1212 buildCommand = ''
pkgs/development/tools/gocode-gomod/default.nix+7−11
@@ -1,11 +1,8 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub }:
1+{ stdenv, buildGoModule, fetchFromGitHub }:
22
3−buildGoPackage rec {
4− pname = "gocode-gomod-unstable";
5− version = "2019-03-27";
6− rev = "81059208699789f992bb4a4a3fedd734e335468d";
7−
8− goPackagePath = "github.com/stamblerre/gocode";
3+buildGoModule rec {
4+ pname = "gocode-gomod";
5+ version = "1.0.0";
96
107 # we must allow references to the original `go` package,
118 # because `gocode` needs to dig into $GOROOT to provide completions for the
@@ -15,14 +12,13 @@ buildGoPackage rec {
1512 excludedPackages = ''internal/suggest/testdata'';
1613
1714 src = fetchFromGitHub {
18− inherit rev;
19−
2015 owner = "stamblerre";
2116 repo = "gocode";
22− sha256 = "0y5lc7sq3913mvvczwx8mq5l3l9yg34jzaw742q8jpd1jzqyza94";
17+ rev = "v${version}";
18+ sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s=";
2319 };
2420
25− goDeps = ./deps.nix;
21+ vendorSha256 = null;
2622
2723 postInstall = ''
2824 mv $out/bin/gocode $out/bin/gocode-gomod
pkgs/development/tools/gocode-gomod/deps.nixdeleted−11
@@ -1,11 +0,0 @@
1−[
2− {
3− goPackagePath = "golang.org/x/tools";
4− fetch = {
5− type = "git";
6− url = "https://go.googlesource.com/tools";
7− rev = "78dc5bac0cacea7969e98b79c3b86597e0aa4e25";
8− sha256 = "16jg2x1sfm39kz4rchn0gxyq99fnkxw6v51wxriqbs76a2wrznp9";
9− };
10− }
11−]
pkgs/development/tools/rust/cargo-crev/default.nix+14−5
@@ -1,19 +1,28 @@
1−{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }:
1+{ stdenv
2+, fetchFromGitHub
3+, rustPlatform
4+, perl
5+, pkg-config
6+, Security
7+, curl
8+, libiconv
9+, openssl
10+}:
211
312rustPlatform.buildRustPackage rec {
413 pname = "cargo-crev";
5− version = "0.16.1";
14+ version = "0.17.0";
615
716 src = fetchFromGitHub {
817 owner = "crev-dev";
918 repo = "cargo-crev";
1019 rev = "v${version}";
11− sha256 = "16da30zbv8f7w8bxsssmrpzm41a966wby1l6ldyiiszs980qh7c5";
20+ sha256 = "1s5wb5m0d77qi90pyxld98ap37xnxrz3sz5gazq0pp5i9c9xa124";
1221 };
1322
14− cargoSha256 = "0z365pgdd95apk2zz2n0gx85s0gf8ccfbqippxqn1fdsppihib6g";
23+ cargoSha256 = "10dzvzjqib751h2p1pl0z3dy2d17xwrcp9vyfrfr185yximcw2wx";
1524
16− nativeBuildInputs = [ pkgconfig ];
25+ nativeBuildInputs = [ perl pkg-config ];
1726
1827 buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
1928
pkgs/development/tools/rust/rust-analyzer/default.nix+3−3
@@ -2,10 +2,10 @@
22
33{
44 rust-analyzer-unwrapped = callPackage ./generic.nix rec {
5− rev = "2020-08-10";
5+ rev = "2020-08-17";
66 version = "unstable-${rev}";
7− sha256 = "0hf9gpvgq7whrc5gnfhc0wjqddp3xpi3azvdccb4yql2pcznz3rh";
8− cargoSha256 = "1bwch08y2av7aj2l5pvhdxdq24c8favxppz5zcd88rx4brlwn2bq";
7+ sha256 = "1lkqhaygl6wak3hypmn3zb2h0v4n082xbpaywmzqr53vhw678sp0";
8+ cargoSha256 = "00a2fxq1kwybng3gp33lkad4c7wrz0gypigxkalqkyy4nbg3qil4";
99 };
1010
1111 rust-analyzer = callPackage ./wrapper.nix {} {
pkgs/development/web/postman/default.nix+2−2
@@ -7,11 +7,11 @@
77
88stdenv.mkDerivation rec {
99 pname = "postman";
10− version = "7.26.0";
10+ version = "7.30.1";
1111
1212 src = fetchurl {
1313 url = "https://dl.pstmn.io/download/version/${version}/linux64";
14− sha256 = "05xs389bf0127n8rdivbfxvgjvlrk9pyr74klswwlksxciv74i3j";
14+ sha256 = "18bphn5m42z9x0igafd259q7i88qn7wcxvvhdjv9ldnvmhf1k935";
1515 name = "${pname}.tar.gz";
1616 };
1717
pkgs/development/web/shopify-themekit/default.nix+1−1
@@ -19,6 +19,6 @@ buildGoPackage rec {
1919 description = "A command line tool for shopify themes";
2020 homepage = "https://shopify.github.io/themekit/";
2121 license = licenses.mit;
22− maintainers = with maintainers; [ maintainers."1000101" ];
22+ maintainers = with maintainers; [ _1000101 ];
2323 };
2424}
pkgs/games/eidolon/default.nix+1−1
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
2020 description = "A single TUI-based registry for drm-free, wine and steam games on linux, accessed through a rofi launch menu";
2121 homepage = "https://github.com/nicohman/eidolon";
2222 license = licenses.gpl3;
23− maintainers = [ maintainers."0x4A6F" ];
23+ maintainers = with maintainers; [ _0x4A6F ];
2424 platforms = platforms.linux;
2525 };
2626}
pkgs/games/factorio/default.nix+5−5
@@ -62,15 +62,15 @@ let
6262 binDists = {
6363 x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
6464 alpha = {
65− stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; };
66− experimental = bdist { sha256 = "0la4590lf4gssdcf29qm73mz901dnp7cii712fcqw382qh9hbl9q"; version = "0.18.36"; withAuth = true; };
65+ stable = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
66+ experimental = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
6767 };
6868 headless = {
69− stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; };
70− experimental = bdist { sha256 = "0d64zzvp6zwz6p2izhhj998b6z8wd6r1b5p8mz1sbpz3v91sazj7"; version = "0.18.36"; };
69+ stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
70+ experimental = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
7171 };
7272 demo = {
73− stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; };
73+ stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; };
7474 };
7575 };
7676 i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in {
pkgs/games/ninvaders/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 description = "Space Invaders clone based on ncurses";
1818 homepage = "http://ninvaders.sourceforge.net/";
1919 license = licenses.gpl2;
20− maintainers = with maintainers; [ maintainers."1000101" ];
20+ maintainers = with maintainers; [ _1000101 ];
2121 platforms = platforms.all;
2222 };
2323}
pkgs/games/steam/runtime.nix+2−2
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
44
55 name = "steam-runtime";
66 # from https://repo.steampowered.com/steamrt-images-scout/snapshots/
7− version = "0.20200604.0";
7+ version = "0.20200720.0";
88
99 src = fetchurl {
1010 url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
11− sha256 = "04ficg3lnf6ijwkj08094vgcsskfncnlhk61v2csls3wfwvkrmhv";
11+ sha256 = "03qdlr1xk84jb4c60ilis00vjhj70bxc0bbgk5g5b1883l2frljd";
1212 name = "scout-runtime-${version}.tar.gz";
1313 };
1414
pkgs/misc/vim-plugins/generated.nix+36
@@ -4320,6 +4320,18 @@ let
43204320 meta.homepage = "https://github.com/qpkorr/vim-bufkill/";
43214321 };
43224322
4323+ vim-carbon-now-sh = buildVimPluginFrom2Nix {
4324+ pname = "vim-carbon-now-sh";
4325+ version = "2019-02-14";
4326+ src = fetchFromGitHub {
4327+ owner = "kristijanhusak";
4328+ repo = "vim-carbon-now-sh";
4329+ rev = "789b15d17966a1100ed2889d670923dd6d9ff063";
4330+ sha256 = "1vfhdqv8mf8w0s4nv8k2rqzvahvh1lxm4zsd3ks1n334f580w8x4";
4331+ };
4332+ meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/";
4333+ };
4334+
43234335 vim-choosewin = buildVimPluginFrom2Nix {
43244336 pname = "vim-choosewin";
43254337 version = "2019-09-17";
@@ -5689,6 +5701,18 @@ let
56895701 meta.homepage = "https://github.com/plasticboy/vim-markdown/";
56905702 };
56915703
5704+ vim-matchup = buildVimPluginFrom2Nix {
5705+ pname = "vim-matchup";
5706+ version = "2020-08-16";
5707+ src = fetchFromGitHub {
5708+ owner = "andymass";
5709+ repo = "vim-matchup";
5710+ rev = "b1af5a28242ae58ece98d833a2bf28e030d57230";
5711+ sha256 = "1nnn0cxvpgmgi8xpqmhxr3vi42s3g1d0rn683hyizdn4i0l888k3";
5712+ };
5713+ meta.homepage = "https://github.com/andymass/vim-matchup/";
5714+ };
5715+
56925716 vim-mergetool = buildVimPluginFrom2Nix {
56935717 pname = "vim-mergetool";
56945718 version = "2019-06-22";
@@ -6553,6 +6577,18 @@ let
65536577 meta.homepage = "https://github.com/t9md/vim-smalls/";
65546578 };
65556579
6580+ vim-smoothie = buildVimPluginFrom2Nix {
6581+ pname = "vim-smoothie";
6582+ version = "2019-12-02";
6583+ src = fetchFromGitHub {
6584+ owner = "psliwka";
6585+ repo = "vim-smoothie";
6586+ rev = "d3de4fbd7a9331b3eb05fa632611ebd34882cc83";
6587+ sha256 = "1bsqnz02jaydr92mmcrdlva4zxs28zgxwgznr2bwk4wnn26i54p6";
6588+ };
6589+ meta.homepage = "https://github.com/psliwka/vim-smoothie/";
6590+ };
6591+
65566592 vim-smt2 = buildVimPluginFrom2Nix {
65576593 pname = "vim-smt2";
65586594 version = "2018-05-20";
pkgs/misc/vim-plugins/vim-plugin-names+3
@@ -14,6 +14,7 @@ andreshazard/vim-logreview
1414AndrewRadev/splitjoin.vim
1515andsild/peskcolor.vim
1616andviro/flake8-vim
17+andymass/vim-matchup
1718andys8/vim-elm-syntax
1819antoinemadec/coc-fzf
1920ap/vim-css-color
@@ -233,6 +234,7 @@ konfekt/fastfold
233234kristijanhusak/defx-git
234235kristijanhusak/defx-icons
235236kristijanhusak/deoplete-phpactor
237+kristijanhusak/vim-carbon-now-sh
236238kristijanhusak/vim-dirvish-git
237239kristijanhusak/vim-hybrid-material
238240kshenoy/vim-signature
@@ -420,6 +422,7 @@ powerman/vim-plugin-AnsiEsc
420422PProvost/vim-ps1
421423preservim/nerdcommenter
422424preservim/nerdtree
425+psliwka/vim-smoothie
423426ptzz/lf.vim
424427purescript-contrib/purescript-vim
425428python-mode/python-mode
pkgs/os-specific/darwin/smimesign/default.nix+11−14
@@ -2,27 +2,24 @@
22
33buildGoModule rec {
44 pname = "smimesign";
5− version = "v0.0.13";
5+ version = "0.1.0";
66
77 src = fetchFromGitHub {
8− owner = "github";
9− repo = "smimesign";
10− rev = version;
11− sha256 = "0higcg2rdz02c0n50vigg7w7bxc7wlmg1x2ygrbh3iwms5lc74vi";
8+ owner = "github";
9+ repo = "smimesign";
10+ rev = "v${version}";
11+ sha256 = "12f8vprp4v78l9ifrlql0mvpyw5qa8nlrh5ajq5js8wljzpx7wsv";
1212 };
1313
14− vendorSha256 = "00000000000000000hlvwysx045nbw0xr5nngh7zj1wcqxhhm206";
14+ vendorSha256 = "1cldxykm9qj5rvyfafam45y5xj4f19700s2f9w7ndhxgfp9vahvz";
1515
16− doCheck = false;
17−
18− buildFlagsArray = "-ldflags=-X main.versionString=${version}";
16+ buildFlagsArray = "-ldflags=-X main.versionString=v${version}";
1917
2018 meta = with lib; {
21− description = "An S/MIME signing utility for macOS and Windows that is compatible with Git.";
22−
23− homepage = "https://github.com/github/smimesign";
24− license = licenses.mit;
25− platforms = platforms.darwin;
19+ description = "An S/MIME signing utility for macOS and Windows that is compatible with Git";
20+ homepage = "https://github.com/github/smimesign";
21+ license = licenses.mit;
22+ platforms = platforms.darwin ++ platforms.windows;
2623 maintainers = [ maintainers.enorris ];
2724 };
2825}
pkgs/os-specific/linux/crda/default.nix+2−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3, wireless-regdb }:
1+{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }:
22
33stdenv.mkDerivation rec {
44 pname = "crda";
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
2525 buildInputs = [ libgcrypt libnl ];
2626 nativeBuildInputs = [
2727 pkgconfig
28− python3
29− python3.pkgs.pycrypto
28+ python3Packages.pycrypto
3029 ];
3130
3231 postPatch = ''
pkgs/os-specific/linux/gobi_loader/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 description = "Firmware loader for Qualcomm Gobi USB chipsets";
2323 homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/";
2424 license = with licenses; [ gpl2 ];
25− maintainers = [ maintainers."0x4A6F" ];
25+ maintainers = with maintainers; [ _0x4A6F ];
2626 platforms = platforms.linux;
2727 };
2828}
pkgs/os-specific/linux/kernel/linux-testing.nix+3−3
@@ -3,15 +3,15 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "5.8-rc7";
7− extraMeta.branch = "5.8";
6+ version = "5.9-rc1";
7+ extraMeta.branch = "5.9";
88
99 # modDirVersion needs to be x.y.z, will always add .0
1010 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
1111
1212 src = fetchurl {
1313 url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
14− sha256 = "1v6ch9lwbckmv66w6ysj24ap41pfxq55ssrfkg0qyz2pv0mc1rxc";
14+ sha256 = "08x6s4wydbrr4rqq3zfxq6qmnha4ikn7m9rmdqd42hmxl2ynqxla";
1515 };
1616
1717 # Should the testing kernels ever be built on Hydra?
pkgs/servers/blockbook/default.nix+1−1
@@ -58,7 +58,7 @@ buildGoModule rec {
5858 description = "Trezor address/account balance backend";
5959 homepage = "https://github.com/trezor/blockbook";
6060 license = licenses.agpl3;
61− maintainers = with maintainers; [ mmahut maintainers."1000101" ];
61+ maintainers = with maintainers; [ mmahut _1000101 ];
6262 platforms = platforms.unix;
6363 };
6464}
pkgs/servers/computing/slurm/default.nix+5−5
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
2−, python, munge, perl, pam, zlib, shadow, coreutils
2+, python3, munge, perl, pam, zlib, shadow, coreutils
33, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
44, readline, freeipmi, xorg, lz4, rdma-core, nixosTests
55, pmix
@@ -9,7 +9,7 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "slurm";
12− version = "19.05.7.1";
12+ version = "20.02.4.1";
1313
1414 # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
1515 # because the latter does not keep older releases.
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 repo = "slurm";
1919 # The release tags use - instead of .
2020 rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
21− sha256 = "115f40k8y7d569nbl6g0mkyshgv925lawlwar7ib5296g30p97f0";
21+ sha256 = "071lwny7cj4idq0h03mmvkk4f4i6fgl3c5q8cvbh7z8px6k50cfp";
2222 };
2323
2424 outputs = [ "out" "dev" ];
@@ -44,9 +44,9 @@ stdenv.mkDerivation rec {
4444 # this doesn't fix tests completely at least makes slurmd to launch
4545 hardeningDisable = [ "bindnow" ];
4646
47− nativeBuildInputs = [ pkgconfig libtool ];
47+ nativeBuildInputs = [ pkgconfig libtool python3 ];
4848 buildInputs = [
49− curl python munge perl pam zlib
49+ curl python3 munge perl pam zlib
5050 libmysqlclient ncurses gtk2 lz4 rdma-core
5151 lua hwloc numactl readline freeipmi shadow.su
5252 pmix
pkgs/servers/matrix-synapse/default.nix+2−2
@@ -9,11 +9,11 @@ let
99in
1010buildPythonApplication rec {
1111 pname = "matrix-synapse";
12− version = "1.18.0";
12+ version = "1.19.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "0bqacma2ip0l053rfvxznbixs2rmb2dawqi2jq2zbqk5jqxhpaxi";
16+ sha256 = "1fl9p0cb442271hx7zjz8vp111xgvdpn4khk8bk3kl8z9hjs2l1p";
1717 };
1818
1919 patches = [
pkgs/servers/misc/navidrome/default.nix+2−2
@@ -4,11 +4,11 @@ with stdenv.lib;
44
55stdenv.mkDerivation rec {
66 pname = "navidrome";
7− version = "0.27.0";
7+ version = "0.29.0";
88
99 src = fetchurl {
1010 url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
11− sha256 = "0givv23dx6hwzg0axwifrha17qafs19ag34vjz29xrj3smsl8zh3";
11+ sha256 = "0dpv68wvrslgfgh18mb8ficji6k1i9jiid9bfw786andf4rwghyc";
1212 };
1313
1414 nativeBuildInputs = [ makeWrapper ];
pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix+1−1
@@ -21,6 +21,6 @@ buildGoModule rec {
2121 description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)";
2222 homepage = "https://github.com/mdlayher/apcupsd_exporter";
2323 license = licenses.mit;
24− maintainers = with maintainers; [ maintainers."1000101" mdlayher ];
24+ maintainers = with maintainers; [ _1000101 mdlayher ];
2525 };
2626}
pkgs/servers/monitoring/prometheus/process-exporter.nix+1−1
@@ -25,7 +25,7 @@ buildGoPackage rec {
2525 description = "Prometheus exporter that mines /proc to report on selected processes";
2626 homepage = "https://github.com/ncabatoff/process-exporter";
2727 license = licenses.mit;
28− maintainers = with maintainers; [ maintainers."1000101" ];
28+ maintainers = with maintainers; [ _1000101 ];
2929 platforms = platforms.linux;
3030 };
3131}
pkgs/servers/monitoring/timescale-prometheus/default.nix+1−1
@@ -23,6 +23,6 @@ buildGoModule rec {
2323 homepage = "https://github.com/timescale/timescale-prometheus";
2424 license = licenses.asl20;
2525 platforms = platforms.unix;
26− maintainers = [ maintainers."0x4A6F" ];
26+ maintainers = with maintainers; [ _0x4A6F ];
2727 };
2828}
pkgs/servers/routinator/default.nix+1−1
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717 description = "An RPKI Validator written in Rust";
1818 homepage = "https://github.com/NLnetLabs/routinator";
1919 license = licenses.bsd3;
20− maintainers = [ maintainers."0x4A6F" ];
20+ maintainers = with maintainers; [ _0x4A6F ];
2121 platforms = platforms.linux;
2222 };
2323}
pkgs/servers/tacacsplus/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 description = "A protocol for authentication, authorization and accounting (AAA) services for routers and network devices";
1717 homepage = "http://www.shrubbery.net/tac_plus/";
1818 license = licenses.free;
19− maintainers = [ maintainers."0x4A6F" ];
19+ maintainers = with maintainers; [ _0x4A6F ];
2020 platforms = with platforms; linux;
2121 };
2222}
pkgs/servers/trezord/default.nix+1−1
@@ -19,7 +19,7 @@ buildGoPackage rec {
1919 description = "TREZOR Communication Daemon aka TREZOR Bridge";
2020 homepage = "https://trezor.io";
2121 license = licenses.lgpl3;
22− maintainers = with maintainers; [ canndrew jb55 prusnak mmahut maintainers."1000101" ];
22+ maintainers = with maintainers; [ canndrew jb55 prusnak mmahut _1000101 ];
2323 platforms = platforms.unix;
2424 };
2525}
pkgs/servers/trickster/trickster.nix+1−1
@@ -21,6 +21,6 @@ buildGoPackage rec {
2121 description = "Reverse proxy cache for the Prometheus HTTP APIv1";
2222 homepage = "https://github.com/Comcast/trickster";
2323 license = licenses.asl20;
24− maintainers = with maintainers; [ maintainers."1000101" ];
24+ maintainers = with maintainers; [ _1000101 ];
2525 };
2626}
pkgs/servers/web-apps/dokuwiki/default.nix+1−1
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
5050 license = licenses.gpl2;
5151 homepage = "https://www.dokuwiki.org";
5252 platforms = platforms.all;
53− maintainers = with maintainers; [ maintainers."1000101" ];
53+ maintainers = with maintainers; [ _1000101 ];
5454 };
5555}
pkgs/servers/web-apps/rss-bridge/default.nixnew file+33
@@ -0,0 +1,33 @@
1+{ config, lib, pkgs, fetchFromGitHub, stdenv, ... }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "rss-bridge";
5+ version = "2020-02-26";
6+
7+ src = fetchFromGitHub {
8+ owner = "RSS-Bridge";
9+ repo = "rss-bridge";
10+ rev = "${version}";
11+ sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q";
12+ };
13+
14+ patchPhase = ''
15+ substituteInPlace lib/rssbridge.php \
16+ --replace "define('PATH_CACHE', PATH_ROOT . 'cache/');" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');" \
17+ --replace "define('FILE_CONFIG', PATH_ROOT . 'config.ini.php');" "define('FILE_CONFIG', getenv('RSSBRIDGE_DATA') . '/config.ini.php');" \
18+ --replace "define('WHITELIST', PATH_ROOT . 'whitelist.txt');" "define('WHITELIST', getenv('RSSBRIDGE_DATA') . '/whitelist.txt');"
19+ '';
20+
21+ installPhase = ''
22+ mkdir $out/
23+ cp -R ./* $out
24+ '';
25+
26+ meta = with lib; {
27+ description = "The RSS feed for websites missing it";
28+ homepage = "https://github.com/RSS-Bridge/rss-bridge";
29+ license = licenses.unlicense;
30+ maintainers = with maintainers; [ dawidsowa ];
31+ platforms = platforms.all;
32+ };
33+}
pkgs/servers/xandikos/default.nix+1−2
@@ -28,7 +28,6 @@ python3Packages.buildPythonApplication rec {
2828 description = "Lightweight CalDAV/CardDAV server";
2929 homepage = "https://github.com/jelmer/xandikos";
3030 license = licenses.gpl3Plus;
31− maintainers = [ maintainers."0x4A6F" ];
31+ maintainers = with maintainers; [ _0x4A6F ];
3232 };
3333}
34−
pkgs/shells/zsh/oh-my-zsh/default.nix+3−3
@@ -4,13 +4,13 @@
44{ stdenv, fetchgit }:
55
66stdenv.mkDerivation rec {
7− version = "2020-08-06";
7+ version = "2020-08-17";
88 pname = "oh-my-zsh";
9− rev = "079e7bb5e0a79171f3356d55d3f6302a82645a39";
9+ rev = "7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3";
1010
1111 src = fetchgit { inherit rev;
1212 url = "https://github.com/ohmyzsh/ohmyzsh";
13− sha256 = "10fpq57alk117991wwbprcmv69f27hbpp7a3gb70mzyjmfiflgk3";
13+ sha256 = "16czqfa01a1ak00ln37334q3gq811f5df2nqbvmj3129agnx28s4";
1414 };
1515
1616 pathsToLink = [ "/share/oh-my-zsh" ];
pkgs/tools/admin/azure-cli/python-packages.nix+4−1
@@ -21,7 +21,10 @@ let
2121 });
2222
2323 overrideAzureMgmtPackage = package: version: extension: sha256:
24− package.overrideAttrs(oldAttrs: rec {
24+ # check to make sure overriding is even necessary
25+ if version == package.version then
26+ package
27+ else package.overrideAttrs(oldAttrs: rec {
2528 inherit version;
2629
2730 src = py.pkgs.fetchPypi {
pkgs/tools/filesystems/squashfs-tools-ng/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "squashfs-tools-ng";
7− version = "1.0.0";
7+ version = "1.0.1";
88
99 src = fetchurl {
1010 url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
11− sha256 = "1dpx0a200s46s1dxp64hkn765vap0hzmyyvmq7wrmcs81mvlrd0l";
11+ sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4";
1212 };
1313
1414 nativeBuildInputs = [ doxygen graphviz pkgconfig perl ];
pkgs/tools/misc/broot/default.nix+3−3
@@ -10,16 +10,16 @@
1010
1111rustPlatform.buildRustPackage rec {
1212 pname = "broot";
13− version = "0.19.4";
13+ version = "0.20.0";
1414
1515 src = fetchFromGitHub {
1616 owner = "Canop";
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "0k5vv7a141ka9qpay5xccqdcy8sj0v9ywhhcdfpgii6z0wrd7mvr";
19+ sha256 = "0by4cln9ljaphqk5hz56mcavz9kc5s42zlxx33nf3idqrszfcarf";
2020 };
2121
22− cargoSha256 = "18b4lh5x25mbhpffva8ygzm5ad00svm1c3r83vfw0l2f61m7vyjh";
22+ cargoSha256 = "1i5zq310k8gv9877rcrvash3aw1cyf3g0741qnky71d565s3n910";
2323
2424 nativeBuildInputs = [ makeWrapper installShellFiles ];
2525
pkgs/tools/networking/pmacct/default.nix+1−1
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 '';
5757 homepage = "http://www.pmacct.net/";
5858 license = licenses.gpl2;
59− maintainers = [ maintainers."0x4A6F" ];
59+ maintainers = with maintainers; [ _0x4A6F ];
6060 platforms = platforms.unix;
6161 };
6262}
pkgs/tools/networking/tayga/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 '';
2121 homepage = "http://www.litech.org/tayga";
2222 license = licenses.gpl2;
23− maintainers = [ maintainers."0x4A6F" ];
23+ maintainers = with maintainers; [ _0x4A6F ];
2424 platforms = platforms.linux;
2525 };
2626}
pkgs/tools/nix/nixpkgs-fmt/default.nix+3−3
@@ -1,16 +1,16 @@
11{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:
22rustPlatform.buildRustPackage rec {
33 pname = "nixpkgs-fmt";
4− version = "0.9.0";
4+ version = "1.0.0";
55
66 src = fetchFromGitHub {
77 owner = "nix-community";
88 repo = pname;
99 rev = "v${version}";
10− sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad";
10+ sha256 = "0w1himwix7iv40rixj9afknwmqg2qmkif23z217gc7x63zyg9vdc";
1111 };
1212
13− cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x";
13+ cargoSha256 = "1qzhii72hjdxmgfncvyk80ybvk6zywd6v73bb1ibhnry734grzvw";
1414
1515 meta = with lib; {
1616 description = "Nix code formatter for nixpkgs";
pkgs/tools/security/john/default.nix+3−2
@@ -48,20 +48,21 @@ stdenv.mkDerivation rec {
4848 enableParallelBuilding = false;
4949
5050 postInstall = ''
51− mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules"
51+ mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules" "$out/${perlPackages.perl.libPrefix}"
5252 find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \
5353 -exec cp -d {} "$out/bin" \;
5454 cp -vt "$out/etc/john" ../run/*.conf
5555 cp -vt "$out/share/john" ../run/*.chr ../run/password.lst
5656 cp -vt "$out/share/john/rules" ../run/rules/*.rule
5757 cp -vrt "$out/share/doc/john" ../doc/*
58+ cp -vt "$out/${perlPackages.perl.libPrefix}" ../run/lib/*
5859 '';
5960
6061 postFixup = ''
6162 wrapPythonPrograms
6263
6364 for i in $out/bin/*.pl; do
64− wrapProgram "$i" --prefix PERL5LIB : $PERL5LIB
65+ wrapProgram "$i" --prefix PERL5LIB : "$PERL5LIB:$out/${perlPackages.perl.libPrefix}"
6566 done
6667 '';
6768
pkgs/tools/system/inxi/default.nix+2−2
@@ -22,13 +22,13 @@ let
2222 ++ recommendedDisplayInformationPrograms;
2323in stdenv.mkDerivation rec {
2424 pname = "inxi";
25− version = "3.1.05-4";
25+ version = "3.1.06-1";
2626
2727 src = fetchFromGitHub {
2828 owner = "smxi";
2929 repo = "inxi";
3030 rev = version;
31− sha256 = "10x3rjydc9mlbfysj5mc6z9yfnhp9wllbza2cmjb1fz0x72rfrv7";
31+ sha256 = "11z90x7rwzm7krkcnmcs9f41i1d284vrj0aqk2xnvl3p79vx25f7";
3232 };
3333
3434 buildInputs = [ perl makeWrapper ];
pkgs/top-level/aliases.nix+4
@@ -140,6 +140,10 @@ mapAliases ({
140140 fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years.
141141 https://github.com/bohoomil/fontconfig-ultimate/issues/171.
142142 '';
143+ fontconfig-penultimate = throw ''
144+ fontconfig-penultimate has been removed.
145+ It was a fork of the abandoned fontconfig-ultimate.
146+ '';
143147 # 2020-07-21
144148 fontconfig_210 = throw ''
145149 fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384
pkgs/top-level/all-packages.nix+23−5
@@ -3675,6 +3675,10 @@ in
36753675
36763676 freetds = callPackage ../development/libraries/freetds { };
36773677
3678+ freqtweak = callPackage ../applications/audio/freqtweak {
3679+ wxGTK = wxGTK31-gtk2;
3680+ };
3681+
36783682 frescobaldi = python3Packages.callPackage ../misc/frescobaldi {};
36793683
36803684 frostwire = callPackage ../applications/networking/p2p/frostwire { };
@@ -3775,6 +3779,8 @@ in
37753779
37763780 genimage = callPackage ../tools/filesystems/genimage { };
37773781
3782+ geonkick = callPackage ../applications/audio/geonkick {};
3783+
37783784 gerrit = callPackage ../applications/version-management/gerrit { };
37793785
37803786 geteltorito = callPackage ../tools/misc/geteltorito { };
@@ -6688,7 +6694,7 @@ in
66886694 quazip = quazip_qt4;
66896695 };
66906696
6691− screenkey = python2Packages.callPackage ../applications/video/screenkey { };
6697+ screenkey = callPackage ../applications/video/screenkey { };
66926698
66936699 quazip_qt4 = libsForQt5.quazip.override {
66946700 qtbase = qt4;
@@ -12103,8 +12109,6 @@ in
1210312109
1210412110 fontconfig = callPackage ../development/libraries/fontconfig { };
1210512111
12106− fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {};
12107−
1210812112 folly = callPackage ../development/libraries/folly { };
1210912113
1211012114 folks = callPackage ../development/libraries/folks { };
@@ -14886,6 +14890,8 @@ in
1488614890
1488714891 randomx = callPackage ../development/libraries/randomx { };
1488814892
14893+ redkite = callPackage ../development/libraries/redkite { };
14894+
1488914895 resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
1489014896
1489114897 rhino = callPackage ../development/libraries/java/rhino {
@@ -16816,6 +16822,8 @@ in
1681616822 tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { };
1681716823 tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { };
1681816824
16825+ rss-bridge = callPackage ../servers/web-apps/rss-bridge { };
16826+
1681916827 searx = callPackage ../servers/web-apps/searx { };
1682016828
1682116829 selfoss = callPackage ../servers/web-apps/selfoss { };
@@ -19343,6 +19351,8 @@ in
1934319351
1934419352 bb = callPackage ../applications/misc/bb { };
1934519353
19354+ bchoppr = callPackage ../applications/audio/bchoppr { };
19355+
1934619356 berry = callPackage ../applications/window-managers/berry { };
1934719357
1934819358 bevelbar = callPackage ../applications/window-managers/bevelbar { };
@@ -19431,6 +19441,8 @@ in
1943119441
1943219442 bjumblr = callPackage ../applications/audio/bjumblr { };
1943319443
19444+ bschaffl = callPackage ../applications/audio/bschaffl { };
19445+
1943419446 bsequencer = callPackage ../applications/audio/bsequencer { };
1943519447
1943619448 bslizr = callPackage ../applications/audio/bslizr { };
@@ -19694,7 +19706,7 @@ in
1969419706 inherit (pkgs.gnome2) libart_lgpl libgnomeui;
1969519707 };
1969619708
19697− direwolf = callPackage ../applications/misc/direwolf { };
19709+ direwolf = callPackage ../applications/radio/direwolf { };
1969819710
1969919711 dirt = callPackage ../applications/audio/dirt {};
1970019712
@@ -20584,6 +20596,8 @@ in
2058420596
2058520597 guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
2058620598
20599+ gwc = callPackage ../applications/audio/gwc { };
20600+
2058720601 gxmessage = callPackage ../applications/misc/gxmessage { };
2058820602
2058920603 gxmatcheq-lv2 = callPackage ../applications/audio/gxmatcheq-lv2 { };
@@ -21002,6 +21016,8 @@ in
2100221016
2100321017 kanshi = callPackage ../tools/misc/kanshi { };
2100421018
21019+ kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { };
21020+
2100521021 kdeApplications =
2100621022 let
2100721023 mkApplications = import ../applications/kde;
@@ -22238,7 +22254,7 @@ in
2223822254
2223922255 protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };
2224022256
22241− protonvpn-cli-ng = callPackage ../applications/networking/protonvpn-cli-ng { };
22257+ protonvpn-gui = callPackage ../applications/networking/protonvpn-gui { };
2224222258
2224322259 ps2client = callPackage ../applications/networking/ps2client { };
2224422260
@@ -23139,6 +23155,8 @@ in
2313923155
2314023156 ueberzug = with python3Packages; toPythonApplication ueberzug;
2314123157
23158+ uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { };
23159+
2314223160 umurmur = callPackage ../applications/networking/umurmur { };
2314323161
2314423162 udocker = pythonPackages.callPackage ../tools/virtualization/udocker { };
pkgs/top-level/python-packages.nix+6
@@ -184,6 +184,8 @@ in {
184184
185185 aioamqp = callPackage ../development/python-modules/aioamqp { };
186186
187+ aiojobs = callPackage ../development/python-modules/aiojobs { };
188+
187189 aioredis = callPackage ../development/python-modules/aioredis { };
188190
189191 aiorun = callPackage ../development/python-modules/aiorun { };
@@ -764,6 +766,8 @@ in {
764766
765767 filemagic = callPackage ../development/python-modules/filemagic { };
766768
769+ finalfusion = callPackage ../development/python-modules/finalfusion { };
770+
767771 fints = callPackage ../development/python-modules/fints { };
768772
769773 fire = callPackage ../development/python-modules/fire { };
@@ -2050,10 +2054,12 @@ in {
20502054
20512055 binwalk = callPackage ../development/python-modules/binwalk {
20522056 pyqtgraph = null;
2057+ matplotlib = null;
20532058 };
20542059
20552060 binwalk-full = appendToName "full" (self.binwalk.override {
20562061 pyqtgraph = self.pyqtgraph;
2062+ matplotlib = self.matplotlib;
20572063 });
20582064
20592065 bitmath = callPackage ../development/python-modules/bitmath { };