git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit303adc76971983c0c2891d62a83065bdd79595b4 authorFrederik Rietdijk <fridh@fridh.nl> dateSun 10 May 2020, 09:43 (7 years ago) parentd7cca0f2e192dc
132 files changed+933−341
doc/languages-frameworks/python.section.md+41−41 maintainers/maintainer-list.nix+6−6 maintainers/scripts/build.nix+43 nixos/modules/services/x11/gdk-pixbuf.nix+1−1 pkgs/applications/audio/audacity/default.nix−1 pkgs/applications/audio/giada/default.nix+33−8 pkgs/applications/audio/streamripper/default.nix−1 pkgs/applications/blockchains/bitcoin.nix+3−3 pkgs/applications/editors/emacs/25.nix+1−1 pkgs/applications/editors/emacs/default.nix+1−1 pkgs/applications/graphics/ImageMagick/7.0.nix−1 pkgs/applications/graphics/ImageMagick/default.nix−1 pkgs/applications/graphics/digikam/default.nix−1 pkgs/applications/graphics/openscad/default.nix+1−2 pkgs/applications/graphics/rawtherapee/default.nix+1−1 pkgs/applications/misc/cura/stable.nix+1−2 pkgs/applications/misc/curaengine/stable.nix−1 pkgs/applications/misc/direwolf/default.nix−1 pkgs/applications/misc/multibootusb/default.nix+37−6 pkgs/applications/misc/mupdf/default.nix+1 pkgs/applications/misc/slic3r/default.nix+1−1 pkgs/applications/networking/dropbox/cli.nix−1 pkgs/applications/networking/ipfs/default.nix+3−3 pkgs/applications/networking/irc/weechat/default.nix+1−1 pkgs/applications/networking/mailreaders/mutt/default.nix+1−1 pkgs/applications/networking/mailreaders/notmuch/default.nix+1−1 pkgs/applications/office/ledger/default.nix+1−1 pkgs/applications/radio/chirp/default.nix−1 pkgs/applications/radio/gnuradio/osmosdr.nix+1−1 pkgs/applications/radio/gqrx/default.nix+1−1 pkgs/applications/radio/hackrf/default.nix+1−1 pkgs/applications/radio/multimon-ng/default.nix−1 pkgs/applications/science/biology/EZminc/default.nix+5−5 pkgs/applications/version-management/git-and-tools/cgit/default.nix+8−14 pkgs/applications/version-management/git-and-tools/git/default.nix+1−1 pkgs/applications/version-management/git-and-tools/hub/default.nix+1−1 pkgs/applications/version-management/git-and-tools/stgit/default.nix−1 pkgs/applications/version-management/git-and-tools/svn2git/default.nix−2 pkgs/applications/version-management/git-lfs/default.nix+2−2 pkgs/applications/version-management/gitea/default.nix+10−3 pkgs/applications/virtualization/containerd/default.nix+3−10 pkgs/applications/virtualization/docker/default.nix+6−15 pkgs/applications/virtualization/firecracker/default.nix+5−5 pkgs/applications/virtualization/runc/default.nix+1−1 pkgs/applications/window-managers/herbstluftwm/default.nix−1 pkgs/applications/window-managers/stumpwm/default.nix−1 pkgs/data/fonts/recursive/default.nix+2−2 pkgs/data/themes/matcha/default.nix+4−4 pkgs/desktops/gnome-3/extensions/arc-menu/default.nix+2 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix+2 pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix+2 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2 pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix+2 pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix+2 pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix+2 pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix+4−4 pkgs/development/arduino/ino/default.nix+1−1 pkgs/development/compilers/avra/default.nix−1 pkgs/development/compilers/chicken/4/chicken.nix+1−1 pkgs/development/compilers/chicken/4/egg2nix.nix+1−1 pkgs/development/compilers/chicken/5/chicken.nix+1−1 pkgs/development/compilers/chicken/5/egg2nix.nix+1−1 pkgs/development/compilers/gcc/10/default.nix+285 pkgs/development/compilers/gforth/default.nix−1 pkgs/development/compilers/gnu-cobol/default.nix+1−1 pkgs/development/compilers/open-watcom-bin/default.nix+66−11 pkgs/development/interpreters/elixir/generic-builder.nix+1−1 pkgs/development/interpreters/erlang/generic-builder.nix+1−1 pkgs/development/interpreters/php/default.nix+3−1 pkgs/development/interpreters/scheme48/default.nix−1 pkgs/development/libraries/itk/default.nix+11−6 pkgs/development/libraries/pxlib/default.nix+20 pkgs/development/libraries/science/biology/elastix/default.nix+17−3 pkgs/development/libraries/simpleitk/default.nix+2−2 pkgs/development/libraries/vtk/default.nix+1−1 pkgs/development/python-modules/eve/default.nix+14−9 pkgs/development/python-modules/flask-wtf/default.nix+2−2 pkgs/development/python-modules/ignite/default.nix+8−7 pkgs/development/python-modules/podcats/default.nix−1 pkgs/development/python-modules/pyroute2/default.nix+2−2 pkgs/development/python-modules/pytorch/default.nix+78−34 pkgs/development/python-modules/todoist/default.nix−1 pkgs/development/tools/build-managers/leiningen/default.nix−1 pkgs/development/tools/build-managers/rebar/default.nix−1 pkgs/development/tools/misc/dfu-programmer/default.nix−1 pkgs/development/tools/misc/stm32flash/default.nix+1−1 pkgs/development/tools/misc/teensy-loader-cli/default.nix−1 pkgs/development/tools/pxview/default.nix+27 pkgs/development/tools/ws/default.nix−1 pkgs/games/anki/default.nix+1−1 pkgs/games/crrcsim/default.nix+1−1 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix+1−1 pkgs/games/dwarf-fortress/game.nix+1−1 pkgs/games/flightgear/default.nix+1−1 pkgs/games/openttd/default.nix+1−1 pkgs/games/the-butterfly-effect/default.nix+2−2 pkgs/misc/emulators/wine/winetricks.nix−1 pkgs/os-specific/linux/ldm/default.nix−1 pkgs/os-specific/linux/usermount/default.nix−1 pkgs/os-specific/linux/wireguard/default.nix+2−2 pkgs/servers/http/gatling/default.nix−1 pkgs/servers/http/yaws/default.nix+1−1 pkgs/servers/monitoring/zabbix/agent.nix+1−1 pkgs/servers/monitoring/zabbix/proxy.nix+1−1 pkgs/servers/monitoring/zabbix/server.nix+1−1 pkgs/servers/monitoring/zabbix/versions.nix+6−6 pkgs/servers/monitoring/zabbix/web.nix+1−1 pkgs/shells/mksh/default.nix+2−2 pkgs/tools/admin/lxd/default.nix+2−2 pkgs/tools/backup/btrbk/default.nix+1−1 pkgs/tools/backup/httrack/default.nix−1 pkgs/tools/backup/rdiff-backup/default.nix−1 pkgs/tools/filesystems/glusterfs/default.nix+17−11 pkgs/tools/graphics/pngcheck/default.nix−1 pkgs/tools/graphics/pngcrush/default.nix−1 pkgs/tools/graphics/wdisplays/default.nix+6−5 pkgs/tools/misc/stow/default.nix−2 pkgs/tools/networking/fping/default.nix−1 pkgs/tools/networking/isync/default.nix−2 pkgs/tools/networking/mu/default.nix+1−1 pkgs/tools/networking/wireguard-go/default.nix+2−2 pkgs/tools/networking/wireguard-go/deps.nix+2−2 pkgs/tools/security/genpass/default.nix+25 pkgs/tools/security/pass/default.nix+1−1 pkgs/tools/security/pass/extensions/import.nix+1−1 pkgs/tools/security/pass/extensions/tomb.nix+1−1 pkgs/tools/security/pass/extensions/update.nix+1−1 pkgs/tools/security/pass/rofi-pass.nix−1 pkgs/tools/security/tor/default.nix+4 pkgs/tools/text/ripgrep/default.nix+5−7 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+48−7
doc/languages-frameworks/python.section.md+41−41
@@ -9,7 +9,7 @@
99Several versions of the Python interpreter are available on Nix, as well as a
1010high amount of packages. The attribute `python` refers to the default
1111interpreter, which is currently CPython 2.7. It is also possible to refer to
12−specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to
12+specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to
1313the default PyPy interpreter.
1414
1515Python is used a lot, and in different ways. This affects also how it is
@@ -25,10 +25,10 @@ however, are in separate sets, with one set per interpreter version.
2525The interpreters have several common attributes. One of these attributes is
2626`pkgs`, which is a package set of Python libraries for this specific
2727interpreter. E.g., the `toolz` package corresponding to the default interpreter
28−is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`.
28+is `python.pkgs.toolz`, and the CPython 3.8 version is `python38.pkgs.toolz`.
2929The main package set contains aliases to these package sets, e.g.
30−`pythonPackages` refers to `python.pkgs` and `python35Packages` to
31−`python35.pkgs`.
30+`pythonPackages` refers to `python.pkgs` and `python38Packages` to
31+`python38.pkgs`.
3232
3333#### Installing Python and packages
3434
@@ -50,7 +50,7 @@ to create an environment with `python.buildEnv` or `python.withPackages` where
5050the interpreter and other executables are able to find each other and all of the
5151modules.
5252
53−In the following examples we create an environment with Python 3.5, `numpy` and
53+In the following examples we create an environment with Python 3.8, `numpy` and
5454`toolz`. As you may imagine, there is one limitation here, and that's that
5555you can install only one environment at a time. You will notice the complaints
5656about collisions when you try to install a second environment.
@@ -61,7 +61,7 @@ Create a file, e.g. `build.nix`, with the following expression
6161```nix
6262with import <nixpkgs> {};
6363
64−python35.withPackages (ps: with ps; [ numpy toolz ])
64+python38.withPackages (ps: with ps; [ numpy toolz ])
6565```
6666and install it in your profile with
6767```shell
@@ -79,7 +79,7 @@ Nixpkgs set, e.g. using `config.nix`,
7979{ # ...
8080
8181 packageOverrides = pkgs: with pkgs; {
82− myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]);
82+ myEnv = python38.withPackages (ps: with ps; [ numpy toolz ]);
8383 };
8484}
8585```
@@ -101,7 +101,7 @@ environment system-wide.
101101{ # ...
102102
103103 environment.systemPackages = with pkgs; [
104− (python35.withPackages(ps: with ps; [ numpy toolz ]))
104+ (python38.withPackages(ps: with ps; [ numpy toolz ]))
105105 ];
106106}
107107```
@@ -118,7 +118,7 @@ recommended method is to create an environment with `python.buildEnv` or
118118`python.withPackages` and load that. E.g.
119119
120120```sh
121−$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])'
121+$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])'
122122```
123123
124124opens a shell from which you can launch the interpreter
@@ -131,7 +131,7 @@ The other method, which is not recommended, does not create an environment and
131131requires you to list the packages directly,
132132
133133```sh
134−$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz
134+$ nix-shell -p python38.pkgs.numpy python38.pkgs.toolz
135135```
136136
137137Again, it is possible to launch the interpreter from the shell. The Python
@@ -140,14 +140,14 @@ that specific interpreter.
140140
141141##### Load environment from `.nix` expression
142142As explained in the Nix manual, `nix-shell` can also load an
143−expression from a `.nix` file. Say we want to have Python 3.5, `numpy`
143+expression from a `.nix` file. Say we want to have Python 3.8, `numpy`
144144and `toolz`, like before, in an environment. Consider a `shell.nix` file
145145with
146146
147147```nix
148148with import <nixpkgs> {};
149149
150−(python35.withPackages (ps: [ps.numpy ps.toolz])).env
150+(python38.withPackages (ps: [ps.numpy ps.toolz])).env
151151```
152152
153153Executing `nix-shell` gives you again a Nix shell from which you can run Python.
@@ -158,7 +158,7 @@ What's happening here?
158158 imports the `<nixpkgs>` function, `{}` calls it and the `with` statement
159159 brings all attributes of `nixpkgs` in the local scope. These attributes form
160160 the main package set.
161−2. Then we create a Python 3.5 environment with the `withPackages` function.
161+2. Then we create a Python 3.8 environment with the `withPackages` function.
1621623. The `withPackages` function expects us to provide a function as an argument
163163 that takes the set of all python packages and returns a list of packages to
164164 include in the environment. Here, we select the packages `numpy` and `toolz`
@@ -170,7 +170,7 @@ To combine this with `mkShell` you can:
170170with import <nixpkgs> {};
171171
172172let
173− pythonEnv = python35.withPackages (ps: [
173+ pythonEnv = python38.withPackages (ps: [
174174 ps.numpy
175175 ps.toolz
176176 ]);
@@ -188,13 +188,13 @@ option, with which you can execute a command in the `nix-shell`. We can
188188e.g. directly open a Python shell
189189
190190```sh
191−$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
191+$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3"
192192```
193193
194194or run a script
195195
196196```sh
197−$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py"
197+$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3 myscript.py"
198198```
199199
200200##### `nix-shell` as shebang
@@ -231,11 +231,11 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
231231
232232buildPythonPackage rec {
233233 pname = "toolz";
234− version = "0.7.4";
234+ version = "0.10.0";
235235
236236 src = fetchPypi {
237237 inherit pname version;
238− sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
238+ sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
239239 };
240240
241241 doCheck = false;
@@ -260,8 +260,8 @@ information. The output of the function is a derivation.
260260
261261An expression for `toolz` can be found in the Nixpkgs repository. As explained
262262in the introduction of this Python section, a derivation of `toolz` is available
263−for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz`
264−derivation corresponding to the CPython 3.5 interpreter.
263+for each interpreter version, e.g. `python38.pkgs.toolz` refers to the `toolz`
264+derivation corresponding to the CPython 3.8 interpreter.
265265The above example works when you're directly working on
266266`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
267267you will want to test a Nix expression outside of the Nixpkgs tree.
@@ -273,13 +273,13 @@ and adds it along with a `numpy` package to a Python environment.
273273with import <nixpkgs> {};
274274
275275( let
276− my_toolz = python35.pkgs.buildPythonPackage rec {
276+ my_toolz = python38.pkgs.buildPythonPackage rec {
277277 pname = "toolz";
278− version = "0.7.4";
278+ version = "0.10.0";
279279
280− src = python35.pkgs.fetchPypi {
280+ src = python38.pkgs.fetchPypi {
281281 inherit pname version;
282− sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
282+ sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
283283 };
284284
285285 doCheck = false;
@@ -290,12 +290,12 @@ with import <nixpkgs> {};
290290 };
291291 };
292292
293− in python35.withPackages (ps: [ps.numpy my_toolz])
293+ in python38.withPackages (ps: [ps.numpy my_toolz])
294294).env
295295```
296296
297297Executing `nix-shell` will result in an environment in which you can use
298−Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
298+Python 3.8 and the `toolz` package. As you can see we had to explicitly mention
299299for which Python version we want to build a package.
300300
301301So, what did we do here? Well, we took the Nix expression that we used earlier
@@ -435,7 +435,7 @@ If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
435435is a local source, and if the local source has a `setup.py`, then development
436436mode is activated.
437437
438−In the following example we create a simple environment that has a Python 3.5
438+In the following example we create a simple environment that has a Python 3.8
439439version of our package in it, as well as its dependencies and other packages we
440440like to have in the environment, all specified with `propagatedBuildInputs`.
441441Indeed, we can just add any package we like to have in our environment to
@@ -443,7 +443,7 @@ Indeed, we can just add any package we like to have in our environment to
443443
444444```nix
445445with import <nixpkgs> {};
446−with python35Packages;
446+with python38Packages;
447447
448448buildPythonPackage rec {
449449 name = "mypackage";
@@ -505,9 +505,9 @@ with import <nixpkgs> {};
505505
506506( let
507507 toolz = callPackage /path/to/toolz/release.nix {
508− buildPythonPackage = python35Packages.buildPythonPackage;
508+ buildPythonPackage = python38Packages.buildPythonPackage;
509509 };
510− in python35.withPackages (ps: [ ps.numpy toolz ])
510+ in python38.withPackages (ps: [ ps.numpy toolz ])
511511).env
512512```
513513
@@ -515,8 +515,8 @@ Important to remember is that the Python version for which the package is made
515515depends on the `python` derivation that is passed to `buildPythonPackage`. Nix
516516tries to automatically pass arguments when possible, which is why generally you
517517don't explicitly define which `python` derivation should be used. In the above
518−example we use `buildPythonPackage` that is part of the set `python35Packages`,
519−and in this case the `python35` interpreter is automatically used.
518+example we use `buildPythonPackage` that is part of the set `python38Packages`,
519+and in this case the `python38` interpreter is automatically used.
520520
521521## Reference
522522
@@ -662,7 +662,7 @@ following are specific to `buildPythonPackage`:
662662 variables which will be available when the binary is run. For example,
663663 `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
664664* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this
665− defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications
665+ defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications
666666 to `""`.
667667* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages
668668 in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
@@ -960,7 +960,7 @@ has security implications and is relevant for those using Python in a
960960
961961When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will
962962have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1`
963−and [PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
963+and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED).
964964Both are also exported in `nix-shell`.
965965
966966
@@ -1014,7 +1014,7 @@ with import <nixpkgs> {};
10141014 packageOverrides = self: super: {
10151015 pandas = super.pandas.overridePythonAttrs(old: {name="foo";});
10161016 };
1017− in pkgs.python35.override {inherit packageOverrides;};
1017+ in pkgs.python38.override {inherit packageOverrides;};
10181018
10191019in python.withPackages(ps: [ps.pandas])).env
10201020```
@@ -1036,7 +1036,7 @@ with import <nixpkgs> {};
10361036 packageOverrides = self: super: {
10371037 scipy = super.scipy_0_17;
10381038 };
1039− in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze])
1039+ in (pkgs.python38.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze])
10401040).env
10411041```
10421042
@@ -1049,12 +1049,12 @@ If you want the whole of Nixpkgs to use your modifications, then you can use
10491049```nix
10501050let
10511051 pkgs = import <nixpkgs> {};
1052− newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: {
1053− python27 = let
1054− packageOverrides = self: super: {
1055− numpy = super.numpy_1_10;
1052+ newpkgs = import pkgs.path { overlays = [ (self: super: {
1053+ python38 = let
1054+ packageOverrides = python-self: python-super: {
1055+ numpy = python-super.numpy_1_18.3;
10561056 };
1057− in pkgssuper.python27.override {inherit packageOverrides;};
1057+ in super.python38.override {inherit packageOverrides;};
10581058 } ) ]; };
10591059in newpkgs.inkscape
10601060```
maintainers/maintainer-list.nix+6−6
@@ -1662,6 +1662,12 @@
16621662 }
16631663 ];
16641664 };
1665+ cyplo = {
1666+ email = "nixos@cyplo.dev";
1667+ github = "cyplo";
1668+ githubId = 217899;
1669+ name = "Cyryl Płotnicki";
1670+ };
16651671 d-goldin = {
16661672 email = "dgoldin+github@protonmail.ch";
16671673 github = "d-goldin";
@@ -7624,12 +7630,6 @@
76247630 githubId = 1141680;
76257631 name = "Thane Gill";
76267632 };
7627− the-kenny = {
7628− email = "moritz@tarn-vedra.de";
7629− github = "the-kenny";
7630− githubId = 31167;
7631− name = "Moritz Ulrich";
7632− };
76337633 thedavidmeister = {
76347634 email = "thedavidmeister@gmail.com";
76357635 github = "thedavidmeister";
maintainers/scripts/build.nixnew file+43
@@ -0,0 +1,43 @@
1+{ maintainer }:
2+
3+# based on update.nix
4+# nix-build build.nix --argstr maintainer <yourname>
5+
6+let
7+ pkgs = import ./../../default.nix {};
8+ maintainer_ = pkgs.lib.maintainers.${maintainer};
9+ packagesWith = cond: return: set:
10+ (pkgs.lib.flatten
11+ (pkgs.lib.mapAttrsToList
12+ (name: pkg:
13+ let
14+ result = builtins.tryEval
15+ (
16+ if pkgs.lib.isDerivation pkg && cond name pkg
17+ then [ (return name pkg) ]
18+ else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false
19+ then packagesWith cond return pkg
20+ else [ ]
21+ );
22+ in
23+ if result.success then result.value
24+ else [ ]
25+ )
26+ set
27+ )
28+ );
29+in
30+packagesWith
31+ (name: pkg:
32+ (
33+ if builtins.hasAttr "maintainers" pkg.meta
34+ then (
35+ if builtins.isList pkg.meta.maintainers
36+ then builtins.elem maintainer_ pkg.meta.maintainers
37+ else maintainer_ == pkg.meta.maintainers
38+ )
39+ else false
40+ )
41+ )
42+ (name: pkg: pkg)
43+ pkgs
nixos/modules/services/x11/gdk-pixbuf.nix+1−1
@@ -37,7 +37,7 @@ in
3737 # If there is any package configured in modulePackages, we generate the
3838 # loaders.cache based on that and set the environment variable
3939 # GDK_PIXBUF_MODULE_FILE to point to it.
40− config = mkIf (cfg.modulePackages != [] || pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) {
40+ config = mkIf (cfg.modulePackages != []) {
4141 environment.variables = {
4242 GDK_PIXBUF_MODULE_FILE = "${loadersCache}";
4343 };
pkgs/applications/audio/audacity/default.nix−1
@@ -60,6 +60,5 @@ stdenv.mkDerivation rec {
6060 homepage = "http://audacityteam.org/";
6161 license = licenses.gpl2Plus;
6262 platforms = intersectLists platforms.linux platforms.x86; # fails on ARM
63− maintainers = with maintainers; [ the-kenny ];
6463 };
6564}
pkgs/applications/audio/giada/default.nix+33−8
@@ -1,23 +1,41 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook,
2− fltk, jansson, rtmidi, libsamplerate, libsndfile,
3− jack2, alsaLib, libpulseaudio,
4− libXpm, libXinerama, libXcursor }:
1+{ stdenv
2+, fetchFromGitHub
3+, autoreconfHook
4+, fltk
5+, jansson
6+, rtmidi
7+, libsamplerate
8+, libsndfile
9+, jack2
10+, alsaLib
11+, libpulseaudio
12+, libXpm
13+, libXinerama
14+, libXcursor
15+, catch2
16+, nlohmann_json
17+}:
518
619stdenv.mkDerivation rec {
720 pname = "giada";
8− version = "0.16.1";
21+ version = "0.16.2.2";
922
1023 src = fetchFromGitHub {
1124 owner = "monocasual";
1225 repo = pname;
1326 rev = "v${version}";
14− sha256 = "0b3lhjs6myml5r5saky15523sbc3qr43r9rh047vhsiafmqdvfq1";
27+ sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p";
1528 };
1629
17− configureFlags = [ "--target=linux" ];
30+ configureFlags = [
31+ "--target=linux"
32+ "--enable-system-catch"
33+ ];
34+
1835 nativeBuildInputs = [
1936 autoreconfHook
2037 ];
38+
2139 buildInputs = [
2240 fltk
2341 libsndfile
@@ -30,9 +48,16 @@ stdenv.mkDerivation rec {
3048 libpulseaudio
3149 libXinerama
3250 libXcursor
51+ catch2
52+ nlohmann_json
3353 ];
3454
35− meta = with lib; {
55+ postPatch = ''
56+ sed -i 's:"deps/json/single_include/nlohmann/json\.hpp":<nlohmann/json.hpp>:' \
57+ src/core/{conf,init,midiMapConf,patch}.cpp
58+ '';
59+
60+ meta = with stdenv.lib; {
3661 description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians";
3762 homepage = "https://giadamusic.com/";
3863 license = licenses.gpl3;
pkgs/applications/audio/streamripper/default.nix−1
@@ -16,6 +16,5 @@ stdenv.mkDerivation rec {
1616 homepage = "http://streamripper.sourceforge.net/";
1717 description = "Application that lets you record streaming mp3 to your hard drive";
1818 license = licenses.gpl2;
19− maintainers = with maintainers; [ the-kenny ];
2019 };
2120}
pkgs/applications/blockchains/bitcoin.nix+3−3
@@ -5,7 +5,7 @@
55with stdenv.lib;
66
77let
8− version = "0.19.0.1";
8+ version = "0.19.1";
99 majorMinorVersion = versions.majorMinor version;
1010
1111 desktop = fetchurl {
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
2626 urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
2727 "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
2828 ];
29− sha256 = "7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284";
29+ sha256 = "f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0";
3030 };
3131
3232 nativeBuildInputs =
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
7373 parties. Users hold the crypto keys to their own money and transact directly
7474 with each other, with the help of a P2P network to check for double-spending.
7575 '';
76− homepage = "http://www.bitcoin.org/";
76+ homepage = "https://bitcoin.org/";
7777 maintainers = with maintainers; [ roconnor AndersonTorres ];
7878 license = licenses.mit;
7979 platforms = platforms.unix;
pkgs/applications/editors/emacs/25.nix+1−1
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
123123 description = "The extensible, customizable GNU text editor";
124124 homepage = "https://www.gnu.org/software/emacs/";
125125 license = licenses.gpl3Plus;
126− maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ];
126+ maintainers = with maintainers; [ lovek323 peti jwiegley ];
127127 platforms = platforms.all;
128128
129129 longDescription = ''
pkgs/applications/editors/emacs/default.nix+1−1
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
139139 description = "The extensible, customizable GNU text editor";
140140 homepage = "https://www.gnu.org/software/emacs/";
141141 license = licenses.gpl3Plus;
142− maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley adisbladis ];
142+ maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ];
143143 platforms = platforms.all;
144144
145145 longDescription = ''
pkgs/applications/graphics/ImageMagick/7.0.nix−1
@@ -84,6 +84,5 @@ stdenv.mkDerivation {
8484 description = "A software suite to create, edit, compose, or convert bitmap images";
8585 platforms = platforms.linux ++ platforms.darwin;
8686 license = licenses.asl20;
87− maintainers = with maintainers; [ the-kenny ];
8887 };
8988}
pkgs/applications/graphics/ImageMagick/default.nix−1
@@ -99,7 +99,6 @@ stdenv.mkDerivation {
9999 homepage = "http://www.imagemagick.org/";
100100 description = "A software suite to create, edit, compose, or convert bitmap images";
101101 platforms = platforms.linux ++ platforms.darwin;
102− maintainers = with maintainers; [ the-kenny ];
103102 license = licenses.asl20;
104103 };
105104}
pkgs/applications/graphics/digikam/default.nix−1
@@ -126,7 +126,6 @@ mkDerivation rec {
126126 description = "Photo Management Program";
127127 license = licenses.gpl2;
128128 homepage = "https://www.digikam.org";
129− maintainers = with maintainers; [ the-kenny ];
130129 platforms = platforms.linux;
131130 };
132131}
pkgs/applications/graphics/openscad/default.nix+1−2
@@ -80,7 +80,6 @@ mkDerivation rec {
8080 homepage = "http://openscad.org/";
8181 license = stdenv.lib.licenses.gpl2;
8282 platforms = stdenv.lib.platforms.unix;
83− maintainers = with stdenv.lib.maintainers;
84− [ bjornfor raskin the-kenny gebner ];
83+ maintainers = with stdenv.lib.maintainers; [ bjornfor raskin gebner ];
8584 };
8685}
pkgs/applications/graphics/rawtherapee/default.nix+1−1
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 description = "RAW converter and digital photo processing software";
3939 homepage = "http://www.rawtherapee.com/";
4040 license = stdenv.lib.licenses.gpl3Plus;
41− maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ];
41+ maintainers = with stdenv.lib.maintainers; [ jcumming mahe ];
4242 platforms = with stdenv.lib.platforms; linux;
4343 };
4444}
pkgs/applications/misc/cura/stable.nix+1−2
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 configurePhase = "";
3434 buildPhase = "";
35−
35+
3636 patches = [ ./numpy-cast.patch ];
3737
3838 installPhase = ''
@@ -69,6 +69,5 @@ stdenv.mkDerivation rec {
6969 homepage = "https://github.com/daid/Cura";
7070 license = licenses.agpl3;
7171 platforms = platforms.linux;
72− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
7372 };
7473}
pkgs/applications/misc/curaengine/stable.nix−1
@@ -25,6 +25,5 @@ stdenv.mkDerivation {
2525 homepage = "https://github.com/Ultimaker/CuraEngine";
2626 license = licenses.agpl3;
2727 platforms = platforms.linux;
28− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
2928 };
3029}
pkgs/applications/misc/direwolf/default.nix−1
@@ -39,6 +39,5 @@ stdenv.mkDerivation rec {
3939 homepage = "https://github.com/wb2osz/direwolf/";
4040 license = licenses.gpl2;
4141 platforms = platforms.unix;
42− maintainers = [ maintainers.the-kenny ];
4342 };
4443}
pkgs/applications/misc/multibootusb/default.nix+37−6
@@ -1,4 +1,5 @@
1−{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps,
1+{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip,
2+ coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk,
23 python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }:
34
45# Note: Multibootusb is tricky to maintain. It relies on the
@@ -19,17 +20,30 @@ python36Packages.buildPythonApplication rec {
1920
2021 nativeBuildInputs = [
2122 wrapQtAppsHook
23+ autoPatchelfHook
24+ unzip
25+ zip
2226 ];
2327
24− buildInputs = [
25− libxcb
26− mtools
27− p7zip
28+ runTimeDeps = [
29+ coreutils
30+ gnugrep
31+ which
2832 parted
33+ utillinux
34+ qemu
35+ p7zip
36+ gnused
37+ mtools
2938 procps
39+ e2fsprogs
40+ gptfdisk
41+ ];
42+
43+ buildInputs = [
44+ libxcb
3045 python36Packages.python
3146 qt5.full
32− utillinux
3347 ];
3448
3549 src = fetchFromGitHub {
@@ -52,6 +66,20 @@ python36Packages.buildPythonApplication rec {
5266 python36Packages.six
5367 ];
5468
69+ # multibootusb ships zips with various versions of syslinux, we need to patchelf them
70+ postPatch = ''
71+ for zip in $(find . -name "*.zip"); do
72+ zip=$(readlink -f $zip)
73+ target="$(mktemp -d)"
74+ pushd $target
75+ unzip $zip
76+ rm $zip
77+ autoPatchelf .
78+ zip -r $zip *
79+ popd
80+ done
81+ '';
82+
5583 postInstall = ''
5684 # This script doesn't work and it doesn't add much anyway
5785 rm $out/bin/multibootusb-pkexec
@@ -69,6 +97,9 @@ python36Packages.buildPythonApplication rec {
6997 # Then, add the installed scripts/ directory to the python path
7098 --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages"
7199
100+ # Add some runtime dependencies
101+ --prefix "PATH" ":" "${stdenv.lib.makeBinPath runTimeDeps}"
102+
72103 # Finally, move to directory that contains data
73104 --run "cd $out/share/${pname}"
74105 )
pkgs/applications/misc/mupdf/default.nix+1
@@ -74,6 +74,7 @@ in stdenv.mkDerivation rec {
7474 Comment=PDF viewer
7575 Exec=$bin/bin/mupdf-x11 %f
7676 Terminal=false
77+ MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip
7778 EOF
7879 '';
7980
pkgs/applications/misc/slic3r/default.nix+1−1
@@ -85,6 +85,6 @@ stdenv.mkDerivation rec {
8585 homepage = "https://slic3r.org/";
8686 license = licenses.agpl3;
8787 platforms = platforms.linux;
88− maintainers = with maintainers; [ bjornfor the-kenny ];
88+ maintainers = with maintainers; [ bjornfor ];
8989 };
9090}
pkgs/applications/networking/dropbox/cli.nix−1
@@ -64,7 +64,6 @@ stdenv.mkDerivation {
6464 homepage = "https://www.dropbox.com";
6565 description = "Command line client for the dropbox daemon";
6666 license = stdenv.lib.licenses.gpl3Plus;
67− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
6867 # NOTE: Dropbox itself only works on linux, so this is ok.
6968 platforms = stdenv.lib.platforms.linux;
7069 };
pkgs/applications/networking/ipfs/default.nix+3−3
@@ -2,14 +2,14 @@
22
33buildGoModule rec {
44 pname = "ipfs";
5− version = "0.5.0";
5+ version = "0.5.1";
66 rev = "v${version}";
77
88 src = fetchFromGitHub {
99 owner = "ipfs";
1010 repo = "go-ipfs";
1111 inherit rev;
12− sha256 = "0dbyvs49wyqj46c8hvz0fr4vpgfrdj1h8blniwzjf0jabgvw8nik";
12+ sha256 = "11l55hlbixv1i25d3n216pkrwgcgac99fa88lyy3dailvminqxw7";
1313 };
1414
1515 postPatch = ''
@@ -23,7 +23,7 @@ buildGoModule rec {
2323
2424 passthru.tests.ipfs = nixosTests.ipfs;
2525
26− modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8";
26+ modSha256 = "13mpva3r6r2amw08g0bdggbxn933jjimngkvzgq1q5dksp4mivfk";
2727
2828 meta = with stdenv.lib; {
2929 description = "A global, versioned, peer-to-peer filesystem";
pkgs/applications/networking/irc/weechat/default.nix+1−1
@@ -78,7 +78,7 @@ let
7878 on https://nixos.org/nixpkgs/manual/#sec-weechat .
7979 '';
8080 license = stdenv.lib.licenses.gpl3;
81− maintainers = with stdenv.lib.maintainers; [ lovek323 the-kenny lheckemann ma27 ];
81+ maintainers = with stdenv.lib.maintainers; [ lovek323 lheckemann ma27 ];
8282 platforms = stdenv.lib.platforms.unix;
8383 };
8484 }
pkgs/applications/networking/mailreaders/mutt/default.nix+1−1
@@ -91,6 +91,6 @@ stdenv.mkDerivation rec {
9191 homepage = "http://www.mutt.org";
9292 license = licenses.gpl2Plus;
9393 platforms = platforms.unix;
94− maintainers = with maintainers; [ the-kenny rnhmjoj ];
94+ maintainers = with maintainers; [ rnhmjoj ];
9595 };
9696}
pkgs/applications/networking/mailreaders/notmuch/default.nix+1−1
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
9696 description = "Mail indexer";
9797 homepage = "https://notmuchmail.org/";
9898 license = licenses.gpl3;
99− maintainers = with maintainers; [ flokli puckipedia the-kenny ];
99+ maintainers = with maintainers; [ flokli puckipedia ];
100100 platforms = platforms.unix;
101101 };
102102}
pkgs/applications/office/ledger/default.nix+1−1
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
4444 '';
4545
4646 platforms = platforms.all;
47− maintainers = with maintainers; [ the-kenny jwiegley ];
47+ maintainers = with maintainers; [ jwiegley ];
4848 };
4949}
pkgs/applications/radio/chirp/default.nix−1
@@ -20,6 +20,5 @@ python2.pkgs.buildPythonApplication rec {
2020 homepage = "https://chirp.danplanet.com/";
2121 license = licenses.gpl3;
2222 platforms = platforms.linux;
23− maintainers = [ maintainers.the-kenny ];
2423 };
2524}
pkgs/applications/radio/gnuradio/osmosdr.nix+1−1
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
4242 homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR";
4343 license = licenses.gpl3Plus;
4444 platforms = platforms.linux ++ platforms.darwin;
45− maintainers = with maintainers; [ bjornfor the-kenny ];
45+ maintainers = with maintainers; [ bjornfor ];
4646 };
4747}
pkgs/applications/radio/gqrx/default.nix+1−1
@@ -43,6 +43,6 @@ mkDerivation rec {
4343 # it's currently unknown which version of the BSD license that is.
4444 license = licenses.gpl3Plus;
4545 platforms = platforms.linux; # should work on Darwin / macOS too
46− maintainers = with maintainers; [ bjornfor the-kenny fpletz ];
46+ maintainers = with maintainers; [ bjornfor fpletz ];
4747 };
4848}
pkgs/applications/radio/hackrf/default.nix+1−1
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
3232 homepage = "http://greatscottgadgets.com/hackrf/";
3333 license = licenses.gpl2;
3434 platforms = platforms.all;
35− maintainers = with maintainers; [ sjmackenzie the-kenny ];
35+ maintainers = with maintainers; [ sjmackenzie ];
3636 };
3737}
pkgs/applications/radio/multimon-ng/default.nix−1
@@ -39,6 +39,5 @@ stdenv.mkDerivation {
3939 homepage = "https://github.com/EliasOenal/multimon-ng";
4040 license = licenses.gpl2;
4141 platforms = platforms.linux;
42− maintainers = with maintainers; [ the-kenny ];
4342 };
4443}
pkgs/applications/science/biology/EZminc/default.nix+5−5
@@ -1,18 +1,18 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk, fftwFloat, gsl }:
1+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }:
22
33stdenv.mkDerivation rec {
44 pname = "EZminc";
5− name = "${pname}-unstable-2019-07-25";
5+ name = "${pname}-unstable-2019-03-12";
66
77 src = fetchFromGitHub {
88 owner = "BIC-MNI";
99 repo = pname;
10− rev = "9591edd5389a5bda2c1f606816c7cdb35c065adf";
11− sha256 = "02k87qbpx0f48l2lbcjmlqx82py684z3sfi29va5icfg3hjd6j7b";
10+ rev = "5e3333ee356f914d34d66d33ea8df809c7f7fa51";
11+ sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4";
1212 };
1313
1414 nativeBuildInputs = [ cmake pkgconfig ];
15− buildInputs = [ itk libminc bicpl fftwFloat gsl ];
15+ buildInputs = [ itk4 libminc bicpl fftwFloat gsl ];
1616
1717 cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/"
1818 "-DEZMINC_BUILD_TOOLS=TRUE"
pkgs/applications/version-management/git-and-tools/cgit/default.nix+8−14
@@ -1,35 +1,27 @@
1−{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt
1+{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
22, docbook_xsl, pkgconfig, luajit
33, coreutils, gnused, groff, docutils
4−, gzip, bzip2, xz
4+, gzip, bzip2, lzip, xz, zstd
55, python, wrapPython, pygments, markdown
66}:
77
88stdenv.mkDerivation rec {
99 pname = "cgit";
10− version = "1.2.1";
10+ version = "1.2.3";
1111
1212 src = fetchurl {
1313 url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz";
14− sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w";
14+ sha256 = "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss";
1515 };
1616
1717 # cgit is tightly coupled with git and needs a git source tree to build.
1818 # IMPORTANT: Remember to check which git version cgit needs on every version
1919 # bump (look for "GIT_VER" in the top-level Makefile).
2020 gitSrc = fetchurl {
21− url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz";
22− sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
21+ url = "mirror://kernel/software/scm/git/git-2.25.1.tar.xz";
22+ sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
2323 };
2424
25− patches = [
26− (fetchpatch {
27− name = "prevent-dos-limit-path-length.patch";
28− url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a";
29− sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j";
30− })
31− ];
32−
3325 nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
3426 buildInputs = [
3527 openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
@@ -39,7 +31,9 @@ stdenv.mkDerivation rec {
3931 postPatch = ''
4032 sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
4133 -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
34+ -e 's|"lzip"|"${lzip}/bin/lzip"|' \
4235 -e 's|"xz"|"${xz.bin}/bin/xz"|' \
36+ -e 's|"zstd"|"${zstd}/bin/zstd"|' \
4337 -i ui-snapshot.c
4438
4539 substituteInPlace filters/html-converters/man2html \
pkgs/applications/version-management/git-and-tools/git/default.nix+1−1
@@ -343,6 +343,6 @@ stdenv.mkDerivation {
343343 '';
344344
345345 platforms = stdenv.lib.platforms.all;
346− maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens globin ];
346+ maintainers = with stdenv.lib.maintainers; [ peti wmertens globin ];
347347 };
348348}
pkgs/applications/version-management/git-and-tools/hub/default.nix+1−1
@@ -37,7 +37,7 @@ buildGoPackage rec {
3737 description = "Command-line wrapper for git that makes you better at GitHub";
3838 license = licenses.mit;
3939 homepage = "https://hub.github.com/";
40− maintainers = with maintainers; [ the-kenny globin ];
40+ maintainers = with maintainers; [ globin ];
4141 platforms = with platforms; unix;
4242 };
4343}
pkgs/applications/version-management/git-and-tools/stgit/default.nix−1
@@ -30,7 +30,6 @@ stdenv.mkDerivation {
3030 description = "A patch manager implemented on top of Git";
3131 homepage = "http://procode.org/stgit/";
3232 license = licenses.gpl2;
33− maintainers = with maintainers; [ the-kenny ];
3433 platforms = platforms.unix;
3534 };
3635}
pkgs/applications/version-management/git-and-tools/svn2git/default.nix−2
@@ -34,8 +34,6 @@ stdenv.mkDerivation {
3434 homepage = "https://github.com/nirvdrum/svn2git";
3535 description = "Tool for importing Subversion repositories into git";
3636 license = stdenv.lib.licenses.mit;
37−
38− maintainers = [ stdenv.lib.maintainers.the-kenny ];
3937 platforms = stdenv.lib.platforms.unix;
4038 };
4139}
pkgs/applications/version-management/git-lfs/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoPackage rec {
44 pname = "git-lfs";
5− version = "2.10.0";
5+ version = "2.11.0";
66
77 src = fetchFromGitHub {
88 rev = "v${version}";
99 owner = "git-lfs";
1010 repo = "git-lfs";
11− sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9";
11+ sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5";
1212 };
1313
1414 goPackagePath = "github.com/git-lfs/git-lfs";
pkgs/applications/version-management/gitea/default.nix+10−3
@@ -1,5 +1,6 @@
11{ stdenv, buildGoPackage, fetchurl, makeWrapper
22, git, bash, gzip, openssh, pam
3+, fetchpatch
34, sqliteSupport ? true
45, pamSupport ? true
56}:
@@ -8,11 +9,11 @@ with stdenv.lib;
89
910buildGoPackage rec {
1011 pname = "gitea";
11− version = "1.11.4";
12+ version = "1.11.5";
1213
1314 src = fetchurl {
1415 url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
15− sha256 = "18k6kcdq0ijpzgay2aq1w95qkgfvrn1dgh4cxyj9c4i0pwb3ar7f";
16+ sha256 = "0iqxwg53wjwi4vpq2h6fwmniazsi4cf68fcjrs459qbz4d6x8xa9";
1617 };
1718
1819 unpackPhase = ''
@@ -22,7 +23,13 @@ buildGoPackage rec {
2223
2324 sourceRoot = "source";
2425
25− patches = [ ./static-root-path.patch ];
26+ patches = [
27+ ./static-root-path.patch
28+ (fetchpatch {
29+ url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch";
30+ sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i";
31+ })
32+ ];
2633
2734 postPatch = ''
2835 patchShebangs .
pkgs/applications/virtualization/containerd/default.nix+3−10
@@ -1,4 +1,4 @@
1−{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }:
1+{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux }:
22
33with lib;
44
@@ -18,7 +18,7 @@ buildGoPackage rec {
1818 goPackagePath = "github.com/containerd/containerd";
1919 outputs = [ "out" "man" ];
2020
21− nativeBuildInputs = [ go-md2man utillinux ];
21+ nativeBuildInputs = [ go-md2man installShellFiles utillinux ];
2222
2323 buildInputs = [ btrfs-progs ];
2424
@@ -39,14 +39,7 @@ buildGoPackage rec {
3939 done
4040
4141 make man
42− manRoot="$man/share/man"
43− mkdir -p "$manRoot"
44− for manFile in man/*; do
45− manName="$(basename "$manFile")" # "docker-build.1"
46− number="$(echo $manName | rev | cut -d'.' -f1 | rev)"
47− mkdir -p "$manRoot/man$number"
48− gzip -c "$manFile" > "$manRoot/man$number/$manName.gz"
49− done
42+ installManPage man/*.[1-9]
5043 '';
5144
5245 meta = {
pkgs/applications/virtualization/docker/default.nix+6−15
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
1+{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig
22, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
33, sqlite, iproute, lvm2, systemd
44, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git
@@ -78,7 +78,7 @@ rec {
7878 sha256 = sha256;
7979 };
8080
81− nativeBuildInputs = [ pkgconfig ];
81+ nativeBuildInputs = [ installShellFiles pkgconfig ];
8282 buildInputs = [
8383 makeWrapper removeReferencesTo go-md2man go libtool
8484 ] ++ optionals (stdenv.isLinux) [
@@ -147,9 +147,9 @@ rec {
147147 --prefix PATH : "$out/libexec/docker:$extraPath"
148148
149149 # completion (cli)
150− install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker
151− install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
152− install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
150+ installShellCompletion --bash ./components/cli/contrib/completion/bash/docker
151+ installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish
152+ installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker
153153
154154 # Include contributed man pages (cli)
155155 # Generate man pages from cobra commands
@@ -163,16 +163,7 @@ rec {
163163 echo "Generate legacy manpages"
164164 ./man/md2man-all.sh -q
165165
166− manRoot="$man/share/man"
167− mkdir -p "$manRoot"
168− for manDir in ./man/man?; do
169− manBase="$(basename "$manDir")" # "man1"
170− for manFile in "$manDir"/*; do
171− manName="$(basename "$manFile")" # "docker-build.1"
172− mkdir -p "$manRoot/$manBase"
173− gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz"
174− done
175− done
166+ installManPage man/*/*.[1-9]
176167 '';
177168
178169 preFixup = ''
pkgs/applications/virtualization/firecracker/default.nix+5−5
@@ -1,7 +1,7 @@
11{ fetchurl, stdenv }:
22
33let
4− version = "0.20.0";
4+ version = "0.21.1";
55
66 suffix = {
77 x86_64-linux = "x86_64";
@@ -15,13 +15,13 @@ let
1515 };
1616
1717 firecracker-bin = fetchbin "firecracker" {
18− x86_64-linux = "073pp4q5dnyr126k8k7qdkqclqx18hj12app4gj2is0413gia8z9";
19− aarch64-linux = "1w5f522imq5dnjrdidnrq7jlwcdrsiz32shv9bh66dhy336sd8qw";
18+ x86_64-linux = "0g4fja3bz1fsyz8vj99199yblkn46ygf33ldwd1ssw8f957vbwnb";
19+ aarch64-linux = "1qyppcxnh7f42fs4px5rvkk6lza57h2sq9naskvqn5zy4vsvq89s";
2020 };
2121
2222 jailer-bin = fetchbin "jailer" {
23− x86_64-linux = "0falk6y9y0pimgav1yg6ydn6wsslz0my01qd9by8ipk3f3776531";
24− aarch64-linux = "1j4x4p4zz1ydvpzbbmxszyqv28qbl4v3hiwdj2f67f1jn1cv9l7z";
23+ x86_64-linux = "0x89pfmqci9d3i9fi9b9zm94yr2v7pq7kp3drlb952jkdfj0njyk";
24+ aarch64-linux = "03fx9sk88jm23wqm8fraqd1ccfhbqvc310mkfv1f5p2ykhq2ahrk";
2525 };
2626
2727in
pkgs/applications/virtualization/runc/default.nix+1−1
@@ -39,7 +39,7 @@ buildGoPackage rec {
3939
4040 installPhase = ''
4141 install -Dm755 runc $out/bin/runc
42− installManPage man/*/*
42+ installManPage man/*/*.[1-9]
4343 '';
4444
4545 meta = with lib; {
pkgs/applications/window-managers/herbstluftwm/default.nix−1
@@ -43,6 +43,5 @@ stdenv.mkDerivation rec {
4343 homepage = "https://herbstluftwm.org/";
4444 license = stdenv.lib.licenses.bsd2;
4545 platforms = stdenv.lib.platforms.linux;
46− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
4746 };
4847}
pkgs/applications/window-managers/stumpwm/default.nix−1
@@ -97,7 +97,6 @@ stdenv.mkDerivation {
9797 description = "A tiling window manager for X11";
9898 homepage = "https://github.com/stumpwm/";
9999 license = licenses.gpl2Plus;
100− maintainers = with maintainers; [ the-kenny ];
101100 platforms = platforms.linux;
102101 broken = true; # 2018-04-11
103102 };
pkgs/data/fonts/recursive/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, fetchzip }:
22
33let
4− version = "1.047";
4+ version = "1.051";
55in
66fetchzip {
77 name = "recursive-${version}";
@@ -14,7 +14,7 @@ fetchzip {
1414 unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
1515 '';
1616
17− sha256 = "0v50m6hiv19f7i4idi987j1six6493y6hj3r9djifg075v9adxx9";
17+ sha256 = "1cqlljbzvrxamswcqx8jbr61q4kji7yil5ic1mh60x4yfsk9x5wn";
1818
1919 meta = with lib; {
2020 homepage = "https://recursive.design/";
pkgs/data/themes/matcha/default.nix+4−4
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
22
33stdenv.mkDerivation rec {
4− pname = "matcha";
5− version = "2020-04-08";
4+ pname = "matcha-gtk-theme";
5+ version = "2020-05-09";
66
77 src = fetchFromGitHub {
88 owner = "vinceliuice";
99 repo = pname;
1010 rev = version;
11− sha256 = "0gmdscw9gv19k80ciai6zziih2nccr5snz5na48gr4k5rhq9mzqx";
11+ sha256 = "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww";
1212 };
1313
1414 buildInputs = [ gdk-pixbuf librsvg ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 '';
2626
2727 meta = with stdenv.lib; {
28− description = "A stylish Design theme for GTK based desktop environments";
28+ description = "A stylish flat Design theme for GTK based desktop environments";
2929 homepage = "https://vinceliuice.github.io/theme-matcha";
3030 license = licenses.gpl3;
3131 platforms = platforms.unix;
pkgs/desktops/gnome-3/extensions/arc-menu/default.nix+2
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
2424
2525 makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ];
2626
27+ uuid = "arc-menu@linxgem33.com";
28+
2729 meta = with stdenv.lib; {
2830 description = "Gnome shell extension designed to replace the standard menu found in Gnome 3";
2931 license = licenses.gpl2Plus;
pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix+2
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
2525 "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
2626 ];
2727
28+ uuid = "dash-to-dock@micxgx.gmail.com";
29+
2830 meta = with stdenv.lib; {
2931 description = "A dock for the Gnome Shell";
3032 homepage = "https://micheleg.github.io/dash-to-dock/";
pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix+2
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717
1818 makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
1919
20+ uuid = "dash-to-panel@jderose9.github.com";
21+
2022 meta = with stdenv.lib; {
2123 description = "An icon taskbar for Gnome Shell";
2224 license = licenses.gpl2;
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2
@@ -73,6 +73,8 @@ stdenv.mkDerivation rec {
7373 done
7474 '';
7575
76+ uuid = "gsconnect@andyholmes.github.io";
77+
7678 meta = with stdenv.lib; {
7779 description = "KDE Connect implementation for Gnome Shell";
7880 homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki";
pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix+2
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
2525
2626 makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
2727
28+ uuid = "no-title-bar@franglais125.gmail.com";
29+
2830 meta = with stdenv.lib; {
2931 description = "Integrates maximized windows with the top panel";
3032 homepage = "https://github.com/franglais125/no-title-bar";
pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix+2
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
2121 mv *.js metadata.json dbus.xml schemas locale "$extensions_dir"
2222 '';
2323
24+ uuid = "pidgin@muffinmad";
25+
2426 meta = with stdenv.lib; {
2527 homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension";
2628 description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix+2
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717
1818 makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ];
1919
20+ uuid = "TopIcons@phocean.net";
21+
2022 meta = with stdenv.lib; {
2123 description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround";
2224 license = licenses.gpl2;
pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix+4−4
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-window-is-ready-remover";
5− version = "unstable-2020-03-25";
5+ version = "1.02";
66
77 src = fetchFromGitHub {
88 owner = "nunofarruca";
99 repo = "WindowIsReady_Remover";
10− rev = "a9f9b3a060a6ba8eec71332f39dc2569b6e93761";
11− sha256 = "0l6cg9kz2plbvsqhgwfajknzw9yv3mg9gxdbsk147gbh2arnp6v3";
10+ rev = "v${version}";
11+ sha256 = "1xaf95gn0if44avvkjxyf8fl29y28idn9shnrks0m9k67jcwv8ns";
1212 };
1313
1414 uuid = "windowIsReady_Remover@nunofarruca@gmail.com";
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
2121 meta = with stdenv.lib; {
2222 description = "GNOME Shell extension removing window is ready notification";
2323 homepage = "https://github.com/nunofarruca/WindowIsReady_Remover";
24− license = licenses.unfree;
24+ license = licenses.asl20;
2525 };
2626}
pkgs/development/arduino/ino/default.nix+1−1
@@ -40,7 +40,7 @@ python2Packages.buildPythonApplication rec {
4040 description = "Command line toolkit for working with Arduino hardware";
4141 homepage = "http://inotool.org/";
4242 license = stdenv.lib.licenses.mit;
43− maintainers = with stdenv.lib.maintainers; [ antono the-kenny ];
43+ maintainers = with stdenv.lib.maintainers; [ antono ];
4444 platforms = stdenv.lib.platforms.linux;
4545 };
4646}
pkgs/development/compilers/avra/default.nix−1
@@ -24,6 +24,5 @@ stdenv.mkDerivation rec {
2424 homepage = "http://avra.sourceforge.net/";
2525 license = licenses.gpl2Plus;
2626 platforms = platforms.all;
27− maintainers = with maintainers; [ the-kenny ];
2827 };
2928}
pkgs/development/compilers/chicken/4/chicken.nix+1−1
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
6363 meta = {
6464 homepage = "http://www.call-cc.org/";
6565 license = stdenv.lib.licenses.bsd3;
66− maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ];
66+ maintainers = with stdenv.lib.maintainers; [ corngood ];
6767 platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
6868 description = "A portable compiler for the Scheme programming language";
6969 longDescription = ''
pkgs/development/compilers/chicken/4/egg2nix.nix+1−1
@@ -22,6 +22,6 @@ eggDerivation {
2222 homepage = "https://github.com/the-kenny/egg2nix";
2323 license = stdenv.lib.licenses.bsd3;
2424 platforms = stdenv.lib.platforms.unix;
25− maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ];
25+ maintainers = with stdenv.lib.maintainers; [ corngood ];
2626 };
2727}
pkgs/development/compilers/chicken/5/chicken.nix+1−1
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
4545 meta = {
4646 homepage = "http://www.call-cc.org/";
4747 license = stdenv.lib.licenses.bsd3;
48− maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ];
48+ maintainers = with stdenv.lib.maintainers; [ corngood ];
4949 platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
5050 description = "A portable compiler for the Scheme programming language";
5151 longDescription = ''
pkgs/development/compilers/chicken/5/egg2nix.nix+1−1
@@ -24,6 +24,6 @@ eggDerivation {
2424 homepage = "https://github.com/the-kenny/egg2nix";
2525 license = stdenv.lib.licenses.bsd3;
2626 platforms = stdenv.lib.platforms.unix;
27− maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ];
27+ maintainers = with stdenv.lib.maintainers; [ corngood ];
2828 };
2929}
pkgs/development/compilers/gcc/10/default.nixnew file+285
@@ -0,0 +1,285 @@
1+{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
2+, langC ? true, langCC ? true, langFortran ? false
3+, langAda ? false
4+, langObjC ? stdenv.targetPlatform.isDarwin
5+, langObjCpp ? stdenv.targetPlatform.isDarwin
6+, langGo ? false
7+, profiledCompiler ? false
8+, staticCompiler ? false
9+, enableShared ? true
10+, enableLTO ? true
11+, texinfo ? null
12+, perl ? null # optional, for texi2pod (then pod2man)
13+, gmp, mpfr, libmpc, gettext, which
14+, libelf # optional, for link-time optimizations (LTO)
15+, isl ? null # optional, for the Graphite optimization framework.
16+, zlib ? null
17+, gnatboot ? null
18+, enableMultilib ? false
19+, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
20+, name ? "gcc"
21+, libcCross ? null
22+, threadsCross ? null # for MinGW
23+, crossStageStatic ? false
24+, # Strip kills static libs of other archs (hence no cross)
25+ stripped ? stdenv.hostPlatform == stdenv.buildPlatform
26+ && stdenv.targetPlatform == stdenv.hostPlatform
27+, gnused ? null
28+, cloog # unused; just for compat with gcc4, as we override the parameter on some places
29+, buildPackages
30+}:
31+
32+# LTO needs libelf and zlib.
33+assert libelf != null -> zlib != null;
34+
35+# Make sure we get GNU sed.
36+assert stdenv.hostPlatform.isDarwin -> gnused != null;
37+
38+# The go frontend is written in c++
39+assert langGo -> langCC;
40+assert langAda -> gnatboot != null;
41+
42+# threadsCross is just for MinGW
43+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
44+
45+with stdenv.lib;
46+with builtins;
47+
48+let majorVersion = "10";
49+ version = "${majorVersion}.1.0";
50+
51+ inherit (stdenv) buildPlatform hostPlatform targetPlatform;
52+
53+ patches =
54+ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
55+ ++ optional noSysDirs ../no-sys-dirs.patch
56+ /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
57+ url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
58+ sha256 = ""; # TODO: uncomment and check hash when available.
59+ }) */
60+ ++ optional langAda ../gnat-cflags.patch
61+ ++ optional langFortran ../gfortran-driving.patch
62+ ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
63+ ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch {
64+ url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch";
65+ sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a";
66+ });
67+
68+ /* Cross-gcc settings (build == host != target) */
69+ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
70+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
71+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
72+
73+in
74+
75+stdenv.mkDerivation ({
76+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
77+ inherit version;
78+
79+ builder = ../builder.sh;
80+
81+ src = fetchurl {
82+ url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
83+ sha256 = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2";
84+ };
85+
86+ inherit patches;
87+
88+ outputs = [ "out" "lib" "man" "info" ];
89+ setOutputFlags = false;
90+ NIX_NO_SELF_RPATH = true;
91+
92+ libc_dev = stdenv.cc.libc_dev;
93+
94+ hardeningDisable = [ "format" "pie" ];
95+
96+ # This should kill all the stdinc frameworks that gcc and friends like to
97+ # insert into default search paths.
98+ prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
99+ substituteInPlace gcc/config/darwin-c.c \
100+ --replace 'if (stdinc)' 'if (0)'
101+
102+ substituteInPlace libgcc/config/t-slibgcc-darwin \
103+ --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
104+
105+ substituteInPlace libgfortran/configure \
106+ --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
107+ '';
108+
109+ postPatch = ''
110+ configureScripts=$(find . -name configure)
111+ for configureScript in $configureScripts; do
112+ patchShebangs $configureScript
113+ done
114+ '' + (
115+ if targetPlatform != hostPlatform || stdenv.cc.libc != null then
116+ # On NixOS, use the right path to the dynamic linker instead of
117+ # `/lib/ld*.so'.
118+ let
119+ libc = if libcCross != null then libcCross else stdenv.cc.libc;
120+ in
121+ (
122+ '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..."
123+ for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
124+ do
125+ grep -q _DYNAMIC_LINKER "$header" || continue
126+ echo " fixing \`$header'..."
127+ sed -i "$header" \
128+ -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \
129+ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
130+ done
131+ ''
132+ + stdenv.lib.optionalString (targetPlatform.libc == "musl")
133+ ''
134+ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
135+ ''
136+ )
137+ else "")
138+ + stdenv.lib.optionalString targetPlatform.isAvr ''
139+ makeFlagsArray+=(
140+ 'LIMITS_H_TEST=false'
141+ )
142+ '';
143+
144+ inherit noSysDirs staticCompiler crossStageStatic
145+ libcCross crossMingw;
146+
147+ depsBuildBuild = [ buildPackages.stdenv.cc ];
148+ nativeBuildInputs = [ texinfo which gettext ]
149+ ++ (optional (perl != null) perl);
150+
151+ # For building runtime libs
152+ depsBuildTarget =
153+ if hostPlatform == buildPlatform then [
154+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
155+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
156+ stdenv.cc
157+ ];
158+
159+ buildInputs = [
160+ gmp mpfr libmpc libelf
161+ targetPackages.stdenv.cc.bintools # For linking code at run-time
162+ ] ++ (optional (isl != null) isl)
163+ ++ (optional (zlib != null) zlib)
164+ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
165+ # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
166+ ++ (optional hostPlatform.isDarwin gnused)
167+ ++ (optional langAda gnatboot)
168+ ;
169+
170+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
171+
172+ NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
173+
174+ preConfigure = import ../common/pre-configure.nix {
175+ inherit (stdenv) lib;
176+ inherit version hostPlatform gnatboot langAda langGo;
177+ };
178+
179+ dontDisableStatic = true;
180+
181+ # TODO(@Ericson2314): Always pass "--target" and always prefix.
182+ configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
183+
184+ configureFlags = import ../common/configure-flags.nix {
185+ inherit
186+ stdenv
187+ targetPackages
188+ crossStageStatic libcCross
189+ version
190+
191+ gmp mpfr libmpc libelf isl
192+
193+ enableLTO
194+ enableMultilib
195+ enablePlugin
196+ enableShared
197+
198+ langC
199+ langCC
200+ langFortran
201+ langAda
202+ langGo
203+ langObjC
204+ langObjCpp
205+ ;
206+ };
207+
208+ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
209+
210+ buildFlags = optional
211+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
212+ (if profiledCompiler then "profiledbootstrap" else "bootstrap");
213+
214+ dontStrip = !stripped;
215+
216+ installTargets = optional stripped "install-strip";
217+
218+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
219+ ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
220+
221+ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
222+ # library headers and binaries, regarless of the language being compiled.
223+ #
224+ # Likewise, the LTO code doesn't find zlib.
225+ #
226+ # Cross-compiling, we need gcc not to read ./specs in order to build the g++
227+ # compiler (after the specs for the cross-gcc are created). Having
228+ # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
229+
230+ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
231+ ++ optional (zlib != null) zlib
232+ ));
233+
234+ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
235+
236+ inherit
237+ (import ../common/extra-target-flags.nix {
238+ inherit stdenv crossStageStatic libcCross threadsCross;
239+ })
240+ EXTRA_TARGET_FLAGS
241+ EXTRA_TARGET_LDFLAGS
242+ ;
243+
244+ passthru = {
245+ inherit langC langCC langObjC langObjCpp langAda langFortran langGo version;
246+ isGNU = true;
247+ };
248+
249+ enableParallelBuilding = true;
250+ inherit enableMultilib;
251+
252+ inherit (stdenv) is64bit;
253+
254+ meta = {
255+ homepage = "https://gcc.gnu.org/";
256+ license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
257+ description = "GNU Compiler Collection, version ${version}"
258+ + (if stripped then "" else " (with debugging info)");
259+
260+ longDescription = ''
261+ The GNU Compiler Collection includes compiler front ends for C, C++,
262+ Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
263+ libraries for these languages (libstdc++, libgomp,...).
264+
265+ GCC development is a part of the GNU Project, aiming to improve the
266+ compiler used in the GNU system including the GNU/Linux variant.
267+ '';
268+
269+ maintainers = with stdenv.lib.maintainers; [ synthetica ];
270+
271+ platforms =
272+ stdenv.lib.platforms.linux ++
273+ stdenv.lib.platforms.freebsd ++
274+ stdenv.lib.platforms.illumos ++
275+ stdenv.lib.platforms.darwin;
276+ };
277+}
278+
279+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
280+ makeFlags = [ "all-gcc" "all-target-libgcc" ];
281+ installTargets = "install-gcc install-target-libgcc";
282+}
283+
284+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
285+)
pkgs/development/compilers/gforth/default.nix−1
@@ -25,6 +25,5 @@ stdenv.mkDerivation {
2525 homepage = "https://www.gnu.org/software/gforth/";
2626 license = stdenv.lib.licenses.gpl3;
2727 platforms = stdenv.lib.platforms.all;
28− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
2928 };
3029}
pkgs/development/compilers/gnu-cobol/default.nix+1−1
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 description = "An open-source COBOL compiler";
3535 homepage = "https://sourceforge.net/projects/open-cobol/";
3636 license = licenses.gpl3;
37− maintainers = with maintainers; [ ericsagnes the-kenny ];
37+ maintainers = with maintainers; [ ericsagnes ];
3838 platforms = with platforms; linux ++ darwin;
3939 };
4040}
pkgs/development/compilers/open-watcom-bin/default.nix+66−11
@@ -1,15 +1,62 @@
1−{ stdenvNoCC, fetchurl, qemu, expect, writeScript, ncurses }:
1+{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
22
33let
44
5− # We execute the installer in qemu-user, because otherwise the
6− # installer fails to open itself due to a failed stat() call. This
7− # seems like an incompatibility of new Linux kernels to run this
8− # ancient binary.
9− performInstall = writeScript "perform-ow-install" ''
5+ # We execute all OpenWatcom binaries in qemu-user, because otherwise
6+ # some binaries (most notably the installer itself and wlib) fail to
7+ # use the stat() systemcall. The failure mode is that it returns
8+ # EOVERFLOW for completely legitimate requests. This seems like an
9+ # incompatibility of new Linux kernels to run this ancient binary.
10+ wrapLegacyBinary = writeScript "wrapLegacyBinary" ''
11+ #!${bash}/bin/bash
12+
13+ set -eu
14+
15+ if [ $# -ne 2 ]; then
16+ echo "Usage: $0 unwrapped-binary wrapped-binary"
17+ exit 1
18+ fi
19+
20+ IN="$(${coreutils}/bin/realpath $1)"
21+ OUT="$2"
22+ ARGV0="$(basename $2)"
23+
24+ cat > "$OUT" <<EOF
25+ #!${bash}/bin/bash
26+
27+ TERMINFO=${ncurses}/share/terminfo TERM=vt100 exec ${qemu}/bin/qemu-i386 -0 $ARGV0 $IN "\$@"
28+ EOF
29+
30+ chmod +x "$OUT"
31+ '';
32+
33+ wrapInPlace = writeScriptBin "wrapInPlace" ''
34+ #!${bash}/bin/bash
35+
36+ set -eu
37+
38+ if [ $# -ne 1 ]; then
39+ echo "Usage: $0 unwrapped-binary"
40+ exit 1
41+ fi
42+
43+ TARGET="$1"
44+
45+ mv "$TARGET" "$TARGET-unwrapped"
46+ chmod +x "$TARGET-unwrapped"
47+
48+ exec ${wrapLegacyBinary} "$TARGET-unwrapped" "$TARGET"
49+ '';
50+
51+ # Do a scripted installation of OpenWatcom with its original installer.
52+ #
53+ # If maintaining this expect script turns out to be too much of a
54+ # hassle, we can switch to just using `unzip' on the installer and
55+ # the correct file permissions manually.
56+ performInstall = writeScriptBin "performInstall" ''
1057 #!${expect}/bin/expect -f
1158
12− spawn env TERMINFO=${ncurses}/share/terminfo TERM=vt100 ${qemu}/bin/qemu-i386 [lindex $argv 0]
59+ spawn [lindex $argv 0]
1360
1461 # Wait for button saying "I agree" with escape sequences.
1562 expect "gree"
@@ -46,15 +93,23 @@ stdenvNoCC.mkDerivation rec {
4693 sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p";
4794 };
4895
96+ nativeBuildInputs = [ wrapInPlace performInstall ];
97+
4998 dontUnpack = true;
50− dontBuild = true;
5199 dontConfigure = true;
52100
101+ buildPhase = ''
102+ cp ${src} install-bin-unwrapped
103+ wrapInPlace install-bin-unwrapped
104+ '';
105+
53106 installPhase = ''
54− cp ${src} install-bin
55− chmod +x install-bin
107+ performInstall ./install-bin-unwrapped
56108
57− ${performInstall} install-bin
109+ for e in $(find $out/binl -type f -executable); do
110+ echo "Wrapping $e"
111+ wrapInPlace "$e"
112+ done
58113 '';
59114
60115 meta = with stdenvNoCC.lib; {
pkgs/development/interpreters/elixir/generic-builder.nix+1−1
@@ -73,6 +73,6 @@ in
7373
7474 license = licenses.epl10;
7575 platforms = platforms.unix;
76− maintainers = with maintainers; [ the-kenny havvy couchemar ankhers filalex77 ];
76+ maintainers = with maintainers; [ havvy couchemar ankhers filalex77 ];
7777 };
7878 })
pkgs/development/interpreters/erlang/generic-builder.nix+1−1
@@ -122,7 +122,7 @@ in stdenv.mkDerivation ({
122122 '';
123123
124124 platforms = platforms.unix;
125− maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ];
125+ maintainers = with maintainers; [ sjmackenzie couchemar gleber ];
126126 license = licenses.asl20;
127127 } // meta);
128128}
pkgs/development/interpreters/php/default.nix+3−1
@@ -113,7 +113,9 @@ let
113113 unwrapped = php;
114114 tests = nixosTests.php;
115115 inherit (php-packages) packages extensions;
116− inherit (php) meta;
116+ meta = php.meta // {
117+ outputsToInstall = [ "out" ];
118+ };
117119 };
118120 paths = [ php ];
119121 postBuild = ''
pkgs/development/interpreters/scheme48/default.nix−1
@@ -6,7 +6,6 @@ stdenv.mkDerivation {
66 meta = {
77 homepage = "http://s48.org/";
88 description = "Scheme 48";
9− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
109 platforms = with stdenv.lib.platforms; unix;
1110 license = stdenv.lib.licenses.bsd3;
1211 };
pkgs/development/libraries/itk/default.nix+11−6
@@ -1,14 +1,15 @@
1−{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk, darwin }:
1+{ stdenv, fetchFromGitHub, cmake, makeWrapper
2+, pkgconfig, libX11, libuuid, xz, vtk, Cocoa }:
23
34stdenv.mkDerivation rec {
45 pname = "itk";
5− version = "5.0.1";
6+ version = "5.1.0";
67
78 src = fetchFromGitHub {
89 owner = "InsightSoftwareConsortium";
910 repo = "ITK";
1011 rev = "v${version}";
11− sha256 = "0dcjsn5frjnrphfgw8alnd2ahrvicpx2a2ngb5ixaa9anaicz9z1";
12+ sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl";
1213 };
1314
1415 cmakeFlags = [
@@ -23,12 +24,16 @@ stdenv.mkDerivation rec {
2324
2425 enableParallelBuilding = true;
2526
26− nativeBuildInputs = [ cmake xz ];
27− buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
27+ nativeBuildInputs = [ cmake xz makeWrapper ];
28+ buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
29+
30+ postInstall = ''
31+ wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin"
32+ '';
2833
2934 meta = {
3035 description = "Insight Segmentation and Registration Toolkit";
31− homepage = "http://www.itk.org/";
36+ homepage = "https://www.itk.org/";
3237 license = stdenv.lib.licenses.asl20;
3338 maintainers = with stdenv.lib.maintainers; [viric];
3439 };
pkgs/development/libraries/pxlib/default.nixnew file+20
@@ -0,0 +1,20 @@
1+{ stdenv, fetchurl, intltool }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "pxlib";
5+ version = "0.6.8";
6+ src = fetchurl {
7+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
8+ sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz";
9+ };
10+
11+ nativeBuildInputs = [ intltool ];
12+
13+ meta = with stdenv.lib; {
14+ description = "Library to read and write Paradox files";
15+ homepage = "http://pxlib.sourceforge.net/";
16+ license = licenses.gpl2;
17+ platforms = platforms.linux;
18+ maintainers = [ maintainers.winpat ];
19+ };
20+}
pkgs/development/libraries/science/biology/elastix/default.nix+17−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, itk, python3 }:
1+{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }:
22
33stdenv.mkDerivation rec {
44 pname = "elastix";
@@ -11,10 +11,24 @@ stdenv.mkDerivation rec {
1111 sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj";
1212 };
1313
14+ patches = [
15+ (fetchpatch {
16+ name = "itk-5.1-compat.patch";
17+ url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch";
18+ sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9";
19+ })
20+ (fetchpatch {
21+ name = "fix-osx-build.patch";
22+ url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch";
23+ sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q";
24+ })
25+ ];
26+
27+
1428 nativeBuildInputs = [ cmake python3 ];
1529 buildInputs = [ itk ];
1630
17− doCheck = true;
31+ doCheck = !stdenv.isDarwin; # usual dynamic linker issues
1832
1933 preCheck = "
2034 export LD_LIBRARY_PATH=$(pwd)/bin
@@ -24,7 +38,7 @@ stdenv.mkDerivation rec {
2438 homepage = "http://elastix.isi.uu.nl/";
2539 description = "Image registration toolkit based on ITK";
2640 maintainers = with maintainers; [ bcdarwin ];
27− platforms = platforms.linux;
41+ platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1
2842 license = licenses.asl20;
2943 };
3044}
pkgs/development/libraries/simpleitk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }:
1+{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }:
22
33stdenv.mkDerivation rec {
44 pname = "simpleitk";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ cmake git swig ];
15− buildInputs = [ lua itk ];
15+ buildInputs = [ lua itk4 ];
1616
1717 cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ];
1818
pkgs/development/libraries/vtk/default.nix+1−1
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757 ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];
5858
5959 postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
60− sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt
60+ sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
6161 sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
6262 sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
6363 '';
pkgs/development/python-modules/eve/default.nix+14−9
@@ -1,13 +1,21 @@
1−{ stdenv, buildPythonPackage, fetchPypi, flask, events
2−, pymongo, simplejson, cerberus, werkzeug }:
1+{ stdenv
2+, buildPythonPackage
3+, fetchPypi
4+, flask
5+, events
6+, pymongo
7+, simplejson
8+, cerberus
9+, setuptools
10+}:
311
412buildPythonPackage rec {
513 pname = "Eve";
6− version = "1.0";
14+ version = "1.1";
715
816 src = fetchPypi {
917 inherit pname version;
10− sha256 = "ebde455e631b8eb9d38783eedfbd7e416b4477cce3d9988880eb3e477256a11e";
18+ sha256 = "1a7i7x77p5wjqfzmgn30m9sz2mcz06k4qf5af6a45109lafcq0bv";
1119 };
1220
1321 propagatedBuildInputs = [
@@ -16,13 +24,10 @@ buildPythonPackage rec {
1624 flask
1725 pymongo
1826 simplejson
19− werkzeug
27+ setuptools
2028 ];
2129
22− postPatch = ''
23− substituteInPlace setup.py \
24− --replace "werkzeug==0.15.4" "werkzeug"
25− '';
30+ pythonImportsCheck = [ "eve" ];
2631
2732 # tests call a running mongodb instance
2833 doCheck = false;
pkgs/development/python-modules/flask-wtf/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "Flask-WTF";
5− version = "0.14.2";
5+ version = "0.14.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x";
9+ sha256 = "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl";
1010 };
1111
1212 propagatedBuildInputs = [ flask wtforms nose ];
pkgs/development/python-modules/ignite/default.nix+8−7
@@ -2,6 +2,7 @@
22, buildPythonPackage
33, fetchFromGitHub
44, pytest
5+, matplotlib
56, mock
67, pytorch
78, pynvml
@@ -11,23 +12,23 @@
1112
1213buildPythonPackage rec {
1314 pname = "ignite";
14− version = "0.2.1";
15+ version = "0.3.0";
1516
1617 src = fetchFromGitHub {
1718 owner = "pytorch";
1819 repo = pname;
1920 rev = "v${version}";
20− sha256 = "15k6dd11yxn4923llcpmw4srl1by5ljhh7aw5pnkn4n4qpywh6cm";
21+ sha256 = "0i863kxi1r1hspj19lhn6r8256vdazjcyvis0s33fgzrf7kxi08x";
2122 };
2223
23− checkInputs = [ pytest mock ];
24+ checkInputs = [ pytest matplotlib mock ];
25+ propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ];
2426
27+ # Some packages are not in NixPkgs; other tests try to build distributed
28+ # models, which doesn't work in the sandbox.
2529 checkPhase = ''
26− pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon' tests/
30+ pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon and not conftest and not engines and not distrib_' tests/
2731 '';
28− # these packages are not currently in nixpkgs
29−
30− propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ];
3132
3233 meta = with lib; {
3334 description = "High-level training library for PyTorch";
pkgs/development/python-modules/podcats/default.nix−1
@@ -22,6 +22,5 @@ buildPythonPackage rec {
2222 description = "Application that generates RSS feeds for podcast episodes from local audio files";
2323 homepage = "https://github.com/jakubroztocil/podcats";
2424 license = lib.licenses.bsd2;
25− maintainers = with lib.maintainers; [ the-kenny ];
2625 };
2726}
pkgs/development/python-modules/pyroute2/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pyroute2";
5− version = "0.5.11";
5+ version = "0.5.12";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1wjamijkg2pp9mgj5k4qw3jl2i3ajikkps0zp5c52wcxm3qmks85";
9+ sha256 = "1lry042qsamdzyw6zpmdld0v14g6cl05jsr9qdb7h5wnahf80mq1";
1010 };
1111
1212 # requires root priviledges
pkgs/development/python-modules/pytorch/default.nix+78−34
@@ -1,23 +1,25 @@
1−{ stdenv, fetchurl, fetchgit, buildPythonPackage, python, pythonOlder,
1+{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
22 cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null,
3− mklSupport ? false, mkl ? null,
3+ mklDnnSupport ? true, useSystemNccl ? true,
44 openMPISupport ? false, openmpi ? null,
5− buildNamedTensor ? false,
6− buildBinaries ? false,
5+ buildDocs ? false,
76 cudaArchList ? null,
8− fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl,
7+ numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil,
98 linkFarm, symlinkJoin,
109
10+ # virtual pkg that consistently instantiates blas across nixpkgs
11+ # See https://github.com/NixOS/nixpkgs/pull/83888
12+ blas,
13+
1114 # ninja (https://ninja-build.org) must be available to run C++ extensions tests,
1215 ninja,
1316
1417 # dependencies for torch.utils.tensorboard
15− tensorboardSupport ? true, pillow, six, future, tensorflow-tensorboard,
18+ pillow, six, future, tensorflow-tensorboard, protobuf,
1619
1720 utillinux, which, isPy3k }:
1821
1922assert !openMPISupport || openmpi != null;
20−assert !tensorboardSupport || tensorflow-tensorboard != null;
2123
2224# assert that everything needed for cuda is present and that the correct cuda versions are used
2325assert !cudaSupport || cudatoolkit != null;
@@ -28,17 +30,11 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
2830let
2931 hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs;
3032 matchesCudatoolkit = hasDependency cudatoolkit;
31− matchesMkl = hasDependency mkl;
3233in
3334# confirm that cudatoolkits are sync'd across dependencies
3435assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi;
3536assert !cudaSupport || matchesCudatoolkit magma;
3637
37−# confirm that mkl is sync'd across dependencies
38−assert !mklSupport || mkl != null;
39−assert !(mklSupport && cudaSupport) || matchesMkl magma;
40−assert !mklSupport || (numpy.blasImplementation == "mkl" && numpy.blas == mkl);
41−
4238let
4339 cudatoolkit_joined = symlinkJoin {
4440 name = "${cudatoolkit.name}-unsplit";
@@ -108,7 +104,7 @@ let
108104 "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ";
109105
110106in buildPythonPackage rec {
111− version = "1.2.0";
107+ version = "1.4.1";
112108 pname = "pytorch";
113109 disabled = !isPy3k;
114110
@@ -122,11 +118,9 @@ in buildPythonPackage rec {
122118 repo = "pytorch";
123119 rev = "v${version}";
124120 fetchSubmodules = true;
125− sha256 = "1biyq2p48chakf2xw7hazzqmr5ps1nx475ql8vkmxjg5zaa071cz";
121+ sha256 = "1aa1il4f98pswfj20cv27yfb91l1jcq4515i7mvq7sh5647yzwms";
126122 };
127123
128− dontUseCmakeConfigure = true;
129−
130124 preConfigure = lib.optionalString cudaSupport ''
131125 export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"
132126 export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
@@ -134,6 +128,44 @@ in buildPythonPackage rec {
134128 export CUDNN_INCLUDE_DIR=${cudnn}/include
135129 '';
136130
131+ patches = [
132+ # Prevents a race condition which would be introduced by pull 30333.
133+ # See https://github.com/pytorch/pytorch/issues/32277
134+ # Can be removed >1.5.0.
135+ (fetchpatch {
136+ url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30332.patch";
137+ sha256 = "1v9dwbhz3rdxcx6sz8y8j9n3bj6nqs78b1r8yg89yc15n6l4cqx2";
138+ })
139+
140+ # Fixes errors with gcc-9 compilation. Cherry-picked on advice from ezyang.
141+ # See https://github.com/pytorch/pytorch/issues/32277
142+ # Can be removed >1.5.0.
143+ (fetchpatch {
144+ url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30333.patch";
145+ sha256 = "139413fl37h2fnil0cv99a67mqqnsh02k74b92by1qyr6pcfyg3q";
146+ })
147+ ];
148+
149+ # Use pytorch's custom configurations
150+ dontUseCmakeConfigure = true;
151+
152+ BUILD_NAMEDTENSOR = true;
153+ BUILD_DOCS = buildDocs;
154+
155+ USE_MKL = blas.implementation == "mkl";
156+
157+ # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note
158+ # that this was renamed to dnnl and then renamed again to oneDNN upstream, but
159+ # pytorch still calls it by the old name mkldnn.
160+ USE_MKLDNN = mklDnnSupport;
161+ USE_MKLDNN_CBLAS = mklDnnSupport;
162+
163+ preBuild = ''
164+ export MAX_JOBS=$NIX_BUILD_CORES
165+ ${python.interpreter} setup.py build --cmake-only
166+ ${cmake}/bin/cmake build
167+ '';
168+
137169 preFixup = ''
138170 function join_by { local IFS="$1"; shift; echo "$*"; }
139171 function strip2 {
@@ -155,8 +187,7 @@ in buildPythonPackage rec {
155187 PYTORCH_BUILD_VERSION = version;
156188 PYTORCH_BUILD_NUMBER = 0;
157189
158− BUILD_NAMEDTENSOR = buildNamedTensor; # experimental feature
159− USE_SYSTEM_NCCL=true; # don't build pytorch's third_party NCCL
190+ USE_SYSTEM_NCCL=useSystemNccl; # don't build pytorch's third_party NCCL
160191
161192 # Suppress a weird warning in mkl-dnn, part of ideep in pytorch
162193 # (upstream seems to have fixed this in the wrong place?)
@@ -165,7 +196,7 @@ in buildPythonPackage rec {
165196 #
166197 # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
167198 # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17
168− NIX_CFLAGS_COMPILE = lib.optionals (numpy.blas == mkl) [ "-Wno-error=array-bounds" ];
199+ NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ];
169200
170201 nativeBuildInputs = [
171202 cmake
@@ -174,9 +205,8 @@ in buildPythonPackage rec {
174205 ninja
175206 ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
176207
177− buildInputs = [
178− numpy.blas
179− ] ++ lib.optionals cudaSupport [ cudnn magma nccl ]
208+ buildInputs = [ blas blas.provider oneDNN ]
209+ ++ lib.optionals cudaSupport [ cudnn magma nccl ]
180210 ++ lib.optionals stdenv.isLinux [ numactl ];
181211
182212 propagatedBuildInputs = [
@@ -184,23 +214,37 @@ in buildPythonPackage rec {
184214 click
185215 numpy
186216 pyyaml
187− ] ++ lib.optionals openMPISupport [ openmpi ]
188− ++ lib.optional (pythonOlder "3.5") typing
189− ++ lib.optionals tensorboardSupport [pillow six future tensorflow-tensorboard];
217+ # the following are required for tensorboard support
218+ pillow six future tensorflow-tensorboard protobuf
219+ ] ++ lib.optionals openMPISupport [ openmpi ];
190220
191− checkInputs = [ hypothesis ninja ];
221+ checkInputs = [ hypothesis ninja psutil ];
192222
193− doCheck = false; # tests take a long time for channel release, so doCheck should be overridden only when developing
194− checkPhase = "${cudaStubEnv}python test/run_test.py"
195− + " --exclude utils" # utils requires git, which is not allowed in the check phase
223+ # Tests take a long time and may be flaky, so just sanity-check imports
224+ doCheck = false;
225+ pythonImportsCheck = [
226+ "torch"
227+ ];
228+
229+ checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [
230+ cudaStubEnv
231+ "${python.interpreter} test/run_test.py"
232+ "--exclude"
233+ (concatStringsSep " " [
234+ "utils" # utils requires git, which is not allowed in the check phase
196235
197− # Other tests which have been disabled in previous nix derivations of pytorch.
198− # --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions
199− ;
236+ # "dataloader" # psutils correctly finds and triggers multiprocessing, but is too sandboxed to run -- resulting in numerous errors
237+ # ^^^^^^^^^^^^ NOTE: while test_dataloader does return errors, these are acceptable errors and do not interfere with the build
238+
239+ # tensorboard has acceptable failures for pytorch 1.3.x due to dependencies on tensorboard-plugins
240+ (optionalString (majorMinor version == "1.3" ) "tensorboard")
241+ ])
242+ ];
200243 postInstall = ''
201244 mkdir $dev
202245 cp -r $out/${python.sitePackages}/torch/lib $dev/lib
203246 cp -r $out/${python.sitePackages}/torch/include $dev/include
247+ cp -r $out/${python.sitePackages}/torch/share $dev/share
204248 '';
205249
206250 postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -233,6 +277,6 @@ in buildPythonPackage rec {
233277 homepage = "https://pytorch.org/";
234278 license = lib.licenses.bsd3;
235279 platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
236− maintainers = with lib.maintainers; [ teh thoughtpolice stites tscholak ]; # tscholak esp. for darwin-related builds
280+ maintainers = with lib.maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
237281 };
238282}
pkgs/development/python-modules/todoist/default.nix−1
@@ -16,6 +16,5 @@ buildPythonPackage rec {
1616 description = "The official Todoist Python API library";
1717 homepage = "https://todoist-python.readthedocs.io/en/latest/";
1818 license = stdenv.lib.licenses.mit;
19− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
2019 };
2120}
pkgs/development/tools/build-managers/leiningen/default.nix−1
@@ -48,6 +48,5 @@ stdenv.mkDerivation rec {
4848 description = "Project automation for Clojure";
4949 license = stdenv.lib.licenses.epl10;
5050 platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
51− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
5251 };
5352}
pkgs/development/tools/build-managers/rebar/default.nix−1
@@ -36,7 +36,6 @@ stdenv.mkDerivation {
3636 '';
3737
3838 platforms = stdenv.lib.platforms.unix;
39− maintainers = [ stdenv.lib.maintainers.the-kenny ];
4039 license = stdenv.lib.licenses.asl20;
4140 };
4241}
pkgs/development/tools/misc/dfu-programmer/default.nix−1
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
1919 license = licenses.gpl2;
2020 description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
2121 homepage = "http://dfu-programmer.sourceforge.net/";
22− maintainers = [ maintainers.the-kenny ];
2322 platforms = platforms.unix;
2423 };
2524}
pkgs/development/tools/misc/stm32flash/default.nix+1−1
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
2121 homepage = "https://sourceforge.net/projects/stm32flash/";
2222 license = stdenv.lib.licenses.gpl2;
2323 platforms = platforms.all; # Should work on all platforms
24− maintainers = with maintainers; [ the-kenny elitak ];
24+ maintainers = with maintainers; [ elitak ];
2525 };
2626}
pkgs/development/tools/misc/teensy-loader-cli/default.nix−1
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
2626 description = "Firmware uploader for the Teensy microcontroller boards";
2727 homepage = "https://www.pjrc.com/teensy/";
2828 license = licenses.gpl3;
29− maintainers = with maintainers; [ the-kenny ];
3029 platforms = platforms.unix;
3130 };
3231}
pkgs/development/tools/pxview/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "pxview";
5+ version = "0.2.5";
6+ src = fetchurl {
7+ url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz";
8+ sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139";
9+ };
10+
11+ buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]);
12+ nativeBuildInputs = [ pkgconfig ];
13+
14+ configureFlags = [ "--with-pxlib=${pxlib.out}" ];
15+
16+ # https://sourceforge.net/p/pxlib/bugs/12/
17+ LDFLAGS = "-lm";
18+ hardeningDisable = [ "format" ];
19+
20+ meta = with stdenv.lib; {
21+ description = "Program to convert Paradox databases";
22+ homepage = "http://pxlib.sourceforge.net/pxview/";
23+ license = licenses.gpl2;
24+ platforms = platforms.linux;
25+ maintainers = [ maintainers.winpat ];
26+ };
27+}
pkgs/development/tools/ws/default.nix−1
@@ -20,7 +20,6 @@ buildGoPackage rec {
2020 description = "websocket command line tool";
2121 homepage = "https://github.com/hashrocket/ws";
2222 license = licenses.mit;
23− maintainers = [ maintainers.the-kenny ];
2423 platforms = platforms.unix;
2524 };
2625}
pkgs/games/anki/default.nix+1−1
@@ -195,6 +195,6 @@ buildPythonApplication rec {
195195 license = licenses.agpl3Plus;
196196 broken = stdenv.hostPlatform.isAarch64;
197197 platforms = platforms.mesaPlatforms;
198− maintainers = with maintainers; [ oxij the-kenny Profpatsch enzime ];
198+ maintainers = with maintainers; [ oxij Profpatsch enzime ];
199199 };
200200}
pkgs/games/crrcsim/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 meta = {
2323 description = "A model-airplane flight simulator";
24− maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ];
24+ maintainers = with stdenv.lib.maintainers; [ raskin ];
2525 platforms = [ "i686-linux" "x86_64-linux" ];
2626 license = stdenv.lib.licenses.gpl2;
2727 };
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 meta = with stdenv.lib; {
2424 description = "Tool to manage dwarves in a running game of Dwarf Fortress";
25− maintainers = with maintainers; [ the-kenny abbradar bendlas numinit jonringer ];
25+ maintainers = with maintainers; [ abbradar bendlas numinit jonringer ];
2626 license = licenses.mit;
2727 platforms = platforms.unix;
2828 homepage = "https://github.com/Dwarf-Therapist/Dwarf-Therapist";
pkgs/games/dwarf-fortress/game.nix+1−1
@@ -96,6 +96,6 @@ stdenv.mkDerivation {
9696 inherit homepage;
9797 license = licenses.unfreeRedistributable;
9898 platforms = attrNames platforms;
99− maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit shazow ];
99+ maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ];
100100 };
101101}
pkgs/games/flightgear/default.nix+1−1
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
7373
7474 meta = with stdenv.lib; {
7575 description = "Flight simulator";
76− maintainers = with maintainers; [ raskin the-kenny ];
76+ maintainers = with maintainers; [ raskin ];
7777 platforms = platforms.linux;
7878 hydraPlatforms = []; # disabled from hydra because it's so big
7979 license = licenses.gpl2;
pkgs/games/openttd/default.nix+1−1
@@ -89,6 +89,6 @@ stdenv.mkDerivation rec {
8989 homepage = "https://www.openttd.org/";
9090 license = licenses.gpl2;
9191 platforms = platforms.linux;
92− maintainers = with maintainers; [ jcumming the-kenny fpletz ];
92+ maintainers = with maintainers; [ jcumming fpletz ];
9393 };
9494}
pkgs/games/the-butterfly-effect/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, fetchgit, qt5, box2d, which, cmake, gettext }:
1+{ stdenv, mkDerivation, fetchgit, qt5, box2d, which, cmake, gettext }:
22
3−stdenv.mkDerivation rec {
3+mkDerivation rec {
44 pname = "tbe";
55 version = "0.9.3.1";
66
pkgs/misc/emulators/wine/winetricks.nix−1
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
2626 description = "A script to install DLLs needed to work around problems in Wine";
2727 license = stdenv.lib.licenses.lgpl21;
2828 homepage = "https://github.com/Winetricks/winetricks";
29− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
3029 platforms = with stdenv.lib.platforms; linux;
3130 };
3231}
pkgs/os-specific/linux/ldm/default.nix−1
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
3838 license = stdenv.lib.licenses.mit;
3939
4040 platforms = stdenv.lib.platforms.linux;
41− maintainers = [ stdenv.lib.maintainers.the-kenny ];
4241 repositories.git = git;
4342 };
4443}
pkgs/os-specific/linux/usermount/default.nix−1
@@ -24,6 +24,5 @@ stdenv.mkDerivation {
2424 description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus";
2525 license = stdenv.lib.licenses.mit;
2626 platforms = stdenv.lib.platforms.linux;
27− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
2827 };
2928}
pkgs/os-specific/linux/wireguard/default.nix+2−2
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
77
88stdenv.mkDerivation rec {
99 pname = "wireguard";
10− version = "1.0.20200429";
10+ version = "1.0.20200506";
1111
1212 src = fetchzip {
1313 url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
14− sha256 = "161srq06qa6ag2lycqz19mfms4ha2pmwn778jhvi96729rmivjkd";
14+ sha256 = "05dphmcxm3lg860r5bj1b995avh43d1pap8p18p4ig4kv2r2g9nq";
1515 };
1616
1717 hardeningDisable = [ "pic" ];
pkgs/servers/http/gatling/default.nix−1
@@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
2828 homepage = "http://www.fefe.de/gatling/";
2929 license = stdenv.lib.licenses.gpl2;
3030 platforms = platforms.linux;
31− maintainers = [ maintainers.the-kenny ];
3231 };
3332}
pkgs/servers/http/yaws/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 homepage = "http://yaws.hyber.org";
3030 license = licenses.bsd2;
3131 platforms = platforms.linux;
32− maintainers = with maintainers; [ goibhniu the-kenny ];
32+ maintainers = with maintainers; [ goibhniu ];
3333 };
3434
3535}
pkgs/servers/monitoring/zabbix/agent.nix+1−1
@@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }:
66 inherit version;
77
88 src = fetchurl {
9− url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
9+ url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz";
1010 inherit sha256;
1111 };
1212
pkgs/servers/monitoring/zabbix/proxy.nix+1−1
@@ -21,7 +21,7 @@ in
2121 inherit version;
2222
2323 src = fetchurl {
24− url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
24+ url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz";
2525 inherit sha256;
2626 };
2727
pkgs/servers/monitoring/zabbix/server.nix+1−1
@@ -21,7 +21,7 @@ in
2121 inherit version;
2222
2323 src = fetchurl {
24− url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
24+ url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz";
2525 inherit sha256;
2626 };
2727
pkgs/servers/monitoring/zabbix/versions.nix+6−6
@@ -1,16 +1,16 @@
11generic: {
22 v44 = generic {
3− version = "4.4.7";
4− sha256 = "13gckz5ysmqr257mcmbbbf8l43f1jdk4iyn6a3ad8xjmj3kqyys9";
3+ version = "4.4.8";
4+ sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0";
55 };
66
77 v40 = generic {
8− version = "4.0.19";
9− sha256 = "0csiva0iddzdf18lii7vwlvp91kh3vfl8r90jpcsnsivaqwfnkbr";
8+ version = "4.0.20";
9+ sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w";
1010 };
1111
1212 v30 = generic {
13− version = "3.0.30";
14− sha256 = "0g2qw4ff02gsnmqza1cv9dq6bqyg7w9cdli6hsln07irf0hyrb07";
13+ version = "3.0.31";
14+ sha256 = "0a2jznpmg24lqdqbc9p8i2q6jkz0hx53hh6q12xsvvmq48vi3snm";
1515 };
1616}
pkgs/servers/monitoring/zabbix/web.nix+1−1
@@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }:
66 inherit version;
77
88 src = fetchurl {
9− url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
9+ url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz";
1010 inherit sha256;
1111 };
1212
pkgs/shells/mksh/default.nix+2−2
@@ -2,14 +2,14 @@
22
33stdenv.mkDerivation rec {
44 pname = "mksh";
5− version = "58";
5+ version = "59";
66
77 src = fetchurl {
88 urls = [
99 "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
1010 "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
1111 ];
12− sha256 = "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0";
12+ sha256 = "1flhsdfksvv9gmfkgjwgdia1irv53g9abmq3y22s5a5ycyx2hajr";
1313 };
1414
1515 dontConfigure = true;
pkgs/tools/admin/lxd/default.nix+2−2
@@ -10,13 +10,13 @@
1010
1111buildGoPackage rec {
1212 pname = "lxd";
13− version = "4.0.1";
13+ version = "4.1";
1414
1515 goPackagePath = "github.com/lxc/lxd";
1616
1717 src = fetchurl {
1818 url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
19− sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx";
19+ sha256 = "0svzj57wwm43d2gnx0myr2p9pzjmkivwhgg0dww6zl169bx32liz";
2020 };
2121
2222 postPatch = ''
pkgs/tools/backup/btrbk/default.nix+1−1
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
4646 homepage = "https://digint.ch/btrbk";
4747 license = licenses.gpl3;
4848 platforms = platforms.unix;
49− maintainers = with maintainers; [ asymmetric the-kenny ];
49+ maintainers = with maintainers; [ asymmetric ];
5050 inherit version;
5151 };
5252}
pkgs/tools/backup/httrack/default.nix−1
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
1717 description = "Easy-to-use offline browser / website mirroring utility";
1818 homepage = "http://www.httrack.com";
1919 license = licenses.gpl3;
20− maintainers = with maintainers; [ the-kenny ];
2120 platforms = with platforms; unix;
2221 };
2322}
pkgs/tools/backup/rdiff-backup/default.nix−1
@@ -19,6 +19,5 @@ python2Packages.buildPythonApplication {
1919 homepage = "http://rdiff-backup.nongnu.org/";
2020 license = stdenv.lib.licenses.gpl2;
2121 platforms = stdenv.lib.platforms.all;
22− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
2322 };
2423}
pkgs/tools/filesystems/glusterfs/default.nix+17−11
@@ -73,19 +73,25 @@ stdenv.mkDerivation
7373
7474 postPatch = ''
7575 sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
76+ substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \
77+ --replace '/sbin/' '${lvm2}/bin/'
78+ substituteInPlace libglusterfs/src/glusterfs/compat.h \
79+ --replace '/bin/umount' '${utillinux}/bin/umount'
80+ substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \
81+ --replace '/bin/mount' '${utillinux}/bin/mount'
7682 '';
7783
78− # Note that the VERSION file is something that is present in release tarballs
79− # but not in git tags (at least not as of writing in v3.10.1).
80− # That's why we have to create it.
81− # Without this, gluster (at least 3.10.1) will fail very late and cryptically,
82− # for example when setting up geo-replication, with a message like
83− # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume.
84− # What happens here is that the gverify.sh script tries to compare the versions,
85− # but fails when the version is empty.
86− # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705
87− preConfigure = ''
88− echo "v${s.version}" > VERSION
84+ # Note that the VERSION file is something that is present in release tarballs
85+ # but not in git tags (at least not as of writing in v3.10.1).
86+ # That's why we have to create it.
87+ # Without this, gluster (at least 3.10.1) will fail very late and cryptically,
88+ # for example when setting up geo-replication, with a message like
89+ # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume.
90+ # What happens here is that the gverify.sh script tries to compare the versions,
91+ # but fails when the version is empty.
92+ # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705
93+ preConfigure = ''
94+ echo "v${s.version}" > VERSION
8995 ./autogen.sh
9096 export PYTHON=${python3}/bin/python
9197 '';
pkgs/tools/graphics/pngcheck/default.nix−1
@@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
2525 description = "Verifies the integrity of PNG, JNG and MNG files";
2626 license = stdenv.lib.licenses.free;
2727 platforms = with stdenv.lib.platforms; linux;
28− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
2928 };
3029}
pkgs/tools/graphics/pngcrush/default.nix−1
@@ -21,6 +21,5 @@ stdenv.mkDerivation rec {
2121 description = "A PNG optimizer";
2222 license = stdenv.lib.licenses.free;
2323 platforms = with stdenv.lib.platforms; linux ++ darwin;
24− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
2524 };
2625}
pkgs/tools/graphics/wdisplays/default.nix+6−5
@@ -1,7 +1,8 @@
11{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }:
2−stdenv.mkDerivation {
3− pname = "wdisplays-unstable";
4− version = "2020-03-15";
2+
3+stdenv.mkDerivation rec {
4+ pname = "wdisplays";
5+ version = "1.0";
56
67 nativeBuildInputs = [ meson ninja pkgconfig ];
78
@@ -10,8 +11,8 @@ stdenv.mkDerivation {
1011 src = fetchFromGitHub {
1112 owner = "cyclopsian";
1213 repo = "wdisplays";
13− rev = "0faafdc04d7dd47d3a4e385f348cb9d267f2e60d";
14− sha256 = "1y3bzh4mi6d67n6v0i8j5snpaikpbyr89acayr4m6bx85qnrq4g2";
14+ rev = version;
15+ sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y";
1516 };
1617
1718 meta = let inherit (stdenv) lib; in {
pkgs/tools/misc/stow/default.nix−2
@@ -31,8 +31,6 @@ stdenv.mkDerivation {
3131
3232 license = stdenv.lib.licenses.gpl3Plus;
3333 homepage = "https://www.gnu.org/software/stow/";
34−
35− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
3634 platforms = stdenv.lib.platforms.all;
3735 };
3836}
pkgs/tools/networking/fping/default.nix−1
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
1313 meta = with stdenv.lib; {
1414 homepage = "http://fping.org/";
1515 description = "Send ICMP echo probes to network hosts";
16− maintainers = with maintainers; [ the-kenny ];
1716 license = licenses.bsd0;
1817 platforms = platforms.all;
1918 };
pkgs/tools/networking/isync/default.nix−2
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
1515 homepage = "http://isync.sourceforge.net/";
1616 description = "Free IMAP and MailDir mailbox synchronizer";
1717 license = licenses.gpl2Plus;
18−
19− maintainers = with maintainers; [ the-kenny ];
2018 platforms = platforms.unix;
2119 };
2220}
pkgs/tools/networking/mu/default.nix+1−1
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 description = "A collection of utilties for indexing and searching Maildirs";
4848 license = licenses.gpl3Plus;
4949 homepage = "https://www.djcbsoftware.nl/code/mu/";
50− maintainers = with maintainers; [ antono the-kenny peterhoeg ];
50+ maintainers = with maintainers; [ antono peterhoeg ];
5151 platforms = platforms.mesaPlatforms;
5252 };
5353}
pkgs/tools/networking/wireguard-go/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoPackage rec {
44 pname = "wireguard-go";
5− version = "0.0.20200121";
5+ version = "0.0.20200320";
66
77 goPackagePath = "golang.zx2c4.com/wireguard";
88
99 src = fetchzip {
1010 url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
11− sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9";
11+ sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r";
1212 };
1313
1414 patches = [ ./0001-Fix-darwin-build.patch ];
pkgs/tools/networking/wireguard-go/deps.nix+2−2
@@ -23,8 +23,8 @@
2323 fetch = {
2424 type = "git";
2525 url = "https://go.googlesource.com/sys";
26− rev = "c178f38b412c";
27− sha256 = "1r6v8xnvb4z5vdckbj6vd08kn6h4ivr9hvdpgq4drj6l1mp79rf7";
26+ rev = "5c8b2ff67527";
27+ sha256 = "0r5s7f4w7crrbcf5ydpr2xzsq0svjm332vsds41yp58kwi2lvh2v";
2828 };
2929 }
3030 {
pkgs/tools/security/genpass/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ stdenv
2+, fetchFromGitHub
3+, rustPlatform
4+}:
5+rustPlatform.buildRustPackage rec {
6+ pname = "genpass";
7+ version = "0.4.1";
8+
9+ src = fetchFromGitHub {
10+ owner = "cyplo";
11+ repo = pname;
12+ rev = "v${version}";
13+ sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini";
14+ };
15+
16+ cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m";
17+
18+ meta = with stdenv.lib; {
19+ description = "A simple yet robust commandline random password generator.";
20+ homepage = "https://github.com/cyplo/genpass";
21+ license = licenses.agpl3;
22+ platforms = platforms.all;
23+ maintainers = with maintainers; [ cyplo ];
24+ };
25+}
pkgs/tools/security/pass/default.nix+1−1
@@ -144,7 +144,7 @@ stdenv.mkDerivation rec {
144144 description = "Stores, retrieves, generates, and synchronizes passwords securely";
145145 homepage = "https://www.passwordstore.org/";
146146 license = licenses.gpl2Plus;
147− maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ma27 ];
147+ maintainers = with maintainers; [ lovek323 fpletz tadfisher globin ma27 ];
148148 platforms = platforms.unix;
149149
150150 longDescription = ''
pkgs/tools/security/pass/extensions/import.nix+1−1
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
5353 description = "Pass extension for importing data from existing password managers";
5454 homepage = "https://github.com/roddhjav/pass-import";
5555 license = licenses.gpl3Plus;
56− maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
56+ maintainers = with maintainers; [ lovek323 fpletz tadfisher ];
5757 platforms = platforms.unix;
5858 };
5959}
pkgs/tools/security/pass/extensions/tomb.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 description = "Pass extension that keeps the password store encrypted inside a tomb";
2727 homepage = "https://github.com/roddhjav/pass-tomb";
2828 license = licenses.gpl3Plus;
29− maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
29+ maintainers = with maintainers; [ lovek323 fpletz tadfisher ];
3030 platforms = platforms.unix;
3131 };
3232}
pkgs/tools/security/pass/extensions/update.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 description = "Pass extension that provides an easy flow for updating passwords";
2525 homepage = "https://github.com/roddhjav/pass-update";
2626 license = licenses.gpl3Plus;
27− maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
27+ maintainers = with maintainers; [ lovek323 fpletz tadfisher ];
2828 platforms = platforms.unix;
2929 };
3030}
pkgs/tools/security/pass/rofi-pass.nix−1
@@ -50,7 +50,6 @@ stdenv.mkDerivation rec {
5050 meta = {
5151 description = "A script to make rofi work with password-store";
5252 homepage = "https://github.com/carnager/rofi-pass";
53− maintainers = with stdenv.lib.maintainers; [ the-kenny ];
5453 license = stdenv.lib.licenses.gpl3;
5554 platforms = with stdenv.lib.platforms; linux;
5655 };
pkgs/tools/security/tor/default.nix+4
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
3030
3131 patches = [ ./disable-monotonic-timer-tests.patch ];
3232
33+ # cross compiles correctly but needs the following
34+ configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
35+ "--disable-tool-name-check";
36+
3337 NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
3438
3539 postPatch = ''
pkgs/tools/text/ripgrep/default.nix+5−7
@@ -1,9 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, rustPlatform
4−, asciidoc
5−, docbook_xsl
6−, libxslt
4+, asciidoctor
75, installShellFiles
86, Security
97, withPCRE2 ? true
@@ -12,20 +10,20 @@
1210
1311rustPlatform.buildRustPackage rec {
1412 pname = "ripgrep";
15− version = "12.0.1";
13+ version = "12.1.0";
1614
1715 src = fetchFromGitHub {
1816 owner = "BurntSushi";
1917 repo = pname;
2018 rev = version;
21− sha256 = "1c0v51s05kbg9825n6mvpizhkkgz38wl7hp8f3vzbjfg4i8l8wb0";
19+ sha256 = "1vgkk78c25ia9y4q5psrh7xrlbfdn7dz7bc20kci40n8zr0vjwww";
2220 };
2321
24− cargoSha256 = "0i8x2xgri8f8mzrlkc8l2yzcgczl35nw4bmwg09d343mjkmk6d8y";
22+ cargoSha256 = "143lnf4yah9ik7v8rphv7gbvr2ckhjpmy8zfgqml1n3fqxiqvxnb";
2523
2624 cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
2725
28− nativeBuildInputs = [ asciidoc docbook_xsl libxslt installShellFiles ];
26+ nativeBuildInputs = [ asciidoctor installShellFiles ];
2927 buildInputs = (stdenv.lib.optional withPCRE2 pcre2)
3028 ++ (stdenv.lib.optional stdenv.isDarwin Security);
3129
pkgs/top-level/aliases.nix+1
@@ -275,6 +275,7 @@ mapAliases ({
275275 man_db = man-db; # added 2016-05
276276 manpages = man-pages; # added 2015-12-06
277277 mariadb-client = hiPrio mariadb.client; #added 2019.07.28
278+ matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09
278279 matrique = spectral; # added 2020-01-27
279280 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
280281 mess = mame; # added 2019-10-30
pkgs/top-level/all-packages.nix+48−7
@@ -930,6 +930,8 @@ in
930930
931931 fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
932932
933+ genpass = callPackage ../tools/security/genpass { };
934+
933935 genymotion = callPackage ../development/mobile/genymotion { };
934936
935937 gaia = callPackage ../development/libraries/gaia { };
@@ -8195,6 +8197,7 @@ in
81958197 gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7;
81968198 gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8;
81978199 gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9;
8200+ gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10;
81988201
81998202 wrapCCMulti = cc:
82008203 if stdenv.targetPlatform.system == "x86_64-linux" then let
@@ -8362,6 +8365,20 @@ in
83628365 isl = if !stdenv.isDarwin then isl_0_17 else null;
83638366 }));
83648367
8368+ gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 {
8369+ inherit noSysDirs;
8370+
8371+ # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
8372+ profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
8373+
8374+ enableLTO = !stdenv.isi686;
8375+
8376+ libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
8377+ threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
8378+
8379+ isl = if !stdenv.isDarwin then isl_0_17 else null;
8380+ }));
8381+
83658382 gfortran = gfortran9;
83668383
83678384 gfortran48 = wrapCC (gcc48.cc.override {
@@ -8412,6 +8429,14 @@ in
84128429 profiledCompiler = false;
84138430 });
84148431
8432+ gfortran10 = wrapCC (gcc10.cc.override {
8433+ name = "gfortran";
8434+ langFortran = true;
8435+ langCC = false;
8436+ langC = false;
8437+ profiledCompiler = false;
8438+ });
8439+
84158440 gcj = gcj6;
84168441 gcj6 = wrapCC (gcc6.cc.override {
84178442 name = "gcj";
@@ -8444,6 +8469,15 @@ in
84448469 gnatboot = gnat6;
84458470 });
84468471
8472+ gnat10 = wrapCC (gcc10.cc.override {
8473+ name = "gnat";
8474+ langC = true;
8475+ langCC = false;
8476+ langAda = true;
8477+ profiledCompiler = false;
8478+ gnatboot = gnat6;
8479+ });
8480+
84478481 gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { });
84488482
84498483 gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { };
@@ -12302,7 +12336,7 @@ in
1230212336 itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; };
1230312337
1230412338 itk = callPackage ../development/libraries/itk {
12305− stdenv = gcc8Stdenv;
12339+ inherit (darwin.apple_sdk.frameworks) Cocoa;
1230612340 };
1230712341
1230812342 jasper = callPackage ../development/libraries/jasper { };
@@ -14436,7 +14470,10 @@ in
1443614470
1443714471 simp_le = callPackage ../tools/admin/simp_le { };
1443814472
14439− simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; };
14473+ simpleitk = callPackage ../development/libraries/simpleitk {
14474+ lua = lua51Packages.lua;
14475+ stdenv = gcc8Stdenv;
14476+ };
1444014477
1444114478 sfml = callPackage ../development/libraries/sfml {
1444214479 inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
@@ -14867,7 +14904,7 @@ in
1486714904 vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
1486814905
1486914906 vtk = callPackage ../development/libraries/vtk {
14870− stdenv = gcc8Stdenv;
14907+ stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv;
1487114908 inherit (darwin) libobjc;
1487214909 inherit (darwin.apple_sdk.libs) xpc;
1487314910 inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@@ -17990,7 +18027,7 @@ in
1799018027
1799118028 manrope = callPackage ../data/fonts/manrope { };
1799218029
17993− matcha = callPackage ../data/themes/matcha { };
18030+ matcha-gtk-theme = callPackage ../data/themes/matcha { };
1799418031
1799518032 materia-theme = callPackage ../data/themes/materia-theme { };
1799618033
@@ -22535,7 +22572,7 @@ in
2253522572
2253622573 weechat = wrapWeechat weechat-unwrapped { };
2253722574
22538− weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { });
22575+ weechatScripts = recurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { });
2253922576
2254022577 westonLite = weston.override {
2254122578 pango = null;
@@ -23925,7 +23962,7 @@ in
2392523962 lua = lua5_1;
2392623963 };
2392723964
23928− tbe = callPackage ../games/the-butterfly-effect { };
23965+ tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };
2392923966
2393023967 teetertorture = callPackage ../games/teetertorture { };
2393123968
@@ -24352,7 +24389,7 @@ in
2435224389
2435324390 est-sfs = callPackage ../applications/science/biology/est-sfs { };
2435424391
24355− ezminc = callPackage ../applications/science/biology/EZminc { };
24392+ ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; };
2435624393
2435724394 exonerate = callPackage ../applications/science/biology/exonerate { };
2435824395
@@ -26487,6 +26524,10 @@ in
2648726524
2648826525 kcli = callPackage ../development/tools/kcli {};
2648926526
26527+ pxlib = callPackage ../development/libraries/pxlib {};
26528+
26529+ pxview = callPackage ../development/tools/pxview {};
26530+
2649026531 unstick = callPackage ../os-specific/linux/unstick {};
2649126532
2649226533 quartus-prime-lite = callPackage ../applications/editors/quartus-prime {};