diff options
2951 files changed, 19159 insertions, 13663 deletions
diff --git a/modules/workstation/weechat/default.nix b/modules/workstation/weechat/default.nix index 129d221ecb51..b645810c1876 100644 --- a/modules/workstation/weechat/default.nix +++ b/modules/workstation/weechat/default.nix @@ -99,7 +99,7 @@ in ''; environment.systemPackages = with pkgs; [ - (wrapWeechat (weechat-unwrapped.override { pythonPackages = python3Packages; }) { + (weechat.override { configure = { availablePlugins, ... }: { scripts = with weechatScripts; [ colorize_nicks go wee-slack zncplayback ]; diff --git a/nixpkgs/README.md b/nixpkgs/README.md index d589b953d182..b34438e41a8f 100644 --- a/nixpkgs/README.md +++ b/nixpkgs/README.md @@ -1,48 +1,113 @@ -[<img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="logo" />](https://nixos.org/nixos) +<p align="center"> + <a href="https://nixos.org/nixos"><img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="NixOS logo" /></a> +</p> -[](https://www.codetriage.com/nixos/nixpkgs) -[](https://opencollective.com/nixos) +<p align="center"> + <a href="https://www.codetriage.com/nixos/nixpkgs"><img src="https://www.codetriage.com/nixos/nixpkgs/badges/users.svg" alt="Code Triagers badge" /></a> + <a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=Supporter&color=brightgreen" alt="Open Collective supporters" /></a> +</p> -Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package -manager. It is periodically built and tested by the [Hydra](https://hydra.nixos.org/) -build daemon as so-called channels. To get channel information via git, add -[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: +[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over +40,000 software packages that can be installed with the +[Nix](https://nixos.org/nix/) package manager. It also implements +[NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution. -``` -% git remote add channels https://github.com/NixOS/nixpkgs-channels.git -``` +# Manuals -For stability and maximum binary package support, it is recommended to maintain -custom changes on top of one of the channels, e.g. `nixos-19.03` for the latest -release and `nixos-unstable` for the latest successful build of master: +* [NixOS Manual](https://nixos.org/nixos/manual) - how to install, configure, and maintain a purely-functional Linux distribution +* [Nixpkgs Manual](https://nixos.org/nixpkgs/manual/) - contributing to Nixpkgs and using programming-language-specific Nix expressions +* [Nix Package Manager Manual](https://nixos.org/nix/manual) - how to write Nix expresssions (programs), and how to use Nix command line tools -``` -% git remote update channels -% git rebase channels/nixos-19.03 -``` +# Community -For pull requests, please rebase onto nixpkgs `master`. +* [Discourse Forum](https://discourse.nixos.org/) +* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) +* [NixOS Weekly](https://weekly.nixos.org/) +* [Community-maintained wiki](https://nixos.wiki/) + +# Other Project Repositories + +The sources of all offical Nix-related projects are in the [NixOS +organization on GitHub](https://github.com/NixOS/). Here are some of +the main ones: + +* [Nix](https://github.com/NixOS/nix) - the purely functional package manager +* [NixOps](https://github.com/NixOS/nixops) - the tool to remotely deploy NixOS machines +* [Nix RFCs](https://github.com/NixOS/rfcs) - the formal process for making substantial changes to the community +* [NixOS homepage](https://github.com/NixOS/nixos-homepage) - the [NixOS.org](https://nixos.org) website +* [hydra](https://github.com/NixOS/hydra) - our continuous integration system +* [NixOS Artwork](https://github.com/NixOS/nixos-artwork) - NixOS artwork -[NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside -`nixos/` folder. +# Continuous Integration and Distribution + +Nixpkgs and NixOS are built and tested by our continuous integration +system, [Hydra](https://hydra.nixos.org/). -* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation) -* [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language) -* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/) -* [Manual (NixOS)](https://nixos.org/nixos/manual/) -* [Community maintained wiki](https://nixos.wiki/) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 19.03 release](https://hydra.nixos.org/jobset/nixos/release-19.03) +* [Continuous package builds for the NixOS 19.03 release](https://hydra.nixos.org/jobset/nixos/release-19.03) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 19.03 release](https://hydra.nixos.org/job/nixos/release-19.03/tested#tabs-constituents) +* [Tests for the NixOS 19.03 release](https://hydra.nixos.org/job/nixos/release-19.03/tested#tabs-constituents) -Communication: +Artifacts successfully built with Hydra are published to cache at +https://cache.nixos.org/. When successful build and test criteria are +met, the Nixpkgs expressions are distributed via [Nix +channels](https://nixos.org/nix/manual/#sec-channels). The channels +are provided via a read-only mirror of the Nixpkgs repository called +[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels). -* [Discourse Forum](https://discourse.nixos.org/) -* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) +# Contributing + +Nixpkgs is among the most active projects on GitHub. While thousands +of open issues and pull requests might seem a lot at first, it helps +consider it in the context of the scope of the project. Nixpkgs +describes how to build over 40,000 pieces of software and implements a +Linux distribution. The [GitHub Insights](https://github.com/NixOS/nixpkgs/pulse) +page gives a sense of the project activity. + +Community contributions are always welcome through GitHub Issues and +Pull Requests. When pull requests are made, our tooling automation bot, +[OfBorg](https://github.com/NixOS/ofborg) will perform various checks +to help ensure expression quality. + +The *Nixpkgs maintainers* are people who have assigned themselves to +maintain specific individual packages. We encourage people who care +about a package to assign themselves as a maintainer. When a pull +request is made against a package, OfBorg will notify the appropriate +maintainer(s). The *Nixpkgs committers* are people who have been given +permission to merge. + +Most contributions are based on and merged into these branches: + +* `master` is the main branch where all small contributions go +* `staging` is branched from master, changes that have a big impact on + Hydra builds go to this branch +* `staging-next` is branched from staging and only fixes to stabilize + and security fixes with a big impact on Hydra builds should be + contributed to this branch. This branch is merged into master when + deemed of sufficiently high quality + +For more information about contributing to the project, please visit +the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). + +# Donations + +The infrastructure for NixOS and related projects is maintained by a +nonprofit organization, the [NixOS +Foundation](https://nixos.org/nixos/foundation.html). To ensure the +continuity and expansion of the NixOS infrastructure, we are looking +for donations to our organization. + +You can donate to the NixOS foundation by using Open Collective: + +<a href="https://opencollective.com/nixos#support"><img src="https://opencollective.com/nixos/tiers/supporter.svg?width=890" /></a> + +# License + +Nixpkgs is licensed under the [MIT License](COPYING). -Note: MIT license does not apply to the packages built by Nixpkgs, merely to -the package descriptions (Nix expressions, build scripts, and so on). It also -might not apply to patches included in Nixpkgs, which may be derivative works -of the packages to which they apply. The aforementioned artifacts are all -covered by the licenses of the respective packages. +Note: MIT license does not apply to the packages built by Nixpkgs, +merely to the files in this repository (the Nix expressions, build +scripts, NixOS modules, etc.). It also might not apply to patches +included in Nixpkgs, which may be derivative works of the packages to +which they apply. The aforementioned artifacts are all covered by the +licenses of the respective packages. diff --git a/nixpkgs/doc/doc-support/lib-function-locations.nix b/nixpkgs/doc/doc-support/lib-function-locations.nix index ae7036e46264..68edd2709854 100644 --- a/nixpkgs/doc/doc-support/lib-function-locations.nix +++ b/nixpkgs/doc/doc-support/lib-function-locations.nix @@ -14,10 +14,10 @@ let builtins.map (subsetname: { subsetname = subsetname; - functions = libDefPos toplib."${subsetname}"; + functions = libDefPos toplib.${subsetname}; }) (builtins.filter - (name: builtins.isAttrs toplib."${name}") + (name: builtins.isAttrs toplib.${name}) (builtins.attrNames toplib)); nixpkgsLib = pkgs.lib; diff --git a/nixpkgs/doc/functions.xml b/nixpkgs/doc/functions.xml index 3b60f46d81da..96bd95958eae 100644 --- a/nixpkgs/doc/functions.xml +++ b/nixpkgs/doc/functions.xml @@ -20,4 +20,5 @@ <xi:include href="functions/appimagetools.xml" /> <xi:include href="functions/prefer-remote-fetch.xml" /> <xi:include href="functions/nix-gitignore.xml" /> + <xi:include href="functions/ocitools.xml" /> </chapter> diff --git a/nixpkgs/doc/functions/ocitools.xml b/nixpkgs/doc/functions/ocitools.xml new file mode 100644 index 000000000000..4500c41a34ae --- /dev/null +++ b/nixpkgs/doc/functions/ocitools.xml @@ -0,0 +1,76 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-pkgs-ociTools"> + <title>pkgs.ociTools</title> + + <para> + <varname>pkgs.ociTools</varname> is a set of functions for creating + containers according to the + <link xlink:href="https://github.com/opencontainers/runtime-spec">OCI + container specification v1.0.0</link>. Beyond that it makes no assumptions + about the container runner you choose to use to run the created container. + </para> + + <section xml:id="ssec-pkgs-ociTools-buildContainer"> + <title>buildContainer</title> + + <para> + This function creates a simple OCI container that runs a single command + inside of it. An OCI container consists of a <varname>config.json</varname> + and a rootfs directory.The nix store of the container will contain all + referenced dependencies of the given command. + </para> + + <para> + The parameters of <varname>buildContainer</varname> with an example value + are described below: + </para> + + <example xml:id='ex-ociTools-buildContainer'> + <title>Build Container</title> +<programlisting> +buildContainer { + cmd = with pkgs; writeScript "run.sh" '' + #!${bash}/bin/bash + ${coreutils}/bin/exec ${bash}/bin/bash + ''; <co xml:id='ex-ociTools-buildContainer-1' /> + + mounts = { + "/data" = { + type = "none"; + source = "/var/lib/mydata"; + options = [ "bind" ]; + }; + };<co xml:id='ex-ociTools-buildContainer-2' /> + + readonly = false; <co xml:id='ex-ociTools-buildContainer-3' /> +} + + </programlisting> + <calloutlist> + <callout arearefs='ex-ociTools-buildContainer-1'> + <para> + <varname>cmd</varname> specifies the program to run inside the container. + This is the only required argument for <varname>buildContainer</varname>. + All referenced packages inside the derivation will be made available + inside the container + </para> + </callout> + <callout arearefs='ex-ociTools-buildContainer-2'> + <para> + <varname>mounts</varname> specifies additional mount points chosen by the + user. By default only a minimal set of necessary filesystems are mounted + into the container (e.g procfs, cgroupfs) + </para> + </callout> + <callout arearefs='ex-ociTools-buildContainer-3'> + <para> + <varname>readonly</varname> makes the container's rootfs read-only if it is set to true. + The default value is false <literal>false</literal>. + </para> + </callout> + </calloutlist> + </example> + </section> +</section> diff --git a/nixpkgs/doc/languages-frameworks/ruby.section.md b/nixpkgs/doc/languages-frameworks/ruby.section.md index f58ada029dce..e4c4ffce0432 100644 --- a/nixpkgs/doc/languages-frameworks/ruby.section.md +++ b/nixpkgs/doc/languages-frameworks/ruby.section.md @@ -37,89 +37,13 @@ Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual. -#### Installing Ruby and gems - -The Nix and NixOS manuals explain how packages are generally installed. In the -case of Ruby and Nix, it is important to make a distinction between whether the -package is considered an application or a library. - -Applications on Nix are typically installed into your user -profile imperatively using `nix-env -iA`, and on NixOS declaratively by adding the -package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`. -Dependencies such as libraries are automatically installed and should not be -installed explicitly. - -The same goes for Ruby applications and libraries. Ruby applications can be -installed in your profile. But Ruby libraries you would like to use for -development cannot be installed, at least not individually, because they won't -be able to find each other resulting in load errors. Instead, it is possible to -create an environment with `bundlerEnv` or `ruby.withPackages` where the -interpreter and other executables are able to find each other and all of the -gems. - -In the following examples we create an environment with Ruby 2.5, `nokogiri` and -`pry`. There is one limitation here, and that's that you can install only one -environment at a time, otherwise you'll encounter collisions. - -##### Environment defined in separate `.nix` file - -Create a file, e.g. `build.nix`, with the following expression: - -```nix -with import <nixpkgs> {}; -ruby_2_5.withPackages (ps: with ps; [ nokogiri pry ]) -``` - -and install it in your profile with: - -```shell -nix-env -if build.nix -``` - -Now you can use the Ruby interpreter, as well as the extra packages (`pry`, -`nokogiri`) that you added to the environment. - -##### Environment defined in ~/.config/nixpkgs/config.nix` - -If you prefer to, you could also add the environment as a package override to -the nixpkgs set like this: - -```nix -{ # ... - packageOverrides = pkgs: - with pkgs; { - myRubyEnv = ruby.withPackages (ps: with ps; [ nokogiri pry ]); - }; -} -``` - -and install it in your profile path with: - -```shell -nix-env -iA nixpkgs.myRubyEnv -``` - -The environment is installed by referring to the attribute, and considering the -`nixpkgs` channel was used. - -##### Environment defined in `/etc/nixos/configuration.nix` - -For the sake of completeness, here's another example of how to install the -environment system-wide. - -```nix -{ # ... - environment.systemPackages = with pkgs; - [ (ruby.withPackages (ps: with ps; [ nokogiri pry ])) ]; -} -``` - #### Temporary Ruby environment with `nix-shell` -The examples in the previous section showed how to install a Ruby environment -into a profile. For development you may need to use multiple environments. -`nix-shell` gives you the possibility to temporarily load another environment -akin to a combined `chruby` or `rvm` and `bundle exec`. +Rather than having a single Ruby environment shared by all Ruby +development projects on a system, Nix allows you to create separate +environments per project. `nix-shell` gives you the possibility to +temporarily load another environment akin to a combined `chruby` or +`rvm` and `bundle exec`. There are two methods for loading a shell with Ruby packages. The first and recommended method is to create an environment with `ruby.withPackages` and load @@ -225,7 +149,7 @@ bundix If you already have a `Gemfile.lock`, you can simply run `bundix` and it will work the same. -To update the gmes in your `Gemfile.lock`, you may use the `bundix -l` flag, +To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag, which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent time of modification. diff --git a/nixpkgs/doc/stdenv.xml b/nixpkgs/doc/stdenv.xml index fe5929656565..15a13ba49e8e 100644 --- a/nixpkgs/doc/stdenv.xml +++ b/nixpkgs/doc/stdenv.xml @@ -2716,6 +2716,49 @@ nativeBuildInputs = [ breakpointHook ]; </varlistentry> <varlistentry> <term> + installShellFiles + </term> + <listitem> + <para> + This hook helps with installing manpages and shell completion files. It + exposes 2 shell functions <literal>installManPage</literal> and + <literal>installShellCompletion</literal> that can be used from your + <literal>postInstall</literal> hook. + </para> + <para> + The <literal>installManPage</literal> function takes one or more paths + to manpages to install. The manpages must have a section suffix, and may + optionally be compressed (with <literal>.gz</literal> suffix). This + function will place them into the correct directory. + </para> + <para> + The <literal>installShellCompletion</literal> function takes one or more + paths to shell completion files. By default it will autodetect the shell + type from the completion file extension, but you may also specify it by + passing one of <literal>--bash</literal>, <literal>--fish</literal>, or + <literal>--zsh</literal>. These flags apply to all paths listed after + them (up until another shell flag is given). Each path may also have a + custom installation name provided by providing a flag <literal>--name + NAME</literal> before the path. If this flag is not provided, zsh + completions will be renamed automatically such that + <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>. +<programlisting> +nativeBuildInputs = [ installShellFiles ]; +postInstall = '' + installManPage doc/foobar.1 doc/barfoo.3 + # explicit behavior + installShellCompletion --bash --name foobar.bash share/completions.bash + installShellCompletion --fish --name foobar.fish share/completions.fish + installShellCompletion --zsh --name _foobar share/completions.zsh + # implicit behavior + installShellCompletion share/completions/foobar.{bash,fish,zsh} +''; +</programlisting> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> libiconv, libintl </term> <listitem> diff --git a/nixpkgs/lib/customisation.nix b/nixpkgs/lib/customisation.nix index 1f5eb0d11e8b..3be36fcd719b 100644 --- a/nixpkgs/lib/customisation.nix +++ b/nixpkgs/lib/customisation.nix @@ -47,7 +47,7 @@ rec { /* `makeOverridable` takes a function from attribute set to attribute set and - injects `override` attibute which can be used to override arguments of + injects `override` attribute which can be used to override arguments of the function. nix-repl> x = {a, b}: { result = a + b; } diff --git a/nixpkgs/lib/deprecated.nix b/nixpkgs/lib/deprecated.nix index 15de50456612..155d6f0c3611 100644 --- a/nixpkgs/lib/deprecated.nix +++ b/nixpkgs/lib/deprecated.nix @@ -24,7 +24,7 @@ rec { let arg = (merger init (defaultMergeArg init x)); # now add the function with composed args already applied to the final attrs base = (setAttrMerge "passthru" {} (f arg) - ( z: z // rec { + ( z: z // { function = foldArgs merger f arg; args = (lib.attrByPath ["passthru" "args"] {} z) // x; } )); diff --git a/nixpkgs/lib/kernel.nix b/nixpkgs/lib/kernel.nix index 5923011774b1..36ea30838289 100644 --- a/nixpkgs/lib/kernel.nix +++ b/nixpkgs/lib/kernel.nix @@ -1,7 +1,7 @@ { lib, version }: with lib; -rec { +{ # Common patterns/legacy whenAtLeast = ver: mkIf (versionAtLeast version ver); whenOlder = ver: mkIf (versionOlder version ver); diff --git a/nixpkgs/lib/licenses.nix b/nixpkgs/lib/licenses.nix index c964060d2a5c..83e1ec7748d5 100644 --- a/nixpkgs/lib/licenses.nix +++ b/nixpkgs/lib/licenses.nix @@ -7,7 +7,7 @@ let in -lib.mapAttrs (n: v: v // { shortName = n; }) rec { +lib.mapAttrs (n: v: v // { shortName = n; }) { /* License identifiers from spdx.org where possible. * If you cannot find your license here, then look for a similar license or * add it to this list. The URL mentioned above is a good source for inspiration. diff --git a/nixpkgs/lib/lists.nix b/nixpkgs/lib/lists.nix index e4fcf959b60c..f9f30412770a 100644 --- a/nixpkgs/lib/lists.nix +++ b/nixpkgs/lib/lists.nix @@ -88,7 +88,7 @@ rec { /* Strict version of `foldl`. The difference is that evaluation is forced upon access. Usually used - with small whole results (in contract with lazily-generated list or large + with small whole results (in contrast with lazily-generated list or large lists where only a part is consumed.) Type: foldl' :: (b -> a -> b) -> b -> [a] -> b @@ -459,11 +459,11 @@ rec { if length list < 2 then # finish { result = list; } - else if dfsthis ? "cycle" + else if dfsthis ? cycle then # there's a cycle, starting from the current vertex, return it { cycle = reverseList ([ dfsthis.cycle ] ++ dfsthis.visited); inherit (dfsthis) loops; } - else if toporest ? "cycle" + else if toporest ? cycle then # there's a cycle somewhere else in the graph, return it toporest # Slow, but short. Can be made a bit faster with an explicit stack. diff --git a/nixpkgs/lib/sources.nix b/nixpkgs/lib/sources.nix index c4680087b245..51bcf5559e32 100644 --- a/nixpkgs/lib/sources.nix +++ b/nixpkgs/lib/sources.nix @@ -36,18 +36,47 @@ rec { # allowing you to chain multiple calls together without any # intermediate copies being put in the nix store. # - # lib.cleanSourceWith f (lib.cleanSourceWith g ./.) # Succeeds! - # builtins.filterSource f (builtins.filterSource g ./.) # Fails! - cleanSourceWith = { filter, src }: + # lib.cleanSourceWith { + # filter = f; + # src = lib.cleanSourceWith { + # filter = g; + # src = ./.; + # }; + # } + # # Succeeds! + # + # builtins.filterSource f (builtins.filterSource g ./.) + # # Fails! + # + # Parameters: + # + # src: A path or cleanSourceWith result to filter and/or rename. + # + # filter: A function (path -> type -> bool) + # Optional with default value: constant true (include everything) + # The function will be combined with the && operator such + # that src.filter is called lazily. + # For implementing a filter, see + # https://nixos.org/nix/manual/#builtin-filterSource + # + # name: Optional name to use as part of the store path. + # This defaults `src.name` or otherwise `baseNameOf src`. + # We recommend setting `name` whenever `src` is syntactically `./.`. + # Otherwise, you depend on `./.`'s name in the parent directory, + # which can cause inconsistent names, defeating caching. + # + cleanSourceWith = { filter ? _path: _type: true, src, name ? null }: let isFiltered = src ? _isLibCleanSourceWith; origSrc = if isFiltered then src.origSrc else src; filter' = if isFiltered then name: type: filter name type && src.filter name type else filter; + name' = if name != null then name else if isFiltered then src.name else baseNameOf src; in { inherit origSrc; filter = filter'; - outPath = builtins.filterSource filter' origSrc; + outPath = builtins.path { filter = filter'; path = origSrc; name = name'; }; _isLibCleanSourceWith = true; + name = name'; }; # Filter sources by a list of regular expressions. diff --git a/nixpkgs/lib/systems/default.nix b/nixpkgs/lib/systems/default.nix index 8aa413f53817..0c0cdf1f11b1 100644 --- a/nixpkgs/lib/systems/default.nix +++ b/nixpkgs/lib/systems/default.nix @@ -58,13 +58,13 @@ rec { uname = { # uname -s system = { - "linux" = "Linux"; - "windows" = "Windows"; - "darwin" = "Darwin"; - "netbsd" = "NetBSD"; - "freebsd" = "FreeBSD"; - "openbsd" = "OpenBSD"; - "wasi" = "Wasi"; + linux = "Linux"; + windows = "Windows"; + darwin = "Darwin"; + netbsd = "NetBSD"; + freebsd = "FreeBSD"; + openbsd = "OpenBSD"; + wasi = "Wasi"; }.${final.parsed.kernel.name} or null; # uname -p @@ -86,10 +86,10 @@ rec { else if final.isx86_64 then "x86_64" else if final.isx86 then "i386" else { - "powerpc" = "ppc"; - "powerpcle" = "ppc"; - "powerpc64" = "ppc64"; - "powerpc64le" = "ppc64le"; + powerpc = "ppc"; + powerpcle = "ppc"; + powerpc64 = "ppc64"; + powerpc64le = "ppc64le"; }.${final.parsed.cpu.name} or final.parsed.cpu.name; emulator = pkgs: let diff --git a/nixpkgs/lib/systems/doubles.nix b/nixpkgs/lib/systems/doubles.nix index 823f6a915d6e..8e02fcb5de0c 100644 --- a/nixpkgs/lib/systems/doubles.nix +++ b/nixpkgs/lib/systems/doubles.nix @@ -33,7 +33,7 @@ let filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed); -in rec { +in { inherit all; none = []; diff --git a/nixpkgs/lib/systems/examples.nix b/nixpkgs/lib/systems/examples.nix index 4861fe634a02..511ae1979485 100644 --- a/nixpkgs/lib/systems/examples.nix +++ b/nixpkgs/lib/systems/examples.nix @@ -24,27 +24,27 @@ rec { platform = platforms.powernv; }; - sheevaplug = rec { + sheevaplug = { config = "armv5tel-unknown-linux-gnueabi"; platform = platforms.sheevaplug; }; - raspberryPi = rec { + raspberryPi = { config = "armv6l-unknown-linux-gnueabihf"; platform = platforms.raspberrypi; }; - armv7l-hf-multiplatform = rec { + armv7l-hf-multiplatform = { config = "armv7l-unknown-linux-gnueabihf"; platform = platforms.armv7l-hf-multiplatform; }; - aarch64-multiplatform = rec { + aarch64-multiplatform = { config = "aarch64-unknown-linux-gnu"; platform = platforms.aarch64-multiplatform; }; - armv7a-android-prebuilt = rec { + armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; sdkVer = "24"; ndkVer = "18b"; @@ -52,7 +52,7 @@ rec { useAndroidPrebuilt = true; }; - aarch64-android-prebuilt = rec { + aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; sdkVer = "24"; ndkVer = "18b"; @@ -65,17 +65,17 @@ rec { inherit (platform.gcc) fpu; }; - pogoplug4 = rec { + pogoplug4 = { config = "armv5tel-unknown-linux-gnueabi"; platform = platforms.pogoplug4; }; - ben-nanonote = rec { + ben-nanonote = { config = "mipsel-unknown-linux-uclibc"; platform = platforms.ben_nanonote; }; - fuloongminipc = rec { + fuloongminipc = { config = "mipsel-unknown-linux-gnu"; platform = platforms.fuloong2f_n32; }; diff --git a/nixpkgs/lib/systems/parse.nix b/nixpkgs/lib/systems/parse.nix index 0c42689a9b13..5e12df32ffdd 100644 --- a/nixpkgs/lib/systems/parse.nix +++ b/nixpkgs/lib/systems/parse.nix @@ -408,7 +408,7 @@ rec { getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}"); getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}"); - parsed = rec { + parsed = { cpu = getCpu args.cpu; vendor = /**/ if args ? vendor then getVendor args.vendor diff --git a/nixpkgs/lib/systems/platforms.nix b/nixpkgs/lib/systems/platforms.nix index a2b43c970a41..ab3cf1d54301 100644 --- a/nixpkgs/lib/systems/platforms.nix +++ b/nixpkgs/lib/systems/platforms.nix @@ -456,16 +456,16 @@ rec { }; selectBySystem = system: { - "i486-linux" = pc32; - "i586-linux" = pc32; - "i686-linux" = pc32; - "x86_64-linux" = pc64; - "armv5tel-linux" = sheevaplug; - "armv6l-linux" = raspberrypi; - "armv7a-linux" = armv7l-hf-multiplatform; - "armv7l-linux" = armv7l-hf-multiplatform; - "aarch64-linux" = aarch64-multiplatform; - "mipsel-linux" = fuloong2f_n32; - "powerpc64le-linux" = powernv; + i486-linux = pc32; + i586-linux = pc32; + i686-linux = pc32; + x86_64-linux = pc64; + armv5tel-linux = sheevaplug; + armv6l-linux = raspberrypi; + armv7a-linux = armv7l-hf-multiplatform; + armv7l-linux = armv7l-hf-multiplatform; + aarch64-linux = aarch64-multiplatform; + mipsel-linux = fuloong2f_n32; + powerpc64le-linux = powernv; }.${system} or pcBase; } diff --git a/nixpkgs/lib/types.nix b/nixpkgs/lib/types.nix index bcb5de0c379b..5e9a28ac4f0a 100644 --- a/nixpkgs/lib/types.nix +++ b/nixpkgs/lib/types.nix @@ -42,7 +42,7 @@ rec { # Default type functor defaultFunctor = name: { inherit name; - type = types."${name}" or null; + type = types.${name} or null; wrapped = null; payload = null; binOp = a: b: null; @@ -107,7 +107,7 @@ rec { merge = mergeEqualOption; }; - int = mkOptionType rec { + int = mkOptionType { name = "int"; description = "signed integer"; check = isInt; @@ -136,7 +136,7 @@ rec { sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1) "signedInt${toString bit}" "${toString bit} bit signed integer"; - in rec { + in { /* An int with a fixed range. * * Example: @@ -172,7 +172,7 @@ rec { # Alias of u16 for a port number port = ints.u16; - float = mkOptionType rec { + float = mkOptionType { name = "float"; description = "floating point number"; check = isFloat; diff --git a/nixpkgs/lib/versions.nix b/nixpkgs/lib/versions.nix index 8f7f98ff5e1e..2c05445b3dd0 100644 --- a/nixpkgs/lib/versions.nix +++ b/nixpkgs/lib/versions.nix @@ -7,7 +7,7 @@ let in -rec { +{ /* Get the major version string from a string. diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 7298ed804bbf..a5b7ce5eaa47 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -1225,11 +1225,15 @@ githubId = 25088352; name = "Christian Kögler"; }; - ckampka = { + kampka = { email = "christian@kampka.net"; github = "kampka"; githubId = 422412; name = "Christian Kampka"; + keys = [{ + longkeyid = "ed25519/0x1CBE9645DD68E915"; + fingerprint = "F7FA 0BD0 8775 337C F6AB 4A14 1CBE 9645 DD68 E915"; + }]; }; ckauhaus = { email = "kc@flyingcircus.io"; @@ -1633,6 +1637,12 @@ githubId = 10913120; name = "Dje4321"; }; + dkabot = { + email = "dkabot@dkabot.com"; + github = "dkabot"; + githubId = 1316469; + name = "Naomi Morse"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; @@ -2091,7 +2101,7 @@ githubId = 2817965; name = "f--t"; }; - f-breidenstein = { + fleaz = { email = "mail@felixbreidenstein.de"; github = "fleaz"; githubId = 2489598; @@ -3069,6 +3079,16 @@ githubId = 8735102; name = "John Ramsden"; }; + jojosch = { + name = "Johannes Schleifenbaum"; + email = "johannes@js-webcoding.de"; + github = "jojosch"; + githubId = 327488; + keys = [{ + longkeyid = "ed25519/059093B1A278BCD0"; + fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0"; + }]; + }; joko = { email = "ioannis.koutras@gmail.com"; github = "jokogr"; @@ -3229,6 +3249,12 @@ githubId = 1047859; name = "Kaz Wesley"; }; + kcalvinalvin = { + email = "calvin@kcalvinalvin.info"; + github = "kcalvinalvin"; + githubId = 37185887; + name = "Calvin Kim"; + }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; @@ -4584,6 +4610,12 @@ githubId = 9939720; name = "Philippe Nguyen"; }; + nrdxp = { + email = "tim.deh@pm.me"; + github = "nrdxp"; + githubId = 34083928; + name = "Tim DeHerrera"; + }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; @@ -4756,6 +4788,12 @@ githubId = 11016164; name = "Fedor Pakhomov"; }; + pamplemousse = { + email = "xav.maso@gmail.com"; + github = "Pamplemousse"; + githubId = 2647236; + name = "Xavier Maso"; + }; panaeon = { email = "vitalii.voloshyn@gmail.com"; github = "panaeon"; @@ -5409,6 +5447,12 @@ githubId = 852967; name = "Russell O'Connor"; }; + roelvandijk = { + email = "roel@lambdacube.nl"; + github = "roelvandijk"; + githubId = 710906; + name = "Roel van Dijk"; + }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; diff --git a/nixpkgs/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv index 0ec9ff3d84d9..a6fbcd5a0beb 100644 --- a/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -52,7 +52,9 @@ luasocket,,,,, luasql-sqlite3,,,,,vyp luassert,,,,, luasystem,,,,, +luautf8,,,,,pstn luazip,,,,, +lua-yajl,,,,,pstn luuid,,,,, luv,,,,, markdown,,,,, diff --git a/nixpkgs/nixos/doc/manual/Makefile b/nixpkgs/nixos/doc/manual/Makefile index 9ff599a0090f..b86a76005753 100644 --- a/nixpkgs/nixos/doc/manual/Makefile +++ b/nixpkgs/nixos/doc/manual/Makefile @@ -24,7 +24,7 @@ fix-misc-xml: clean: rm -f manual-combined.xml generated -generated: ./options-to-docbook.xsl +generated: nix-build ../../release.nix \ --attr manualGeneratedSources.x86_64-linux \ --out-link ./generated diff --git a/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml b/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml index 03b5bb53197b..34e6ab4b24d6 100644 --- a/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml @@ -24,8 +24,8 @@ <para> Apart from high-level options, it’s possible to tweak a package in almost arbitrary ways, such as changing or disabling dependencies of a package. For - instance, the Emacs package in Nixpkgs by default has a dependency on GTK+ 2. - If you want to build it against GTK+ 3, you can specify that as follows: + instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2. + If you want to build it against GTK 3, you can specify that as follows: <programlisting> <xref linkend="opt-environment.systemPackages"/> = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; </programlisting> @@ -33,7 +33,7 @@ function that produces Emacs, with the original arguments amended by the set of arguments specified by you. So here the function argument <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing - Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix, + Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, <xref linkend="opt-environment.systemPackages"/> would be a list with two elements.) diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-1703.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1703.xml index 86f4a1ccfb78..14b31b232e90 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1703.xml @@ -730,7 +730,7 @@ in </listitem> <listitem> <para> - <literal>jre</literal> now defaults to GTK+ UI by default. This improves + <literal>jre</literal> now defaults to GTK UI by default. This improves visual consistency and makes Java follow system font style, improving the situation on HighDPI displays. This has a cost of increased closure size; for server and other headless workloads it's recommended to use diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml index 11c13b8d942b..db4629443002 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml @@ -63,10 +63,10 @@ like games. <itemizedlist> <para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para> - <listitem><para><link linkend="opt-services.gnome3.core-os-services.enable"><literal>services.gnome3.core-os-services.enable</literal></link></para></listitem> - <listitem><para><link linkend="opt-services.gnome3.core-shell.enable"><literal>services.gnome3.core-shell.enable</literal></link></para></listitem> - <listitem><para><link linkend="opt-services.gnome3.core-utilities.enable"><literal>services.gnome3.core-utilities.enable</literal></link></para></listitem> - <listitem><para><link linkend="opt-services.gnome3.games.enable"><literal>services.gnome3.games.enable</literal></link></para></listitem> + <listitem><para><xref linkend="opt-services.gnome3.core-os-services.enable"/></para></listitem> + <listitem><para><xref linkend="opt-services.gnome3.core-shell.enable"/></para></listitem> + <listitem><para><xref linkend="opt-services.gnome3.core-utilities.enable"/></para></listitem> + <listitem><para><xref linkend="opt-services.gnome3.games.enable"/></para></listitem> </itemizedlist> With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications. @@ -135,7 +135,43 @@ <literal>./programs/dwm-status.nix</literal> </para> </listitem> + <listitem> + <para> + The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers + via the <varname>ensurePrinters</varname> and + <varname>ensureDefaultPrinter</varname> options. + <varname>ensurePrinters</varname> will never delete existing printers, + but will make sure that the given printers are configured as declared. + </para> + </listitem> + <listitem> + <para> + There is a new <xref linkend="opt-services.system-config-printer.enable"/> and <xref linkend="opt-programs.system-config-printer.enable"/> module + for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other + means you should migrate to using one of these modules. + </para> + <itemizedlist> + <para>If you're a user of the following desktopManager modules no action is needed:</para> + <listitem> + <para><option>services.xserver.desktopManager.plasma5</option></para> + </listitem> + <listitem> + <para><option>services.xserver.desktopManager.gnome3</option></para> + </listitem> + <listitem> + <para><option>services.xserver.desktopManager.pantheon</option></para> + </listitem> + <listitem> + <para><option>services.xserver.desktopManager.mate</option></para> + <para> + Note Mate uses <literal>programs.system-config-printer</literal> as it doesn't + use it as a service, but its graphical interface directly. + </para> + </listitem> + </itemizedlist> + </listitem> </itemizedlist> + </section> <section xmlns="http://docbook.org/ns/docbook" @@ -170,6 +206,11 @@ </listitem> <listitem> <para> + PostgreSQL 9.4 is scheduled EOL during the 19.09 life cycle and has been removed. + </para> + </listitem> + <listitem> + <para> The options <option>services.prometheus.alertmanager.user</option> and <option>services.prometheus.alertmanager.group</option> have been removed because the alertmanager service is now using systemd's <link @@ -412,7 +453,30 @@ It was not useful except for debugging purposes and was confusingly set as default in some circumstances. </para> </listitem> - + <listitem> + <para> + The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive + any updates from upstream and depends on outdated Python2-based modules. + </para> + </listitem> + <listitem> + <para> + Old unsupported versions (<literal>logstash5</literal>, + <literal>kibana5</literal>, + <literal>filebeat5</literal>, + <literal>heartbeat5</literal>, + <literal>metricbeat5</literal>, + <literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed. + </para> + </listitem> + <listitem> + <para> + For NixOS 19.03, both Prometheus 1 and 2 were available to allow for + a seamless transition from version 1 to 2 with existing setups. + Because Prometheus 1 is no longer developed, it was removed. + Prometheus 2 is now configured with <literal>services.prometheus</literal>. + </para> + </listitem> </itemizedlist> </section> @@ -700,6 +764,22 @@ <literal>nix-shell -p altcoins.dogecoin</literal>, etc. </para> </listitem> + <listitem> + <para> + Ceph has been upgraded to v14.2.1. + See the <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release notes</link> for details. + The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module. + Note: There's been some issues with python-cherrypy, which is used by the dashboard + and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch. + </para> + </listitem> + <listitem> + <para> + <literal>pkgs.weechat</literal> is now compiled against <literal>pkgs.python3</literal>. + Weechat also recommends <link xlink:href="https://weechat.org/scripts/python3/">to use Python3 + in their docs.</link> + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixpkgs/nixos/lib/make-options-doc/default.nix b/nixpkgs/nixos/lib/make-options-doc/default.nix index 88e052106a28..35c8b543dece 100644 --- a/nixpkgs/nixos/lib/make-options-doc/default.nix +++ b/nixpkgs/nixos/lib/make-options-doc/default.nix @@ -126,7 +126,7 @@ let } ''; -in rec { +in { inherit optionsNix; optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix); diff --git a/nixpkgs/nixos/lib/qemu-flags.nix b/nixpkgs/nixos/lib/qemu-flags.nix index 779f0377a512..774f66b4804e 100644 --- a/nixpkgs/nixos/lib/qemu-flags.nix +++ b/nixpkgs/nixos/lib/qemu-flags.nix @@ -17,9 +17,9 @@ in else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; - "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; - "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; - "x86_64-darwin" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; + aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; + x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; }.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm"; } diff --git a/nixpkgs/nixos/lib/utils.nix b/nixpkgs/nixos/lib/utils.nix index b68e55a40b90..a522834e4294 100644 --- a/nixpkgs/nixos/lib/utils.nix +++ b/nixpkgs/nixos/lib/utils.nix @@ -24,4 +24,116 @@ rec { throw "${shell} is not a shell package" else shell; + + /* Recurse into a list or an attrset, searching for attrs named like + the value of the "attr" parameter, and return an attrset where the + names are the corresponding jq path where the attrs were found and + the values are the values of the attrs. + + Example: + recursiveGetAttrWithJqPrefix { + example = [ + { + irrelevant = "not interesting"; + } + { + ignored = "ignored attr"; + relevant = { + secret = { + _secret = "/path/to/secret"; + }; + }; + } + ]; + } "_secret" -> { ".example[1].relevant.secret" = "/path/to/secret"; } + */ + recursiveGetAttrWithJqPrefix = item: attr: + let + recurse = prefix: item: + if item ? ${attr} then + nameValuePair prefix item.${attr} + else if isAttrs item then + map (name: recurse (prefix + "." + name) item.${name}) (attrNames item) + else if isList item then + imap0 (index: item: recurse (prefix + "[${toString index}]") item) item + else + []; + in listToAttrs (flatten (recurse "" item)); + + /* Takes an attrset and a file path and generates a bash snippet that + outputs a JSON file at the file path with all instances of + + { _secret = "/path/to/secret" } + + in the attrset replaced with the contents of the file + "/path/to/secret" in the output JSON. + + When a configuration option accepts an attrset that is finally + converted to JSON, this makes it possible to let the user define + arbitrary secret values. + + Example: + If the file "/path/to/secret" contains the string + "topsecretpassword1234", + + genJqSecretsReplacementSnippet { + example = [ + { + irrelevant = "not interesting"; + } + { + ignored = "ignored attr"; + relevant = { + secret = { + _secret = "/path/to/secret"; + }; + }; + } + ]; + } "/path/to/output.json" + + would generate a snippet that, when run, outputs the following + JSON file at "/path/to/output.json": + + { + "example": [ + { + "irrelevant": "not interesting" + }, + { + "ignored": "ignored attr", + "relevant": { + "secret": "topsecretpassword1234" + } + } + ] + } + */ + genJqSecretsReplacementSnippet = genJqSecretsReplacementSnippet' "_secret"; + + # Like genJqSecretsReplacementSnippet, but allows the name of the + # attr which identifies the secret to be changed. + genJqSecretsReplacementSnippet' = attr: set: output: + let + secrets = recursiveGetAttrWithJqPrefix set attr; + in '' + if [[ -h '${output}' ]]; then + rm '${output}' + fi + '' + + concatStringsSep + "\n" + (imap1 (index: name: "export secret${toString index}=$(<'${secrets.${name}}')") + (attrNames secrets)) + + "\n" + + "${pkgs.jq}/bin/jq >'${output}' '" + + concatStringsSep + " | " + (imap1 (index: name: ''${name} = $ENV.secret${toString index}'') + (attrNames secrets)) + + '' + ' <<'EOF' + ${builtins.toJSON set} + EOF + ''; } diff --git a/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix index 88d95e675447..31e15537179a 100644 --- a/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -17,7 +17,7 @@ in { name = mkOption { type = types.str; description = "The name of the generated derivation"; - default = "nixos-disk-image"; + default = "nixos-amazon-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; }; contents = mkOption { @@ -42,7 +42,7 @@ in { format = mkOption { type = types.enum [ "raw" "qcow2" "vpc" ]; - default = "qcow2"; + default = "vpc"; description = "The image format to output"; }; }; @@ -51,7 +51,9 @@ in { inherit lib config; inherit (cfg) contents format name; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - partitionTableType = if config.ec2.hvm then "legacy" else "none"; + partitionTableType = if config.ec2.efi then "efi" + else if config.ec2.hvm then "legacy" + else "none"; diskSize = cfg.sizeMB; fsType = "ext4"; configFile = pkgs.writeText "configuration.nix" @@ -61,7 +63,27 @@ in { ${optionalString config.ec2.hvm '' ec2.hvm = true; ''} + ${optionalString config.ec2.efi '' + ec2.efi = true; + ''} } ''; + postVM = '' + extension=''${diskImage##*.} + friendlyName=$out/${cfg.name}.$extension + mv "$diskImage" "$friendlyName" + diskImage=$friendlyName + + mkdir -p $out/nix-support + echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg file "$diskImage" \ + '$ARGS.named' \ + > $out/nix-support/image-info.json + ''; }; } diff --git a/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh b/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh index 790cc6cbc531..c4149e3e8ffe 100755 --- a/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,279 +1,296 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p qemu ec2_ami_tools jq ec2_api_tools awscli +#!nix-shell -p awscli -p jq -p qemu -i bash + +# Uploads and registers NixOS images built from the +# <nixos/release.nix> amazonImage attribute. Images are uploaded and +# registered via a home region, and then copied to other regions. + +# The home region requires an s3 bucket, and a "vmimport" IAM role +# with access to the S3 bucket. Configuration of the vmimport role is +# documented in +# https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html + +# set -x +set -euo pipefail + +# configuration +state_dir=/home/deploy/amis/ec2-images +home_region=eu-west-1 +bucket=nixos-amis + +regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1 + us-east-1 us-east-2 us-west-1 us-west-2 + ca-central-1 + ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 + ap-south-1 ap-east-1 + sa-east-1) + +log() { + echo "$@" >&2 +} + +if [ -z "$1" ]; then + log "Usage: ./upload-amazon-image.sh IMAGE_OUTPUT" + exit 1 +fi + +# result of the amazon-image from nixos/release.nix +store_path=$1 + +if [ ! -e "$store_path" ]; then + log "Store path: $store_path does not exist, fetching..." + nix-store --realise "$store_path" +fi + +if [ ! -d "$store_path" ]; then + log "store_path: $store_path is not a directory. aborting" + exit 1 +fi + +read_image_info() { + if [ ! -e "$store_path/nix-support/image-info.json" ]; then + log "Image missing metadata" + exit 1 + fi + jq -r "$1" "$store_path/nix-support/image-info.json" +} + +# We handle a single image per invocation, store all attributes in +# globals for convenience. +image_label=$(read_image_info .label) +image_system=$(read_image_info .system) +image_file=$(read_image_info .file) +image_logical_bytes=$(read_image_info .logical_bytes) + +# Derived attributes + +image_logical_gigabytes=$((($image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB + +case "$image_system" in + aarch64-linux) + amazon_arch=arm64 + ;; + x86_64-linux) + amazon_arch=x86_64 + ;; + *) + log "Unknown system: $image_system" + exit 1 +esac + +image_name="NixOS-${image_label}-${image_system}" +image_description="NixOS ${image_label} ${image_system}" + +log "Image Details:" +log " Name: $image_name" +log " Description: $image_description" +log " Size (gigabytes): $image_logical_gigabytes" +log " System: $image_system" +log " Amazon Arch: $amazon_arch" + +read_state() { + local state_key=$1 + local type=$2 + + cat "$state_dir/$state_key.$type" 2>/dev/null || true +} + +write_state() { + local state_key=$1 + local type=$2 + local val=$3 + + mkdir -p $state_dir + echo "$val" > "$state_dir/$state_key.$type" +} + +wait_for_import() { + local region=$1 + local task_id=$2 + local state snapshot_id + log "Waiting for import task $task_id to be completed" + while true; do + read state progress snapshot_id < <( + aws ec2 describe-import-snapshot-tasks --region $region --import-task-ids "$task_id" | \ + jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.Progress) \(.SnapshotId)"' + ) + log " ... state=$state progress=$progress snapshot_id=$snapshot_id" + case "$state" in + active) + sleep 10 + ;; + completed) + echo "$snapshot_id" + return + ;; + *) + log "Unexpected snapshot import state: '${state}'" + exit 1 + ;; + esac + done +} + +wait_for_image() { + local region=$1 + local ami_id=$2 + local state + log "Waiting for image $ami_id to be available" + + while true; do + read state < <( + aws ec2 describe-images --image-ids "$ami_id" --region $region | \ + jq -r ".Images[].State" + ) + log " ... state=$state" + case "$state" in + pending) + sleep 10 + ;; + available) + return + ;; + *) + log "Unexpected AMI state: '${state}'" + exit 1 + ;; + esac + done +} + + +make_image_public() { + local region=$1 + local ami_id=$2 -# To start with do: nix-shell -p awscli --run "aws configure" + wait_for_image $region "$ami_id" -set -e -set -o pipefail + log "Making image $ami_id public" -version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.version | sed s/'"'//g) -major=${version:0:5} -echo "NixOS version is $version ($major)" + aws ec2 modify-image-attribute \ + --image-id "$ami_id" --region "$region" --launch-permission 'Add={Group=all}' >&2 +} -stateDir=/home/deploy/amis/ec2-image-$version -echo "keeping state in $stateDir" -mkdir -p $stateDir +upload_image() { + local region=$1 -rm -f ec2-amis.nix + local aws_path=${image_file#/} -types="hvm" -stores="ebs" -regions="eu-west-1 eu-west-2 eu-west-3 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" + local state_key="$region.$image_label.$image_system" + local task_id=$(read_state "$state_key" task_id) + local snapshot_id=$(read_state "$state_key" snapshot_id) + local ami_id=$(read_state "$state_key" ami_id) -for type in $types; do - link=$stateDir/$type - imageFile=$link/nixos.qcow2 - system=x86_64-linux - arch=x86_64 + if [ -z "$task_id" ]; then + log "Checking for image on S3" + if ! aws s3 ls --region "$region" "s3://${bucket}/${aws_path}" >&2; then + log "Image missing from aws, uploading" + aws s3 cp --region $region "$image_file" "s3://${bucket}/${aws_path}" >&2 + fi - # Build the image. - if ! [ -L $link ]; then - if [ $type = pv ]; then hvmFlag=false; else hvmFlag=true; fi + log "Importing image from S3 path s3://$bucket/$aws_path" - echo "building image type '$type'..." - nix-build -o $link \ - '<nixpkgs/nixos>' \ - -A config.system.build.amazonImage \ - --arg configuration "{ imports = [ <nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix> ]; ec2.hvm = $hvmFlag; }" + task_id=$(aws ec2 import-snapshot --disk-container "{ + \"Description\": \"nixos-image-${image_label}-${image_system}\", + \"Format\": \"vhd\", + \"UserBucket\": { + \"S3Bucket\": \"$bucket\", + \"S3Key\": \"$aws_path\" + } + }" --region $region | jq -r '.ImportTaskId') + + write_state "$state_key" task_id "$task_id" fi - for store in $stores; do - - bucket=nixos-amis - bucketDir="$version-$type-$store" - - prevAmi= - prevRegion= - - for region in $regions; do - - name=nixos-$version-$arch-$type-$store - description="NixOS $system $version ($type-$store)" - - amiFile=$stateDir/$region.$type.$store.ami-id - - if ! [ -e $amiFile ]; then - - echo "doing $name in $region..." - - if [ -n "$prevAmi" ]; then - ami=$(aws ec2 copy-image \ - --region "$region" \ - --source-region "$prevRegion" --source-image-id "$prevAmi" \ - --name "$name" --description "$description" | jq -r '.ImageId') - if [ "$ami" = null ]; then break; fi - else - - if [ $store = s3 ]; then - - # Bundle the image. - imageDir=$stateDir/$type-bundled - - # Convert the image to raw format. - rawFile=$stateDir/$type.raw - if ! [ -e $rawFile ]; then - qemu-img convert -f qcow2 -O raw $imageFile $rawFile.tmp - mv $rawFile.tmp $rawFile - fi - - if ! [ -d $imageDir ]; then - rm -rf $imageDir.tmp - mkdir -p $imageDir.tmp - ec2-bundle-image \ - -d $imageDir.tmp \ - -i $rawFile --arch $arch \ - --user "$AWS_ACCOUNT" -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY" - mv $imageDir.tmp $imageDir - fi - - # Upload the bundle to S3. - if ! [ -e $imageDir/uploaded ]; then - echo "uploading bundle to S3..." - ec2-upload-bundle \ - -m $imageDir/$type.raw.manifest.xml \ - -b "$bucket/$bucketDir" \ - -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" \ - --location EU - touch $imageDir/uploaded - fi - - extraFlags="--image-location $bucket/$bucketDir/$type.raw.manifest.xml" - - else - - # Convert the image to vhd format so we don't have - # to upload a huge raw image. - vhdFile=$stateDir/$type.vhd - if ! [ -e $vhdFile ]; then - qemu-img convert -f qcow2 -O vpc $imageFile $vhdFile.tmp - mv $vhdFile.tmp $vhdFile - fi - - vhdFileLogicalBytes="$(qemu-img info "$vhdFile" | grep ^virtual\ size: | cut -f 2 -d \( | cut -f 1 -d \ )" - vhdFileLogicalGigaBytes=$(((vhdFileLogicalBytes-1)/1024/1024/1024+1)) # Round to the next GB - - echo "Disk size is $vhdFileLogicalBytes bytes. Will be registered as $vhdFileLogicalGigaBytes GB." - - taskId=$(cat $stateDir/$region.$type.task-id 2> /dev/null || true) - volId=$(cat $stateDir/$region.$type.vol-id 2> /dev/null || true) - snapId=$(cat $stateDir/$region.$type.snap-id 2> /dev/null || true) - - # Import the VHD file. - if [ -z "$snapId" -a -z "$volId" -a -z "$taskId" ]; then - echo "importing $vhdFile..." - taskId=$(ec2-import-volume $vhdFile --no-upload -f vhd \ - -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \ - -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" \ - --region "$region" -z "${region}a" \ - --bucket "$bucket" --prefix "$bucketDir/" \ - | tee /dev/stderr \ - | sed 's/.*\(import-vol-[0-9a-z]\+\).*/\1/ ; t ; d') - echo -n "$taskId" > $stateDir/$region.$type.task-id - fi - - if [ -z "$snapId" -a -z "$volId" ]; then - ec2-resume-import $vhdFile -t "$taskId" --region "$region" \ - -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \ - -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" - fi - - # Wait for the volume creation to finish. - if [ -z "$snapId" -a -z "$volId" ]; then - echo "waiting for import to finish..." - while true; do - volId=$(aws ec2 describe-conversion-tasks --conversion-task-ids "$taskId" --region "$region" | jq -r .ConversionTasks[0].ImportVolume.Volume.Id) - if [ "$volId" != null ]; then break; fi - sleep 10 - done - - echo -n "$volId" > $stateDir/$region.$type.vol-id - fi - - # Delete the import task. - if [ -n "$volId" -a -n "$taskId" ]; then - echo "removing import task..." - ec2-delete-disk-image -t "$taskId" --region "$region" \ - -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \ - -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" || true - rm -f $stateDir/$region.$type.task-id - fi - - # Create a snapshot. - if [ -z "$snapId" ]; then - echo "creating snapshot..." - # FIXME: this can fail with InvalidVolume.NotFound. Eventual consistency yay. - snapId=$(aws ec2 create-snapshot --volume-id "$volId" --region "$region" --description "$description" | jq -r .SnapshotId) - if [ "$snapId" = null ]; then exit 1; fi - echo -n "$snapId" > $stateDir/$region.$type.snap-id - fi - - # Wait for the snapshot to finish. - echo "waiting for snapshot to finish..." - while true; do - status=$(aws ec2 describe-snapshots --snapshot-ids "$snapId" --region "$region" | jq -r .Snapshots[0].State) - if [ "$status" = completed ]; then break; fi - sleep 10 - done - - # Delete the volume. - if [ -n "$volId" ]; then - echo "deleting volume..." - aws ec2 delete-volume --volume-id "$volId" --region "$region" || true - rm -f $stateDir/$region.$type.vol-id - fi - - blockDeviceMappings="DeviceName=/dev/sda1,Ebs={SnapshotId=$snapId,VolumeSize=$vhdFileLogicalGigaBytes,DeleteOnTermination=true,VolumeType=gp2}" - extraFlags="" - - if [ $type = pv ]; then - extraFlags+=" --root-device-name /dev/sda1" - else - extraFlags+=" --root-device-name /dev/sda1" - extraFlags+=" --sriov-net-support simple" - extraFlags+=" --ena-support" - fi - - blockDeviceMappings+=" DeviceName=/dev/sdb,VirtualName=ephemeral0" - blockDeviceMappings+=" DeviceName=/dev/sdc,VirtualName=ephemeral1" - blockDeviceMappings+=" DeviceName=/dev/sdd,VirtualName=ephemeral2" - blockDeviceMappings+=" DeviceName=/dev/sde,VirtualName=ephemeral3" - fi - - if [ $type = hvm ]; then - extraFlags+=" --sriov-net-support simple" - extraFlags+=" --ena-support" - fi - - # Register the AMI. - if [ $type = pv ]; then - kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.05-$arch.gz" | jq -r .Images[0].ImageId) - if [ "$kernel" = null ]; then break; fi - echo "using PV-GRUB kernel $kernel" - extraFlags+=" --virtualization-type paravirtual --kernel $kernel" - else - extraFlags+=" --virtualization-type hvm" - fi - - ami=$(aws ec2 register-image \ - --name "$name" \ - --description "$description" \ - --region "$region" \ - --architecture "$arch" \ - --block-device-mappings $blockDeviceMappings \ - $extraFlags | jq -r .ImageId) - if [ "$ami" = null ]; then break; fi - fi - - echo -n "$ami" > $amiFile - echo "created AMI $ami of type '$type' in $region..." - - else - ami=$(cat $amiFile) - fi - - echo "region = $region, type = $type, store = $store, ami = $ami" - - if [ -z "$prevAmi" ]; then - prevAmi="$ami" - prevRegion="$region" - fi - done + if [ -z "$snapshot_id" ]; then + snapshot_id=$(wait_for_import "$region" "$task_id") + write_state "$state_key" snapshot_id "$snapshot_id" + fi - done + if [ -z "$ami_id" ]; then + log "Registering snapshot $snapshot_id as AMI" + + local block_device_mappings=( + "DeviceName=/dev/sda1,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp2}" + ) + + local extra_flags=( + --root-device-name /dev/sda1 + --sriov-net-support simple + --ena-support + --virtualization-type hvm + ) + + block_device_mappings+=(DeviceName=/dev/sdb,VirtualName=ephemeral0) + block_device_mappings+=(DeviceName=/dev/sdc,VirtualName=ephemeral1) + block_device_mappings+=(DeviceName=/dev/sdd,VirtualName=ephemeral2) + block_device_mappings+=(DeviceName=/dev/sde,VirtualName=ephemeral3) + + ami_id=$( + aws ec2 register-image \ + --name "$image_name" \ + --description "$image_description" \ + --region $region \ + --architecture $amazon_arch \ + --block-device-mappings "${block_device_mappings[@]}" \ + "${extra_flags[@]}" \ + | jq -r '.ImageId' + ) + + write_state "$state_key" ami_id "$ami_id" + fi -done + make_image_public $region "$ami_id" -for type in $types; do - link=$stateDir/$type - system=x86_64-linux - arch=x86_64 + echo "$ami_id" +} - for store in $stores; do +copy_to_region() { + local region=$1 + local from_region=$2 + local from_ami_id=$3 - for region in $regions; do + state_key="$region.$image_label.$image_system" + ami_id=$(read_state "$state_key" ami_id) - name=nixos-$version-$arch-$type-$store - amiFile=$stateDir/$region.$type.$store.ami-id - ami=$(cat $amiFile) + if [ -z "$ami_id" ]; then + log "Copying $from_ami_id to $region" + ami_id=$( + aws ec2 copy-image \ + --region "$region" \ + --source-region "$from_region" \ + --source-image-id "$from_ami_id" \ + --name "$image_name" \ + --description "$image_description" \ + | jq -r '.ImageId' + ) - echo "region = $region, type = $type, store = $store, ami = $ami" + write_state "$state_key" ami_id "$ami_id" + fi - echo -n "waiting for AMI..." - while true; do - status=$(aws ec2 describe-images --image-ids "$ami" --region "$region" | jq -r .Images[0].State) - if [ "$status" = available ]; then break; fi - sleep 10 - echo -n '.' - done - echo + make_image_public $region "$ami_id" + + echo "$ami_id" +} - # Make the image public. - aws ec2 modify-image-attribute \ - --image-id "$ami" --region "$region" --launch-permission 'Add={Group=all}' +upload_all() { + home_image_id=$(upload_image "$home_region") + jq -n \ + --arg key "$home_region.$image_system" \ + --arg value "$home_image_id" \ + '$ARGS.named' - echo " \"$major\".$region.$type-$store = \"$ami\";" >> ec2-amis.nix - done + for region in "${regions[@]}"; do + if [ "$region" = "$home_region" ]; then + continue + fi + copied_image_id=$(copy_to_region "$region" "$home_region" "$home_image_id") + jq -n \ + --arg key "$region.$image_system" \ + --arg value "$copied_image_id" \ + '$ARGS.named' done +} -done +upload_all | jq --slurp from_entries diff --git a/nixpkgs/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixpkgs/nixos/modules/config/fonts/fontconfig-penultimate.nix index 7100f10dcfc8..7e311a21acf6 100644 --- a/nixpkgs/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixpkgs/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -35,8 +35,8 @@ let then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; - cache = makeCache pkgs."${fcPackage}"; - cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}"; + cache = makeCache pkgs.${fcPackage}; + cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage}; in pkgs.writeText "fc-00-nixos-cache.conf" '' <?xml version='1.0'?> diff --git a/nixpkgs/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixpkgs/nixos/modules/config/fonts/fontconfig-ultimate.nix index 45328f3eaf13..84d90899dfff 100644 --- a/nixpkgs/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixpkgs/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -79,7 +79,7 @@ in config = mkIf (config.fonts.fontconfig.enable && cfg.enable) { fonts.fontconfig.confPackages = [ confPkg ]; - environment.variables."INFINALITY_FT" = cfg.preset; + environment.variables.INFINALITY_FT = cfg.preset; }; diff --git a/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix b/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix index 9c5d993b9c59..86a6bfb5af41 100644 --- a/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix +++ b/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix @@ -7,7 +7,7 @@ with lib; type = types.bool; default = config.services.xserver.enable; description = '' - Whether to build icon theme caches for GTK+ applications. + Whether to build icon theme caches for GTK applications. ''; }; }; diff --git a/nixpkgs/nixos/modules/config/krb5/default.nix b/nixpkgs/nixos/modules/config/krb5/default.nix index 87021a27d34f..ff16ffcf9c65 100644 --- a/nixpkgs/nixos/modules/config/krb5/default.nix +++ b/nixpkgs/nixos/modules/config/krb5/default.nix @@ -15,7 +15,7 @@ let realms = optionalAttrs (lib.all (value: value != null) [ cfg.defaultRealm cfg.kdc cfg.kerberosAdminServer ]) { - "${cfg.defaultRealm}" = { + ${cfg.defaultRealm} = { kdc = cfg.kdc; admin_server = cfg.kerberosAdminServer; }; @@ -25,7 +25,7 @@ let cfg.domainRealm cfg.defaultRealm ]) { ".${cfg.domainRealm}" = cfg.defaultRealm; - "${cfg.domainRealm}" = cfg.defaultRealm; + ${cfg.domainRealm} = cfg.defaultRealm; }; }; diff --git a/nixpkgs/nixos/modules/config/malloc.nix b/nixpkgs/nixos/modules/config/malloc.nix index 65130454735c..31a659ee83fe 100644 --- a/nixpkgs/nixos/modules/config/malloc.nix +++ b/nixpkgs/nixos/modules/config/malloc.nix @@ -6,7 +6,7 @@ let # The set of alternative malloc(3) providers. providers = { - "graphene-hardened" = rec { + graphene-hardened = { libPath = "${pkgs.graphene-hardened-malloc}/lib/libhardened_malloc.so"; description = '' An allocator designed to mitigate memory corruption attacks, such as @@ -14,7 +14,7 @@ let ''; }; - "jemalloc" = { + jemalloc = { libPath = "${pkgs.jemalloc}/lib/libjemalloc.so"; description = '' A general purpose allocator that emphasizes fragmentation avoidance @@ -22,7 +22,7 @@ let ''; }; - "scudo" = { + scudo = { libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so"; description = '' A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator, @@ -32,7 +32,7 @@ let }; }; - providerConf = providers."${cfg.provider}"; + providerConf = providers.${cfg.provider}; # An output that contains only the shared library, to avoid # needlessly bloating the system closure diff --git a/nixpkgs/nixos/modules/config/networking.nix b/nixpkgs/nixos/modules/config/networking.nix index 4b9086022ed5..a89667ea221c 100644 --- a/nixpkgs/nixos/modules/config/networking.nix +++ b/nixpkgs/nixos/modules/config/networking.nix @@ -171,13 +171,13 @@ in environment.etc = { # /etc/services: TCP/UDP port assignments. - "services".source = pkgs.iana-etc + "/etc/services"; + services.source = pkgs.iana-etc + "/etc/services"; # /etc/protocols: IP protocol numbers. - "protocols".source = pkgs.iana-etc + "/etc/protocols"; + protocols.source = pkgs.iana-etc + "/etc/protocols"; # /etc/hosts: Hostname-to-IP mappings. - "hosts".text = let + hosts.text = let oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip}; allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set); in '' @@ -190,7 +190,7 @@ in } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") { # /etc/rpc: RPC program numbers. - "rpc".source = pkgs.glibc.out + "/etc/rpc"; + rpc.source = pkgs.glibc.out + "/etc/rpc"; }; networking.proxy.envVars = diff --git a/nixpkgs/nixos/modules/config/power-management.nix b/nixpkgs/nixos/modules/config/power-management.nix index 0277f1ad11e9..64cdf50f1413 100644 --- a/nixpkgs/nixos/modules/config/power-management.nix +++ b/nixpkgs/nixos/modules/config/power-management.nix @@ -78,7 +78,7 @@ in }; # Service executed before suspending/hibernating. - systemd.services."pre-sleep" = + systemd.services.pre-sleep = { description = "Pre-Sleep Actions"; wantedBy = [ "sleep.target" ]; before = [ "sleep.target" ]; @@ -89,7 +89,7 @@ in serviceConfig.Type = "oneshot"; }; - systemd.services."post-resume" = + systemd.services.post-resume = { description = "Post-Resume Actions"; after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" ]; script = diff --git a/nixpkgs/nixos/modules/config/shells-environment.nix b/nixpkgs/nixos/modules/config/shells-environment.nix index 6379b52870ea..9dfc1add8299 100644 --- a/nixpkgs/nixos/modules/config/shells-environment.nix +++ b/nixpkgs/nixos/modules/config/shells-environment.nix @@ -163,7 +163,7 @@ in l = "ls -alh"; }; - environment.etc."shells".text = + environment.etc.shells.text = '' ${concatStringsSep "\n" (map utils.toShellPath cfg.shells)} /bin/sh @@ -171,7 +171,7 @@ in # For resetting environment with `. /etc/set-environment` when needed # and discoverability (see motivation of #30418). - environment.etc."set-environment".source = config.system.build.setEnvironment; + environment.etc.set-environment.source = config.system.build.setEnvironment; system.build.setEnvironment = pkgs.writeText "set-environment" '' diff --git a/nixpkgs/nixos/modules/config/terminfo.nix b/nixpkgs/nixos/modules/config/terminfo.nix index 4fd6ba5ea605..b86ce2dbf057 100644 --- a/nixpkgs/nixos/modules/config/terminfo.nix +++ b/nixpkgs/nixos/modules/config/terminfo.nix @@ -8,7 +8,7 @@ "/share/terminfo" ]; - environment.etc."terminfo" = { + environment.etc.terminfo = { source = "${config.system.path}/share/terminfo"; }; diff --git a/nixpkgs/nixos/modules/config/users-groups.nix b/nixpkgs/nixos/modules/config/users-groups.nix index c91eb0ebb876..ba79bd3d6ecc 100644 --- a/nixpkgs/nixos/modules/config/users-groups.nix +++ b/nixpkgs/nixos/modules/config/users-groups.nix @@ -546,11 +546,11 @@ in { environment.systemPackages = systemShells; environment.etc = { - "subuid" = { + subuid = { text = subuidFile; mode = "0644"; }; - "subgid" = { + subgid = { text = subgidFile; mode = "0644"; }; diff --git a/nixpkgs/nixos/modules/hardware/nitrokey.nix b/nixpkgs/nixos/modules/hardware/nitrokey.nix index 60fc95a75828..02e4c3f46f8d 100644 --- a/nixpkgs/nixos/modules/hardware/nitrokey.nix +++ b/nixpkgs/nixos/modules/hardware/nitrokey.nix @@ -36,6 +36,6 @@ in { inherit (cfg) group; } )) ]; - users.groups."${cfg.group}" = {}; + users.groups.${cfg.group} = {}; }; } diff --git a/nixpkgs/nixos/modules/hardware/openrazer.nix b/nixpkgs/nixos/modules/hardware/openrazer.nix new file mode 100644 index 000000000000..883db7f2f4f1 --- /dev/null +++ b/nixpkgs/nixos/modules/hardware/openrazer.nix @@ -0,0 +1,133 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.hardware.openrazer; + kernelPackages = config.boot.kernelPackages; + + toPyBoolStr = b: if b then "True" else "False"; + + daemonExe = "${pkgs.openrazer-daemon}/bin/openrazer-daemon --config ${daemonConfFile}"; + + daemonConfFile = pkgs.writeTextFile { + name = "razer.conf"; + text = '' + [General] + verbose_logging = ${toPyBoolStr cfg.verboseLogging} + + [Startup] + sync_effects_enabled = ${toPyBoolStr cfg.syncEffectsEnabled} + devices_off_on_screensaver = ${toPyBoolStr cfg.devicesOffOnScreensaver} + mouse_battery_notifier = ${toPyBoolStr cfg.mouseBatteryNotifier} + + [Statistics] + key_statistics = ${toPyBoolStr cfg.keyStatistics} + ''; + }; + + dbusServiceFile = pkgs.writeTextFile rec { + name = "org.razer.service"; + destination = "/share/dbus-1/services/${name}"; + text = '' + [D-BUS Service] + Name=org.razer + Exec=${daemonExe} + SystemdService=openrazer-daemon.service + ''; + }; + + drivers = [ + "razerkbd" + "razermouse" + "razerfirefly" + "razerkraken" + "razermug" + "razercore" + ]; +in +{ + options = { + hardware.openrazer = { + enable = mkEnableOption "OpenRazer drivers and userspace daemon."; + + verboseLogging = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable verbose logging. Logs debug messages. + ''; + }; + + syncEffectsEnabled = mkOption { + type = types.bool; + default = true; + description = '' + Set the sync effects flag to true so any assignment of + effects will work across devices. + ''; + }; + + devicesOffOnScreensaver = mkOption { + type = types.bool; + default = true; + description = '' + Turn off the devices when the systems screensaver kicks in. + ''; + }; + + mouseBatteryNotifier = mkOption { + type = types.bool; + default = true; + description = '' + Mouse battery notifier. + ''; + }; + + keyStatistics = mkOption { + type = types.bool; + default = false; + description = '' + Collects number of keypresses per hour per key used to + generate a heatmap. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + boot.extraModulePackages = [ kernelPackages.openrazer ]; + boot.kernelModules = drivers; + + # Makes the man pages available so you can succesfully run + # > systemctl --user help openrazer-daemon + environment.systemPackages = [ pkgs.python3Packages.openrazer-daemon.man ]; + + services.udev.packages = [ kernelPackages.openrazer ]; + services.dbus.packages = [ dbusServiceFile ]; + + # A user must be a member of the plugdev group in order to start + # the openrazer-daemon. Therefore we make sure that the plugdev + # group exists. + users.groups.plugdev = {}; + + systemd.user.services.openrazer-daemon = { + description = "Daemon to manage razer devices in userspace"; + unitConfig.Documentation = "man:openrazer-daemon(8)"; + # Requires a graphical session so the daemon knows when the screensaver + # starts. See the 'devicesOffOnScreensaver' option. + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + serviceConfig = { + Type = "dbus"; + BusName = "org.razer"; + ExecStart = "${daemonExe} --foreground"; + Restart = "always"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ roelvandijk ]; + }; +} diff --git a/nixpkgs/nixos/modules/hardware/printers.nix b/nixpkgs/nixos/modules/hardware/printers.nix new file mode 100644 index 000000000000..12ee5516d4ed --- /dev/null +++ b/nixpkgs/nixos/modules/hardware/printers.nix @@ -0,0 +1,135 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.hardware.printers; + ppdOptionsString = options: optionalString (options != {}) + (concatStringsSep " " + (mapAttrsToList (name: value: "-o '${name}'='${value}'") options) + ); + ensurePrinter = p: '' + ${pkgs.cups}/bin/lpadmin -p '${p.name}' -E \ + ${optionalString (p.location != null) "-L '${p.location}'"} \ + ${optionalString (p.description != null) "-D '${p.description}'"} \ + -v '${p.deviceUri}' \ + -m '${p.model}' \ + ${ppdOptionsString p.ppdOptions} + ''; + ensureDefaultPrinter = name: '' + ${pkgs.cups}/bin/lpoptions -d '${name}' + ''; + + # "graph but not # or /" can't be implemented as regex alone due to missing lookahead support + noInvalidChars = str: all (c: c != "#" && c != "/") (stringToCharacters str); + printerName = (types.addCheck (types.strMatching "[[:graph:]]+") noInvalidChars) + // { description = "printable string without spaces, # and /"; }; + + +in { + options = { + hardware.printers = { + ensureDefaultPrinter = mkOption { + type = types.nullOr printerName; + default = null; + description = '' + Ensures the named printer is the default CUPS printer / printer queue. + ''; + }; + ensurePrinters = mkOption { + description = '' + Will regularly ensure that the given CUPS printers are configured as declared here. + If a printer's options are manually changed afterwards, they will be overwritten eventually. + This option will never delete any printer, even if removed from this list. + You can check existing printers with <command>lpstat -s</command> + and remove printers with <command>lpadmin -x <printer-name></command>. + Printers not listed here can still be manually configured. + ''; + default = []; + type = types.listOf (types.submodule { + options = { + name = mkOption { + type = printerName; + example = "BrotherHL_Workroom"; + description = '' + Name of the printer / printer queue. + May contain any printable characters except "/", "#", and space. + ''; + }; + location = mkOption { + type = types.nullOr types.str; + default = null; + example = "Workroom"; + description = '' + Optional human-readable location. + ''; + }; + description = mkOption { + type = types.nullOr types.str; + default = null; + example = "Brother HL-5140"; + description = '' + Optional human-readable description. + ''; + }; + deviceUri = mkOption { + type = types.str; + example = [ + "ipp://printserver.local/printers/BrotherHL_Workroom" + "usb://HP/DESKJET%20940C?serial=CN16E6C364BH" + ]; + description = '' + How to reach the printer. + <command>lpinfo -v</command> shows a list of supported device URIs and schemes. + ''; + }; + model = mkOption { + type = types.str; + example = literalExample '' + gutenprint.''${lib.version.majorMinor (lib.getVersion pkgs.cups)}://brother-hl-5140/expert + ''; + description = '' + Location of the ppd driver file for the printer. + <command>lpinfo -m</command> shows a list of supported models. + ''; + }; + ppdOptions = mkOption { + type = types.attrsOf types.str; + example = { + "PageSize" = "A4"; + "Duplex" = "DuplexNoTumble"; + }; + default = {}; + description = '' + Sets PPD options for the printer. + <command>lpoptions [-p printername] -l</command> shows suported PPD options for the given printer. + ''; + }; + }; + }); + }; + }; + }; + + config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) { + systemd.services."ensure-printers" = let + cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service"; + in { + description = "Ensure NixOS-configured CUPS printers"; + wantedBy = [ "multi-user.target" ]; + requires = [ cupsUnit ]; + # in contrast to cups.socket, for cups.service, this is actually not enough, + # as the cups service reports its activation before clients can actually interact with it. + # Because of this, commands like `lpinfo -v` will report a bad file descriptor + # due to the missing UNIX socket without sufficient sleep time. + after = [ cupsUnit ]; + + serviceConfig = { + Type = "oneshot"; + }; + + # sleep 10 is required to wait until cups.service is actually initialized and has created its UNIX socket file + script = (optionalString (!config.services.printing.startWhenNeeded) "sleep 10\n") + + (concatMapStringsSep "\n" ensurePrinter cfg.ensurePrinters) + + optionalString (cfg.ensureDefaultPrinter != null) (ensureDefaultPrinter cfg.ensureDefaultPrinter); + }; + }; +} diff --git a/nixpkgs/nixos/modules/hardware/video/ati.nix b/nixpkgs/nixos/modules/hardware/video/ati.nix index f867bba80630..0aab7bd6b92c 100644 --- a/nixpkgs/nixos/modules/hardware/video/ati.nix +++ b/nixpkgs/nixos/modules/hardware/video/ati.nix @@ -33,7 +33,7 @@ in boot.blacklistedKernelModules = [ "radeon" ]; - environment.etc."ati".source = "${ati_x11}/etc/ati"; + environment.etc.ati.source = "${ati_x11}/etc/ati"; }; diff --git a/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 2536ba73a1de..559899b0a3b1 100644 --- a/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -13,9 +13,6 @@ with lib; enable = true; enableQt4Support = false; }; - - # Enable touchpad support for many laptops. - synaptics.enable = true; }; environment.systemPackages = with pkgs; [ diff --git a/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix index 5da5df81ede1..bf8b7deb59eb 100644 --- a/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix +++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix @@ -129,7 +129,7 @@ in ]; nixpkgs.config = { - packageOverrides = p: rec { + packageOverrides = p: { linux_3_4 = p.linux_3_4.override { extraConfig = '' # Enable drivers in kernel for most NICs. diff --git a/nixpkgs/nixos/modules/installer/netboot/netboot.nix b/nixpkgs/nixos/modules/installer/netboot/netboot.nix index f9b8d95c684d..5146858cccf5 100644 --- a/nixpkgs/nixos/modules/installer/netboot/netboot.nix +++ b/nixpkgs/nixos/modules/installer/netboot/netboot.nix @@ -18,7 +18,7 @@ with lib; }; - config = rec { + config = { # Don't build the GRUB menu builder script, since we don't need it # here and it causes a cyclic dependency. boot.loader.grub.enable = false; diff --git a/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index b9ab2053c41f..2673887d2b96 100644 --- a/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/hbhdjn5ik3byg642d1m11k3k3s0kn3py-nix-2.2.2"; - i686-linux = "/nix/store/fz5cikwvj3n0a6zl44h6l2z3cin64mda-nix-2.2.2"; - aarch64-linux = "/nix/store/2gba4cyl4wvxzfbhmli90jy4n5aj0kjj-nix-2.2.2"; - x86_64-darwin = "/nix/store/87i4fp46jfw9yl8c7i9gx75m5yph7irl-nix-2.2.2"; + x86_64-linux = "/nix/store/3ds3cgji9vjxdbgp10av6smyym1126d1-nix-2.3"; + i686-linux = "/nix/store/ln1ndqvfpc9cdl03vqxi6kvlxm9wfv9g-nix-2.3"; + aarch64-linux = "/nix/store/n8a1rwzrp20qcr2c4hvyn6c5q9zx8csw-nix-2.3"; + x86_64-darwin = "/nix/store/jq6npmpld02sz4rgniz0qrsdfnm6j17a-nix-2.3"; } diff --git a/nixpkgs/nixos/modules/misc/version.nix b/nixpkgs/nixos/modules/misc/version.nix index 3ae60cb79160..773724ffbd5e 100644 --- a/nixpkgs/nixos/modules/misc/version.nix +++ b/nixpkgs/nixos/modules/misc/version.nix @@ -85,7 +85,7 @@ in # Generate /etc/os-release. See # https://www.freedesktop.org/software/systemd/man/os-release.html for the # format. - environment.etc."os-release".text = + environment.etc.os-release.text = '' NAME=NixOS ID=nixos diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index 48bfbd8bd6e1..a1476a8179b9 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -58,7 +58,9 @@ ./hardware/network/intel-2200bg.nix ./hardware/nitrokey.nix ./hardware/opengl.nix + ./hardware/openrazer.nix ./hardware/pcmcia.nix + ./hardware/printers.nix ./hardware/raid/hpsa.nix ./hardware/steam-hardware.nix ./hardware/usb-wwan.nix @@ -149,6 +151,7 @@ ./programs/sysdig.nix ./programs/systemtap.nix ./programs/sway.nix + ./programs/system-config-printer.nix ./programs/thefuck.nix ./programs/tmux.nix ./programs/tsm-client.nix @@ -281,6 +284,7 @@ ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix + ./services/desktops/blueman.nix ./services/desktops/deepin/deepin.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix @@ -306,6 +310,7 @@ ./services/desktops/gnome3/tracker.nix ./services/desktops/gnome3/tracker-miners.nix ./services/desktops/profile-sync-daemon.nix + ./services/desktops/system-config-printer.nix ./services/desktops/telepathy.nix ./services/desktops/tumbler.nix ./services/desktops/zeitgeist.nix @@ -699,6 +704,7 @@ ./services/networking/supybot.nix ./services/networking/syncthing.nix ./services/networking/syncthing-relay.nix + ./services/networking/syncplay.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix @@ -848,6 +854,7 @@ ./services/x11/hardware/multitouch.nix ./services/x11/hardware/synaptics.nix ./services/x11/hardware/wacom.nix + ./services/x11/hardware/cmt.nix ./services/x11/gdk-pixbuf.nix ./services/x11/redshift.nix ./services/x11/urxvtd.nix @@ -945,6 +952,7 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/qemu-guest-agent.nix + ./virtualisation/railcar.nix ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix diff --git a/nixpkgs/nixos/modules/programs/atop.nix b/nixpkgs/nixos/modules/programs/atop.nix index 4651cdb76e0b..7ef8d687ca17 100644 --- a/nixpkgs/nixos/modules/programs/atop.nix +++ b/nixpkgs/nixos/modules/programs/atop.nix @@ -30,7 +30,7 @@ in }; config = mkIf (cfg.settings != {}) { - environment.etc."atoprc".text = + environment.etc.atoprc.text = concatStrings (mapAttrsToList (n: v: "${n} ${toString v}\n") cfg.settings); }; } diff --git a/nixpkgs/nixos/modules/programs/bash/bash.nix b/nixpkgs/nixos/modules/programs/bash/bash.nix index 99daec5ff5b7..548babac38ca 100644 --- a/nixpkgs/nixos/modules/programs/bash/bash.nix +++ b/nixpkgs/nixos/modules/programs/bash/bash.nix @@ -159,7 +159,7 @@ in }; - environment.etc."profile".text = + environment.etc.profile.text = '' # /etc/profile: DO NOT EDIT -- this file has been generated automatically. # This file is read for login shells. @@ -184,7 +184,7 @@ in fi ''; - environment.etc."bashrc".text = + environment.etc.bashrc.text = '' # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically. @@ -212,7 +212,7 @@ in # Configuration for readline in bash. We use "option default" # priority to allow user override using both .text and .source. - environment.etc."inputrc".source = mkOptionDefault ./inputrc; + environment.etc.inputrc.source = mkOptionDefault ./inputrc; users.defaultUserShell = mkDefault pkgs.bashInteractive; diff --git a/nixpkgs/nixos/modules/programs/firejail.nix b/nixpkgs/nixos/modules/programs/firejail.nix index 46ee4bc0f7a0..74c3e4425a7c 100644 --- a/nixpkgs/nixos/modules/programs/firejail.nix +++ b/nixpkgs/nixos/modules/programs/firejail.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.programs.firejail; - wrappedBins = pkgs.stdenv.mkDerivation rec { + wrappedBins = pkgs.stdenv.mkDerivation { name = "firejail-wrapped-binaries"; nativeBuildInputs = with pkgs; [ makeWrapper ]; buildCommand = '' diff --git a/nixpkgs/nixos/modules/programs/less.nix b/nixpkgs/nixos/modules/programs/less.nix index 9fdf99e9c694..e19935b77caf 100644 --- a/nixpkgs/nixos/modules/programs/less.nix +++ b/nixpkgs/nixos/modules/programs/less.nix @@ -54,8 +54,8 @@ in type = types.attrsOf types.str; default = {}; example = { - "h" = "noaction 5\e("; - "l" = "noaction 5\e)"; + h = "noaction 5\e("; + l = "noaction 5\e)"; }; description = "Defines new command keys."; }; @@ -74,7 +74,7 @@ in type = types.attrsOf types.str; default = {}; example = { - "\e" = "abort"; + e = "abort"; }; description = "Defines new line-editing keys."; }; @@ -111,11 +111,11 @@ in environment.systemPackages = [ pkgs.less ]; environment.variables = { - "LESSKEY_SYSTEM" = toString lessKey; + LESSKEY_SYSTEM = toString lessKey; } // optionalAttrs (cfg.lessopen != null) { - "LESSOPEN" = cfg.lessopen; + LESSOPEN = cfg.lessopen; } // optionalAttrs (cfg.lessclose != null) { - "LESSCLOSE" = cfg.lessclose; + LESSCLOSE = cfg.lessclose; }; warnings = optional ( diff --git a/nixpkgs/nixos/modules/programs/nano.nix b/nixpkgs/nixos/modules/programs/nano.nix index 6a4d46338e19..5837dd46d7cd 100644 --- a/nixpkgs/nixos/modules/programs/nano.nix +++ b/nixpkgs/nixos/modules/programs/nano.nix @@ -35,7 +35,7 @@ in ###### implementation config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) { - environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc + environment.etc.nanorc.text = lib.concatStrings [ cfg.nanorc (lib.optionalString cfg.syntaxHighlight ''${LF}include "${pkgs.nano}/share/nano/*.nanorc"'') ]; }; diff --git a/nixpkgs/nixos/modules/programs/npm.nix b/nixpkgs/nixos/modules/programs/npm.nix index 5fdd4fa841a1..b351d80c7acf 100644 --- a/nixpkgs/nixos/modules/programs/npm.nix +++ b/nixpkgs/nixos/modules/programs/npm.nix @@ -36,7 +36,7 @@ in ###### implementation config = lib.mkIf cfg.enable { - environment.etc."npmrc".text = cfg.npmrc; + environment.etc.npmrc.text = cfg.npmrc; environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc"; diff --git a/nixpkgs/nixos/modules/programs/plotinus.nix b/nixpkgs/nixos/modules/programs/plotinus.nix index 065e72d6c374..e3549c79588b 100644 --- a/nixpkgs/nixos/modules/programs/plotinus.nix +++ b/nixpkgs/nixos/modules/programs/plotinus.nix @@ -18,7 +18,7 @@ in enable = mkOption { default = false; description = '' - Whether to enable the Plotinus GTK+3 plugin. Plotinus provides a + Whether to enable the Plotinus GTK 3 plugin. Plotinus provides a popup (triggered by Ctrl-Shift-P) to search the menus of a compatible application. ''; diff --git a/nixpkgs/nixos/modules/programs/plotinus.xml b/nixpkgs/nixos/modules/programs/plotinus.xml index 902cd89e0c49..8fc8c22c6d76 100644 --- a/nixpkgs/nixos/modules/programs/plotinus.xml +++ b/nixpkgs/nixos/modules/programs/plotinus.xml @@ -13,10 +13,10 @@ <link xlink:href="https://github.com/p-e-w/plotinus"/> </para> <para> - Plotinus is a searchable command palette in every modern GTK+ application. + Plotinus is a searchable command palette in every modern GTK application. </para> <para> - When in a GTK+3 application and Plotinus is enabled, you can press + When in a GTK 3 application and Plotinus is enabled, you can press <literal>Ctrl+Shift+P</literal> to open the command palette. The command palette provides a searchable list of of all menu items in the application. </para> diff --git a/nixpkgs/nixos/modules/programs/screen.nix b/nixpkgs/nixos/modules/programs/screen.nix index c1daaa58f16f..4fd800dbae79 100644 --- a/nixpkgs/nixos/modules/programs/screen.nix +++ b/nixpkgs/nixos/modules/programs/screen.nix @@ -24,7 +24,7 @@ in ###### implementation config = mkIf (cfg.screenrc != "") { - environment.etc."screenrc".text = cfg.screenrc; + environment.etc.screenrc.text = cfg.screenrc; environment.systemPackages = [ pkgs.screen ]; }; diff --git a/nixpkgs/nixos/modules/programs/system-config-printer.nix b/nixpkgs/nixos/modules/programs/system-config-printer.nix new file mode 100644 index 000000000000..34592dd7064b --- /dev/null +++ b/nixpkgs/nixos/modules/programs/system-config-printer.nix @@ -0,0 +1,32 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + programs.system-config-printer = { + + enable = mkEnableOption "system-config-printer, a Graphical user interface for CUPS administration"; + + }; + + }; + + + ###### implementation + + config = mkIf config.programs.system-config-printer.enable { + + environment.systemPackages = [ + pkgs.system-config-printer + ]; + + services.system-config-printer.enable = true; + + }; + +} diff --git a/nixpkgs/nixos/modules/programs/xfs_quota.nix b/nixpkgs/nixos/modules/programs/xfs_quota.nix index 648fd9a8a94f..c03e59a5b4ab 100644 --- a/nixpkgs/nixos/modules/programs/xfs_quota.nix +++ b/nixpkgs/nixos/modules/programs/xfs_quota.nix @@ -61,7 +61,7 @@ in description = "Setup of xfs_quota projects. Make sure the filesystem is mounted with the pquota option."; example = { - "projname" = { + projname = { id = 50; path = "/xfsprojects/projname"; sizeHardLimit = "50g"; diff --git a/nixpkgs/nixos/modules/programs/xonsh.nix b/nixpkgs/nixos/modules/programs/xonsh.nix index 5cd2a49f8073..1590020f7b64 100644 --- a/nixpkgs/nixos/modules/programs/xonsh.nix +++ b/nixpkgs/nixos/modules/programs/xonsh.nix @@ -45,7 +45,7 @@ in config = mkIf cfg.enable { - environment.etc."xonshrc".text = cfg.config; + environment.etc.xonshrc.text = cfg.config; environment.systemPackages = [ cfg.package ]; diff --git a/nixpkgs/nixos/modules/programs/zsh/zsh.nix b/nixpkgs/nixos/modules/programs/zsh/zsh.nix index 6e9eefd74d18..c66c29ed45fb 100644 --- a/nixpkgs/nixos/modules/programs/zsh/zsh.nix +++ b/nixpkgs/nixos/modules/programs/zsh/zsh.nix @@ -133,7 +133,7 @@ in programs.zsh.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; - environment.etc."zshenv".text = + environment.etc.zshenv.text = '' # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically. # This file is read for all shells. @@ -157,7 +157,7 @@ in fi ''; - environment.etc."zprofile".text = + environment.etc.zprofile.text = '' # /etc/zprofile: DO NOT EDIT -- this file has been generated automatically. # This file is read for login shells. @@ -176,7 +176,7 @@ in fi ''; - environment.etc."zshrc".text = + environment.etc.zshrc.text = '' # /etc/zshrc: DO NOT EDIT -- this file has been generated automatically. # This file is read for interactive shells. @@ -225,7 +225,7 @@ in fi ''; - environment.etc."zinputrc".source = ./zinputrc; + environment.etc.zinputrc.source = ./zinputrc; environment.systemPackages = [ pkgs.zsh ] ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; diff --git a/nixpkgs/nixos/modules/rename.nix b/nixpkgs/nixos/modules/rename.nix index 9e0ab60ca679..d1303f90ad8d 100644 --- a/nixpkgs/nixos/modules/rename.nix +++ b/nixpkgs/nixos/modules/rename.nix @@ -34,6 +34,7 @@ with lib; (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ]) (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "") (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "") + (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "") (mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"]) (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "") (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) @@ -51,10 +52,11 @@ with lib; (mkRemovedOptionModule [ "services" "misc" "nzbget" "openFirewall" ] "The port used by nzbget is managed through the web interface so you should adjust your firewall rules accordingly.") (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.") (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.") - (mkRemovedOptionModule [ "services" "prometheus2" "alertmanagerURL" ] '' + (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerURL" ] '' Due to incompatibility, the alertmanagerURL option has been removed, please use 'services.prometheus2.alertmanagers' instead. '') + (mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ]) (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) diff --git a/nixpkgs/nixos/modules/security/acme.nix b/nixpkgs/nixos/modules/security/acme.nix index feb54affbf83..b321c04e574c 100644 --- a/nixpkgs/nixos/modules/security/acme.nix +++ b/nixpkgs/nixos/modules/security/acme.nix @@ -213,7 +213,7 @@ in StateDirectoryMode = rights; WorkingDirectory = "/var/lib/${lpath}"; ExecStart = "${pkgs.simp_le}/bin/simp_le ${escapeShellArgs cmdline}"; - ExecStopPost = + ExecStopPost = let script = pkgs.writeScript "acme-post-stop" '' #!${pkgs.runtimeShell} -e @@ -298,6 +298,9 @@ in }; }) ); + + systemd.targets.acme-selfsigned-certificates = mkIf cfg.preliminarySelfsigned {}; + systemd.targets.acme-certificates = {}; }) ]; diff --git a/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix b/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix index be6acb3f1f53..2255477f26e4 100644 --- a/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix +++ b/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix @@ -24,6 +24,6 @@ in config = mkIf cfg.enable { environment.systemPackages = [ sandbox ]; - security.wrappers."${sandbox.passthru.sandboxExecutableName}".source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}"; + security.wrappers.${sandbox.passthru.sandboxExecutableName}.source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}"; }; } diff --git a/nixpkgs/nixos/modules/security/polkit.nix b/nixpkgs/nixos/modules/security/polkit.nix index 7f1de81d5b70..f2b2df4004cb 100644 --- a/nixpkgs/nixos/modules/security/polkit.nix +++ b/nixpkgs/nixos/modules/security/polkit.nix @@ -85,7 +85,7 @@ in security.wrappers = { pkexec.source = "${pkgs.polkit.bin}/bin/pkexec"; - "polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; + polkit-agent-helper-1.source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; }; systemd.tmpfiles.rules = [ diff --git a/nixpkgs/nixos/modules/security/prey.nix b/nixpkgs/nixos/modules/security/prey.nix index 1c643f2e1a57..b899ccb6c3e2 100644 --- a/nixpkgs/nixos/modules/security/prey.nix +++ b/nixpkgs/nixos/modules/security/prey.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.prey; - myPrey = pkgs."prey-bash-client".override { + myPrey = pkgs.prey-bash-client.override { apiKey = cfg.apiKey; deviceKey = cfg.deviceKey; }; diff --git a/nixpkgs/nixos/modules/security/wrappers/default.nix b/nixpkgs/nixos/modules/security/wrappers/default.nix index dcb9c8d4ed5f..47738e7962ea 100644 --- a/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -7,7 +7,7 @@ let programs = (lib.mapAttrsToList - (n: v: (if v ? "program" then v else v // {program=n;})) + (n: v: (if v ? program then v else v // {program=n;})) wrappers); securityWrapper = pkgs.stdenv.mkDerivation { @@ -74,15 +74,15 @@ let mkWrappedPrograms = builtins.map - (s: if (s ? "capabilities") + (s: if (s ? capabilities) then mkSetcapProgram ({ owner = "root"; group = "root"; } // s) else if - (s ? "setuid" && s.setuid) || - (s ? "setgid" && s.setgid) || - (s ? "permissions") + (s ? setuid && s.setuid) || + (s ? setgid && s.setgid) || + (s ? permissions) then mkSetuidProgram s else mkSetuidProgram ({ owner = "root"; diff --git a/nixpkgs/nixos/modules/services/audio/alsa.nix b/nixpkgs/nixos/modules/services/audio/alsa.nix index 4939adc4ee65..f632644af09e 100644 --- a/nixpkgs/nixos/modules/services/audio/alsa.nix +++ b/nixpkgs/nixos/modules/services/audio/alsa.nix @@ -99,7 +99,7 @@ in boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss"; - systemd.services."alsa-store" = + systemd.services.alsa-store = { description = "Store Sound Card State"; wantedBy = [ "multi-user.target" ]; unitConfig.RequiresMountsFor = "/var/lib/alsa"; diff --git a/nixpkgs/nixos/modules/services/backup/mysql-backup.nix b/nixpkgs/nixos/modules/services/backup/mysql-backup.nix index ba6e154f6b3d..dbd5605143f6 100644 --- a/nixpkgs/nixos/modules/services/backup/mysql-backup.nix +++ b/nixpkgs/nixos/modules/services/backup/mysql-backup.nix @@ -103,7 +103,7 @@ in }]; systemd = { - timers."mysql-backup" = { + timers.mysql-backup = { description = "Mysql backup timer"; wantedBy = [ "timers.target" ]; timerConfig = { @@ -112,7 +112,7 @@ in Unit = "mysql-backup.service"; }; }; - services."mysql-backup" = { + services.mysql-backup = { description = "Mysql backup service"; enable = true; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/backup/tsm.nix b/nixpkgs/nixos/modules/services/backup/tsm.nix index 3b2bb37491b5..6c238745797e 100644 --- a/nixpkgs/nixos/modules/services/backup/tsm.nix +++ b/nixpkgs/nixos/modules/services/backup/tsm.nix @@ -78,7 +78,7 @@ in config = mkIf cfg.enable { inherit assertions; programs.tsmClient.enable = true; - programs.tsmClient.servers."${cfg.servername}".passwdDir = + programs.tsmClient.servers.${cfg.servername}.passwdDir = mkDefault "/var/lib/tsm-backup/password"; systemd.services.tsm-backup = { description = "IBM Spectrum Protect (Tivoli Storage Manager) Backup"; diff --git a/nixpkgs/nixos/modules/services/backup/zfs-replication.nix b/nixpkgs/nixos/modules/services/backup/zfs-replication.nix index 785cedb98694..5a64304275d5 100644 --- a/nixpkgs/nixos/modules/services/backup/zfs-replication.nix +++ b/nixpkgs/nixos/modules/services/backup/zfs-replication.nix @@ -60,7 +60,7 @@ in { pkgs.lz4 ]; - systemd.services."zfs-replication" = { + systemd.services.zfs-replication = { after = [ "zfs-snapshot-daily.service" "zfs-snapshot-frequent.service" diff --git a/nixpkgs/nixos/modules/services/backup/znapzend.nix b/nixpkgs/nixos/modules/services/backup/znapzend.nix index 9c7f84655727..f317078ddda2 100644 --- a/nixpkgs/nixos/modules/services/backup/znapzend.nix +++ b/nixpkgs/nixos/modules/services/backup/znapzend.nix @@ -361,7 +361,7 @@ in environment.systemPackages = [ pkgs.znapzend ]; systemd.services = { - "znapzend" = { + znapzend = { description = "ZnapZend - ZFS Backup System"; wantedBy = [ "zfs.target" ]; after = [ "zfs.target" ]; diff --git a/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix index a38b6a78d3a5..4f4b0a92108f 100644 --- a/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -24,7 +24,7 @@ with lib; config = mkMerge [ (mkIf cfg.hdfs.namenode.enabled { - systemd.services."hdfs-namenode" = { + systemd.services.hdfs-namenode = { description = "Hadoop HDFS NameNode"; wantedBy = [ "multi-user.target" ]; @@ -44,7 +44,7 @@ with lib; }; }) (mkIf cfg.hdfs.datanode.enabled { - systemd.services."hdfs-datanode" = { + systemd.services.hdfs-datanode = { description = "Hadoop HDFS DataNode"; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix b/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix index 5345a2732d7e..c92020637e47 100644 --- a/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix @@ -35,7 +35,7 @@ with lib; }) (mkIf cfg.yarn.resourcemanager.enabled { - systemd.services."yarn-resourcemanager" = { + systemd.services.yarn-resourcemanager = { description = "Hadoop YARN ResourceManager"; wantedBy = [ "multi-user.target" ]; @@ -53,7 +53,7 @@ with lib; }) (mkIf cfg.yarn.nodemanager.enabled { - systemd.services."yarn-nodemanager" = { + systemd.services.yarn-nodemanager = { description = "Hadoop YARN NodeManager"; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix index ad7d17c9c283..17f2dde31a71 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -62,50 +62,19 @@ in ''; }; - enable = mkEnableOption "Kubernetes addon manager"; - - kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager"; - bootstrapAddonsKubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager bootstrap"; + enable = mkEnableOption "Whether to enable Kubernetes addon manager."; }; ###### implementation - config = let - - addonManagerPaths = filter (a: a != null) [ - cfg.kubeconfig.caFile - cfg.kubeconfig.certFile - cfg.kubeconfig.keyFile - ]; - bootstrapAddonsPaths = filter (a: a != null) [ - cfg.bootstrapAddonsKubeconfig.caFile - cfg.bootstrapAddonsKubeconfig.certFile - cfg.bootstrapAddonsKubeconfig.keyFile - ]; - - in mkIf cfg.enable { + config = mkIf cfg.enable { environment.etc."kubernetes/addons".source = "${addons}/"; - #TODO: Get rid of kube-addon-manager in the future for the following reasons - # - it is basically just a shell script wrapped around kubectl - # - it assumes that it is clusterAdmin or can gain clusterAdmin rights through serviceAccount - # - it is designed to be used with k8s system components only - # - it would be better with a more Nix-oriented way of managing addons systemd.services.kube-addon-manager = { description = "Kubernetes addon manager"; wantedBy = [ "kubernetes.target" ]; - after = [ "kube-node-online.target" ]; - before = [ "kubernetes.target" ]; - environment = { - ADDON_PATH = "/etc/kubernetes/addons/"; - KUBECONFIG = top.lib.mkKubeConfig "kube-addon-manager" cfg.kubeconfig; - }; - path = with pkgs; [ gawk kubectl ]; - preStart = '' - until kubectl -n kube-system get serviceaccounts/default 2>/dev/null; do - echo kubectl -n kube-system get serviceaccounts/default: exit status $? - sleep 2 - done - ''; + after = [ "kube-apiserver.service" ]; + environment.ADDON_PATH = "/etc/kubernetes/addons/"; + path = [ pkgs.gawk ]; serviceConfig = { Slice = "kubernetes.slice"; ExecStart = "${top.package}/bin/kube-addons"; @@ -115,52 +84,8 @@ in Restart = "on-failure"; RestartSec = 10; }; - unitConfig.ConditionPathExists = addonManagerPaths; }; - systemd.paths.kube-addon-manager = { - wantedBy = [ "kube-addon-manager.service" ]; - pathConfig = { - PathExists = addonManagerPaths; - PathChanged = addonManagerPaths; - }; - }; - - services.kubernetes.addonManager.kubeconfig.server = mkDefault top.apiserverAddress; - - systemd.services.kube-addon-manager-bootstrap = mkIf (top.apiserver.enable && top.addonManager.bootstrapAddons != {}) { - wantedBy = [ "kube-control-plane-online.target" ]; - after = [ "kube-apiserver.service" ]; - before = [ "kube-control-plane-online.target" ]; - path = [ pkgs.kubectl ]; - environment = { - KUBECONFIG = top.lib.mkKubeConfig "kube-addon-manager-bootstrap" cfg.bootstrapAddonsKubeconfig; - }; - preStart = with pkgs; let - files = mapAttrsToList (n: v: writeText "${n}.json" (builtins.toJSON v)) - cfg.bootstrapAddons; - in '' - until kubectl auth can-i '*' '*' -q 2>/dev/null; do - echo kubectl auth can-i '*' '*': exit status $? - sleep 2 - done - - kubectl apply -f ${concatStringsSep " \\\n -f " files} - ''; - script = "echo Ok"; - unitConfig.ConditionPathExists = bootstrapAddonsPaths; - }; - - systemd.paths.kube-addon-manager-bootstrap = { - wantedBy = [ "kube-addon-manager-bootstrap.service" ]; - pathConfig = { - PathExists = bootstrapAddonsPaths; - PathChanged = bootstrapAddonsPaths; - }; - }; - - services.kubernetes.addonManager.bootstrapAddonsKubeconfig.server = mkDefault top.apiserverAddress; - services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled (let name = system:kube-addon-manager; diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix index 2295694ffc74..70f96d75a461 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix @@ -74,7 +74,7 @@ in { spec = { replicas = 1; revisionHistoryLimit = 10; - selector.matchLabels."k8s-app" = "kubernetes-dashboard"; + selector.matchLabels.k8s-app = "kubernetes-dashboard"; template = { metadata = { labels = { @@ -169,23 +169,6 @@ in { }; }; - kubernetes-dashboard-cm = { - apiVersion = "v1"; - kind = "ConfigMap"; - metadata = { - labels = { - k8s-app = "kubernetes-dashboard"; - # Allows editing resource and makes sure it is created first. - "addonmanager.kubernetes.io/mode" = "EnsureExists"; - }; - name = "kubernetes-dashboard-settings"; - namespace = "kube-system"; - }; - }; - }; - - services.kubernetes.addonManager.bootstrapAddons = mkMerge [{ - kubernetes-dashboard-sa = { apiVersion = "v1"; kind = "ServiceAccount"; @@ -227,9 +210,20 @@ in { }; type = "Opaque"; }; - } - - (optionalAttrs cfg.rbac.enable + kubernetes-dashboard-cm = { + apiVersion = "v1"; + kind = "ConfigMap"; + metadata = { + labels = { + k8s-app = "kubernetes-dashboard"; + # Allows editing resource and makes sure it is created first. + "addonmanager.kubernetes.io/mode" = "EnsureExists"; + }; + name = "kubernetes-dashboard-settings"; + namespace = "kube-system"; + }; + }; + } // (optionalAttrs cfg.rbac.enable (let subjects = [{ kind = "ServiceAccount"; @@ -329,6 +323,6 @@ in { inherit subjects; }; }) - ))]; + )); }; } diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix index ee0ac632ecf0..47e588de3c93 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -73,7 +73,7 @@ in { metadata = { labels = { "addonmanager.kubernetes.io/mode" = "Reconcile"; - "k8s-app" = "kube-dns"; + k8s-app = "kube-dns"; "kubernetes.io/cluster-service" = "true"; "kubernetes.io/bootstrapping" = "rbac-defaults"; }; @@ -102,7 +102,7 @@ in { }; labels = { "addonmanager.kubernetes.io/mode" = "Reconcile"; - "k8s-app" = "kube-dns"; + k8s-app = "kube-dns"; "kubernetes.io/cluster-service" = "true"; "kubernetes.io/bootstrapping" = "rbac-defaults"; }; @@ -130,7 +130,7 @@ in { metadata = { labels = { "addonmanager.kubernetes.io/mode" = "Reconcile"; - "k8s-app" = "kube-dns"; + k8s-app = "kube-dns"; "kubernetes.io/cluster-service" = "true"; }; name = "coredns"; @@ -144,7 +144,7 @@ in { metadata = { labels = { "addonmanager.kubernetes.io/mode" = cfg.reconcileMode; - "k8s-app" = "kube-dns"; + k8s-app = "kube-dns"; "kubernetes.io/cluster-service" = "true"; }; name = "coredns"; @@ -175,7 +175,7 @@ in { metadata = { labels = { "addonmanager.kubernetes.io/mode" = cfg.reconcileMode; - "k8s-app" = "kube-dns"; + k8s-app = "kube-dns"; "kubernetes.io/cluster-service" = "true"; "kubernetes.io/name" = "CoreDNS"; }; @@ -301,7 +301,7 @@ in { }; labels = { "addonmanager.kubernetes.io/mode" = "Reconcile"; - "k8s-app" = "kube-dns"; + k8s-app = "kube-dns"; "kubernetes.io/cluster-service" = "true"; "kubernetes.io/name" = "CoreDNS"; }; diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix index f293dd79f42a..33796bf2e080 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -290,32 +290,11 @@ in ###### implementation config = mkMerge [ - (let - - apiserverPaths = filter (a: a != null) [ - cfg.clientCaFile - cfg.etcd.caFile - cfg.etcd.certFile - cfg.etcd.keyFile - cfg.kubeletClientCaFile - cfg.kubeletClientCertFile - cfg.kubeletClientKeyFile - cfg.serviceAccountKeyFile - cfg.tlsCertFile - cfg.tlsKeyFile - ]; - etcdPaths = filter (a: a != null) [ - config.services.etcd.trustedCaFile - config.services.etcd.certFile - config.services.etcd.keyFile - ]; - - in mkIf cfg.enable { + (mkIf cfg.enable { systemd.services.kube-apiserver = { description = "Kubernetes APIServer Service"; - wantedBy = [ "kube-control-plane-online.target" ]; - after = [ "certmgr.service" ]; - before = [ "kube-control-plane-online.target" ]; + wantedBy = [ "kubernetes.target" ]; + after = [ "network.target" ]; serviceConfig = { Slice = "kubernetes.slice"; ExecStart = ''${top.package}/bin/kube-apiserver \ @@ -386,15 +365,6 @@ in Restart = "on-failure"; RestartSec = 5; }; - unitConfig.ConditionPathExists = apiserverPaths; - }; - - systemd.paths.kube-apiserver = mkIf top.apiserver.enable { - wantedBy = [ "kube-apiserver.service" ]; - pathConfig = { - PathExists = apiserverPaths; - PathChanged = apiserverPaths; - }; }; services.etcd = { @@ -408,18 +378,6 @@ in initialAdvertisePeerUrls = mkDefault ["https://${top.masterAddress}:2380"]; }; - systemd.services.etcd = { - unitConfig.ConditionPathExists = etcdPaths; - }; - - systemd.paths.etcd = { - wantedBy = [ "etcd.service" ]; - pathConfig = { - PathExists = etcdPaths; - PathChanged = etcdPaths; - }; - }; - services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled { apiserver-kubelet-api-admin-crb = { diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix index b94e8bd86d4c..0b73d090f241 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix @@ -104,31 +104,11 @@ in }; ###### implementation - config = let - - controllerManagerPaths = filter (a: a != null) [ - cfg.kubeconfig.caFile - cfg.kubeconfig.certFile - cfg.kubeconfig.keyFile - cfg.rootCaFile - cfg.serviceAccountKeyFile - cfg.tlsCertFile - cfg.tlsKeyFile - ]; - - in mkIf cfg.enable { - systemd.services.kube-controller-manager = rec { + config = mkIf cfg.enable { + systemd.services.kube-controller-manager = { description = "Kubernetes Controller Manager Service"; - wantedBy = [ "kube-control-plane-online.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; - before = [ "kube-control-plane-online.target" ]; - environment.KUBECONFIG = top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig; - preStart = '' - until kubectl auth can-i get /api -q 2>/dev/null; do - echo kubectl auth can-i get /api: exit status $? - sleep 2 - done - ''; serviceConfig = { RestartSec = "30s"; Restart = "on-failure"; @@ -140,7 +120,7 @@ in "--cluster-cidr=${cfg.clusterCidr}"} \ ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ - --kubeconfig=${environment.KUBECONFIG} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \ --leader-elect=${boolToString cfg.leaderElect} \ ${optionalString (cfg.rootCaFile!=null) "--root-ca-file=${cfg.rootCaFile}"} \ @@ -161,16 +141,7 @@ in User = "kubernetes"; Group = "kubernetes"; }; - path = top.path ++ [ pkgs.kubectl ]; - unitConfig.ConditionPathExists = controllerManagerPaths; - }; - - systemd.paths.kube-controller-manager = { - wantedBy = [ "kube-controller-manager.service" ]; - pathConfig = { - PathExists = controllerManagerPaths; - PathChanged = controllerManagerPaths; - }; + path = top.path; }; services.kubernetes.pki.certs = with top.lib; { diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix index 143b41f57f6a..3790ac9b6918 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix @@ -256,29 +256,6 @@ in { wantedBy = [ "multi-user.target" ]; }; - systemd.targets.kube-control-plane-online = { - wantedBy = [ "kubernetes.target" ]; - before = [ "kubernetes.target" ]; - }; - - systemd.services.kube-control-plane-online = rec { - description = "Kubernetes control plane is online"; - wantedBy = [ "kube-control-plane-online.target" ]; - after = [ "kube-scheduler.service" "kube-controller-manager.service" ]; - before = [ "kube-control-plane-online.target" ]; - path = [ pkgs.curl ]; - preStart = '' - until curl -Ssf ${cfg.apiserverAddress}/healthz do - echo curl -Ssf ${cfg.apiserverAddress}/healthz: exit status $? - sleep 3 - done - ''; - script = "echo Ok"; - serviceConfig = { - TimeoutSec = "500"; - }; - }; - systemd.tmpfiles.rules = [ "d /opt/cni/bin 0755 root root -" "d /run/kubernetes 0755 kubernetes kubernetes -" @@ -302,8 +279,6 @@ in { services.kubernetes.apiserverAddress = mkDefault ("https://${if cfg.apiserver.advertiseAddress != null then cfg.apiserver.advertiseAddress else "${cfg.masterAddress}:${toString cfg.apiserver.securePort}"}"); - - services.kubernetes.kubeconfig.server = mkDefault cfg.apiserverAddress; }) ]; } diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix index d9437427d6d1..74d10d684375 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -14,36 +14,25 @@ let buildInputs = [ pkgs.makeWrapper ]; } '' mkdir -p $out - cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh # bashInteractive needed for `compgen` - makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh" + makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "${pkgs.kubernetes}/bin/mk-docker-opts.sh" ''; in { ###### interface options.services.kubernetes.flannel = { - enable = mkEnableOption "flannel networking"; - kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes flannel"; + enable = mkEnableOption "enable flannel networking"; }; ###### implementation - config = let - - flannelPaths = filter (a: a != null) [ - cfg.kubeconfig.caFile - cfg.kubeconfig.certFile - cfg.kubeconfig.keyFile - ]; - kubeconfig = top.lib.mkKubeConfig "flannel" cfg.kubeconfig; - - in mkIf cfg.enable { + config = mkIf cfg.enable { services.flannel = { enable = mkDefault true; network = mkDefault top.clusterCidr; - inherit storageBackend kubeconfig; - nodeName = top.kubelet.hostname; + inherit storageBackend; + nodeName = config.services.kubernetes.kubelet.hostname; }; services.kubernetes.kubelet = { @@ -58,66 +47,24 @@ in }]; }; - systemd.services.mk-docker-opts = { + systemd.services."mk-docker-opts" = { description = "Pre-Docker Actions"; - wantedBy = [ "flannel.target" ]; - before = [ "flannel.target" ]; path = with pkgs; [ gawk gnugrep ]; script = '' ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker systemctl restart docker ''; - unitConfig.ConditionPathExists = [ "/run/flannel/subnet.env" ]; serviceConfig.Type = "oneshot"; }; - systemd.paths.flannel-subnet-env = { - wantedBy = [ "mk-docker-opts.service" ]; - pathConfig = { - PathExists = [ "/run/flannel/subnet.env" ]; - PathChanged = [ "/run/flannel/subnet.env" ]; - Unit = "mk-docker-opts.service"; - }; - }; - - systemd.targets.flannel = { - wantedBy = [ "kube-node-online.target" ]; - before = [ "kube-node-online.target" ]; - }; - - systemd.services.flannel = { - wantedBy = [ "flannel.target" ]; - after = [ "kubelet.target" ]; - before = [ "flannel.target" ]; - path = with pkgs; [ iptables kubectl ]; - environment.KUBECONFIG = kubeconfig; - preStart = let - args = [ - "--selector=kubernetes.io/hostname=${top.kubelet.hostname}" - # flannel exits if node is not registered yet, before that there is no podCIDR - "--output=jsonpath={.items[0].spec.podCIDR}" - # if jsonpath cannot be resolved exit with status 1 - "--allow-missing-template-keys=false" - ]; - in '' - until kubectl get nodes ${concatStringsSep " " args} 2>/dev/null; do - echo Waiting for ${top.kubelet.hostname} to be RegisteredNode - sleep 1 - done - ''; - unitConfig.ConditionPathExists = flannelPaths; - }; - - systemd.paths.flannel = { + systemd.paths."flannel-subnet-env" = { wantedBy = [ "flannel.service" ]; pathConfig = { - PathExists = flannelPaths; - PathChanged = flannelPaths; + PathModified = "/run/flannel/subnet.env"; + Unit = "mk-docker-opts.service"; }; }; - services.kubernetes.flannel.kubeconfig.server = mkDefault top.apiserverAddress; - systemd.services.docker = { environment.DOCKER_OPTS = "-b none"; serviceConfig.EnvironmentFile = "-/run/flannel/docker"; @@ -144,6 +91,7 @@ in # give flannel som kubernetes rbac permissions if applicable services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) { + flannel-cr = { apiVersion = "rbac.authorization.k8s.io/v1beta1"; kind = "ClusterRole"; @@ -179,6 +127,7 @@ in name = "flannel-client"; }]; }; + }; }; } diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index 4c5df96bcc6a..250da4c807ec 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -61,12 +61,6 @@ in type = str; }; - allowPrivileged = mkOption { - description = "Whether to allow Kubernetes containers to request privileged mode."; - default = false; - type = bool; - }; - clusterDns = mkOption { description = "Use alternative DNS."; default = "10.1.0.1"; @@ -234,28 +228,21 @@ in ###### implementation config = mkMerge [ - (let - - kubeletPaths = filter (a: a != null) [ - cfg.kubeconfig.caFile - cfg.kubeconfig.certFile - cfg.kubeconfig.keyFile - cfg.clientCaFile - cfg.tlsCertFile - cfg.tlsKeyFile - ]; - - in mkIf cfg.enable { + (mkIf cfg.enable { services.kubernetes.kubelet.seedDockerImages = [infraContainer]; systemd.services.kubelet = { description = "Kubernetes Kubelet Service"; - wantedBy = [ "kubelet.target" ]; - after = [ "kube-control-plane-online.target" ]; - before = [ "kubelet.target" ]; + wantedBy = [ "kubernetes.target" ]; + after = [ "network.target" "docker.service" "kube-apiserver.service" ]; path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; preStart = '' - rm -f /opt/cni/bin/* || true + ${concatMapStrings (img: '' + echo "Seeding docker image: ${img}" + docker load <${img} + '') cfg.seedDockerImages} + + rm /opt/cni/bin/* || true ${concatMapStrings (package: '' echo "Linking cni package: ${package}" ln -fs ${package}/bin/* /opt/cni/bin @@ -269,7 +256,6 @@ in RestartSec = "1000ms"; ExecStart = ''${top.package}/bin/kubelet \ --address=${cfg.address} \ - --allow-privileged=${boolToString cfg.allowPrivileged} \ --authentication-token-webhook \ --authentication-token-webhook-cache-ttl="10s" \ --authorization-mode=Webhook \ @@ -308,56 +294,6 @@ in ''; WorkingDirectory = top.dataDir; }; - unitConfig.ConditionPathExists = kubeletPaths; - }; - - systemd.paths.kubelet = { - wantedBy = [ "kubelet.service" ]; - pathConfig = { - PathExists = kubeletPaths; - PathChanged = kubeletPaths; - }; - }; - - systemd.services.docker.before = [ "kubelet.service" ]; - - systemd.services.docker-seed-images = { - wantedBy = [ "docker.service" ]; - after = [ "docker.service" ]; - before = [ "kubelet.service" ]; - path = with pkgs; [ docker ]; - preStart = '' - ${concatMapStrings (img: '' - echo "Seeding docker image: ${img}" - docker load <${img} - '') cfg.seedDockerImages} - ''; - script = "echo Ok"; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - serviceConfig.Slice = "kubernetes.slice"; - }; - - systemd.services.kubelet-online = { - wantedBy = [ "kube-node-online.target" ]; - after = [ "flannel.target" "kubelet.target" ]; - before = [ "kube-node-online.target" ]; - # it is complicated. flannel needs kubelet to run the pause container before - # it discusses the node CIDR with apiserver and afterwards configures and restarts - # dockerd. Until then prevent creating any pods because they have to be recreated anyway - # because the network of docker0 has been changed by flannel. - script = let - docker-env = "/run/flannel/docker"; - flannel-date = "stat --print=%Y ${docker-env}"; - docker-date = "systemctl show --property=ActiveEnterTimestamp --value docker"; - in '' - until test -f ${docker-env} ; do sleep 1 ; done - while test `${flannel-date}` -gt `date +%s --date="$(${docker-date})"` ; do - sleep 1 - done - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.Slice = "kubernetes.slice"; }; # Allways include cni plugins @@ -404,16 +340,5 @@ in }; }) - { - systemd.targets.kubelet = { - wantedBy = [ "kube-node-online.target" ]; - before = [ "kube-node-online.target" ]; - }; - - systemd.targets.kube-node-online = { - wantedBy = [ "kubernetes.target" ]; - before = [ "kubernetes.target" ]; - }; - } ]; } diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix index 47384ae50a07..733479e24c97 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix @@ -27,11 +27,12 @@ let certmgrAPITokenPath = "${top.secretsPath}/${cfsslAPITokenBaseName}"; cfsslAPITokenLength = 32; - clusterAdminKubeconfig = with cfg.certs.clusterAdmin; { - server = top.apiserverAddress; - certFile = cert; - keyFile = key; - }; + clusterAdminKubeconfig = with cfg.certs.clusterAdmin; + top.lib.mkKubeConfig "cluster-admin" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; remote = with config.services; "https://${kubernetes.masterAddress}:${toString cfssl.port}"; in @@ -118,11 +119,6 @@ in cfsslCertPathPrefix = "${config.services.cfssl.dataDir}/cfssl"; cfsslCert = "${cfsslCertPathPrefix}.pem"; cfsslKey = "${cfsslCertPathPrefix}-key.pem"; - - certmgrPaths = [ - top.caFile - certmgrAPITokenPath - ]; in { @@ -172,40 +168,13 @@ in chown cfssl "${cfsslAPITokenPath}" && chmod 400 "${cfsslAPITokenPath}" '')]); - systemd.targets.cfssl-online = { - wantedBy = [ "network-online.target" ]; - after = [ "cfssl.service" "network-online.target" "cfssl-online.service" ]; - }; - - systemd.services.cfssl-online = { - description = "Wait for ${remote} to be reachable."; - wantedBy = [ "cfssl-online.target" ]; - before = [ "cfssl-online.target" ]; - path = [ pkgs.curl ]; - preStart = '' - until curl --fail-early -fskd '{}' ${remote}/api/v1/cfssl/info -o /dev/null; do - echo curl ${remote}/api/v1/cfssl/info: exit status $? - sleep 2 - done - ''; - script = "echo Ok"; - serviceConfig = { - TimeoutSec = "300"; - }; - }; - systemd.services.kube-certmgr-bootstrap = { description = "Kubernetes certmgr bootstrapper"; - wantedBy = [ "cfssl-online.target" ]; - after = [ "cfssl-online.target" ]; - before = [ "certmgr.service" ]; - path = with pkgs; [ curl cfssl ]; + wantedBy = [ "certmgr.service" ]; + after = [ "cfssl.target" ]; script = concatStringsSep "\n" ['' set -e - mkdir -p $(dirname ${certmgrAPITokenPath}) - mkdir -p $(dirname ${top.caFile}) - # If there's a cfssl (cert issuer) running locally, then don't rely on user to # manually paste it in place. Just symlink. # otherwise, create the target file, ready for users to insert the token @@ -217,18 +186,15 @@ in fi '' (optionalString (cfg.pkiTrustOnBootstrap) '' - if [ ! -s "${top.caFile}" ]; then - until test -s ${top.caFile}.json; do - sleep 2 - curl --fail-early -fskd '{}' ${remote}/api/v1/cfssl/info -o ${top.caFile}.json - done - cfssljson -f ${top.caFile}.json -stdout >${top.caFile} - rm ${top.caFile}.json + if [ ! -f "${top.caFile}" ] || [ $(cat "${top.caFile}" | wc -c) -lt 1 ]; then + ${pkgs.curl}/bin/curl --fail-early -f -kd '{}' ${remote}/api/v1/cfssl/info | \ + ${pkgs.cfssl}/bin/cfssljson -stdout >${top.caFile} fi '') ]; serviceConfig = { - TimeoutSec = "500"; + RestartSec = "10s"; + Restart = "on-failure"; }; }; @@ -264,28 +230,35 @@ in mapAttrs mkSpec cfg.certs; }; - systemd.services.certmgr = { - wantedBy = [ "cfssl-online.target" ]; - after = [ "cfssl-online.target" "kube-certmgr-bootstrap.service" ]; - preStart = '' - while ! test -s ${certmgrAPITokenPath} ; do - sleep 1 - echo Waiting for ${certmgrAPITokenPath} - done - ''; - unitConfig.ConditionPathExists = certmgrPaths; - }; - - systemd.paths.certmgr = { - wantedBy = [ "certmgr.service" ]; - pathConfig = { - PathExists = certmgrPaths; - PathChanged = certmgrPaths; - }; - }; - - environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (cfg.etcClusterAdminKubeconfig != null) - (top.lib.mkKubeConfig "cluster-admin" clusterAdminKubeconfig); + #TODO: Get rid of kube-addon-manager in the future for the following reasons + # - it is basically just a shell script wrapped around kubectl + # - it assumes that it is clusterAdmin or can gain clusterAdmin rights through serviceAccount + # - it is designed to be used with k8s system components only + # - it would be better with a more Nix-oriented way of managing addons + systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{ + environment.KUBECONFIG = with cfg.certs.addonManager; + top.lib.mkKubeConfig "addon-manager" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; + } + + (optionalAttrs (top.addonManager.bootstrapAddons != {}) { + serviceConfig.PermissionsStartOnly = true; + preStart = with pkgs; + let + files = mapAttrsToList (n: v: writeText "${n}.json" (builtins.toJSON v)) + top.addonManager.bootstrapAddons; + in + '' + export KUBECONFIG=${clusterAdminKubeconfig} + ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} + ''; + })]); + + environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig) + clusterAdminKubeconfig; environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [ (pkgs.writeScriptBin "nixos-kubernetes-node-join" '' @@ -311,22 +284,38 @@ in exit 1 fi - do_restart=$(test -s ${certmgrAPITokenPath} && echo -n y || echo -n n) - echo $token > ${certmgrAPITokenPath} chmod 600 ${certmgrAPITokenPath} - if [ y = $do_restart ]; then - echo "Restarting certmgr..." >&1 - systemctl restart certmgr - fi + echo "Restarting certmgr..." >&1 + systemctl restart certmgr + + echo "Waiting for certs to appear..." >&1 + + ${optionalString top.kubelet.enable '' + while [ ! -f ${cfg.certs.kubelet.cert} ]; do sleep 1; done + echo "Restarting kubelet..." >&1 + systemctl restart kubelet + ''} + + ${optionalString top.proxy.enable '' + while [ ! -f ${cfg.certs.kubeProxyClient.cert} ]; do sleep 1; done + echo "Restarting kube-proxy..." >&1 + systemctl restart kube-proxy + ''} - echo "Node joined succesfully" >&1 + ${optionalString top.flannel.enable '' + while [ ! -f ${cfg.certs.flannelClient.cert} ]; do sleep 1; done + echo "Restarting flannel..." >&1 + systemctl restart flannel + ''} + + echo "Node joined succesfully" '')]; # isolate etcd on loopback at the master node # easyCerts doesn't support multimaster clusters anyway atm. - services.etcd = mkIf top.apiserver.enable (with cfg.certs.etcd; { + services.etcd = with cfg.certs.etcd; { listenClientUrls = ["https://127.0.0.1:2379"]; listenPeerUrls = ["https://127.0.0.1:2380"]; advertiseClientUrls = ["https://etcd.local:2379"]; @@ -335,11 +324,19 @@ in certFile = mkDefault cert; keyFile = mkDefault key; trustedCaFile = mkDefault caCert; - }); + }; networking.extraHosts = mkIf (config.services.etcd.enable) '' 127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local ''; + services.flannel = with cfg.certs.flannelClient; { + kubeconfig = top.lib.mkKubeConfig "flannel" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; + }; + services.kubernetes = { apiserver = mkIf top.apiserver.enable (with cfg.certs.apiServer; { @@ -359,13 +356,6 @@ in proxyClientCertFile = mkDefault cfg.certs.apiserverProxyClient.cert; proxyClientKeyFile = mkDefault cfg.certs.apiserverProxyClient.key; }); - addonManager = mkIf top.addonManager.enable { - kubeconfig = with cfg.certs.addonManager; { - certFile = mkDefault cert; - keyFile = mkDefault key; - }; - bootstrapAddonsKubeconfig = clusterAdminKubeconfig; - }; controllerManager = mkIf top.controllerManager.enable { serviceAccountKeyFile = mkDefault cfg.certs.serviceAccount.key; rootCaFile = cfg.certs.controllerManagerClient.caCert; @@ -374,12 +364,6 @@ in keyFile = mkDefault key; }; }; - flannel = mkIf top.flannel.enable { - kubeconfig = with cfg.certs.flannelClient; { - certFile = cert; - keyFile = key; - }; - }; scheduler = mkIf top.scheduler.enable { kubeconfig = with cfg.certs.schedulerClient; { certFile = mkDefault cert; diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix index 23f4d97b7030..bd4bf04ea833 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -45,28 +45,12 @@ in }; ###### implementation - config = let - - proxyPaths = filter (a: a != null) [ - cfg.kubeconfig.caFile - cfg.kubeconfig.certFile - cfg.kubeconfig.keyFile - ]; - - in mkIf cfg.enable { - systemd.services.kube-proxy = rec { + config = mkIf cfg.enable { + systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; - wantedBy = [ "kube-node-online.target" ]; - after = [ "kubelet-online.service" ]; - before = [ "kube-node-online.target" ]; - environment.KUBECONFIG = top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig; - path = with pkgs; [ iptables conntrack_tools kubectl ]; - preStart = '' - until kubectl auth can-i get nodes/${top.kubelet.hostname} -q 2>/dev/null; do - echo kubectl auth can-i get nodes/${top.kubelet.hostname}: exit status $? - sleep 2 - done - ''; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + path = with pkgs; [ iptables conntrack_tools ]; serviceConfig = { Slice = "kubernetes.slice"; ExecStart = ''${top.package}/bin/kube-proxy \ @@ -75,7 +59,7 @@ in "--cluster-cidr=${top.clusterCidr}"} \ ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ - --kubeconfig=${environment.KUBECONFIG} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ ${cfg.extraOpts} ''; @@ -83,15 +67,6 @@ in Restart = "on-failure"; RestartSec = 5; }; - unitConfig.ConditionPathExists = proxyPaths; - }; - - systemd.paths.kube-proxy = { - wantedBy = [ "kube-proxy.service" ]; - pathConfig = { - PathExists = proxyPaths; - PathChanged = proxyPaths; - }; }; services.kubernetes.pki.certs = { diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix index a0e484542951..5f6113227d9d 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -56,35 +56,18 @@ in }; ###### implementation - config = let - - schedulerPaths = filter (a: a != null) [ - cfg.kubeconfig.caFile - cfg.kubeconfig.certFile - cfg.kubeconfig.keyFile - ]; - - in mkIf cfg.enable { - systemd.services.kube-scheduler = rec { + config = mkIf cfg.enable { + systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; - wantedBy = [ "kube-control-plane-online.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; - before = [ "kube-control-plane-online.target" ]; - environment.KUBECONFIG = top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig; - path = [ pkgs.kubectl ]; - preStart = '' - until kubectl auth can-i get /api -q 2>/dev/null; do - echo kubectl auth can-i get /api: exit status $? - sleep 2 - done - ''; serviceConfig = { Slice = "kubernetes.slice"; ExecStart = ''${top.package}/bin/kube-scheduler \ --address=${cfg.address} \ ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ - --kubeconfig=${environment.KUBECONFIG} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \ --leader-elect=${boolToString cfg.leaderElect} \ --port=${toString cfg.port} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ @@ -96,15 +79,6 @@ in Restart = "on-failure"; RestartSec = 5; }; - unitConfig.ConditionPathExists = schedulerPaths; - }; - - systemd.paths.kube-scheduler = { - wantedBy = [ "kube-scheduler.service" ]; - pathConfig = { - PathExists = schedulerPaths; - PathChanged = schedulerPaths; - }; }; services.kubernetes.pki.certs = { diff --git a/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix index c7fe4eeeab99..500acb485620 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix @@ -43,7 +43,7 @@ in ###### interface options = { - services.hydra = rec { + services.hydra = { enable = mkOption { type = types.bool; diff --git a/nixpkgs/nixos/modules/services/databases/cassandra.nix b/nixpkgs/nixos/modules/services/databases/cassandra.nix index 9c8b6c50af14..90c094f68b61 100644 --- a/nixpkgs/nixos/modules/services/databases/cassandra.nix +++ b/nixpkgs/nixos/modules/services/databases/cassandra.nix @@ -397,14 +397,14 @@ in { } ]; users = mkIf (cfg.user == defaultUser) { - extraUsers."${defaultUser}" = + extraUsers.${defaultUser} = { group = cfg.group; home = cfg.homeDir; createHome = true; uid = config.ids.uids.cassandra; description = "Cassandra service user"; }; - extraGroups."${defaultUser}".gid = config.ids.gids.cassandra; + extraGroups.${defaultUser}.gid = config.ids.gids.cassandra; }; systemd.services.cassandra = diff --git a/nixpkgs/nixos/modules/services/databases/pgmanage.nix b/nixpkgs/nixos/modules/services/databases/pgmanage.nix index 1050c2dd481a..0f8634dab319 100644 --- a/nixpkgs/nixos/modules/services/databases/pgmanage.nix +++ b/nixpkgs/nixos/modules/services/databases/pgmanage.nix @@ -59,8 +59,8 @@ in { type = types.attrsOf types.str; default = {}; example = { - "nuc-server" = "hostaddr=192.168.0.100 port=5432 dbname=postgres"; - "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; + nuc-server = "hostaddr=192.168.0.100 port=5432 dbname=postgres"; + mini-server = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; }; description = '' pgmanage requires at least one PostgreSQL server be defined. @@ -192,13 +192,13 @@ in { }; }; users = { - users."${pgmanage}" = { + users.${pgmanage} = { name = pgmanage; group = pgmanage; home = cfg.sqlRoot; createHome = true; }; - groups."${pgmanage}" = { + groups.${pgmanage} = { name = pgmanage; }; }; diff --git a/nixpkgs/nixos/modules/services/databases/postgresql.nix b/nixpkgs/nixos/modules/services/databases/postgresql.nix index 10250bb5193a..7bba4dacddcc 100644 --- a/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -81,6 +81,10 @@ in default = ""; description = '' Defines the mapping from system users to database users. + + The general form is: + + map-name system-username database-username ''; }; @@ -224,7 +228,7 @@ in # systems! mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 - else pkgs.postgresql_9_4); + else throw "postgresql_9_4 was removed, please upgrade your postgresql version."); services.postgresql.dataDir = mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}" diff --git a/nixpkgs/nixos/modules/services/desktops/blueman.nix b/nixpkgs/nixos/modules/services/desktops/blueman.nix new file mode 100644 index 000000000000..18ad610247ed --- /dev/null +++ b/nixpkgs/nixos/modules/services/desktops/blueman.nix @@ -0,0 +1,25 @@ +# blueman service +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.blueman; +in { + ###### interface + options = { + services.blueman = { + enable = mkEnableOption "blueman"; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.blueman ]; + + services.dbus.packages = [ pkgs.blueman ]; + + systemd.packages = [ pkgs.blueman ]; + }; +} diff --git a/nixpkgs/nixos/modules/services/desktops/geoclue2.nix b/nixpkgs/nixos/modules/services/desktops/geoclue2.nix index 040fe157d52d..6007dddf50c0 100644 --- a/nixpkgs/nixos/modules/services/desktops/geoclue2.nix +++ b/nixpkgs/nixos/modules/services/desktops/geoclue2.nix @@ -202,14 +202,14 @@ in ]; # restart geoclue service when the configuration changes - systemd.services."geoclue".restartTriggers = [ + systemd.services.geoclue.restartTriggers = [ config.environment.etc."geoclue/geoclue.conf".source ]; # this needs to run as a user service, since it's associated with the # user who is making the requests systemd.user.services = mkIf cfg.enableDemoAgent { - "geoclue-agent" = { + geoclue-agent = { description = "Geoclue agent"; script = "${package}/libexec/geoclue-2.0/demos/agent"; # this should really be `partOf = [ "geoclue.service" ]`, but @@ -219,12 +219,12 @@ in }; }; - services.geoclue2.appConfig."epiphany" = { + services.geoclue2.appConfig.epiphany = { isAllowed = true; isSystem = false; }; - services.geoclue2.appConfig."firefox" = { + services.geoclue2.appConfig.firefox = { isAllowed = true; isSystem = false; }; diff --git a/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix index 2740a22c7ca0..3d2b3ed85e3a 100644 --- a/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix +++ b/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix @@ -23,5 +23,7 @@ with lib; environment.systemPackages = [ pkgs.chrome-gnome-shell ]; services.dbus.packages = [ pkgs.chrome-gnome-shell ]; + + nixpkgs.config.firefox.enableGnomeExtensions = true; }; } diff --git a/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix index 186668d7d385..fcd58509d6fc 100644 --- a/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix +++ b/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix @@ -22,11 +22,11 @@ with lib; config = mkIf config.services.gnome3.glib-networking.enable { - services.dbus.packages = [ pkgs.gnome3.glib-networking ]; + services.dbus.packages = [ pkgs.glib-networking ]; - systemd.packages = [ pkgs.gnome3.glib-networking ]; + systemd.packages = [ pkgs.glib-networking ]; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ]; + environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; }; diff --git a/nixpkgs/nixos/modules/services/desktops/system-config-printer.nix b/nixpkgs/nixos/modules/services/desktops/system-config-printer.nix new file mode 100644 index 000000000000..8a80be266b20 --- /dev/null +++ b/nixpkgs/nixos/modules/services/desktops/system-config-printer.nix @@ -0,0 +1,38 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.system-config-printer = { + + enable = mkEnableOption "system-config-printer, a service for CUPS administration used by printing interfaces"; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.system-config-printer.enable { + + services.dbus.packages = [ + pkgs.system-config-printer + ]; + + systemd.packages = [ + pkgs.system-config-printer + ]; + + services.udev.packages = [ + pkgs.system-config-printer + ]; + + }; + +} diff --git a/nixpkgs/nixos/modules/services/editors/emacs.xml b/nixpkgs/nixos/modules/services/editors/emacs.xml index 8ced302bad1e..03483f69fa2f 100644 --- a/nixpkgs/nixos/modules/services/editors/emacs.xml +++ b/nixpkgs/nixos/modules/services/editors/emacs.xml @@ -59,7 +59,7 @@ <para> The latest stable version of Emacs 25 using the <link - xlink:href="http://www.gtk.org">GTK+ 2</link> + xlink:href="http://www.gtk.org">GTK 2</link> widget toolkit. </para> </listitem> @@ -321,7 +321,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides <para> If you want, you can tweak the Emacs package itself from your <filename>emacs.nix</filename>. For example, if you want to have a - GTK+3-based Emacs instead of the default GTK+2-based binary and remove the + GTK 3-based Emacs instead of the default GTK 2-based binary and remove the automatically generated <filename>emacs.desktop</filename> (useful is you only use <command>emacsclient</command>), you can change your file <filename>emacs.nix</filename> in this way: @@ -349,7 +349,7 @@ in [...] <para> After building this file as shown in <xref linkend="ex-emacsNix" />, you - will get an GTK3-based Emacs binary pre-loaded with your favorite packages. + will get an GTK 3-based Emacs binary pre-loaded with your favorite packages. </para> </section> </section> diff --git a/nixpkgs/nixos/modules/services/games/terraria.nix b/nixpkgs/nixos/modules/services/games/terraria.nix index 31f8edca20ce..a59b74c0b4c4 100644 --- a/nixpkgs/nixos/modules/services/games/terraria.nix +++ b/nixpkgs/nixos/modules/services/games/terraria.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.terraria; - worldSizeMap = { "small" = 1; "medium" = 2; "large" = 3; }; + worldSizeMap = { small = 1; medium = 2; large = 3; }; valFlag = name: val: optionalString (val != null) "-${name} \"${escape ["\\" "\""] (toString val)}\""; boolFlag = name: val: optionalString val "-${name}"; flags = [ diff --git a/nixpkgs/nixos/modules/services/hardware/sane.nix b/nixpkgs/nixos/modules/services/hardware/sane.nix index 3f52658ff013..b344dfc20610 100644 --- a/nixpkgs/nixos/modules/services/hardware/sane.nix +++ b/nixpkgs/nixos/modules/services/hardware/sane.nix @@ -124,7 +124,7 @@ in environment.sessionVariables = env; services.udev.packages = backends; - users.groups."scanner".gid = config.ids.gids.scanner; + users.groups.scanner.gid = config.ids.gids.scanner; }) (mkIf config.services.saned.enable { @@ -152,7 +152,7 @@ in }; }; - users.users."scanner" = { + users.users.scanner = { uid = config.ids.uids.scanner; group = "scanner"; }; diff --git a/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix index fd19d8020fb8..6bf31982b71a 100644 --- a/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix +++ b/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix @@ -33,7 +33,7 @@ let addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "brscan4-etc-files-0.4.3-3"; src = "${brscan4}/opt/brother/scanner/brscan4"; diff --git a/nixpkgs/nixos/modules/services/hardware/throttled.nix b/nixpkgs/nixos/modules/services/hardware/throttled.nix index 13fc5e4792e6..7617c4492d7c 100644 --- a/nixpkgs/nixos/modules/services/hardware/throttled.nix +++ b/nixpkgs/nixos/modules/services/hardware/throttled.nix @@ -20,7 +20,7 @@ in { config = mkIf cfg.enable { systemd.packages = [ pkgs.throttled ]; # The upstream package has this in Install, but that's not enough, see the NixOS manual - systemd.services."lenovo_fix".wantedBy = [ "multi-user.target" ]; + systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ]; environment.etc."lenovo_fix.conf".source = if cfg.extraConfig != "" diff --git a/nixpkgs/nixos/modules/services/hardware/tlp.nix b/nixpkgs/nixos/modules/services/hardware/tlp.nix index 092ff051a042..4f8af7978286 100644 --- a/nixpkgs/nixos/modules/services/hardware/tlp.nix +++ b/nixpkgs/nixos/modules/services/hardware/tlp.nix @@ -60,11 +60,11 @@ in powerManagement.cpufreq.max = null; powerManagement.cpufreq.min = null; - systemd.sockets."systemd-rfkill".enable = false; + systemd.sockets.systemd-rfkill.enable = false; systemd.services = { "systemd-rfkill@".enable = false; - "systemd-rfkill".enable = false; + systemd-rfkill.enable = false; tlp = { description = "TLP system startup/shutdown"; diff --git a/nixpkgs/nixos/modules/services/hardware/upower.nix b/nixpkgs/nixos/modules/services/hardware/upower.nix index 1da47349c077..5e7ac7a6e659 100644 --- a/nixpkgs/nixos/modules/services/hardware/upower.nix +++ b/nixpkgs/nixos/modules/services/hardware/upower.nix @@ -5,8 +5,11 @@ with lib; let + cfg = config.services.upower; + in + { ###### interface @@ -49,55 +52,7 @@ in services.udev.packages = [ cfg.package ]; - systemd.services.upower = - { description = "Power Management Daemon"; - path = [ pkgs.glib.out ]; # needed for gdbus - serviceConfig = - { Type = "dbus"; - BusName = "org.freedesktop.UPower"; - ExecStart = "@${cfg.package}/libexec/upowerd upowerd"; - Restart = "on-failure"; - # Upstream lockdown: - # Filesystem lockdown - ProtectSystem = "strict"; - # Needed by keyboard backlight support - ProtectKernelTunables = false; - ProtectControlGroups = true; - ReadWritePaths = "/var/lib/upower"; - ProtectHome = true; - PrivateTmp = true; - - # Network - # PrivateNetwork=true would block udev's netlink socket - RestrictAddressFamilies = "AF_UNIX AF_NETLINK"; - - # Execute Mappings - MemoryDenyWriteExecute = true; - - # Modules - ProtectKernelModules = true; - - # Real-time - RestrictRealtime = true; - - # Privilege escalation - NoNewPrivileges = true; - }; - }; - - system.activationScripts.upower = - '' - mkdir -m 0755 -p /var/lib/upower - ''; - - # The upower daemon seems to get stuck after doing a suspend - # (i.e. subsequent suspend requests will say "Sleep has already - # been requested and is pending"). So as a workaround, restart - # the daemon. - powerManagement.resumeCommands = - '' - ${config.systemd.package}/bin/systemctl try-restart upower - ''; + systemd.packages = [ cfg.package ]; }; diff --git a/nixpkgs/nixos/modules/services/logging/logcheck.nix b/nixpkgs/nixos/modules/services/logging/logcheck.nix index e7d6e3d62638..6d8be5b926d5 100644 --- a/nixpkgs/nixos/modules/services/logging/logcheck.nix +++ b/nixpkgs/nixos/modules/services/logging/logcheck.nix @@ -23,9 +23,9 @@ let flags = "-r ${rulesDir} -c ${configFile} -L ${logFiles} -${levelFlag} -m ${cfg.mailTo}"; levelFlag = getAttrFromPath [cfg.level] - { "paranoid" = "p"; - "server" = "s"; - "workstation" = "w"; + { paranoid = "p"; + server = "s"; + workstation = "w"; }; cronJob = '' diff --git a/nixpkgs/nixos/modules/services/logging/logstash.nix b/nixpkgs/nixos/modules/services/logging/logstash.nix index 9b707e9deb58..4943e8d7db3a 100644 --- a/nixpkgs/nixos/modules/services/logging/logstash.nix +++ b/nixpkgs/nixos/modules/services/logging/logstash.nix @@ -53,7 +53,7 @@ in type = types.package; default = pkgs.logstash; defaultText = "pkgs.logstash"; - example = literalExample "pkgs.logstash5"; + example = literalExample "pkgs.logstash"; description = "Logstash package to use."; }; diff --git a/nixpkgs/nixos/modules/services/mail/mlmmj.nix b/nixpkgs/nixos/modules/services/mail/mlmmj.nix index 11565bc02f89..7ae00f3e501e 100644 --- a/nixpkgs/nixos/modules/services/mail/mlmmj.nix +++ b/nixpkgs/nixos/modules/services/mail/mlmmj.nix @@ -137,7 +137,7 @@ in ${pkgs.postfix}/bin/postmap ${stateDir}/transports ''; - systemd.services."mlmmj-maintd" = { + systemd.services.mlmmj-maintd = { description = "mlmmj maintenance daemon"; serviceConfig = { User = cfg.user; @@ -146,7 +146,7 @@ in }; }; - systemd.timers."mlmmj-maintd" = { + systemd.timers.mlmmj-maintd = { description = "mlmmj maintenance timer"; timerConfig.OnUnitActiveSec = cfg.maintInterval; wantedBy = [ "timers.target" ]; diff --git a/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix b/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix index 9599854352c9..38984f896d6a 100644 --- a/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix +++ b/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix @@ -40,7 +40,7 @@ with lib; systemPackages = [ pkgs.pfixtools ]; }; - systemd.services."pfix-srsd" = { + systemd.services.pfix-srsd = { description = "Postfix sender rewriting scheme daemon"; before = [ "postfix.service" ]; #note that we use requires rather than wants because postfix diff --git a/nixpkgs/nixos/modules/services/mail/postfix.nix b/nixpkgs/nixos/modules/services/mail/postfix.nix index c9b3ff0c8f8a..d5fd76da970b 100644 --- a/nixpkgs/nixos/modules/services/mail/postfix.nix +++ b/nixpkgs/nixos/modules/services/mail/postfix.nix @@ -877,22 +877,22 @@ in } (mkIf haveAliases { - services.postfix.aliasFiles."aliases" = aliasesFile; + services.postfix.aliasFiles.aliases = aliasesFile; }) (mkIf haveTransport { - services.postfix.mapFiles."transport" = transportFile; + services.postfix.mapFiles.transport = transportFile; }) (mkIf haveVirtual { - services.postfix.mapFiles."virtual" = virtualFile; + services.postfix.mapFiles.virtual = virtualFile; }) (mkIf haveLocalRecipients { - services.postfix.mapFiles."local_recipients" = localRecipientMapFile; + services.postfix.mapFiles.local_recipients = localRecipientMapFile; }) (mkIf cfg.enableHeaderChecks { - services.postfix.mapFiles."header_checks" = headerChecksFile; + services.postfix.mapFiles.header_checks = headerChecksFile; }) (mkIf (cfg.dnsBlacklists != []) { - services.postfix.mapFiles."client_access" = checkClientAccessFile; + services.postfix.mapFiles.client_access = checkClientAccessFile; }) ]); } diff --git a/nixpkgs/nixos/modules/services/mail/postgrey.nix b/nixpkgs/nixos/modules/services/mail/postgrey.nix index 660c4ca74b10..88fb7f0b4ad1 100644 --- a/nixpkgs/nixos/modules/services/mail/postgrey.nix +++ b/nixpkgs/nixos/modules/services/mail/postgrey.nix @@ -7,7 +7,7 @@ with lib; let natural = with types; addCheck int (x: x >= 0); natural' = with types; addCheck int (x: x > 0); - socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port"); + socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? path || x ? port); inetSocket = with types; { options = { @@ -151,7 +151,7 @@ in { }; systemd.services.postgrey = let - bind-flag = if cfg.socket ? "path" then + bind-flag = if cfg.socket ? path then ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}'' else ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}''; diff --git a/nixpkgs/nixos/modules/services/mail/rspamd.nix b/nixpkgs/nixos/modules/services/mail/rspamd.nix index e1ba63078111..89aa9d17ff7f 100644 --- a/nixpkgs/nixos/modules/services/mail/rspamd.nix +++ b/nixpkgs/nixos/modules/services/mail/rspamd.nix @@ -387,7 +387,7 @@ in gid = config.ids.gids.rspamd; }; - environment.etc."rspamd".source = rspamdDir; + environment.etc.rspamd.source = rspamdDir; systemd.services.rspamd = { description = "Rspamd Service"; diff --git a/nixpkgs/nixos/modules/services/misc/airsonic.nix b/nixpkgs/nixos/modules/services/misc/airsonic.nix index f449ccaa8d2c..919d3b2f6e64 100644 --- a/nixpkgs/nixos/modules/services/misc/airsonic.nix +++ b/nixpkgs/nixos/modules/services/misc/airsonic.nix @@ -138,8 +138,8 @@ in { services.nginx = mkIf (cfg.virtualHost != null) { enable = true; - virtualHosts."${cfg.virtualHost}" = { - locations."${cfg.contextPath}".proxyPass = "http://${cfg.listenAddress}:${toString cfg.port}"; + virtualHosts.${cfg.virtualHost} = { + locations.${cfg.contextPath}.proxyPass = "http://${cfg.listenAddress}:${toString cfg.port}"; }; }; diff --git a/nixpkgs/nixos/modules/services/misc/dysnomia.nix b/nixpkgs/nixos/modules/services/misc/dysnomia.nix index 61ea822890ed..9402d5cd801c 100644 --- a/nixpkgs/nixos/modules/services/misc/dysnomia.nix +++ b/nixpkgs/nixos/modules/services/misc/dysnomia.nix @@ -8,9 +8,9 @@ let printProperties = properties: concatMapStrings (propertyName: let - property = properties."${propertyName}"; + property = properties.${propertyName}; in - if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties."${propertyName}")})\n" + if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties.${propertyName})})\n" else "${propertyName}=\"${toString property}\"\n" ) (builtins.attrNames properties); @@ -31,7 +31,7 @@ let ${concatMapStrings (containerName: let - containerProperties = cfg.containers."${containerName}"; + containerProperties = cfg.containers.${containerName}; in '' cat > ${containerName} <<EOF @@ -49,10 +49,10 @@ let ${concatMapStrings (componentName: let - component = cfg.components."${containerName}"."${componentName}"; + component = cfg.components.${containerName}.${componentName}; in "ln -s ${component} ${containerName}/${componentName}\n" - ) (builtins.attrNames (cfg.components."${containerName}" or {}))} + ) (builtins.attrNames (cfg.components.${containerName} or {}))} ''; componentsDir = pkgs.stdenv.mkDerivation { diff --git a/nixpkgs/nixos/modules/services/misc/exhibitor.nix b/nixpkgs/nixos/modules/services/misc/exhibitor.nix index f526270cb4b3..74f4f671f460 100644 --- a/nixpkgs/nixos/modules/services/misc/exhibitor.nix +++ b/nixpkgs/nixos/modules/services/misc/exhibitor.nix @@ -58,7 +58,7 @@ let }; }; cliOptions = concatStringsSep " " (mapAttrsToList (k: v: "--${k} ${v}") (filterAttrs (k: v: v != null && v != "") (cliOptionsCommon // - cliOptionsPerConfig."${cfg.configType}" // + cliOptionsPerConfig.${cfg.configType} // s3CommonOptions // optionalAttrs cfg.s3Backup { s3backup = "true"; } // optionalAttrs cfg.fileSystemBackup { filesystembackup = "true"; } diff --git a/nixpkgs/nixos/modules/services/misc/gitlab.nix b/nixpkgs/nixos/modules/services/misc/gitlab.nix index 09c3a89d6a68..caef4ad4ea80 100644 --- a/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: # TODO: support non-postgresql @@ -12,14 +12,12 @@ let gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url; - pgSuperUser = config.services.postgresql.superUser; databaseConfig = { production = { adapter = "postgresql"; database = cfg.databaseName; host = cfg.databaseHost; - password = cfg.databasePassword; username = cfg.databaseUsername; encoding = "utf8"; pool = cfg.databasePool; @@ -66,13 +64,6 @@ let redisConfig.production.url = "redis://localhost:6379/"; - secretsConfig.production = { - secret_key_base = cfg.secrets.secret; - otp_key_base = cfg.secrets.otp; - db_key_base = cfg.secrets.db; - openid_connect_signing_key = cfg.secrets.jws; - }; - gitlabConfig = { # These are the default settings from config/gitlab.example.yml production = flip recursiveUpdate cfg.extraConfig { @@ -140,7 +131,7 @@ let RAILS_ENV = "production"; }; - gitlab-rake = pkgs.stdenv.mkDerivation rec { + gitlab-rake = pkgs.stdenv.mkDerivation { name = "gitlab-rake"; buildInputs = [ pkgs.makeWrapper ]; dontBuild = true; @@ -155,7 +146,7 @@ let ''; }; - gitlab-rails = pkgs.stdenv.mkDerivation rec { + gitlab-rails = pkgs.stdenv.mkDerivation { name = "gitlab-rails"; buildInputs = [ pkgs.makeWrapper ]; dontBuild = true; @@ -180,10 +171,11 @@ let address: "${cfg.smtp.address}", port: ${toString cfg.smtp.port}, ${optionalString (cfg.smtp.username != null) ''user_name: "${cfg.smtp.username}",''} - ${optionalString (cfg.smtp.password != null) ''password: "${cfg.smtp.password}",''} + ${optionalString (cfg.smtp.passwordFile != null) ''password: "@smtpPassword@",''} domain: "${cfg.smtp.domain}", ${optionalString (cfg.smtp.authentication != null) "authentication: :${cfg.smtp.authentication},"} enable_starttls_auto: ${toString cfg.smtp.enableStartTLSAuto}, + ca_file: "/etc/ssl/certs/ca-certificates.crt", openssl_verify_mode: '${cfg.smtp.opensslVerifyMode}' } end @@ -244,13 +236,33 @@ in { databaseHost = mkOption { type = types.str; - default = "127.0.0.1"; - description = "Gitlab database hostname."; + default = ""; + description = '' + Gitlab database hostname. An empty string means <quote>use + local unix socket connection</quote>. + ''; }; - databasePassword = mkOption { - type = types.str; - description = "Gitlab database user password."; + databasePasswordFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + File containing the Gitlab database user password. + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. + ''; + }; + + databaseCreateLocally = mkOption { + type = types.bool; + default = true; + description = '' + Whether a database should be automatically created on the + local host. Set this to <literal>false</literal> if you plan + on provisioning a local database yourself or use an external + one. + ''; }; databaseName = mkOption { @@ -338,10 +350,15 @@ in { ''; }; - initialRootPassword = mkOption { - type = types.str; + initialRootPasswordFile = mkOption { + type = with types; nullOr path; + default = null; description = '' - Initial password of the root account if this is a new install. + File containing the initial password of the root account if + this is a new install. + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. ''; }; @@ -365,15 +382,20 @@ in { }; username = mkOption { - type = types.nullOr types.str; + type = with types; nullOr str; default = null; description = "Username of the SMTP server for Gitlab."; }; - password = mkOption { - type = types.nullOr types.str; + passwordFile = mkOption { + type = types.nullOr types.path; default = null; - description = "Password of the SMTP server for Gitlab."; + description = '' + File containing the password of the SMTP server for Gitlab. + + This should be a string, not a nix path, since nix paths + are copied into the world-readable nix store. + ''; }; domain = mkOption { @@ -383,7 +405,7 @@ in { }; authentication = mkOption { - type = types.nullOr types.str; + type = with types; nullOr str; default = null; description = "Authentitcation type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; }; @@ -401,68 +423,125 @@ in { }; }; - secrets.secret = mkOption { - type = types.str; + secrets.secretFile = mkOption { + type = with types; nullOr path; + default = null; description = '' - The secret is used to encrypt variables in the DB. If - you change or lose this key you will be unable to access variables - stored in database. + A file containing the secret used to encrypt variables in + the DB. If you change or lose this key you will be unable to + access variables stored in database. Make sure the secret is at least 30 characters and all random, no regular words or you'll be exposed to dictionary attacks. + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. ''; }; - secrets.db = mkOption { - type = types.str; + secrets.dbFile = mkOption { + type = with types; nullOr path; + default = null; description = '' - The secret is used to encrypt variables in the DB. If - you change or lose this key you will be unable to access variables - stored in database. + A file containing the secret used to encrypt variables in + the DB. If you change or lose this key you will be unable to + access variables stored in database. Make sure the secret is at least 30 characters and all random, no regular words or you'll be exposed to dictionary attacks. + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. ''; }; - secrets.otp = mkOption { - type = types.str; + secrets.otpFile = mkOption { + type = with types; nullOr path; + default = null; description = '' - The secret is used to encrypt secrets for OTP tokens. If - you change or lose this key, users which have 2FA enabled for login - won't be able to login anymore. + A file containing the secret used to encrypt secrets for OTP + tokens. If you change or lose this key, users which have 2FA + enabled for login won't be able to login anymore. Make sure the secret is at least 30 characters and all random, no regular words or you'll be exposed to dictionary attacks. + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. ''; }; - secrets.jws = mkOption { - type = types.str; + secrets.jwsFile = mkOption { + type = with types; nullOr path; + default = null; description = '' - The secret is used to encrypt session keys. If you change or lose - this key, users will be disconnected. + A file containing the secret used to encrypt session + keys. If you change or lose this key, users will be + disconnected. Make sure the secret is an RSA private key in PEM format. You can generate one with openssl genrsa 2048 + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. ''; }; extraConfig = mkOption { type = types.attrs; default = {}; - example = { - gitlab = { - default_projects_features = { - builds = false; + example = literalExample '' + { + gitlab = { + default_projects_features = { + builds = false; + }; + }; + omniauth = { + enabled = true; + auto_sign_in_with_provider = "openid_connect"; + allow_single_sign_on = ["openid_connect"]; + block_auto_created_users = false; + providers = [ + { + name = "openid_connect"; + label = "OpenID Connect"; + args = { + name = "openid_connect"; + scope = ["openid" "profile"]; + response_type = "code"; + issuer = "https://keycloak.example.com/auth/realms/My%20Realm"; + discovery = true; + client_auth_method = "query"; + uid_field = "preferred_username"; + client_options = { + identifier = "gitlab"; + secret = { _secret = "/var/keys/gitlab_oidc_secret"; }; + redirect_uri = "https://git.example.com/users/auth/openid_connect/callback"; + }; + }; + } + ]; }; }; - }; + ''; description = '' - Extra options to be merged into config/gitlab.yml as nix - attribute set. + Extra options to be added under + <literal>production</literal> in + <filename>config/gitlab.yml</filename>, as a nix attribute + set. + + Options containing secret data should be set to an attribute + set containing the attribute <literal>_secret</literal> - a + string pointing to a file containing the value the option + should be set to. See the example to get a better picture of + this: in the resulting + <filename>config/gitlab.yml</filename> file, the + <literal>production.omniauth.providers[0].args.client_options.secret</literal> + key will be set to the contents of the + <filename>/var/keys/gitlab_oidc_secret</filename> file. ''; }; }; @@ -470,12 +549,66 @@ in { config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.databaseCreateLocally -> (cfg.user == cfg.databaseUsername); + message = "For local automatic database provisioning services.gitlab.user and services.gitlab.databaseUsername should be identical."; + } + { + assertion = (cfg.databaseHost != "") -> (cfg.databasePasswordFile != null); + message = "When services.gitlab.databaseHost is customized, services.gitlab.databasePasswordFile must be set!"; + } + { + assertion = cfg.initialRootPasswordFile != null; + message = "services.gitlab.initialRootPasswordFile must be set!"; + } + { + assertion = cfg.secrets.secretFile != null; + message = "services.gitlab.secrets.secretFile must be set!"; + } + { + assertion = cfg.secrets.dbFile != null; + message = "services.gitlab.secrets.dbFile must be set!"; + } + { + assertion = cfg.secrets.otpFile != null; + message = "services.gitlab.secrets.otpFile must be set!"; + } + { + assertion = cfg.secrets.jwsFile != null; + message = "services.gitlab.secrets.jwsFile must be set!"; + } + ]; + environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ]; # Redis is required for the sidekiq queue runner. services.redis.enable = mkDefault true; + # We use postgres as the main data store. - services.postgresql.enable = mkDefault true; + services.postgresql = optionalAttrs cfg.databaseCreateLocally { + enable = true; + ensureUsers = singleton { name = cfg.databaseUsername; }; + }; + # The postgresql module doesn't currently support concepts like + # objects owners and extensions; for now we tack on what's needed + # here. + systemd.services.postgresql.postStart = mkAfter (optionalString cfg.databaseCreateLocally '' + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' + current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'") + if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then + $PSQL -tAc 'ALTER DATABASE "${cfg.databaseName}" OWNER TO "${cfg.databaseUsername}"' + if [[ -e "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" ]]; then + echo "Reassigning ownership of database ${cfg.databaseName} to user ${cfg.databaseUsername} failed on last boot. Failing..." + exit 1 + fi + touch "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" + $PSQL "${cfg.databaseName}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.databaseUsername}\"" + rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" + fi + $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" + ''); + # Use postfix to send out mails. services.postfix.enable = mkDefault true; @@ -527,14 +660,9 @@ in { "L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}" - "L+ ${cfg.statePath}/config/gitlab.yml - - - - ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)}" - "L+ ${cfg.statePath}/config/database.yml - - - - ${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)}" - "L+ ${cfg.statePath}/config/secrets.yml - - - - ${pkgs.writeText "secrets.yml" (builtins.toJSON secretsConfig)}" "L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}" - "L+ ${cfg.statePath}/config/initializers/extra-gitlab.rb - - - - ${extraGitlabRb}" - ] ++ optional cfg.smtp.enable - "L+ ${cfg.statePath}/config/initializers/smtp_settings.rb - - - - ${smtpSettings}" ; + ]; systemd.services.gitlab-sidekiq = { after = [ "network.target" "redis.service" "gitlab.service" ]; @@ -626,46 +754,75 @@ in { gnupg ]; preStart = '' - ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION - ${pkgs.sudo}/bin/sudo -u ${cfg.user} rm -rf ${cfg.statePath}/db/* - ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config - ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db - - ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret - - ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${cfg.packages.gitlab-shell}/bin/install - - if ! test -e "${cfg.statePath}/db-created"; then - if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'" - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} - - # enable required pg_trgm extension for gitlab - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" + cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION + rm -rf ${cfg.statePath}/db/* + cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db + + ${cfg.packages.gitlab-shell}/bin/install + + ${optionalString cfg.smtp.enable '' + install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb + ${optionalString (cfg.smtp.passwordFile != null) '' + smtp_password=$(<'${cfg.smtp.passwordFile}') + ${pkgs.replace}/bin/replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb' + ''} + ''} + + ( + umask u=rwx,g=,o= + + ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret + + ${if cfg.databasePasswordFile != null then '' + export db_password="$(<'${cfg.databasePasswordFile}')" + + if [[ -z "$db_password" ]]; then + >&2 echo "Database password was an empty string!" + exit 1 + fi + + ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ + '.production.password = $ENV.db_password' \ + >'${cfg.statePath}/config/database.yml' + '' + else '' + ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ + >'${cfg.statePath}/config/database.yml' + '' + } + + ${utils.genJqSecretsReplacementSnippet + gitlabConfig + "${cfg.statePath}/config/gitlab.yml" + } + + if [[ -h '${cfg.statePath}/config/secrets.yml' ]]; then + rm '${cfg.statePath}/config/secrets.yml' fi - ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:schema:load - - ${pkgs.sudo}/bin/sudo -u ${cfg.user} touch "${cfg.statePath}/db-created" - fi - - # Always do the db migrations just to be sure the database is up-to-date - ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:migrate - - if ! test -e "${cfg.statePath}/db-seeded"; then - ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${gitlab-rake}/bin/gitlab-rake db:seed_fu \ - GITLAB_ROOT_PASSWORD='${cfg.initialRootPassword}' GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' - ${pkgs.sudo}/bin/sudo -u ${cfg.user} touch "${cfg.statePath}/db-seeded" - fi + export secret="$(<'${cfg.secrets.secretFile}')" + export db="$(<'${cfg.secrets.dbFile}')" + export otp="$(<'${cfg.secrets.otpFile}')" + export jws="$(<'${cfg.secrets.jwsFile}')" + ${pkgs.jq}/bin/jq -n '{production: {secret_key_base: $ENV.secret, + otp_key_base: $ENV.db, + db_key_base: $ENV.otp, + openid_connect_signing_key: $ENV.jws}}' \ + > '${cfg.statePath}/config/secrets.yml' + ) + + initial_root_password="$(<'${cfg.initialRootPasswordFile}')" + ${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \ + GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' # We remove potentially broken links to old gitlab-shell versions rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks - ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${pkgs.git}/bin/git config --global core.autocrlf "input" + ${pkgs.git}/bin/git config --global core.autocrlf "input" ''; serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; User = cfg.user; Group = cfg.group; diff --git a/nixpkgs/nixos/modules/services/misc/gitlab.xml b/nixpkgs/nixos/modules/services/misc/gitlab.xml index 5ff570a442f6..b6171a9a194c 100644 --- a/nixpkgs/nixos/modules/services/misc/gitlab.xml +++ b/nixpkgs/nixos/modules/services/misc/gitlab.xml @@ -54,8 +54,8 @@ <programlisting> services.gitlab = { <link linkend="opt-services.gitlab.enable">enable</link> = true; - <link linkend="opt-services.gitlab.databasePassword">databasePassword</link> = "eXaMpl3"; - <link linkend="opt-services.gitlab.initialRootPassword">initialRootPassword</link> = "UseNixOS!"; + <link linkend="opt-services.gitlab.databasePasswordFile">databasePasswordFile</link> = "/var/keys/gitlab/db_password"; + <link linkend="opt-services.gitlab.initialRootPasswordFile">initialRootPasswordFile</link> = "/var/keys/gitlab/root_password"; <link linkend="opt-services.gitlab.https">https</link> = true; <link linkend="opt-services.gitlab.host">host</link> = "git.example.com"; <link linkend="opt-services.gitlab.port">port</link> = 443; @@ -67,38 +67,10 @@ services.gitlab = { <link linkend="opt-services.gitlab.smtp.port">port</link> = 25; }; secrets = { - <link linkend="opt-services.gitlab.secrets.db">db</link> = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; - <link linkend="opt-services.gitlab.secrets.secret">secret</link> = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; - <link linkend="opt-services.gitlab.secrets.otp">otp</link> = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; - <link linkend="opt-services.gitlab.secrets.jws">jws</link> = '' - -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK - ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm - hnsjuNIXTF7BXrx3RX6BxZpH5Vzzh9nCwWKT/JCFqtwH7afNGGL7aMf+hdaiUg/Q - SD05yRObioiO4iXDolsJOhrnbZvlzVHl1ZYxFJv0H6/Snc0BBA9Fl/3uj6ANpbjP - eXF1SnJCqT87bj46r5NdVauzaRxAsIfqHroHK4UZ98X5LjGQFGvSqTvyjPBS4I1i - s7VJU28ObuutHxIxSlH0ibn4HZqWmKWlTS652wIDAQABAoIBAGtPcUTTw2sJlR3x - 4k2wfAvLexkHNbZhBdKEa5JiO5mWPuLKwUiZEY2CU7Gd6csG3oqNWcm7/IjtC7dz - xV8p4yp8T4yq7vQIJ93B80NqTLtBD2QTvG2RCMJEPMzJUObWxkVmyVpLQyZo7KOd - KE/OM+aj94OUeEYLjRkSCScz1Gvq/qFG/nAy7KPCmN9JDHuhX26WHo2Rr1OnPNT/ - 7diph0bB9F3b8gjjNTqXDrpdAqVOgR/PsjEBz6DMY+bdyMIn87q2yfmMexxRofN6 - LulpzSaa6Yup8N8H6PzVO6KAkQuf1aQRj0sMwGk1IZEnj6I0KbuHIZkw21Nc6sf2 - ESFySDECgYEA1PnCNn5tmLnwe62Ttmrzl20zIS3Me1gUVJ1NTfr6+ai0I9iMYU21 - 5czuAjJPm9JKQF2vY8UAaCj2ZoObtHa/anb3xsCd8NXoM3iJq5JDoXI1ldz3Y+ad - U/bZUg1DLRvAniTuXmw9iOTwTwPxlDIGq5k+wG2Xmi1lk7zH8ezr9BMCgYEA0gfk - EhgcmPH8Z5cU3YYwOdt6HSJOM0OyN4k/5gnkv+HYVoJTj02gkrJmLr+mi1ugKj46 - 7huYO9TVnrKP21tmbaSv1dp5hS3letVRIxSloEtVGXmmdvJvBRzDWos+G+KcvADi - fFCz6w8v9NmO40CB7y/3SxTmSiSxDQeoi9LhDBkCgYEAsPgMWm25sfOnkY2NNUIv - wT8bAlHlHQT2d8zx5H9NttBpR3P0ShJhuF8N0sNthSQ7ULrIN5YGHYcUH+DyLAWU - TuomP3/kfa+xL7vUYb269tdJEYs4AkoppxBySoz8qenqpz422D0G8M6TpIS5Y5Qi - GMrQ6uLl21YnlpiCaFOfSQMCgYEAmZxj1kgEQmhZrnn1LL/D7czz1vMMNrpAUhXz - wg9iWmSXkU3oR1sDIceQrIhHCo2M6thwyU0tXjUft93pEQocM/zLDaGoVxtmRxxV - J08mg8IVD3jFoyFUyWxsBIDqgAKRl38eJsXvkO+ep3mm49Z+Ma3nM+apN3j2dQ0w - 3HLzXaECgYBFLMEAboVFwi5+MZjGvqtpg2PVTisfuJy2eYnPwHs+AXUgi/xRNFjI - YHEa7UBPb5TEPSzWImQpETi2P5ywcUYL1EbN/nqPWmjFnat8wVmJtV4sUpJhubF4 - Vqm9LxIWc1uQ1q1HDCejRIxIN3aSH+wgRS3Kcj8kCTIoXd1aERb04g== - -----END RSA PRIVATE KEY----- - ''; + <link linkend="opt-services.gitlab.secrets.dbFile">dbFile</link> = "/var/keys/gitlab/db"; + <link linkend="opt-services.gitlab.secrets.secretFile">secretFile</link> = "/var/keys/gitlab/secret"; + <link linkend="opt-services.gitlab.secrets.otpFile">otpFile</link> = "/var/keys/gitlab/otp"; + <link linkend="opt-services.gitlab.secrets.jwsFile">jwsFile</link> = "/var/keys/gitlab/jws"; }; <link linkend="opt-services.gitlab.extraConfig">extraConfig</link> = { gitlab = { @@ -113,12 +85,16 @@ services.gitlab = { </para> <para> - If you're setting up a new Gitlab instance, generate new secrets. You for - instance use <literal>tr -dc A-Za-z0-9 < /dev/urandom | head -c - 128</literal> to generate a new secret. Gitlab encrypts sensitive data - stored in the database. If you're restoring an existing Gitlab instance, you - must specify the secrets secret from <literal>config/secrets.yml</literal> - located in your Gitlab state folder. + If you're setting up a new Gitlab instance, generate new + secrets. You for instance use <literal>tr -dc A-Za-z0-9 < + /dev/urandom | head -c 128 > /var/keys/gitlab/db</literal> to + generate a new db secret. Make sure the files can be read by, and + only by, the user specified by <link + linkend="opt-services.gitlab.user">services.gitlab.user</link>. Gitlab + encrypts sensitive data stored in the database. If you're restoring + an existing Gitlab instance, you must specify the secrets secret + from <literal>config/secrets.yml</literal> located in your Gitlab + state folder. </para> <para> diff --git a/nixpkgs/nixos/modules/services/misc/gitolite.nix b/nixpkgs/nixos/modules/services/misc/gitolite.nix index cbe2c06ab651..cc69f81bbcc4 100644 --- a/nixpkgs/nixos/modules/services/misc/gitolite.nix +++ b/nixpkgs/nixos/modules/services/misc/gitolite.nix @@ -147,7 +147,7 @@ in group = cfg.group; useDefaultShell = true; }; - users.groups."${cfg.group}".gid = config.ids.gids.gitolite; + users.groups.${cfg.group}.gid = config.ids.gids.gitolite; systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} - -" @@ -157,7 +157,7 @@ in "Z ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -" ]; - systemd.services."gitolite-init" = { + systemd.services.gitolite-init = { description = "Gitolite initialization"; wantedBy = [ "multi-user.target" ]; unitConfig.RequiresMountsFor = cfg.dataDir; diff --git a/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix b/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix index 3eb649b08a2f..018fac386163 100644 --- a/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix @@ -374,7 +374,7 @@ in { user = cfg.database_user; database = cfg.database_name; }; - }."${cfg.database_type}"; + }.${cfg.database_type}; description = '' Arguments to pass to the engine. ''; diff --git a/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index 088dfd71860b..3826f728afd0 100644 --- a/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -500,12 +500,12 @@ in optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) ( # a x86_64 builder can run code for `platform.gcc.arch` and minor architectures: [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ { - "sandybridge" = [ "gccarch-westmere" ]; - "ivybridge" = [ "gccarch-westmere" "gccarch-sandybridge" ]; - "haswell" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ]; - "broadwell" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ]; - "skylake" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ]; - "skylake-avx512" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ]; + sandybridge = [ "gccarch-westmere" ]; + ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ]; + haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ]; + broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ]; + skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ]; + skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ]; }.${pkgs.hostPlatform.platform.gcc.arch} or [] ) ); diff --git a/nixpkgs/nixos/modules/services/misc/nixos-manual.nix b/nixpkgs/nixos/modules/services/misc/nixos-manual.nix index df3e71c80dea..20ba3d8ef0bc 100644 --- a/nixpkgs/nixos/modules/services/misc/nixos-manual.nix +++ b/nixpkgs/nixos/modules/services/misc/nixos-manual.nix @@ -54,7 +54,7 @@ in (mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) { boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ]; - systemd.services."nixos-manual" = { + systemd.services.nixos-manual = { description = "NixOS Manual"; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/misc/pykms.nix b/nixpkgs/nixos/modules/services/misc/pykms.nix index ef90d124a284..ab00086e591e 100644 --- a/nixpkgs/nixos/modules/services/misc/pykms.nix +++ b/nixpkgs/nixos/modules/services/misc/pykms.nix @@ -9,7 +9,7 @@ in { meta.maintainers = with lib.maintainers; [ peterhoeg ]; options = { - services.pykms = rec { + services.pykms = { enable = mkOption { type = types.bool; default = false; diff --git a/nixpkgs/nixos/modules/services/misc/snapper.nix b/nixpkgs/nixos/modules/services/misc/snapper.nix index 62b344d11b06..6f3aaa973a04 100644 --- a/nixpkgs/nixos/modules/services/misc/snapper.nix +++ b/nixpkgs/nixos/modules/services/misc/snapper.nix @@ -44,7 +44,7 @@ in configs = mkOption { default = { }; example = literalExample { - "home" = { + home = { subvolume = "/home"; extraConfig = '' ALLOW_USERS="alice" diff --git a/nixpkgs/nixos/modules/services/misc/synergy.nix b/nixpkgs/nixos/modules/services/misc/synergy.nix index b89cb41ac3ad..bfab8c534d8c 100644 --- a/nixpkgs/nixos/modules/services/misc/synergy.nix +++ b/nixpkgs/nixos/modules/services/misc/synergy.nix @@ -83,7 +83,7 @@ in config = mkMerge [ (mkIf cfgC.enable { - systemd.user.services."synergy-client" = { + systemd.user.services.synergy-client = { after = [ "network.target" "graphical-session.target" ]; description = "Synergy client"; wantedBy = optional cfgC.autoStart "graphical-session.target"; @@ -93,7 +93,7 @@ in }; }) (mkIf cfgS.enable { - systemd.user.services."synergy-server" = { + systemd.user.services.synergy-server = { after = [ "network.target" "graphical-session.target" ]; description = "Synergy server"; wantedBy = optional cfgS.autoStart "graphical-session.target"; diff --git a/nixpkgs/nixos/modules/services/misc/zoneminder.nix b/nixpkgs/nixos/modules/services/misc/zoneminder.nix index bf38b9ad7a2d..3bff04e7127d 100644 --- a/nixpkgs/nixos/modules/services/misc/zoneminder.nix +++ b/nixpkgs/nixos/modules/services/misc/zoneminder.nix @@ -11,7 +11,7 @@ let group = { nginx = config.services.nginx.group; none = user; - }."${cfg.webserver}"; + }.${cfg.webserver}; useNginx = cfg.webserver == "nginx"; @@ -225,7 +225,7 @@ in { nginx = lib.mkIf useNginx { enable = true; virtualHosts = { - "${cfg.hostname}" = { + ${cfg.hostname} = { default = true; root = "${pkg}/share/zoneminder/www"; listen = [ { addr = "0.0.0.0"; inherit (cfg) port; } ]; @@ -312,7 +312,7 @@ in { }; systemd.services = { - zoneminder = with pkgs; rec { + zoneminder = with pkgs; { inherit (zoneminder.meta) description; documentation = [ "https://zoneminder.readthedocs.org/en/latest/" ]; path = [ @@ -356,11 +356,11 @@ in { }; }; - users.groups."${user}" = { + users.groups.${user} = { gid = config.ids.gids.zoneminder; }; - users.users."${user}" = { + users.users.${user} = { uid = config.ids.uids.zoneminder; group = user; inherit home; diff --git a/nixpkgs/nixos/modules/services/misc/zookeeper.nix b/nixpkgs/nixos/modules/services/misc/zookeeper.nix index 50c84e3c6b80..5d91e44a199d 100644 --- a/nixpkgs/nixos/modules/services/misc/zookeeper.nix +++ b/nixpkgs/nixos/modules/services/misc/zookeeper.nix @@ -121,6 +121,7 @@ in { systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' 0700 zookeeper - - -" + "Z '${cfg.dataDir}' 0700 zookeeper - - -" ]; systemd.services.zookeeper = { diff --git a/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index c0ea1eeb424f..5ee6b092a6a4 100644 --- a/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -184,7 +184,7 @@ in { }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ]; + environment.systemPackages = [ pkgs.dd-agent pkgs.sysstat pkgs.procps ]; users.users.datadog = { description = "Datadog Agent User"; diff --git a/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix b/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix index 9c976c65ea49..b90579bb70c7 100644 --- a/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix +++ b/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix @@ -51,7 +51,7 @@ in { description = "FusionInventory user"; }; - systemd.services."fusion-inventory" = { + systemd.services.fusion-inventory = { description = "Fusion Inventory Agent"; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/monitoring/monit.nix b/nixpkgs/nixos/modules/services/monitoring/monit.nix index 32e14ab21ffc..ca9352272174 100644 --- a/nixpkgs/nixos/modules/services/monitoring/monit.nix +++ b/nixpkgs/nixos/modules/services/monitoring/monit.nix @@ -23,7 +23,7 @@ in environment.systemPackages = [ pkgs.monit ]; - environment.etc."monitrc" = { + environment.etc.monitrc = { text = cfg.config; mode = "0400"; }; @@ -39,7 +39,7 @@ in KillMode = "process"; Restart = "always"; }; - restartTriggers = [ config.environment.etc."monitrc".source ]; + restartTriggers = [ config.environment.etc.monitrc.source ]; }; }; diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index 647d67533b89..191c0bff9c84 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -4,37 +4,14 @@ with lib; let cfg = config.services.prometheus; - cfg2 = config.services.prometheus2; - promUser = "prometheus"; - promGroup = "prometheus"; - - stateDir = - if cfg.stateDir != null - then cfg.stateDir - else - if cfg.dataDir != null - then - # This assumes /var/lib/ is a prefix of cfg.dataDir. - # This is checked as an assertion below. - removePrefix stateDirBase cfg.dataDir - else "prometheus"; - stateDirBase = "/var/lib/"; - workingDir = stateDirBase + stateDir; - workingDir2 = stateDirBase + cfg2.stateDir; - # a wrapper that verifies that the configuration is valid - promtoolCheck = what: name: file: pkgs.runCommand "${name}-${what}-checked" - { buildInputs = [ cfg.package ]; } '' - ln -s ${file} $out - promtool ${what} $out - ''; + workingDir = "/var/lib/" + cfg.stateDir; - # a wrapper that verifies that the configuration is valid for - # prometheus 2 - prom2toolCheck = what: name: file: + # a wrapper that verifies that the configuration is valid + promtoolCheck = what: name: file: pkgs.runCommand "${name}-${replaceStrings [" "] [""] what}-checked" - { buildInputs = [ cfg2.package ]; } '' + { buildInputs = [ cfg.package ]; } '' ln -s ${file} $out promtool ${what} $out ''; @@ -45,61 +22,34 @@ let echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out ''; - # This becomes the main config file for Prometheus 1 + generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; + + # This becomes the main config file for Prometheus promConfig = { global = filterValidPrometheus cfg.globalConfig; - rule_files = map (promtoolCheck "check-rules" "rules") (cfg.ruleFiles ++ [ + rule_files = map (promtoolCheck "check rules" "rules") (cfg.ruleFiles ++ [ (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules)) ]); scrape_configs = filterValidPrometheus cfg.scrapeConfigs; + alerting = { + inherit (cfg) alertmanagers; + }; }; - generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; - prometheusYml = let yml = if cfg.configText != null then pkgs.writeText "prometheus.yml" cfg.configText else generatedPrometheusYml; - in promtoolCheck "check-config" "prometheus.yml" yml; + in promtoolCheck "check config" "prometheus.yml" yml; cmdlineArgs = cfg.extraFlags ++ [ - "-storage.local.path=${workingDir}/metrics" - "-config.file=${prometheusYml}" - "-web.listen-address=${cfg.listenAddress}" - "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" - "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" + "--storage.tsdb.path=${workingDir}/data/" + "--config.file=${prometheusYml}" + "--web.listen-address=${cfg.listenAddress}" + "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" + "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" ] ++ - optional (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}" ++ - optional (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}"; - - # This becomes the main config file for Prometheus 2 - promConfig2 = { - global = filterValidPrometheus cfg2.globalConfig; - rule_files = map (prom2toolCheck "check rules" "rules") (cfg2.ruleFiles ++ [ - (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg2.rules)) - ]); - scrape_configs = filterValidPrometheus cfg2.scrapeConfigs; - alerting = { - inherit (cfg2) alertmanagers; - }; - }; - - generatedPrometheus2Yml = writePrettyJSON "prometheus.yml" promConfig2; - - prometheus2Yml = let - yml = if cfg2.configText != null then - pkgs.writeText "prometheus.yml" cfg2.configText - else generatedPrometheus2Yml; - in prom2toolCheck "check config" "prometheus.yml" yml; - - cmdlineArgs2 = cfg2.extraFlags ++ [ - "--storage.tsdb.path=${workingDir2}/data/" - "--config.file=${prometheus2Yml}" - "--web.listen-address=${cfg2.listenAddress}" - "--alertmanager.notification-queue-capacity=${toString cfg2.alertmanagerNotificationQueueCapacity}" - "--alertmanager.timeout=${toString cfg2.alertmanagerTimeout}s" - ] ++ - optional (cfg2.webExternalUrl != null) "--web.external-url=${cfg2.webExternalUrl}"; + optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"; filterValidPrometheus = filterAttrsListRecursive (n: v: !(n == "_module" || v == null)); filterAttrsListRecursive = pred: x: @@ -514,343 +464,159 @@ let }; in { - options = { - services.prometheus = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the Prometheus monitoring daemon. - ''; - }; - - package = mkOption { - type = types.package; - default = pkgs.prometheus; - defaultText = "pkgs.prometheus"; - description = '' - The prometheus package that should be used. - ''; - }; - - listenAddress = mkOption { - type = types.str; - default = "0.0.0.0:9090"; - description = '' - Address to listen on for the web interface, API, and telemetry. - ''; - }; - - dataDir = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Directory to store Prometheus metrics data. - This option is deprecated, please use <option>services.prometheus.stateDir</option>. - ''; - }; - - stateDir = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Directory below <literal>${stateDirBase}</literal> to store Prometheus metrics data. - This directory will be created automatically using systemd's StateDirectory mechanism. - Defaults to <literal>prometheus</literal>. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching Prometheus. - ''; - }; - - configText = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - If non-null, this option defines the text that is written to - prometheus.yml. If null, the contents of prometheus.yml is generated - from the structured config options. - ''; - }; - - globalConfig = mkOption { - type = promTypes.globalConfig; - default = {}; - description = '' - Parameters that are valid in all configuration contexts. They - also serve as defaults for other configuration sections - ''; - }; - - rules = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Alerting and/or Recording rules to evaluate at runtime. - ''; - }; - - ruleFiles = mkOption { - type = types.listOf types.path; - default = []; - description = '' - Any additional rules files to include in this configuration. - ''; - }; + options.services.prometheus = { - scrapeConfigs = mkOption { - type = types.listOf promTypes.scrape_config; - default = []; - description = '' - A list of scrape configurations. - ''; - }; - - alertmanagerURL = mkOption { - type = types.listOf types.str; - default = []; - description = '' - List of Alertmanager URLs to send notifications to. - ''; - }; - - alertmanagerNotificationQueueCapacity = mkOption { - type = types.int; - default = 10000; - description = '' - The capacity of the queue for pending alert manager notifications. - ''; - }; - - alertmanagerTimeout = mkOption { - type = types.int; - default = 10; - description = '' - Alert manager HTTP API timeout (in seconds). - ''; - }; - - webExternalUrl = mkOption { - type = types.nullOr types.str; - default = null; - example = "https://example.com/"; - description = '' - The URL under which Prometheus is externally reachable (for example, - if Prometheus is served via a reverse proxy). - ''; - }; + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Prometheus monitoring daemon. + ''; }; - services.prometheus2 = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the Prometheus 2 monitoring daemon. - ''; - }; + package = mkOption { + type = types.package; + default = pkgs.prometheus; + defaultText = "pkgs.prometheus"; + description = '' + The prometheus package that should be used. + ''; + }; - package = mkOption { - type = types.package; - default = pkgs.prometheus_2; - defaultText = "pkgs.prometheus_2"; - description = '' - The prometheus2 package that should be used. - ''; - }; + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0:9090"; + description = '' + Address to listen on for the web interface, API, and telemetry. + ''; + }; - listenAddress = mkOption { - type = types.str; - default = "0.0.0.0:9090"; - description = '' - Address to listen on for the web interface, API, and telemetry. - ''; - }; + stateDir = mkOption { + type = types.str; + default = "prometheus2"; + description = '' + Directory below <literal>/var/lib</literal> to store Prometheus metrics data. + This directory will be created automatically using systemd's StateDirectory mechanism. + ''; + }; - stateDir = mkOption { - type = types.str; - default = "prometheus2"; - description = '' - Directory below <literal>${stateDirBase}</literal> to store Prometheus metrics data. - This directory will be created automatically using systemd's StateDirectory mechanism. - Defaults to <literal>prometheus2</literal>. - ''; - }; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching Prometheus. + ''; + }; - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching Prometheus 2. - ''; - }; + configText = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + If non-null, this option defines the text that is written to + prometheus.yml. If null, the contents of prometheus.yml is generated + from the structured config options. + ''; + }; - configText = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - If non-null, this option defines the text that is written to - prometheus.yml. If null, the contents of prometheus.yml is generated - from the structured config options. - ''; - }; + globalConfig = mkOption { + type = promTypes.globalConfig; + default = {}; + description = '' + Parameters that are valid in all configuration contexts. They + also serve as defaults for other configuration sections + ''; + }; - globalConfig = mkOption { - type = promTypes.globalConfig; - default = {}; - description = '' - Parameters that are valid in all configuration contexts. They - also serve as defaults for other configuration sections - ''; - }; + rules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Alerting and/or Recording rules to evaluate at runtime. + ''; + }; - rules = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Alerting and/or Recording rules to evaluate at runtime. - ''; - }; + ruleFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Any additional rules files to include in this configuration. + ''; + }; - ruleFiles = mkOption { - type = types.listOf types.path; - default = []; - description = '' - Any additional rules files to include in this configuration. - ''; - }; + scrapeConfigs = mkOption { + type = types.listOf promTypes.scrape_config; + default = []; + description = '' + A list of scrape configurations. + ''; + }; - scrapeConfigs = mkOption { - type = types.listOf promTypes.scrape_config; - default = []; - description = '' - A list of scrape configurations. - ''; - }; + alertmanagers = mkOption { + type = types.listOf types.attrs; + example = literalExample '' + [ { + scheme = "https"; + path_prefix = "/alertmanager"; + static_configs = [ { + targets = [ + "prometheus.domain.tld" + ]; + } ]; + } ] + ''; + default = []; + description = '' + A list of alertmanagers to send alerts to. + See <link xlink:href="https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alertmanager_config">the official documentation</link> for more information. + ''; + }; - alertmanagers = mkOption { - type = types.listOf types.attrs; - example = literalExample '' - [ { - scheme = "https"; - path_prefix = "/alertmanager"; - static_configs = [ { - targets = [ - "prometheus.domain.tld" - ]; - } ]; - } ] - ''; - default = []; - description = '' - A list of alertmanagers to send alerts to. - See <link xlink:href="https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alertmanager_config">the official documentation</link> for more information. - ''; - }; + alertmanagerNotificationQueueCapacity = mkOption { + type = types.int; + default = 10000; + description = '' + The capacity of the queue for pending alert manager notifications. + ''; + }; - alertmanagerNotificationQueueCapacity = mkOption { - type = types.int; - default = 10000; - description = '' - The capacity of the queue for pending alert manager notifications. - ''; - }; + alertmanagerTimeout = mkOption { + type = types.int; + default = 10; + description = '' + Alert manager HTTP API timeout (in seconds). + ''; + }; - alertmanagerTimeout = mkOption { - type = types.int; - default = 10; - description = '' - Alert manager HTTP API timeout (in seconds). - ''; - }; + webExternalUrl = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://example.com/"; + description = '' + The URL under which Prometheus is externally reachable (for example, + if Prometheus is served via a reverse proxy). + ''; + }; + }; - webExternalUrl = mkOption { - type = types.nullOr types.str; - default = null; - example = "https://example.com/"; - description = '' - The URL under which Prometheus is externally reachable (for example, - if Prometheus is served via a reverse proxy). - ''; - }; + config = mkIf cfg.enable { + users.groups.prometheus.gid = config.ids.gids.prometheus; + users.users.prometheus = { + description = "Prometheus daemon user"; + uid = config.ids.uids.prometheus; + group = "prometheus"; }; - }; - - config = mkMerge [ - (mkIf (cfg.enable || cfg2.enable) { - users.groups.${promGroup}.gid = config.ids.gids.prometheus; - users.users.${promUser} = { - description = "Prometheus daemon user"; - uid = config.ids.uids.prometheus; - group = promGroup; + systemd.services.prometheus = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/prometheus" + + optionalString (length cmdlineArgs != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs); + User = "prometheus"; + Restart = "always"; + WorkingDirectory = workingDir; + StateDirectory = cfg.stateDir; }; - }) - (mkIf cfg.enable { - warnings = - optional (cfg.dataDir != null) '' - The option services.prometheus.dataDir is deprecated, please use - services.prometheus.stateDir. - ''; - assertions = [ - { - assertion = !(cfg.dataDir != null && cfg.stateDir != null); - message = - "The options services.prometheus.dataDir and services.prometheus.stateDir" + - " can't both be set at the same time! It's recommended to only set the latter" + - " since the former is deprecated."; - } - { - assertion = cfg.dataDir != null -> hasPrefix stateDirBase cfg.dataDir; - message = - "The option services.prometheus.dataDir should have ${stateDirBase} as a prefix!"; - } - { - assertion = cfg.stateDir != null -> !hasPrefix "/" cfg.stateDir; - message = - "The option services.prometheus.stateDir shouldn't be an absolute directory." + - " It should be a directory relative to ${stateDirBase}."; - } - { - assertion = cfg2.stateDir != null -> !hasPrefix "/" cfg2.stateDir; - message = - "The option services.prometheus2.stateDir shouldn't be an absolute directory." + - " It should be a directory relative to ${stateDirBase}."; - } - ]; - systemd.services.prometheus = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/prometheus" + - optionalString (length cmdlineArgs != 0) (" \\\n " + - concatStringsSep " \\\n " cmdlineArgs); - User = promUser; - Restart = "always"; - WorkingDirectory = workingDir; - StateDirectory = stateDir; - }; - }; - }) - (mkIf cfg2.enable { - systemd.services.prometheus2 = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${cfg2.package}/bin/prometheus" + - optionalString (length cmdlineArgs2 != 0) (" \\\n " + - concatStringsSep " \\\n " cmdlineArgs2); - User = promUser; - Restart = "always"; - WorkingDirectory = workingDir2; - StateDirectory = cfg2.stateDir; - }; - }; - }) - ]; + }; + }; } diff --git a/nixpkgs/nixos/modules/services/monitoring/thanos.nix b/nixpkgs/nixos/modules/services/monitoring/thanos.nix index b41e99b76477..215cd43fd864 100644 --- a/nixpkgs/nixos/modules/services/monitoring/thanos.nix +++ b/nixpkgs/nixos/modules/services/monitoring/thanos.nix @@ -70,14 +70,14 @@ let } ''json2yaml -i $json -o $out''; thanos = cmd: "${cfg.package}/bin/thanos ${cmd}" + - (let args = cfg."${cmd}".arguments; + (let args = cfg.${cmd}.arguments; in optionalString (length args != 0) (" \\\n " + concatStringsSep " \\\n " args)); argumentsOf = cmd: concatLists (collect isList - (flip mapParamsRecursive params."${cmd}" (path: param: + (flip mapParamsRecursive params.${cmd} (path: param: let opt = concatStringsSep "." path; - v = getAttrFromPath path cfg."${cmd}"; + v = getAttrFromPath path cfg.${cmd}; in param.toArgs opt v))); mkArgumentsOption = cmd: mkOption { @@ -95,7 +95,7 @@ let }; mapParamsRecursive = - let noParam = attr: !(attr ? "toArgs" && attr ? "option"); + let noParam = attr: !(attr ? toArgs && attr ? option); in mapAttrsRecursiveCond noParam; paramsToOptions = mapParamsRecursive (_path: param: param.option); @@ -218,8 +218,8 @@ let toArgs = optionToArgs; option = mkOption { type = types.str; - default = "/var/lib/${config.services.prometheus2.stateDir}/data"; - defaultText = "/var/lib/\${config.services.prometheus2.stateDir}/data"; + default = "/var/lib/${config.services.prometheus.stateDir}/data"; + defaultText = "/var/lib/\${config.services.prometheus.stateDir}/data"; description = '' Data directory of TSDB. ''; @@ -607,7 +607,7 @@ let assertRelativeStateDir = cmd: { assertions = [ { - assertion = !hasPrefix "/" cfg."${cmd}".stateDir; + assertion = !hasPrefix "/" cfg.${cmd}.stateDir; message = "The option services.thanos.${cmd}.stateDir should not be an absolute directory." + " It should be a directory relative to /var/lib."; @@ -679,22 +679,22 @@ in { (mkIf cfg.sidecar.enable { assertions = [ { - assertion = config.services.prometheus2.enable; + assertion = config.services.prometheus.enable; message = - "Please enable services.prometheus2 when enabling services.thanos.sidecar."; + "Please enable services.prometheus when enabling services.thanos.sidecar."; } { - assertion = !(config.services.prometheus2.globalConfig.external_labels == null || - config.services.prometheus2.globalConfig.external_labels == {}); + assertion = !(config.services.prometheus.globalConfig.external_labels == null || + config.services.prometheus.globalConfig.external_labels == {}); message = "services.thanos.sidecar requires uniquely identifying external labels " + "to be configured in the Prometheus server. " + - "Please set services.prometheus2.globalConfig.external_labels."; + "Please set services.prometheus.globalConfig.external_labels."; } ]; systemd.services.thanos-sidecar = { wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "prometheus2.service" ]; + after = [ "network.target" "prometheus.service" ]; serviceConfig = { User = "prometheus"; Restart = "always"; diff --git a/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix index b1645f861101..856b9432892b 100644 --- a/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix @@ -135,7 +135,7 @@ in users.groups.${group} = { }; - systemd.services."zabbix-agent" = { + systemd.services.zabbix-agent = { description = "Zabbix Agent"; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix index 90abed30db5d..9d214469c3b3 100644 --- a/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -252,7 +252,7 @@ in fping.source = "${pkgs.fping}/bin/fping"; }; - systemd.services."zabbix-proxy" = { + systemd.services.zabbix-proxy = { description = "Zabbix Proxy"; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix index 11311b466c3f..4b4049ed360e 100644 --- a/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix @@ -237,7 +237,7 @@ in fping.source = "${pkgs.fping}/bin/fping"; }; - systemd.services."zabbix-server" = { + systemd.services.zabbix-server = { description = "Zabbix Server"; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/network-filesystems/beegfs.nix b/nixpkgs/nixos/modules/services/network-filesystems/beegfs.nix index 86b1bb9160f1..2e03a422665a 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/beegfs.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/beegfs.nix @@ -69,7 +69,7 @@ let # functions to generate systemd.service entries systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg: - (nameValuePair "beegfs-${service}-${name}" (mkIf cfg."${service}".enable { + (nameValuePair "beegfs-${service}-${name}" (mkIf cfg.${service}.enable { wantedBy = [ "multi-user.target" ]; requires = [ "network-online.target" ]; after = [ "network-online.target" ]; diff --git a/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix b/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix index 54841861c081..3dc5b8feef65 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix @@ -3,18 +3,18 @@ with lib; let - ceph = pkgs.ceph; cfg = config.services.ceph; + # function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode - translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars); - generateDaemonList = (daemonType: daemons: extraServiceConfig: - mkMerge ( - map (daemon: - { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; } - ) daemons - ) - ); - generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: { + expandCamelCase = replaceStrings upperChars (map (s: " ${s}") lowerChars); + expandCamelCaseAttrs = mapAttrs' (name: value: nameValuePair (expandCamelCase name) value); + + makeServices = (daemonType: daemonIds: extraServiceConfig: + mkMerge (map (daemonId: + { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName pkgs.ceph extraServiceConfig; }) + daemonIds)); + + makeService = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: { enable = true; description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}"; after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target"; @@ -34,23 +34,29 @@ let Restart = "on-failure"; StartLimitBurst = "5"; StartLimitInterval = "30min"; - ExecStart = "${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} -f --cluster ${clusterName} --id ${if daemonType == "rgw" then "client.${daemonId}" else daemonId} --setuser ceph --setgroup ceph"; + ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \ + -f --cluster ${clusterName} --id ${daemonId} --setuser ceph \ + --setgroup ${if daemonType == "osd" then "disk" else "ceph"}''; } // extraServiceConfig - // optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.out}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; }; - } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { preStart = '' + // optionalAttrs (daemonType == "osd") { ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh \ + --id ${daemonId} --cluster ${clusterName}''; }; + } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { + preStart = '' daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}" - if [ ! -d ''$daemonPath ]; then - mkdir -m 755 -p ''$daemonPath - chown -R ceph:ceph ''$daemonPath + if [ ! -d $daemonPath ]; then + mkdir -m 755 -p $daemonPath + chown -R ceph:ceph $daemonPath fi ''; } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; } ); - generateTargetFile = (daemonType: + + makeTarget = (daemonType: { "ceph-${daemonType}" = { description = "Ceph target allowing to start/stop all ceph-${daemonType} services at once"; partOf = [ "ceph.target" ]; + wantedBy = [ "ceph.target" ]; before = [ "ceph.target" ]; }; } @@ -82,6 +88,14 @@ in ''; }; + mgrModulePath = mkOption { + type = types.path; + default = "${pkgs.ceph.lib}/lib/ceph/mgr"; + description = '' + Path at which to find ceph-mgr modules. + ''; + }; + monInitialMembers = mkOption { type = with types; nullOr commas; default = null; @@ -157,6 +171,27 @@ in A comma-separated list of subnets that will be used as cluster networks in the cluster. ''; }; + + rgwMimeTypesFile = mkOption { + type = with types; nullOr path; + default = "${pkgs.mime-types}/etc/mime.types"; + description = '' + Path to mime types used by radosgw. + ''; + }; + }; + + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + example = '' + { + "ms bind ipv6" = "true"; + }; + ''; + description = '' + Extra configuration to add to the global section. Use for setting values that are common for all daemons in the cluster. + ''; }; mgr = { @@ -216,6 +251,7 @@ in to the id part in ceph i.e. [ "name1" ] would result in osd.name1 ''; }; + extraConfig = mkOption { type = with types; attrsOf str; default = { @@ -296,9 +332,6 @@ in { assertion = cfg.global.fsid != ""; message = "fsid has to be set to a valid uuid for the cluster to function"; } - { assertion = cfg.mgr.enable == true; - message = "ceph 12.x requires atleast 1 MGR daemon enabled for the cluster to function"; - } { assertion = cfg.mon.enable == true -> cfg.mon.daemons != []; message = "have to set id of atleast one MON if you're going to enable Monitor"; } @@ -317,17 +350,15 @@ in ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function''; environment.etc."ceph/ceph.conf".text = let - # Translate camelCaseOptions to the expected camel case option for ceph.conf - translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global; # Merge the extraConfig set for mgr daemons, as mgr don't have their own section - globalAndMgrConfig = translatedGlobalConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig; + globalSection = expandCamelCaseAttrs (cfg.global // cfg.extraConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig); # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf - globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig); + globalSection' = filterAttrs (name: value: value != null) globalSection; totalConfig = { - "global" = globalConfig; - } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; } - // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; } - // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; } + global = globalSection'; + } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { mon = cfg.mon.extraConfig; } + // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { mds = cfg.mds.extraConfig; } + // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { osd = cfg.osd.extraConfig; } // optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; in generators.toINI {} totalConfig; @@ -336,8 +367,9 @@ in name = "ceph"; uid = config.ids.uids.ceph; description = "Ceph daemon user"; + group = "ceph"; + extraGroups = [ "disk" ]; }; - users.groups = singleton { name = "ceph"; gid = config.ids.gids.ceph; @@ -345,22 +377,26 @@ in systemd.services = let services = [] - ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; }) - ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; }) - ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; }) - ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { }) - ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; }); + ++ optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons { RestartSec = "10"; }) + ++ optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons { StartLimitBurst = "3"; }) + ++ optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons { StartLimitBurst = "30"; + RestartSec = "20s"; + PrivateDevices = "no"; # osd needs disk access + }) + ++ optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons { }) + ++ optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; }); in mkMerge services; systemd.targets = let targets = [ - { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; } - ] ++ optional cfg.mon.enable (generateTargetFile "mon") - ++ optional cfg.mds.enable (generateTargetFile "mds") - ++ optional cfg.osd.enable (generateTargetFile "osd") - ++ optional cfg.rgw.enable (generateTargetFile "rgw") - ++ optional cfg.mgr.enable (generateTargetFile "mgr"); + { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; + wantedBy = [ "multi-user.target" ]; }; } + ] ++ optional cfg.mon.enable (makeTarget "mon") + ++ optional cfg.mds.enable (makeTarget "mds") + ++ optional cfg.osd.enable (makeTarget "osd") + ++ optional cfg.rgw.enable (makeTarget "rgw") + ++ optional cfg.mgr.enable (makeTarget "mgr"); in mkMerge targets; diff --git a/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix index 1cc9bed847ab..e068ee761c2a 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix @@ -3,7 +3,7 @@ let inherit (lib) concatStringsSep mkOption types; -in rec { +in { mkCellServDB = cellName: db: '' >${cellName} diff --git a/nixpkgs/nixos/modules/services/network-filesystems/samba.nix b/nixpkgs/nixos/modules/services/network-filesystems/samba.nix index 69368441c62c..055508a32244 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/samba.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/samba.nix @@ -234,10 +234,10 @@ in # Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd # for correct use with systemd services = { - "samba-smbd" = daemonService "smbd" ""; - "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" ""); - "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" ""); - "samba-setup" = { + samba-smbd = daemonService "smbd" ""; + samba-nmbd = mkIf cfg.enableNmbd (daemonService "nmbd" ""); + samba-winbindd = mkIf cfg.enableWinbindd (daemonService "winbindd" ""); + samba-setup = { description = "Samba Setup Task"; script = setupScript; unitConfig.RequiresMountsFor = "/var/lib/samba"; diff --git a/nixpkgs/nixos/modules/services/networking/babeld.nix b/nixpkgs/nixos/modules/services/networking/babeld.nix index 3dfd80f6ff52..de863461eab2 100644 --- a/nixpkgs/nixos/modules/services/networking/babeld.nix +++ b/nixpkgs/nixos/modules/services/networking/babeld.nix @@ -52,7 +52,7 @@ in example = { type = "tunnel"; - "split-horizon" = true; + split-horizon = true; }; }; @@ -66,8 +66,8 @@ in example = { enp0s2 = { type = "wired"; - "hello-interval" = 5; - "split-horizon" = "auto"; + hello-interval = 5; + split-horizon = "auto"; }; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/connman.nix b/nixpkgs/nixos/modules/services/networking/connman.nix index 1cd3fd2ade57..31127f790499 100644 --- a/nixpkgs/nixos/modules/services/networking/connman.nix +++ b/nixpkgs/nixos/modules/services/networking/connman.nix @@ -82,7 +82,7 @@ in { environment.systemPackages = [ connman ]; - systemd.services."connman" = { + systemd.services.connman = { description = "Connection service"; wantedBy = [ "multi-user.target" ]; after = [ "syslog.target" ]; @@ -95,7 +95,7 @@ in { }; }; - systemd.services."connman-vpn" = mkIf cfg.enableVPN { + systemd.services.connman-vpn = mkIf cfg.enableVPN { description = "ConnMan VPN service"; wantedBy = [ "multi-user.target" ]; after = [ "syslog.target" ]; @@ -108,7 +108,7 @@ in { }; }; - systemd.services."net-connman-vpn" = mkIf cfg.enableVPN { + systemd.services.net-connman-vpn = mkIf cfg.enableVPN { description = "D-BUS Service"; serviceConfig = { Name = "net.connman.vpn"; diff --git a/nixpkgs/nixos/modules/services/networking/consul.nix b/nixpkgs/nixos/modules/services/networking/consul.nix index f080f12eaccd..689cbc8a986d 100644 --- a/nixpkgs/nixos/modules/services/networking/consul.nix +++ b/nixpkgs/nixos/modules/services/networking/consul.nix @@ -156,7 +156,7 @@ in config = mkIf cfg.enable ( mkMerge [{ - users.users."consul" = { + users.users.consul = { description = "Consul agent daemon user"; uid = config.ids.uids.consul; # The shell is needed for health checks diff --git a/nixpkgs/nixos/modules/services/networking/firewall.nix b/nixpkgs/nixos/modules/services/networking/firewall.nix index 4ea891262e56..5b3aa19af3bb 100644 --- a/nixpkgs/nixos/modules/services/networking/firewall.nix +++ b/nixpkgs/nixos/modules/services/networking/firewall.nix @@ -58,7 +58,7 @@ let ${text} ''; in "${dir}/bin/${name}"; - defaultInterface = { default = mapAttrs (name: value: cfg."${name}") commonOptions; }; + defaultInterface = { default = mapAttrs (name: value: cfg.${name}) commonOptions; }; allInterfaces = defaultInterface // cfg.interfaces; startScript = writeShScript "firewall-start" '' diff --git a/nixpkgs/nixos/modules/services/networking/git-daemon.nix b/nixpkgs/nixos/modules/services/networking/git-daemon.nix index c0020349ec74..a638a3083fba 100644 --- a/nixpkgs/nixos/modules/services/networking/git-daemon.nix +++ b/nixpkgs/nixos/modules/services/networking/git-daemon.nix @@ -115,7 +115,7 @@ in gid = config.ids.gids.git; }; - systemd.services."git-daemon" = { + systemd.services.git-daemon = { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; script = "${pkgs.git}/bin/git daemon --reuseaddr " diff --git a/nixpkgs/nixos/modules/services/networking/hylafax/systemd.nix b/nixpkgs/nixos/modules/services/networking/hylafax/systemd.nix index 0c6602e7f8ab..b9b9b9dca4f0 100644 --- a/nixpkgs/nixos/modules/services/networking/hylafax/systemd.nix +++ b/nixpkgs/nixos/modules/services/networking/hylafax/systemd.nix @@ -68,7 +68,7 @@ let inherit (cfg) spoolAreaPath; }; - sockets."hylafax-hfaxd" = { + sockets.hylafax-hfaxd = { description = "HylaFAX server socket"; documentation = [ "man:hfaxd(8)" ]; wantedBy = [ "multi-user.target" ]; @@ -77,7 +77,7 @@ let socketConfig.Accept = true; }; - paths."hylafax-faxq" = { + paths.hylafax-faxq = { description = "HylaFAX queue manager sendq watch"; documentation = [ "man:faxq(8)" "man:sendq(5)" ]; wantedBy = [ "multi-user.target" ]; @@ -87,11 +87,11 @@ let timers = mkMerge [ ( mkIf (cfg.faxcron.enable.frequency!=null) - { "hylafax-faxcron".timerConfig.Persistent = true; } + { hylafax-faxcron.timerConfig.Persistent = true; } ) ( mkIf (cfg.faxqclean.enable.frequency!=null) - { "hylafax-faxqclean".timerConfig.Persistent = true; } + { hylafax-faxqclean.timerConfig.Persistent = true; } ) ]; @@ -121,7 +121,7 @@ let in service: service // { serviceConfig = apply service; }; - services."hylafax-spool" = { + services.hylafax-spool = { description = "HylaFAX spool area preparation"; documentation = [ "man:hylafax-server(4)" ]; script = '' @@ -140,7 +140,7 @@ let unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ]; }; - services."hylafax-faxq" = { + services.hylafax-faxq = { description = "HylaFAX queue manager"; documentation = [ "man:faxq(8)" ]; requires = [ "hylafax-spool.service" ]; @@ -178,7 +178,7 @@ let serviceConfig.PrivateNetwork = null; }; - services."hylafax-faxcron" = rec { + services.hylafax-faxcron = rec { description = "HylaFAX spool area maintenance"; documentation = [ "man:faxcron(8)" ]; after = [ "hylafax-spool.service" ]; @@ -194,7 +194,7 @@ let ]; }; - services."hylafax-faxqclean" = rec { + services.hylafax-faxqclean = rec { description = "HylaFAX spool area queue cleaner"; documentation = [ "man:faxqclean(8)" ]; after = [ "hylafax-spool.service" ]; diff --git a/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix index 2bd898edf897..f5abe61a1baf 100644 --- a/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -121,7 +121,7 @@ in users.groups.ircd.gid = config.ids.gids.ircd; - systemd.services."ircd-hybrid" = { + systemd.services.ircd-hybrid = { description = "IRCD Hybrid server"; after = [ "started networking" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/networking/iwd.nix b/nixpkgs/nixos/modules/services/networking/iwd.nix index 18ed20e28886..839fa48d9a42 100644 --- a/nixpkgs/nixos/modules/services/networking/iwd.nix +++ b/nixpkgs/nixos/modules/services/networking/iwd.nix @@ -26,6 +26,7 @@ in { systemd.tmpfiles.rules = [ "d /var/lib/iwd 0700 root root -" + "d /var/lib/ead 0700 root root -" ]; }; diff --git a/nixpkgs/nixos/modules/services/networking/jormungandr.nix b/nixpkgs/nixos/modules/services/networking/jormungandr.nix index 68f1e9af9fff..85e804d6cf25 100644 --- a/nixpkgs/nixos/modules/services/networking/jormungandr.nix +++ b/nixpkgs/nixos/modules/services/networking/jormungandr.nix @@ -82,6 +82,9 @@ in { description = "jormungandr server"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; + environment = { + RUST_BACKTRACE = "full"; + }; serviceConfig = { DynamicUser = true; StateDirectory = baseNameOf dataDir; diff --git a/nixpkgs/nixos/modules/services/networking/kippo.nix b/nixpkgs/nixos/modules/services/networking/kippo.nix index 7ef989b2a78e..bdea6a1d1caa 100644 --- a/nixpkgs/nixos/modules/services/networking/kippo.nix +++ b/nixpkgs/nixos/modules/services/networking/kippo.nix @@ -11,7 +11,7 @@ with lib; let cfg = config.services.kippo; in -rec { +{ options = { services.kippo = { enable = mkOption { diff --git a/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix b/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix index 24bf33815da8..d896f227b82c 100644 --- a/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix +++ b/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix @@ -50,8 +50,8 @@ in users = mkOption { type = types.attrsOf types.str; example = { - "tg" = "00000000000000000000000000000000"; - "tg2" = "0123456789abcdef0123456789abcdef"; + tg = "00000000000000000000000000000000"; + tg2 = "0123456789abcdef0123456789abcdef"; }; description = '' Allowed users and their secrets. A secret is a 32 characters long hex string. @@ -80,7 +80,7 @@ in type = types.attrs; default = {}; example = { - "STATS_PRINT_PERIOD" = 600; + STATS_PRINT_PERIOD = 600; }; description = '' Extra configuration options for mtprotoproxy. diff --git a/nixpkgs/nixos/modules/services/networking/murmur.nix b/nixpkgs/nixos/modules/services/networking/murmur.nix index 7ac4d0c6419d..082953d2f6ab 100644 --- a/nixpkgs/nixos/modules/services/networking/murmur.nix +++ b/nixpkgs/nixos/modules/services/networking/murmur.nix @@ -234,7 +234,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra configuration to put into mumur.ini."; + description = "Extra configuration to put into murmur.ini."; }; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/ndppd.nix b/nixpkgs/nixos/modules/services/networking/ndppd.nix index ba17f1ba825a..92088623517f 100644 --- a/nixpkgs/nixos/modules/services/networking/ndppd.nix +++ b/nixpkgs/nixos/modules/services/networking/ndppd.nix @@ -142,7 +142,7 @@ in { messages, and respond to them according to a set of rules. ''; default = {}; - example = { "eth0".rules."1111::/64" = {}; }; + example = { eth0.rules."1111::/64" = {}; }; }; }; @@ -153,7 +153,7 @@ in { '' ]; services.ndppd.proxies = mkIf (cfg.interface != null && cfg.network != null) { - "${cfg.interface}".rules."${cfg.network}" = {}; + ${cfg.interface}.rules.${cfg.network} = {}; }; systemd.services.ndppd = { diff --git a/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/nixpkgs/nixos/modules/services/networking/networkmanager.nix index 0042a7df8e11..2061c02fffbd 100644 --- a/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -81,9 +81,9 @@ let ''; dispatcherTypesSubdirMap = { - "basic" = ""; - "pre-up" = "pre-up.d/"; - "pre-down" = "pre-down.d/"; + basic = ""; + pre-up = "pre-up.d/"; + pre-down = "pre-down.d/"; }; macAddressOpt = mkOption { @@ -453,7 +453,7 @@ in { systemd.packages = cfg.packages; - systemd.services."NetworkManager" = { + systemd.services.NetworkManager = { wantedBy = [ "network.target" ]; restartTriggers = [ configFile ]; @@ -483,7 +483,7 @@ in { }; }; - systemd.services."NetworkManager-dispatcher" = { + systemd.services.NetworkManager-dispatcher = { wantedBy = [ "network.target" ]; restartTriggers = [ configFile ]; diff --git a/nixpkgs/nixos/modules/services/networking/nsd.nix b/nixpkgs/nixos/modules/services/networking/nsd.nix index c69b77f9deec..bc0966e6b8e6 100644 --- a/nixpkgs/nixos/modules/services/networking/nsd.nix +++ b/nixpkgs/nixos/modules/services/networking/nsd.nix @@ -954,7 +954,7 @@ in ''; }; - systemd.timers."nsd-dnssec" = mkIf dnssec { + systemd.timers.nsd-dnssec = mkIf dnssec { description = "Automatic DNSSEC key rollover"; wantedBy = [ "nsd.service" ]; @@ -965,7 +965,7 @@ in }; }; - systemd.services."nsd-dnssec" = mkIf dnssec { + systemd.services.nsd-dnssec = mkIf dnssec { description = "DNSSEC key rollover"; wantedBy = [ "nsd.service" ]; diff --git a/nixpkgs/nixos/modules/services/networking/quicktun.nix b/nixpkgs/nixos/modules/services/networking/quicktun.nix index 5bcf923f909c..fb783c836464 100644 --- a/nixpkgs/nixos/modules/services/networking/quicktun.nix +++ b/nixpkgs/nixos/modules/services/networking/quicktun.nix @@ -93,18 +93,18 @@ with lib; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; environment = { - "INTERFACE" = name; - "TUN_MODE" = toString qtcfg.tunMode; - "REMOTE_ADDRESS" = qtcfg.remoteAddress; - "LOCAL_ADDRESS" = qtcfg.localAddress; - "LOCAL_PORT" = toString qtcfg.localPort; - "REMOTE_PORT" = toString qtcfg.remotePort; - "REMOTE_FLOAT" = toString qtcfg.remoteFloat; - "PRIVATE_KEY" = qtcfg.privateKey; - "PUBLIC_KEY" = qtcfg.publicKey; - "TIME_WINDOW" = toString qtcfg.timeWindow; - "TUN_UP_SCRIPT" = pkgs.writeScript "quicktun-${name}-up.sh" qtcfg.upScript; - "SUID" = "nobody"; + INTERFACE = name; + TUN_MODE = toString qtcfg.tunMode; + REMOTE_ADDRESS = qtcfg.remoteAddress; + LOCAL_ADDRESS = qtcfg.localAddress; + LOCAL_PORT = toString qtcfg.localPort; + REMOTE_PORT = toString qtcfg.remotePort; + REMOTE_FLOAT = toString qtcfg.remoteFloat; + PRIVATE_KEY = qtcfg.privateKey; + PUBLIC_KEY = qtcfg.publicKey; + TIME_WINDOW = toString qtcfg.timeWindow; + TUN_UP_SCRIPT = pkgs.writeScript "quicktun-${name}-up.sh" qtcfg.upScript; + SUID = "nobody"; }; serviceConfig = { Type = "simple"; diff --git a/nixpkgs/nixos/modules/services/networking/smokeping.nix b/nixpkgs/nixos/modules/services/networking/smokeping.nix index 20228ceaaff8..d4d0594a9cdd 100644 --- a/nixpkgs/nixos/modules/services/networking/smokeping.nix +++ b/nixpkgs/nixos/modules/services/networking/smokeping.nix @@ -277,7 +277,7 @@ in ]; security.wrappers = { fping.source = "${pkgs.fping}/bin/fping"; - "fping6".source = "${pkgs.fping}/bin/fping6"; + fping6.source = "${pkgs.fping}/bin/fping6"; }; environment.systemPackages = [ pkgs.fping ]; users.users = singleton { diff --git a/nixpkgs/nixos/modules/services/networking/softether.nix b/nixpkgs/nixos/modules/services/networking/softether.nix index 669c69d832b8..2dc73d81b258 100644 --- a/nixpkgs/nixos/modules/services/networking/softether.nix +++ b/nixpkgs/nixos/modules/services/networking/softether.nix @@ -68,7 +68,7 @@ in mkMerge [{ environment.systemPackages = [ package ]; - systemd.services."softether-init" = { + systemd.services.softether-init = { description = "SoftEther VPN services initial task"; wantedBy = [ "network.target" ]; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 95a174122d04..dfdfc50d8ae2 100644 --- a/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -63,7 +63,7 @@ rec { StrongSwan default: <literal><![CDATA[${builtins.toJSON strongswanDefault}]]></literal> ''; - single = f: name: value: { "${name}" = f value; }; + single = f: name: value: { ${name} = f value; }; mkStrParam = mkParamOfType types.str; mkOptionalStrParam = mkStrParam null; diff --git a/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix index 193ad27f035a..2bbb39a76049 100644 --- a/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix +++ b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix @@ -21,7 +21,7 @@ rec { mkConf = indent : ps : concatMapStringsSep "\n" (name: - let value = ps."${name}"; + let value = ps.${name}; indentation = replicate indent " "; in indentation + ( @@ -58,7 +58,7 @@ rec { ) set); # Recursively map over every parameter in the given attribute set. - mapParamsRecursive = mapAttrsRecursiveCond' (as: (!(as ? "_type" && as._type == "param"))); + mapParamsRecursive = mapAttrsRecursiveCond' (as: (!(as ? _type && as._type == "param"))); mapAttrsRecursiveCond' = cond: f: set: let @@ -67,7 +67,7 @@ rec { g = name: value: if isAttrs value && cond value - then { "${name}" = recurse (path ++ [name]) value; } + then { ${name} = recurse (path ++ [name]) value; } else f (path ++ [name]) name value; in mapAttrs'' g set; in recurse [] set; @@ -77,6 +77,6 @@ rec { # Extract the options from the given set of parameters. paramsToOptions = ps : - mapParamsRecursive (_path: name: param: { "${name}" = param.option; }) ps; + mapParamsRecursive (_path: name: param: { ${name} = param.option; }) ps; } diff --git a/nixpkgs/nixos/modules/services/networking/syncplay.nix b/nixpkgs/nixos/modules/services/networking/syncplay.nix new file mode 100644 index 000000000000..e3147c10502c --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/syncplay.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.syncplay; + + cmdArgs = + [ "--port" cfg.port ] + ++ optionals (cfg.salt != null) [ "--salt" cfg.salt ] + ++ optionals (cfg.certDir != null) [ "--tls" cfg.certDir ]; + +in +{ + options = { + services.syncplay = { + enable = mkOption { + type = types.bool; + default = false; + description = "If enabled, start the Syncplay server."; + }; + + port = mkOption { + type = types.int; + default = 8999; + description = '' + TCP port to bind to. + ''; + }; + + salt = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Salt to allow room operator passwords generated by this server + instance to still work when the server is restarted. + ''; + }; + + certDir = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + TLS certificates directory to use for encryption. See + <link xlink:href="https://github.com/Syncplay/syncplay/wiki/TLS-support"/>. + ''; + }; + + user = mkOption { + type = types.str; + default = "nobody"; + description = '' + User to use when running Syncplay. + ''; + }; + + group = mkOption { + type = types.str; + default = "nogroup"; + description = '' + Group to use when running Syncplay. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.syncplay = { + description = "Syncplay Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target "]; + + serviceConfig = { + ExecStart = "${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs}"; + User = cfg.user; + Group = cfg.group; + }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/networking/syncthing.nix b/nixpkgs/nixos/modules/services/networking/syncthing.nix index 126f5b7b527b..165fd5970cf8 100644 --- a/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -373,7 +373,7 @@ in { systemd.packages = [ pkgs.syncthing ]; users.users = mkIf (cfg.systemService && cfg.user == defaultUser) { - "${defaultUser}" = + ${defaultUser} = { group = cfg.group; home = cfg.dataDir; createHome = true; @@ -383,7 +383,7 @@ in { }; users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) { - "${defaultUser}".gid = + ${defaultUser}.gid = config.ids.gids.syncthing; }; diff --git a/nixpkgs/nixos/modules/services/networking/websockify.nix b/nixpkgs/nixos/modules/services/networking/websockify.nix index 4b76350ecf8a..d9177df65bd6 100644 --- a/nixpkgs/nixos/modules/services/networking/websockify.nix +++ b/nixpkgs/nixos/modules/services/networking/websockify.nix @@ -44,9 +44,9 @@ let cfg = config.services.networking.websockify; in { scriptArgs = "%i"; }; - systemd.targets."default-websockify" = { + systemd.targets.default-websockify = { description = "Target to start all default websockify@ services"; - unitConfig."X-StopOnReconfiguration" = true; + unitConfig.X-StopOnReconfiguration = true; wants = mapAttrsToList (name: value: "websockify@${name}:${toString value}.service") cfg.portMap; wantedBy = [ "multi-user.target" ]; }; diff --git a/nixpkgs/nixos/modules/services/networking/zerobin.nix b/nixpkgs/nixos/modules/services/networking/zerobin.nix index 06ccd7032e6c..78de246a816f 100644 --- a/nixpkgs/nixos/modules/services/networking/zerobin.nix +++ b/nixpkgs/nixos/modules/services/networking/zerobin.nix @@ -74,7 +74,7 @@ in }; config = mkIf (cfg.enable) { - users.users."${cfg.user}" = + users.users.${cfg.user} = if cfg.user == "zerobin" then { isSystemUser = true; group = cfg.group; @@ -82,7 +82,7 @@ in createHome = true; } else {}; - users.groups."${cfg.group}" = {}; + users.groups.${cfg.group} = {}; systemd.services.zerobin = { enable = true; diff --git a/nixpkgs/nixos/modules/services/printing/cupsd.nix b/nixpkgs/nixos/modules/services/printing/cupsd.nix index 42c1b9482cb2..7f1e793b980e 100644 --- a/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -287,7 +287,7 @@ in }; environment.systemPackages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper; - environment.etc."cups".source = "/var/lib/cups"; + environment.etc.cups.source = "/var/lib/cups"; services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper; diff --git a/nixpkgs/nixos/modules/services/search/kibana.nix b/nixpkgs/nixos/modules/services/search/kibana.nix index c096af731ad4..43a63aa8fdc2 100644 --- a/nixpkgs/nixos/modules/services/search/kibana.nix +++ b/nixpkgs/nixos/modules/services/search/kibana.nix @@ -9,7 +9,7 @@ let lt6_6 = builtins.compareVersions cfg.package.version "6.6" < 0; cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( - (filterAttrsRecursive (n: v: v != null) ({ + (filterAttrsRecursive (n: v: v != null && v != []) ({ server.host = cfg.listenAddress; server.port = cfg.port; server.ssl.certificate = cfg.cert; @@ -150,7 +150,7 @@ in { description = "Kibana package to use"; default = pkgs.kibana; defaultText = "pkgs.kibana"; - example = "pkgs.kibana5"; + example = "pkgs.kibana"; type = types.package; }; diff --git a/nixpkgs/nixos/modules/services/security/fprot.nix b/nixpkgs/nixos/modules/services/security/fprot.nix index b1ca4ab23452..474490391463 100644 --- a/nixpkgs/nixos/modules/services/security/fprot.nix +++ b/nixpkgs/nixos/modules/services/security/fprot.nix @@ -67,7 +67,7 @@ in { services.cron.systemCronJobs = [ "*/${toString cfg.updater.frequency} * * * * root start fprot-updater" ]; - systemd.services."fprot-updater" = { + systemd.services.fprot-updater = { serviceConfig = { Type = "oneshot"; RemainAfterExit = false; diff --git a/nixpkgs/nixos/modules/services/security/physlock.nix b/nixpkgs/nixos/modules/services/security/physlock.nix index 97fbd6aae6e0..61bcd84f2e64 100644 --- a/nixpkgs/nixos/modules/services/security/physlock.nix +++ b/nixpkgs/nixos/modules/services/security/physlock.nix @@ -99,7 +99,7 @@ in # for physlock -l and physlock -L environment.systemPackages = [ pkgs.physlock ]; - systemd.services."physlock" = { + systemd.services.physlock = { enable = true; description = "Physlock"; wantedBy = optional cfg.lockOn.suspend "suspend.target" diff --git a/nixpkgs/nixos/modules/services/security/sks.nix b/nixpkgs/nixos/modules/services/security/sks.nix index 1b7a2ad13980..a91060dc659a 100644 --- a/nixpkgs/nixos/modules/services/security/sks.nix +++ b/nixpkgs/nixos/modules/services/security/sks.nix @@ -108,7 +108,7 @@ in { hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ; hkpPort = builtins.toString cfg.hkpPort; in { - "sks-db" = { + sks-db = { description = "SKS database server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/system/dbus.nix b/nixpkgs/nixos/modules/services/system/dbus.nix index e04580218442..936646a5fd78 100644 --- a/nixpkgs/nixos/modules/services/system/dbus.nix +++ b/nixpkgs/nixos/modules/services/system/dbus.nix @@ -44,8 +44,10 @@ in message bus. Specifically, files in the following directories will be included into their respective DBus configuration paths: <filename><replaceable>pkg</replaceable>/etc/dbus-1/system.d</filename> + <filename><replaceable>pkg</replaceable>/share/dbus-1/system.d</filename> <filename><replaceable>pkg</replaceable>/share/dbus-1/system-services</filename> <filename><replaceable>pkg</replaceable>/etc/dbus-1/session.d</filename> + <filename><replaceable>pkg</replaceable>/share/dbus-1/session.d</filename> <filename><replaceable>pkg</replaceable>/share/dbus-1/services</filename> ''; }; diff --git a/nixpkgs/nixos/modules/services/system/localtime.nix b/nixpkgs/nixos/modules/services/system/localtime.nix index 04595fc82fbb..c3c0b432b494 100644 --- a/nixpkgs/nixos/modules/services/system/localtime.nix +++ b/nixpkgs/nixos/modules/services/system/localtime.nix @@ -22,7 +22,7 @@ in { config = mkIf cfg.enable { services.geoclue2 = { enable = true; - appConfig."localtime" = { + appConfig.localtime = { isAllowed = true; isSystem = true; }; diff --git a/nixpkgs/nixos/modules/services/torrent/deluge.nix b/nixpkgs/nixos/modules/services/torrent/deluge.nix index d8810a4481b1..0c72505395dd 100644 --- a/nixpkgs/nixos/modules/services/torrent/deluge.nix +++ b/nixpkgs/nixos/modules/services/torrent/deluge.nix @@ -178,11 +178,11 @@ in { "d '${cfg.dataDir}/.config' 0770 ${cfg.user} ${cfg.group}" "d '${cfg.dataDir}/.config/deluge' 0770 ${cfg.user} ${cfg.group}" ] - ++ optional (cfg.config ? "download_location") + ++ optional (cfg.config ? download_location) "d '${cfg.config.download_location}' 0770 ${cfg.user} ${cfg.group}" - ++ optional (cfg.config ? "torrentfiles_location") + ++ optional (cfg.config ? torrentfiles_location) "d '${cfg.config.torrentfiles_location}' 0770 ${cfg.user} ${cfg.group}" - ++ optional (cfg.config ? "move_completed_path") + ++ optional (cfg.config ? move_completed_path) "d '${cfg.config.move_completed_path}' 0770 ${cfg.user} ${cfg.group}"; systemd.services.deluged = { diff --git a/nixpkgs/nixos/modules/services/ttys/agetty.nix b/nixpkgs/nixos/modules/services/ttys/agetty.nix index 448b7c59e2ac..47eb3ab8206a 100644 --- a/nixpkgs/nixos/modules/services/ttys/agetty.nix +++ b/nixpkgs/nixos/modules/services/ttys/agetty.nix @@ -114,7 +114,7 @@ in restartIfChanged = false; }; - systemd.services."console-getty" = + systemd.services.console-getty = { serviceConfig.ExecStart = [ "" # override upstream default with an empty ExecStart (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM") diff --git a/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix index cf163271d276..59185fdbd36f 100644 --- a/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -142,12 +142,12 @@ in }; config = mkIf cfg.enable { - users.users."${cfg.user}" = { + users.users.${cfg.user} = { isSystemUser = true; group = cfg.group; }; - users.groups."${cfg.group}" = {}; + users.groups.${cfg.group} = {}; systemd.tmpfiles.rules = [ "d '${cfg.home}' - ${cfg.user} - - -" diff --git a/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix index 020ca8d89dbb..ceab656b15e8 100644 --- a/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -110,12 +110,12 @@ in }; config = mkIf cfg.enable { - users.users."${cfg.user}" = { + users.users.${cfg.user} = { isSystemUser = true; group = cfg.group; }; - users.groups."${cfg.group}" = {}; + users.groups.${cfg.group} = {}; systemd.tmpfiles.rules = [ "d '${cfg.home}' - ${cfg.user} ${cfg.group} - -" diff --git a/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix b/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix index b0019e77ac27..ce04982e8a9e 100644 --- a/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix @@ -148,12 +148,12 @@ in }; config = mkIf cfg.enable { - users.users."${cfg.user}" = { + users.users.${cfg.user} = { isSystemUser = true; group = cfg.group; }; - users.groups."${cfg.group}" = {}; + users.groups.${cfg.group} = {}; systemd.tmpfiles.rules = [ "d '${cfg.home}' - ${cfg.user} - - -" diff --git a/nixpkgs/nixos/modules/services/web-apps/frab.nix b/nixpkgs/nixos/modules/services/web-apps/frab.nix index e885dc69b3c0..7914e5cc0ee1 100644 --- a/nixpkgs/nixos/modules/services/web-apps/frab.nix +++ b/nixpkgs/nixos/modules/services/web-apps/frab.nix @@ -19,7 +19,7 @@ let RAILS_SERVE_STATIC_FILES = "1"; } // cfg.extraEnvironment; - frab-rake = pkgs.stdenv.mkDerivation rec { + frab-rake = pkgs.stdenv.mkDerivation { name = "frab-rake"; buildInputs = [ package.env pkgs.makeWrapper ]; phases = "installPhase fixupPhase"; diff --git a/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 95c8fb160510..195ee76ff4e3 100644 --- a/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -189,7 +189,7 @@ in { services.nginx = { enable = true; virtualHosts = mkIf (cfg.virtualHost != null) { - "${cfg.virtualHost}" = { + ${cfg.virtualHost} = { root = "${pkgs.icingaweb2}/public"; extraConfig = '' @@ -216,7 +216,7 @@ in { # /etc/icingaweb2 environment.etc = let - doModule = name: optionalAttrs (cfg.modules."${name}".enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; }; + doModule = name: optionalAttrs (cfg.modules.${name}.enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; }; in {} # Module packages // (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages) diff --git a/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix index 167e5e389568..e9c1d4ffe5ea 100644 --- a/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix +++ b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix @@ -58,7 +58,7 @@ in { }; backends = mkOption { - default = { "icinga" = { resource = "icinga_ido"; }; }; + default = { icinga = { resource = "icinga_ido"; }; }; description = "Monitoring backends to define"; type = attrsOf (submodule ({ name, ... }: { options = { diff --git a/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix b/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix index 2797feb32ebf..68b57a9b90dd 100644 --- a/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix @@ -277,7 +277,7 @@ in systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; - users.users."${user}".group = group; + users.users.${user}.group = group; }; } diff --git a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index ada14ad39291..5f5469e48507 100644 --- a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -102,10 +102,10 @@ in { phpOptions = mkOption { type = types.attrsOf types.str; default = { - "short_open_tag" = "Off"; - "expose_php" = "Off"; - "error_reporting" = "E_ALL & ~E_DEPRECATED & ~E_STRICT"; - "display_errors" = "stderr"; + short_open_tag = "Off"; + expose_php = "Off"; + error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT"; + display_errors = "stderr"; "opcache.enable_cli" = "1"; "opcache.interned_strings_buffer" = "8"; "opcache.max_accelerated_files" = "10000"; @@ -113,7 +113,7 @@ in { "opcache.revalidate_freq" = "1"; "opcache.fast_shutdown" = "1"; "openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt"; - "catch_workers_output" = "yes"; + catch_workers_output = "yes"; }; description = '' Options for PHP's php.ini file for nextcloud. @@ -289,7 +289,7 @@ in { ]; } - { systemd.timers."nextcloud-cron" = { + { systemd.timers.nextcloud-cron = { wantedBy = [ "timers.target" ]; timerConfig.OnBootSec = "5m"; timerConfig.OnUnitActiveSec = "15m"; @@ -297,7 +297,7 @@ in { }; systemd.services = { - "nextcloud-setup" = let + nextcloud-setup = let c = cfg.config; writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]"; overrideConfig = pkgs.writeText "nextcloud-config.php" '' @@ -397,13 +397,13 @@ in { ''; serviceConfig.Type = "oneshot"; }; - "nextcloud-cron" = { + nextcloud-cron = { environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php"; }; - "nextcloud-update-plugins" = mkIf cfg.autoUpdateApps.enable { + nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable { serviceConfig.Type = "oneshot"; serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all"; startAt = cfg.autoUpdateApps.startAt; @@ -441,7 +441,7 @@ in { services.nginx = { enable = true; virtualHosts = { - "${cfg.hostName}" = { + ${cfg.hostName} = { root = pkgs.nextcloud; locations = { "= /robots.txt" = { diff --git a/nixpkgs/nixos/modules/services/web-apps/nexus.nix b/nixpkgs/nixos/modules/services/web-apps/nexus.nix index 052dbed6d4f8..3af97e146d0a 100644 --- a/nixpkgs/nixos/modules/services/web-apps/nexus.nix +++ b/nixpkgs/nixos/modules/services/web-apps/nexus.nix @@ -80,14 +80,14 @@ in }; config = mkIf cfg.enable { - users.users."${cfg.user}" = { + users.users.${cfg.user} = { isSystemUser = true; group = cfg.group; home = cfg.home; createHome = true; }; - users.groups."${cfg.group}" = {}; + users.groups.${cfg.group} = {}; systemd.services.nexus = { description = "Sonatype Nexus3"; diff --git a/nixpkgs/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixpkgs/nixos/modules/services/web-apps/pgpkeyserver-lite.nix index 93f69bd12651..ad70ba70bbef 100644 --- a/nixpkgs/nixos/modules/services/web-apps/pgpkeyserver-lite.nix +++ b/nixpkgs/nixos/modules/services/web-apps/pgpkeyserver-lite.nix @@ -60,7 +60,7 @@ in services.nginx.virtualHosts = let hkpPort = builtins.toString cfg.hkpPort; in { - "${cfg.hostname}" = { + ${cfg.hostname} = { root = webPkg; locations = { "/pks".extraConfig = '' diff --git a/nixpkgs/nixos/modules/services/web-apps/restya-board.nix b/nixpkgs/nixos/modules/services/web-apps/restya-board.nix index 6a1b4143bc16..11272ed591b8 100644 --- a/nixpkgs/nixos/modules/services/web-apps/restya-board.nix +++ b/nixpkgs/nixos/modules/services/web-apps/restya-board.nix @@ -181,6 +181,7 @@ in services.phpfpm.pools = { "${poolName}" = { inherit (cfg) user group; + phpOptions = '' date.timezone = "CET" @@ -207,7 +208,7 @@ in }; services.nginx.enable = true; - services.nginx.virtualHosts."${cfg.virtualHost.serverName}" = { + services.nginx.virtualHosts.${cfg.virtualHost.serverName} = { listen = [ { addr = cfg.virtualHost.listenHost; port = cfg.virtualHost.listenPort; } ]; serverName = cfg.virtualHost.serverName; root = runDir; diff --git a/nixpkgs/nixos/modules/services/web-apps/selfoss.nix b/nixpkgs/nixos/modules/services/web-apps/selfoss.nix index 56b7cafffe8b..d693c401565f 100644 --- a/nixpkgs/nixos/modules/services/web-apps/selfoss.nix +++ b/nixpkgs/nixos/modules/services/web-apps/selfoss.nix @@ -114,7 +114,6 @@ in }; config = mkIf cfg.enable { - services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { "${poolName}" = { user = "nginx"; diff --git a/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix b/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix index 59b0ee1addc6..4daf3ff9f991 100644 --- a/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix @@ -541,7 +541,7 @@ let services.nginx = mkIf (cfg.virtualHost != null) { enable = true; virtualHosts = { - "${cfg.virtualHost}" = { + ${cfg.virtualHost} = { root = "${cfg.root}"; locations."/" = { diff --git a/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/nixpkgs/nixos/modules/services/web-apps/wordpress.nix index 98dc84588189..884754370587 100644 --- a/nixpkgs/nixos/modules/services/web-apps/wordpress.nix +++ b/nixpkgs/nixos/modules/services/web-apps/wordpress.nix @@ -133,7 +133,7 @@ let ''; }; - database = rec { + database = { host = mkOption { type = types.str; default = "localhost"; diff --git a/nixpkgs/nixos/modules/services/web-apps/zabbix.nix b/nixpkgs/nixos/modules/services/web-apps/zabbix.nix index fa358ffafbc3..dac243b20e97 100644 --- a/nixpkgs/nixos/modules/services/web-apps/zabbix.nix +++ b/nixpkgs/nixos/modules/services/web-apps/zabbix.nix @@ -16,7 +16,7 @@ let <?php // Zabbix GUI configuration file. global $DB; - $DB['TYPE'] = '${ { "mysql" = "MYSQL"; "pgsql" = "POSTGRESQL"; "oracle" = "ORACLE"; }.${cfg.database.type} }'; + $DB['TYPE'] = '${ { mysql = "MYSQL"; pgsql = "POSTGRESQL"; oracle = "ORACLE"; }.${cfg.database.type} }'; $DB['SERVER'] = '${cfg.database.host}'; $DB['PORT'] = '${toString cfg.database.port}'; $DB['DATABASE'] = '${cfg.database.name}'; diff --git a/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix b/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix index 80870118c334..d6649fd472d9 100644 --- a/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix +++ b/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix @@ -67,7 +67,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { DynamicUser = true; - ExecStart = "${cfg.package}/bin/darkhttpd ${args}"; + ExecStart = "${pkgs.darkhttpd}/bin/darkhttpd ${args}"; AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; Restart = "on-failure"; RestartSec = "2s"; diff --git a/nixpkgs/nixos/modules/services/x11/clight.nix b/nixpkgs/nixos/modules/services/x11/clight.nix index 6ec395bb05ec..4daf6d8d9db7 100644 --- a/nixpkgs/nixos/modules/services/x11/clight.nix +++ b/nixpkgs/nixos/modules/services/x11/clight.nix @@ -75,7 +75,7 @@ in { longitude = mkDefault config.location.longitude; }); - services.geoclue2.appConfig."clightc" = { + services.geoclue2.appConfig.clightc = { isAllowed = true; isSystem = true; }; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 527e4b18045b..9914b6687090 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -31,7 +31,7 @@ in e.efl e.enlightenment e.terminology e.econnman pkgs.xorg.xauth # used by kdesu - pkgs.gtk2 # To get GTK+'s themes. + pkgs.gtk2 # To get GTK's themes. pkgs.tango-icon-theme pkgs.gnome2.gnome_icon_theme @@ -48,7 +48,7 @@ in services.xserver.desktopManager.session = [ { name = "Enlightenment"; start = '' - # Set GTK_DATA_PREFIX so that GTK+ can find the themes + # Set GTK_DATA_PREFIX so that GTK can find the themes export GTK_DATA_PREFIX=${config.system.path} # find theme engines export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix index 6f344f4121ba..a21d22261ba3 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -227,16 +227,16 @@ in (mkIf serviceCfg.core-shell.enable { services.colord.enable = mkDefault true; + services.gnome3.chrome-gnome-shell.enable = mkDefault true; services.gnome3.glib-networking.enable = true; services.gnome3.gnome-remote-desktop.enable = mkDefault true; services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-user-share.enable = mkDefault true; services.gnome3.rygel.enable = mkDefault true; services.gvfs.enable = true; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.telepathy.enable = mkDefault true; systemd.packages = [ pkgs.gnome3.vino ]; - services.dbus.packages = - optional config.services.printing.enable pkgs.system-config-printer; services.avahi.enable = mkDefault true; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix index e1084b0053cc..d7a871c9c704 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix @@ -48,7 +48,7 @@ in name = "mate"; bgSupport = true; start = '' - # Set GTK_DATA_PREFIX so that GTK+ can find the themes + # Set GTK_DATA_PREFIX so that GTK can find the themes export GTK_DATA_PREFIX=${config.system.path} # Find theme engines @@ -98,6 +98,9 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; + # Mate uses this for printing + programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.gnome3.at-spi2-core.enable = true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-settings-daemon.enable = true; @@ -105,7 +108,7 @@ in services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; - security.pam.services."mate-screensaver".unixAuth = true; + security.pam.services.mate-screensaver.unixAuth = true; environment.pathsToLink = [ "/share" ]; }; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index 5b82cb1f0262..e313a194c345 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -113,9 +113,9 @@ in services.colord.enable = mkDefault true; services.pantheon.files.enable = mkDefault true; services.tumbler.enable = mkDefault true; - services.dbus.packages = mkMerge [ - ([ pkgs.pantheon.switchboard-plug-power ]) - (mkIf config.services.printing.enable ([pkgs.system-config-printer]) ) + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.dbus.packages = [ + pkgs.pantheon.switchboard-plug-power ]; services.pantheon.contractor.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 94a307ae1007..b10755df4dc2 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -72,7 +72,7 @@ in security.wrappers = { kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass"; - "start_kdeinit".source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit"; + start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit"; kwin_wayland = { source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; capabilities = "cap_sys_nice+ep"; @@ -210,8 +210,8 @@ in # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.dbus.packages = - mkIf config.services.printing.enable [ pkgs.system-config-printer ]; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.xserver.libinput.enable = mkDefault true; # Extra UDEV rules used by Solid services.udev.packages = [ diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix index 1102f73d1ac3..e3249aef50c7 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -48,7 +48,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs.xfce // pkgs; [ - # Get GTK+ themes and gtk-update-icon-cache + # Get GTK themes and gtk-update-icon-cache gtk2.out # Supplies some abstract icons such as: @@ -107,10 +107,10 @@ in start = '' ${cfg.extraSessionCommands} - # Set GTK_PATH so that GTK+ can find the theme engines. + # Set GTK_PATH so that GTK can find the theme engines. export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" - # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. + # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes. export GTK_DATA_PREFIX=${config.system.path} ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} & diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index 16329c093f98..57d1268d655a 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -114,10 +114,10 @@ in name = "xfce4-14"; bgSupport = true; start = '' - # Set GTK_PATH so that GTK+ can find the theme engines. + # Set GTK_PATH so that GTK can find the theme engines. export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" - # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. + # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes. export GTK_DATA_PREFIX=${config.system.path} ${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} & @@ -137,8 +137,7 @@ in services.gvfs.enable = true; services.gvfs.package = pkgs.xfce.gvfs; services.tumbler.enable = true; - services.dbus.packages = - optional config.services.printing.enable pkgs.system-config-printer; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager # Enable default programs diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix index 9aed255f878a..c26a5b615353 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix @@ -6,7 +6,7 @@ let xcfg = config.services.xserver; dmcfg = xcfg.displayManager; - xEnv = config.systemd.services."display-manager".environment; + xEnv = config.systemd.services.display-manager.environment; cfg = dmcfg.lightdm; dmDefault = xcfg.desktopManager.default; @@ -232,36 +232,41 @@ in # Enable the accounts daemon to find lightdm's dbus interface environment.systemPackages = [ lightdm ]; - security.pam.services.lightdm = { - allowNullPassword = true; - startSession = true; - }; - security.pam.services.lightdm-greeter = { - allowNullPassword = true; - startSession = true; - text = '' - auth required pam_env.so envfile=${config.system.build.pamEnvironment} - auth required pam_permit.so + security.pam.services.lightdm.text = '' + auth substack login + account include login + password substack login + session include login + ''; - account required pam_permit.so + security.pam.services.lightdm-greeter.text = '' + auth required pam_succeed_if.so audit quiet_success user = lightdm + auth optional pam_permit.so - password required pam_deny.so + account required pam_succeed_if.so audit quiet_success user = lightdm + account sufficient pam_unix.so + + password required pam_deny.so + + session required pam_succeed_if.so audit quiet_success user = lightdm + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional pam_keyinit.so force revoke + session optional pam_permit.so + ''; - session required pam_env.so envfile=${config.system.build.pamEnvironment} - session required pam_unix.so - session optional ${pkgs.systemd}/lib/security/pam_systemd.so - ''; - }; security.pam.services.lightdm-autologin.text = '' - auth requisite pam_nologin.so - auth required pam_succeed_if.so uid >= 1000 quiet - auth required pam_permit.so + auth requisite pam_nologin.so + + auth required pam_succeed_if.so uid >= 1000 quiet + auth required pam_permit.so - account include lightdm + account sufficient pam_unix.so - password include lightdm + password requisite pam_unix.so nullok sha512 - session include lightdm + session optional pam_keyinit.so revoke + session include login ''; users.users.lightdm = { diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index d1ed345ac579..c6cb281c2cc2 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -7,7 +7,7 @@ let xcfg = config.services.xserver; dmcfg = xcfg.displayManager; cfg = dmcfg.sddm; - xEnv = config.systemd.services."display-manager".environment; + xEnv = config.systemd.services.display-manager.environment; inherit (pkgs) sddm; diff --git a/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix b/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix new file mode 100644 index 000000000000..95353e92098e --- /dev/null +++ b/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix @@ -0,0 +1,54 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + +cfg = config.services.xserver.cmt; +etcPath = "X11/xorg.conf.d"; + +in { + + options = { + + services.xserver.cmt = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks."; + }; + models = mkOption { + type = types.enum [ "atlas" "banjo" "candy" "caroline" "cave" "celes" "clapper" "cyan" "daisy" "elan" "elm" "enguarde" "eve" "expresso" "falco" "gandof" "glimmer" "gnawty" "heli" "kevin" "kip" "leon" "lulu" "orco" "pbody" "peppy" "pi" "pit" "puppy" "quawks" "rambi" "samus" "snappy" "spring" "squawks" "swanky" "winky" "wolf" "auron_paine" "auron_yuna" "daisy_skate" "nyan_big" "nyan_blaze" "veyron_jaq" "veyron_jerry" "veyron_mighty" "veyron_minnie" "veyron_speedy" ]; + example = "banjo"; + description = '' + Which models to enable cmt for. Enter the Code Name for your Chromebook. + Code Name can be found at <link xlink:href="https://www.chromium.org/chromium-os/developer-information-for-chrome-os-devices" />. + ''; + }; + }; #closes services + }; #closes options + + config = mkIf cfg.enable { + + services.xserver.modules = [ pkgs.xf86_input_cmt ]; + + environment.etc = { + "${etcPath}/40-touchpad-cmt.conf" = { + source = "${pkgs.chromium-xorg-conf}/40-touchpad-cmt.conf"; + }; + "${etcPath}/50-touchpad-cmt-${cfg.models}.conf" = { + source = "${pkgs.chromium-xorg-conf}/50-touchpad-cmt-${cfg.models}.conf"; + }; + "${etcPath}/60-touchpad-cmt-${cfg.models}.conf" = { + source = "${pkgs.chromium-xorg-conf}/60-touchpad-cmt-${cfg.models}.conf"; + }; + }; + + assertions = [ + { + assertion = !config.services.xserver.libinput.enable; + message = "cmt and libinput are incompatible, you cannot enable both (in services.xserver)."; + } + ]; + }; +} diff --git a/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix b/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix index e39a56528e82..22af869f1f8a 100644 --- a/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix @@ -167,7 +167,7 @@ in { services.xserver.modules = [ pkg.out ]; - environment.etc."${etcFile}".source = + environment.etc.${etcFile}.source = "${pkg.out}/share/X11/xorg.conf.d/70-synaptics.conf"; environment.systemPackages = [ pkg ]; diff --git a/nixpkgs/nixos/modules/services/x11/redshift.nix b/nixpkgs/nixos/modules/services/x11/redshift.nix index 55f8f75021bc..6ddb4c83764a 100644 --- a/nixpkgs/nixos/modules/services/x11/redshift.nix +++ b/nixpkgs/nixos/modules/services/x11/redshift.nix @@ -81,7 +81,7 @@ in { # needed so that .desktop files are installed, which geoclue cares about environment.systemPackages = [ cfg.package ]; - services.geoclue2.appConfig."redshift" = { + services.geoclue2.appConfig.redshift = { isAllowed = true; isSystem = true; }; diff --git a/nixpkgs/nixos/modules/services/x11/xautolock.nix b/nixpkgs/nixos/modules/services/x11/xautolock.nix index 10eef8aefbcd..3e03131ca114 100644 --- a/nixpkgs/nixos/modules/services/x11/xautolock.nix +++ b/nixpkgs/nixos/modules/services/x11/xautolock.nix @@ -132,7 +132,7 @@ in ] ++ (lib.forEach [ "locker" "notifier" "nowlocker" "killer" ] (option: { - assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/"; + assertion = cfg.${option} != null -> builtins.substring 0 1 cfg.${option} == "/"; message = "Please specify a canonical path for `services.xserver.xautolock.${option}`"; }) ); diff --git a/nixpkgs/nixos/modules/system/boot/kernel.nix b/nixpkgs/nixos/modules/system/boot/kernel.nix index baa8c602a99e..50dbf2f83651 100644 --- a/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -261,7 +261,7 @@ in source = kernelModulesConf; }; - systemd.services."systemd-modules-load" = + systemd.services.systemd-modules-load = { wantedBy = [ "multi-user.target" ]; restartTriggers = [ kernelModulesConf ]; serviceConfig = diff --git a/nixpkgs/nixos/modules/system/boot/kexec.nix b/nixpkgs/nixos/modules/system/boot/kexec.nix index fd2cb94b756b..27a8e0217c55 100644 --- a/nixpkgs/nixos/modules/system/boot/kexec.nix +++ b/nixpkgs/nixos/modules/system/boot/kexec.nix @@ -4,7 +4,7 @@ config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platforms) { environment.systemPackages = [ pkgs.kexectools ]; - systemd.services."prepare-kexec" = + systemd.services.prepare-kexec = { description = "Preparation for kexec"; wantedBy = [ "kexec.target" ]; before = [ "systemd-kexec.service" ]; diff --git a/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index d8f347a54d6c..e13f0421d38f 100644 --- a/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -72,7 +72,7 @@ let else "${convertedFont}"); }); - bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {} + bootDeviceCounters = fold (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {} (concatMap (args: args.devices) cfg.mirroredBoots); convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {} diff --git a/nixpkgs/nixos/modules/system/boot/luksroot.nix b/nixpkgs/nixos/modules/system/boot/luksroot.nix index b5c8d5241a3d..a4029d766b05 100644 --- a/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -476,7 +476,7 @@ in boot.initrd.luks.devices = mkOption { default = { }; - example = { "luksroot".device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; }; + example = { luksroot.device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; }; description = '' The encrypted disk that should be opened before the root filesystem is mounted. Both LVM-over-LUKS and LUKS-over-LVM diff --git a/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix b/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix index 34a34091a7dc..db6e06b41072 100644 --- a/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix @@ -117,7 +117,7 @@ in { environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; - systemd.targets."multi-user".wants = [ "machines.target" ]; + systemd.targets.multi-user.wants = [ "machines.target" ]; }; } diff --git a/nixpkgs/nixos/modules/system/boot/systemd.nix b/nixpkgs/nixos/modules/system/boot/systemd.nix index a79513850624..2287a82418fe 100644 --- a/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -328,7 +328,7 @@ let [Service] ${let env = cfg.globalEnvironment // def.environment; in concatMapStrings (n: - let s = optionalString (env."${n}" != null) + let s = optionalString (env.${n} != null) "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; # systemd max line length is now 1MiB # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af @@ -496,7 +496,7 @@ in systemd.generators = mkOption { type = types.attrsOf types.path; default = {}; - example = { "systemd-gpt-auto-generator" = "/dev/null"; }; + example = { systemd-gpt-auto-generator = "/dev/null"; }; description = '' Definition of systemd generators. For each <literal>NAME = VALUE</literal> pair of the attrSet, a link is generated from diff --git a/nixpkgs/nixos/modules/tasks/filesystems.nix b/nixpkgs/nixos/modules/tasks/filesystems.nix index 43764bb82f1f..688c77cb22d1 100644 --- a/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -12,7 +12,7 @@ let fileSystems' = toposort fsBefore (attrValues config.fileSystems); - fileSystems = if fileSystems' ? "result" + fileSystems = if fileSystems' ? result then # use topologically sorted fileSystems everywhere fileSystems'.result else # the assertion below will catch this, @@ -211,7 +211,7 @@ in ls = sep: concatMapStringsSep sep (x: x.mountPoint); notAutoResizable = fs: fs.autoResize && !(hasPrefix "ext" fs.fsType || fs.fsType == "f2fs"); in [ - { assertion = ! (fileSystems' ? "cycle"); + { assertion = ! (fileSystems' ? cycle); message = "The ‘fileSystems’ option can't be topologically sorted: mountpoint dependency path ${ls " -> " fileSystems'.cycle} loops to ${ls ", " fileSystems'.loops}"; } { assertion = ! (any notAutoResizable fileSystems); diff --git a/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index ac06b6caee30..2ed8c5aa2927 100644 --- a/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -469,7 +469,7 @@ in map createSyncService allPools ++ map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]); - systemd.targets."zfs-import" = + systemd.targets.zfs-import = let services = map (pool: "zfs-import-${pool}.service") dataPools; in @@ -479,7 +479,7 @@ in wantedBy = [ "zfs.target" ]; }; - systemd.targets."zfs".wantedBy = [ "multi-user.target" ]; + systemd.targets.zfs.wantedBy = [ "multi-user.target" ]; }) (mkIf enableAutoSnapshots { diff --git a/nixpkgs/nixos/modules/tasks/kbd.nix b/nixpkgs/nixos/modules/tasks/kbd.nix index 6d34f897d189..c6ba998b19e6 100644 --- a/nixpkgs/nixos/modules/tasks/kbd.nix +++ b/nixpkgs/nixos/modules/tasks/kbd.nix @@ -73,7 +73,7 @@ in config = mkMerge [ (mkIf (!setVconsole) { - systemd.services."systemd-vconsole-setup".enable = false; + systemd.services.systemd-vconsole-setup.enable = false; }) (mkIf setVconsole (mkMerge [ @@ -83,7 +83,7 @@ in # virtual consoles. environment.etc."vconsole.conf".source = vconsoleConf; # Provide kbd with additional packages. - environment.etc."kbd".source = "${kbdEnv}/share"; + environment.etc.kbd.source = "${kbdEnv}/share"; boot.initrd.preLVMCommands = mkBefore '' kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console @@ -99,7 +99,7 @@ in '') config.i18n.consoleColors} ''; - systemd.services."systemd-vconsole-setup" = + systemd.services.systemd-vconsole-setup = { before = [ "display-manager.service" ]; after = [ "systemd-udev-settle.service" ]; restartTriggers = [ vconsoleConf kbdEnv ]; diff --git a/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix b/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix index 2b8a7944dc36..1726d05115ea 100644 --- a/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix @@ -498,8 +498,8 @@ let // mapAttrs' createSitDevice cfg.sits // mapAttrs' createVlanDevice cfg.vlans // { - "network-setup" = networkSetup; - "network-local-commands" = networkLocalCommands; + network-setup = networkSetup; + network-local-commands = networkLocalCommands; }; services.udev.extraRules = diff --git a/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix index fbca54978e5b..f5a593211efc 100644 --- a/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix @@ -160,14 +160,14 @@ in (mapAttrsToList (k: _: k) do); ""; # get those driverOptions that have been set filterSystemdOptions = filterAttrs (sysDOpt: kOpts: - any (kOpt: do ? "${kOpt}") kOpts.optNames); + any (kOpt: do ? ${kOpt}) kOpts.optNames); # build final set of systemd options to bond values buildOptionSet = mapAttrs (_: kOpts: with kOpts; # we simply take the first set kernel bond option # (one option has multiple names, which is silly) - head (map (optN: valTransform (do."${optN}")) + head (map (optN: valTransform (do.${optN})) # only map those that exist - (filter (o: do ? "${o}") optNames))); + (filter (o: do ? ${o}) optNames))); in seq assertNoUnknownOption (buildOptionSet (filterSystemdOptions driverOptionMapping)); diff --git a/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 16dde9175150..5bf7b0d227f0 100644 --- a/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -799,19 +799,19 @@ in networking.wlanInterfaces = mkOption { default = { }; example = literalExample { - "wlan-station0" = { + wlan-station0 = { device = "wlp6s0"; }; - "wlan-adhoc0" = { + wlan-adhoc0 = { type = "ibss"; device = "wlp6s0"; mac = "02:00:00:00:00:01"; }; - "wlan-p2p0" = { + wlan-p2p0 = { device = "wlp6s0"; mac = "02:00:00:00:00:02"; }; - "wlan-ap0" = { + wlan-ap0 = { device = "wlp6s0"; mac = "02:00:00:00:00:03"; }; @@ -994,7 +994,7 @@ in domainname "${cfg.domain}" ''; - environment.etc."hostid" = mkIf (cfg.hostId != null) + environment.etc.hostid = mkIf (cfg.hostId != null) { source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' hi="${cfg.hostId}" ${if pkgs.stdenv.isBigEndian then '' @@ -1007,7 +1007,7 @@ in # static hostname configuration needed for hostnamectl and the # org.freedesktop.hostname1 dbus service (both provided by systemd) - environment.etc."hostname" = mkIf (cfg.hostName != "") + environment.etc.hostname = mkIf (cfg.hostName != "") { text = cfg.hostName + "\n"; }; @@ -1027,7 +1027,7 @@ in # The network-interfaces target is kept for backwards compatibility. # New modules must NOT use it. - systemd.targets."network-interfaces" = + systemd.targets.network-interfaces = { description = "All Network Interfaces (deprecated)"; wantedBy = [ "network.target" ]; before = [ "network.target" ]; @@ -1162,13 +1162,13 @@ in in flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) (device: let - interfaces = wlanListDeviceFirst device wlanDeviceInterfaces."${device}"; + interfaces = wlanListDeviceFirst device wlanDeviceInterfaces.${device}; curInterface = elemAt interfaces 0; newInterfaces = drop 1 interfaces; in '' # It is important to have that rule first as overwriting the NAME attribute also prevents the # next rules from matching. - ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces."${device}") (interface: + ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces.${device}) (interface: ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript device interface}"'')} # Add the required, new WLAN interfaces to the default WLAN interface with the diff --git a/nixpkgs/nixos/modules/virtualisation/amazon-image.nix b/nixpkgs/nixos/modules/virtualisation/amazon-image.nix index 0c4ad90b4eb6..aadfc5add350 100644 --- a/nixpkgs/nixos/modules/virtualisation/amazon-image.nix +++ b/nixpkgs/nixos/modules/virtualisation/amazon-image.nix @@ -25,6 +25,9 @@ in { assertion = cfg.hvm; message = "Paravirtualized EC2 instances are no longer supported."; } + { assertion = cfg.efi -> cfg.hvm; + message = "EC2 instances using EFI must be HVM instances."; + } ]; boot.growPartition = cfg.hvm; @@ -35,6 +38,11 @@ in autoResize = true; }; + fileSystems."/boot" = mkIf cfg.efi { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + boot.extraModulePackages = [ config.boot.kernelPackages.ena ]; @@ -50,8 +58,10 @@ in # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. boot.loader.grub.version = if cfg.hvm then 2 else 1; - boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev"; + boot.loader.grub.device = if (cfg.hvm && !cfg.efi) then "/dev/xvda" else "nodev"; boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)"; + boot.loader.grub.efiSupport = cfg.efi; + boot.loader.grub.efiInstallAsRemovable = cfg.efi; boot.loader.timeout = 0; boot.initrd.network.enable = true; @@ -137,7 +147,7 @@ in networking.timeServers = [ "169.254.169.123" ]; # udisks has become too bloated to have in a headless system - # (e.g. it depends on GTK+). + # (e.g. it depends on GTK). services.udisks2.enable = false; }; } diff --git a/nixpkgs/nixos/modules/virtualisation/amazon-options.nix b/nixpkgs/nixos/modules/virtualisation/amazon-options.nix index 15de8638bbab..2e807131e938 100644 --- a/nixpkgs/nixos/modules/virtualisation/amazon-options.nix +++ b/nixpkgs/nixos/modules/virtualisation/amazon-options.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: { options = { ec2 = { @@ -9,6 +9,13 @@ Whether the EC2 instance is a HVM instance. ''; }; + efi = lib.mkOption { + default = pkgs.stdenv.hostPlatform.isAarch64; + internal = true; + description = '' + Whether the EC2 instance is using EFI. + ''; + }; }; }; } diff --git a/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix b/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix index e716982c510a..d0efbcc808aa 100644 --- a/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix @@ -111,7 +111,7 @@ in # Always include cryptsetup so that NixOps can use it. environment.systemPackages = [ pkgs.cryptsetup ]; - systemd.services."fetch-ec2-data" = + systemd.services.fetch-ec2-data = { description = "Fetch EC2 Data"; wantedBy = [ "multi-user.target" "sshd.service" ]; diff --git a/nixpkgs/nixos/modules/virtualisation/containers.nix b/nixpkgs/nixos/modules/virtualisation/containers.nix index 0c0d8551e4aa..9c9f8fc0c215 100644 --- a/nixpkgs/nixos/modules/virtualisation/containers.nix +++ b/nixpkgs/nixos/modules/virtualisation/containers.nix @@ -729,7 +729,7 @@ in serviceConfig = serviceDirectives dummyConfig; }; in { - systemd.targets."multi-user".wants = [ "machines.target" ]; + systemd.targets.multi-user.wants = [ "machines.target" ]; systemd.services = listToAttrs (filter (x: x.value != null) ( # The generic container template used by imperative containers diff --git a/nixpkgs/nixos/modules/virtualisation/ec2-data.nix b/nixpkgs/nixos/modules/virtualisation/ec2-data.nix index db3dd9949c12..82451787e8a1 100644 --- a/nixpkgs/nixos/modules/virtualisation/ec2-data.nix +++ b/nixpkgs/nixos/modules/virtualisation/ec2-data.nix @@ -64,7 +64,7 @@ with lib; serviceConfig.RemainAfterExit = true; }; - systemd.services."print-host-key" = + systemd.services.print-host-key = { description = "Print SSH Host Key"; wantedBy = [ "multi-user.target" ]; after = [ "sshd.service" ]; diff --git a/nixpkgs/nixos/modules/virtualisation/kvmgt.nix b/nixpkgs/nixos/modules/virtualisation/kvmgt.nix index 78753da55328..36ef6d17df69 100644 --- a/nixpkgs/nixos/modules/virtualisation/kvmgt.nix +++ b/nixpkgs/nixos/modules/virtualisation/kvmgt.nix @@ -35,7 +35,7 @@ in { and find info about device via <command>cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description</command> ''; example = { - "i915-GVTg_V5_8" = { + i915-GVTg_V5_8 = { uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525"; }; }; diff --git a/nixpkgs/nixos/modules/virtualisation/railcar.nix b/nixpkgs/nixos/modules/virtualisation/railcar.nix new file mode 100644 index 000000000000..12da1c75fc38 --- /dev/null +++ b/nixpkgs/nixos/modules/virtualisation/railcar.nix @@ -0,0 +1,125 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.railcar; + generateUnit = name: containerConfig: + let + container = pkgs.ociTools.buildContainer { + args = [ + (pkgs.writeShellScript "run.sh" containerConfig.cmd).outPath + ]; + }; + in + nameValuePair "railcar-${name}" { + enable = true; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/railcar -r ${cfg.stateDir} run ${name} -b ${container} + ''; + Type = containerConfig.runType; + }; + }; + mount = with types; (submodule { + options = { + type = mkOption { + type = str; + default = "none"; + description = '' + The type of the filesystem to be mounted. + Linux: filesystem types supported by the kernel as listed in + `/proc/filesystems` (e.g., "minix", "ext2", "ext3", "jfs", "xfs", + "reiserfs", "msdos", "proc", "nfs", "iso9660"). For bind mounts + (when options include either bind or rbind), the type is a dummy, + often "none" (not listed in /proc/filesystems). + ''; + }; + source = mkOption { + type = str; + description = "Source for the in-container mount"; + }; + options = mkOption { + type = loaOf (str); + default = [ "bind" ]; + description = '' + Mount options of the filesystem to be used. + + Support optoions are listed in the mount(8) man page. Note that + both filesystem-independent and filesystem-specific options + are listed. + ''; + }; + }; + }); +in +{ + options.services.railcar = { + enable = mkEnableOption "railcar"; + + containers = mkOption { + default = {}; + description = "Declarative container configuration"; + type = with types; loaOf (submodule ({ name, config, ... }: { + options = { + cmd = mkOption { + type = types.lines; + description = "Command or script to run inside the container"; + }; + + mounts = mkOption { + type = with types; attrsOf mount; + default = {}; + description = '' + A set of mounts inside the container. + + The defaults have been chosen for simple bindmounts, meaning + that you only need to provide the "source" parameter. + ''; + example = '' + { "/data" = { source = "/var/lib/data"; }; } + ''; + }; + + runType = mkOption { + type = types.str; + default = "oneshot"; + description = "The systemd service run type"; + }; + + os = mkOption { + type = types.str; + default = "linux"; + description = "OS type of the container"; + }; + + arch = mkOption { + type = types.str; + default = "x86_64"; + description = "Computer architecture type of the container"; + }; + }; + })); + }; + + stateDir = mkOption { + type = types.path; + default = ''/var/railcar''; + description = "Railcar persistent state directory"; + }; + + package = mkOption { + type = types.package; + default = pkgs.railcar; + description = "Railcar package to use"; + }; + }; + + config = mkIf cfg.enable { + systemd.services = flip mapAttrs' cfg.containers (name: containerConfig: + generateUnit name containerConfig + ); + }; +} + diff --git a/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix b/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix index 41bcb909fb5c..6081d4153a6c 100644 --- a/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix @@ -122,7 +122,7 @@ in # Since we lack the right setuid/setcap binaries, set up a host-only network by default. } (mkIf cfg.addNetworkInterface { - systemd.services."vboxnet0" = + systemd.services.vboxnet0 = { description = "VirtualBox vboxnet0 Interface"; requires = [ "dev-vboxnetctl.device" ]; after = [ "dev-vboxnetctl.device" ]; diff --git a/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix b/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix index d18778f81588..f418f849759f 100644 --- a/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix @@ -33,7 +33,7 @@ in serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; }; - environment.etc."vmware-tools".source = "${open-vm-tools}/etc/vmware-tools/*"; + environment.etc.vmware-tools.source = "${open-vm-tools}/etc/vmware-tools/*"; services.xserver = mkIf (!cfg.headless) { videoDrivers = mkOverride 50 [ "vmware" ]; diff --git a/nixpkgs/nixos/release.nix b/nixpkgs/nixos/release.nix index df2c52ccd0b6..c7c609658909 100644 --- a/nixpkgs/nixos/release.nix +++ b/nixpkgs/nixos/release.nix @@ -196,6 +196,22 @@ in rec { ); + # A disk image that can be imported to Amazon EC2 and registered as an AMI + amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import nixpkgs { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ versionModule + ./maintainers/scripts/ec2/amazon-image.nix + ]; + }).config.system.build.amazonImage) + + ); + + # Ensure that all packages used by the minimal NixOS config end up in the channel. dummy = forAllSystems (system: pkgs.runCommand "dummy" { toplevel = (import lib/eval-config.nix { diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index 8ee4dfbf13bc..5eb8111aa6d3 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -224,7 +224,6 @@ in predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing = handleTest ./printing.nix {}; prometheus = handleTest ./prometheus.nix {}; - prometheus2 = handleTest ./prometheus-2.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./xmpp/prosody.nix {}; prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; diff --git a/nixpkgs/nixos/tests/beegfs.nix b/nixpkgs/nixos/tests/beegfs.nix index 9c241fd2301a..3465272f5599 100644 --- a/nixpkgs/nixos/tests/beegfs.nix +++ b/nixpkgs/nixos/tests/beegfs.nix @@ -23,7 +23,7 @@ let } ]; - environment.etc."${connAuthFile}" = { + environment.etc.${connAuthFile} = { enable = true; text = "ThisIsALousySecret"; mode = "0600"; @@ -47,7 +47,7 @@ let ]; environment.systemPackages = with pkgs; [ beegfs ]; - environment.etc."${connAuthFile}" = { + environment.etc.${connAuthFile} = { enable = true; text = "ThisIsALousySecret"; mode = "0600"; @@ -57,7 +57,7 @@ let services.beegfs.default = { mgmtdHost = "mgmt"; connAuthFile = "/etc/${connAuthFile}"; - "${service}" = { + ${service} = { enable = true; storeDir = "/data"; }; diff --git a/nixpkgs/nixos/tests/borgbackup.nix b/nixpkgs/nixos/tests/borgbackup.nix index fdb87dbea438..165f64b0d6dc 100644 --- a/nixpkgs/nixos/tests/borgbackup.nix +++ b/nixpkgs/nixos/tests/borgbackup.nix @@ -44,7 +44,7 @@ in { client = { ... }: { services.borgbackup.jobs = { - local = rec { + local = { paths = dataDir; repo = localRepo; preHook = '' diff --git a/nixpkgs/nixos/tests/ceph.nix b/nixpkgs/nixos/tests/ceph.nix index 7408029c460e..57120ff978f7 100644 --- a/nixpkgs/nixos/tests/ceph.nix +++ b/nixpkgs/nixos/tests/ceph.nix @@ -1,12 +1,13 @@ -import ./make-test.nix ({pkgs, ...}: rec { +import ./make-test.nix ({pkgs, lib, ...}: { name = "All-in-one-basic-ceph-cluster"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lejonet ]; + maintainers = [ johanot lejonet ]; }; nodes = { aio = { pkgs, ... }: { virtualisation = { + memorySize = 1536; emptyDiskImages = [ 20480 20480 ]; vlans = [ 1 ]; }; @@ -24,9 +25,6 @@ import ./make-test.nix ({pkgs, ...}: rec { ceph xfsprogs ]; - nixpkgs.config.packageOverrides = super: { - ceph = super.ceph.override({ nss = super.nss; libxfs = super.libxfs; libaio = super.libaio; jemalloc = super.jemalloc; }); - }; boot.kernelModules = [ "xfs" ]; @@ -51,6 +49,9 @@ import ./make-test.nix ({pkgs, ...}: rec { enable = true; daemons = [ "0" "1" ]; }; + + # So that we don't have to battle systemd when bootstraping + systemd.targets.ceph.wantedBy = lib.mkForce []; }; }; @@ -61,24 +62,26 @@ import ./make-test.nix ({pkgs, ...}: rec { # Create the ceph-related directories $aio->mustSucceed( - "mkdir -p /var/lib/ceph/mgr/ceph-aio/", - "mkdir -p /var/lib/ceph/mon/ceph-aio/", - "mkdir -p /var/lib/ceph/osd/ceph-{0..1}/", - "chown ceph:ceph -R /var/lib/ceph/" + "mkdir -p /var/lib/ceph/mgr/ceph-aio", + "mkdir -p /var/lib/ceph/mon/ceph-aio", + "mkdir -p /var/lib/ceph/osd/ceph-{0,1}", + "chown ceph:ceph -R /var/lib/ceph/", + "mkdir -p /etc/ceph", + "chown ceph:ceph -R /etc/ceph" ); # Bootstrap ceph-mon daemon $aio->mustSucceed( - "mkdir -p /var/lib/ceph/bootstrap-osd && chown ceph:ceph /var/lib/ceph/bootstrap-osd", "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", - "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", - "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", - "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap", + "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", + "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", + "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap", "sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", - "touch /var/lib/ceph/mon/ceph-aio/done", + "sudo -u ceph touch /var/lib/ceph/mon/ceph-aio/done", "systemctl start ceph-mon-aio" ); $aio->waitForUnit("ceph-mon-aio"); + $aio->mustSucceed("ceph mon enable-msgr2"); # Can't check ceph status until a mon is up $aio->succeed("ceph -s | grep 'mon: 1 daemons'"); @@ -90,6 +93,7 @@ import ./make-test.nix ({pkgs, ...}: rec { ); $aio->waitForUnit("ceph-mgr-aio"); $aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'"); + $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'"); # Bootstrap both OSDs $aio->mustSucceed( @@ -112,8 +116,8 @@ import ./make-test.nix ({pkgs, ...}: rec { "systemctl start ceph-osd-1" ); - $aio->waitUntilSucceeds("ceph osd stat | grep '2 osds: 2 up, 2 in'"); - $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active)'"); + $aio->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'"); + $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'"); $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); $aio->mustSucceed( @@ -135,5 +139,23 @@ import ./make-test.nix ({pkgs, ...}: rec { "ceph osd pool ls | grep 'aio-test'", "ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it" ); + + # As we disable the target in the config, we still want to test that it works as intended + $aio->mustSucceed( + "systemctl stop ceph-osd-0", + "systemctl stop ceph-osd-1", + "systemctl stop ceph-mgr-aio", + "systemctl stop ceph-mon-aio" + ); + $aio->succeed("systemctl start ceph.target"); + $aio->waitForUnit("ceph-mon-aio"); + $aio->waitForUnit("ceph-mgr-aio"); + $aio->waitForUnit("ceph-osd-0"); + $aio->waitForUnit("ceph-osd-1"); + $aio->succeed("ceph -s | grep 'mon: 1 daemons'"); + $aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'"); + $aio->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'"); + $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'"); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); ''; }) diff --git a/nixpkgs/nixos/tests/cjdns.nix b/nixpkgs/nixos/tests/cjdns.nix index e03bb9882540..6660eecf05b9 100644 --- a/nixpkgs/nixos/tests/cjdns.nix +++ b/nixpkgs/nixos/tests/cjdns.nix @@ -23,8 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ ehmry ]; }; - nodes = rec - { # Alice finds peers over over ETHInterface. + nodes = { # Alice finds peers over over ETHInterface. alice = { ... }: { imports = [ basicConfig ]; diff --git a/nixpkgs/nixos/tests/cockroachdb.nix b/nixpkgs/nixos/tests/cockroachdb.nix index 56c624d8cf2f..496283fddc7b 100644 --- a/nixpkgs/nixos/tests/cockroachdb.nix +++ b/nixpkgs/nixos/tests/cockroachdb.nix @@ -100,7 +100,7 @@ in import ./make-test.nix ({ pkgs, ...} : { meta.maintainers = with pkgs.stdenv.lib.maintainers; [ thoughtpolice ]; - nodes = rec { + nodes = { node1 = makeNode "country=us,region=east,dc=1" "192.168.1.1" null; node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1"; node3 = makeNode "country=eu,region=west,dc=2" "192.168.1.3" "192.168.1.1"; diff --git a/nixpkgs/nixos/tests/containers-reloadable.nix b/nixpkgs/nixos/tests/containers-reloadable.nix index 9726ca0cb0e7..f41dea91b1e4 100644 --- a/nixpkgs/nixos/tests/containers-reloadable.nix +++ b/nixpkgs/nixos/tests/containers-reloadable.nix @@ -1,11 +1,11 @@ import ./make-test.nix ({ pkgs, lib, ...} : let - client_base = rec { + client_base = { containers.test1 = { autoStart = true; config = { - environment.etc."check".text = "client_base"; + environment.etc.check.text = "client_base"; }; }; @@ -29,7 +29,7 @@ in { imports = [ client_base ]; containers.test1.config = { - environment.etc."check".text = lib.mkForce "client_c1"; + environment.etc.check.text = lib.mkForce "client_c1"; services.httpd.enable = true; services.httpd.adminAddr = "nixos@example.com"; }; @@ -38,7 +38,7 @@ in { imports = [ client_base ]; containers.test1.config = { - environment.etc."check".text = lib.mkForce "client_c2"; + environment.etc.check.text = lib.mkForce "client_c2"; services.nginx.enable = true; }; }; diff --git a/nixpkgs/nixos/tests/containers-restart_networking.nix b/nixpkgs/nixos/tests/containers-restart_networking.nix index 0fb3b591e9f9..df15f5b2f455 100644 --- a/nixpkgs/nixos/tests/containers-restart_networking.nix +++ b/nixpkgs/nixos/tests/containers-restart_networking.nix @@ -1,7 +1,7 @@ # Test for NixOS' container support. let - client_base = rec { + client_base = { networking.firewall.enable = false; containers.webserver = { diff --git a/nixpkgs/nixos/tests/containers-tmpfs.nix b/nixpkgs/nixos/tests/containers-tmpfs.nix index 05c21f4907bf..e29fe6bbf032 100644 --- a/nixpkgs/nixos/tests/containers-tmpfs.nix +++ b/nixpkgs/nixos/tests/containers-tmpfs.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "containers-tmpfs"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ckampka ]; + maintainers = [ kampka ]; }; machine = diff --git a/nixpkgs/nixos/tests/elk.nix b/nixpkgs/nixos/tests/elk.nix index 95371ef44436..b33d98b85d69 100644 --- a/nixpkgs/nixos/tests/elk.nix +++ b/nixpkgs/nixos/tests/elk.nix @@ -178,13 +178,7 @@ let ''; }; in mapAttrs mkElkTest { - "ELK-5" = { - elasticsearch = pkgs.elasticsearch5; - logstash = pkgs.logstash5; - kibana = pkgs.kibana5; - journalbeat = pkgs.journalbeat5; - }; - "ELK-6" = + ELK-6 = if enableUnfree then { elasticsearch = pkgs.elasticsearch6; @@ -198,7 +192,7 @@ in mapAttrs mkElkTest { kibana = pkgs.kibana6-oss; journalbeat = pkgs.journalbeat6; }; - "ELK-7" = + ELK-7 = if enableUnfree then { elasticsearch = pkgs.elasticsearch7; diff --git a/nixpkgs/nixos/tests/env.nix b/nixpkgs/nixos/tests/env.nix index 064c498204ae..6c681905b19f 100644 --- a/nixpkgs/nixos/tests/env.nix +++ b/nixpkgs/nixos/tests/env.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages; - environment.etc."plainFile".text = '' + environment.etc.plainFile.text = '' Hello World ''; environment.etc."folder/with/file".text = '' diff --git a/nixpkgs/nixos/tests/flannel.nix b/nixpkgs/nixos/tests/flannel.nix index 0b261a684772..9991c5eaa329 100644 --- a/nixpkgs/nixos/tests/flannel.nix +++ b/nixpkgs/nixos/tests/flannel.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ...} : rec { +import ./make-test.nix ({ pkgs, ...} : { name = "flannel"; meta = with pkgs.stdenv.lib.maintainers; { diff --git a/nixpkgs/nixos/tests/gitlab.nix b/nixpkgs/nixos/tests/gitlab.nix index ac733461932d..be0b3c8746a9 100644 --- a/nixpkgs/nixos/tests/gitlab.nix +++ b/nixpkgs/nixos/tests/gitlab.nix @@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { enable = true; recommendedProxySettings = true; virtualHosts = { - "localhost" = { + localhost = { locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; }; }; @@ -29,44 +29,14 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { services.gitlab = { enable = true; - databasePassword = "dbPassword"; - inherit initialRootPassword; + databasePasswordFile = pkgs.writeText "dbPassword" "xo0daiF4"; + initialRootPasswordFile = pkgs.writeText "rootPassword" initialRootPassword; smtp.enable = true; secrets = { - secret = "secret"; - otp = "otpsecret"; - db = "dbsecret"; - - # nix-shell -p openssl --run "openssl genrsa 2048" - jws = '' - -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21 - PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+ - Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX - z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k - 7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY - 0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5 - qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3 - lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM - AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR - cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O - bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac - +kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp - kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8 - vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7 - sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS - qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr - 7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W - 3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+ - vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK - fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX - 12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM - f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L - rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m - VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW - 3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw== - -----END RSA PRIVATE KEY----- - ''; + secretFile = pkgs.writeText "secret" "Aig5zaic"; + otpFile = pkgs.writeText "otpsecret" "Riew9mue"; + dbFile = pkgs.writeText "dbsecret" "we2quaeZ"; + jwsFile = pkgs.runCommand "oidcKeyBase" {} "${pkgs.openssl}/bin/openssl genrsa 2048 > $out"; }; }; }; diff --git a/nixpkgs/nixos/tests/hardened.nix b/nixpkgs/nixos/tests/hardened.nix index 1ff329bd98de..90f9793b370c 100644 --- a/nixpkgs/nixos/tests/hardened.nix +++ b/nixpkgs/nixos/tests/hardened.nix @@ -28,7 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = let - hardened-malloc-tests = pkgs.stdenv.mkDerivation rec { + hardened-malloc-tests = pkgs.stdenv.mkDerivation { name = "hardened-malloc-tests-${pkgs.graphene-hardened-malloc.version}"; src = pkgs.graphene-hardened-malloc.src; buildPhase = '' diff --git a/nixpkgs/nixos/tests/initrd-network-ssh/default.nix b/nixpkgs/nixos/tests/initrd-network-ssh/default.nix index b2209f297a4f..796c50c610e3 100644 --- a/nixpkgs/nixos/tests/initrd-network-ssh/default.nix +++ b/nixpkgs/nixos/tests/initrd-network-ssh/default.nix @@ -6,7 +6,7 @@ import ../make-test.nix ({ lib, ... }: maintainers = [ willibutz ]; }; - nodes = with lib; rec { + nodes = with lib; { server = { config, ... }: { diff --git a/nixpkgs/nixos/tests/jackett.nix b/nixpkgs/nixos/tests/jackett.nix index 399a0c272327..c749c32ad04e 100644 --- a/nixpkgs/nixos/tests/jackett.nix +++ b/nixpkgs/nixos/tests/jackett.nix @@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }: with lib; -rec { +{ name = "jackett"; meta.maintainers = with maintainers; [ etu ]; diff --git a/nixpkgs/nixos/tests/kubernetes/base.nix b/nixpkgs/nixos/tests/kubernetes/base.nix index 212023859f6d..f21634c4ffbf 100644 --- a/nixpkgs/nixos/tests/kubernetes/base.nix +++ b/nixpkgs/nixos/tests/kubernetes/base.nix @@ -30,10 +30,7 @@ let { config, pkgs, lib, nodes, ... }: mkMerge [ { - boot = { - postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*"; - kernel.sysctl = { "fs.inotify.max_user_instances" = 256; }; - }; + boot.postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*"; virtualisation.memorySize = mkDefault 1536; virtualisation.diskSize = mkDefault 4096; networking = { @@ -71,7 +68,7 @@ let 443 # kubernetes apiserver ]; }) - (optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; })) + (optionalAttrs (machine ? extraConfiguration) (machine.extraConfiguration { inherit config pkgs lib nodes; })) (optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; })) ] ) machines; diff --git a/nixpkgs/nixos/tests/kubernetes/dns.nix b/nixpkgs/nixos/tests/kubernetes/dns.nix index e7db0a58ab61..46bcb01a5265 100644 --- a/nixpkgs/nixos/tests/kubernetes/dns.nix +++ b/nixpkgs/nixos/tests/kubernetes/dns.nix @@ -77,7 +77,6 @@ let singleNodeTest = { test = '' # prepare machine1 for test - $machine1->waitForUnit("kubernetes.target"); $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready"); $machine1->waitUntilSucceeds("docker load < ${redisImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); @@ -103,8 +102,6 @@ let # Node token exchange $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); - $machine1->waitForUnit("kubernetes.target"); - $machine2->waitForUnit("kubernetes.target"); # prepare machines for test $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready"); diff --git a/nixpkgs/nixos/tests/kubernetes/rbac.nix b/nixpkgs/nixos/tests/kubernetes/rbac.nix index 967fe506004f..3ce7adcd0d71 100644 --- a/nixpkgs/nixos/tests/kubernetes/rbac.nix +++ b/nixpkgs/nixos/tests/kubernetes/rbac.nix @@ -94,8 +94,6 @@ let singlenode = base // { test = '' - $machine1->waitForUnit("kubernetes.target"); - $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready"); $machine1->waitUntilSucceeds("docker load < ${kubectlImage}"); @@ -118,8 +116,6 @@ let # Node token exchange $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); - $machine1->waitForUnit("kubernetes.target"); - $machine2->waitForUnit("kubernetes.target"); $machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready"); diff --git a/nixpkgs/nixos/tests/ldap.nix b/nixpkgs/nixos/tests/ldap.nix index fe859876ed25..665b9ee09b55 100644 --- a/nixpkgs/nixos/tests/ldap.nix +++ b/nixpkgs/nixos/tests/ldap.nix @@ -115,7 +115,7 @@ in ); slapdDatabases = { - "${dbSuffix}" = { + ${dbSuffix} = { conf = '' dn: olcBackend={1}mdb,cn=config objectClass: olcBackendConfig diff --git a/nixpkgs/nixos/tests/lidarr.nix b/nixpkgs/nixos/tests/lidarr.nix index 58bf82503f8c..85fcbd21d8c0 100644 --- a/nixpkgs/nixos/tests/lidarr.nix +++ b/nixpkgs/nixos/tests/lidarr.nix @@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }: with lib; -rec { +{ name = "lidarr"; meta.maintainers = with maintainers; [ etu ]; diff --git a/nixpkgs/nixos/tests/mosquitto.nix b/nixpkgs/nixos/tests/mosquitto.nix index bd5447de15ff..b4c897c3ab5d 100644 --- a/nixpkgs/nixos/tests/mosquitto.nix +++ b/nixpkgs/nixos/tests/mosquitto.nix @@ -16,7 +16,7 @@ let "-t ${topic}" ]; -in rec { +in { name = "mosquitto"; meta = with pkgs.stdenv.lib; { maintainers = with maintainers; [ peterhoeg ]; @@ -34,7 +34,7 @@ in rec { enable = true; host = "0.0.0.0"; checkPasswords = true; - users."${username}" = { + users.${username} = { inherit password; acl = [ "topic readwrite ${topic}" diff --git a/nixpkgs/nixos/tests/ndppd.nix b/nixpkgs/nixos/tests/ndppd.nix index c53ff93a91f9..6a6f602726de 100644 --- a/nixpkgs/nixos/tests/ndppd.nix +++ b/nixpkgs/nixos/tests/ndppd.nix @@ -37,7 +37,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : { }; services.ndppd = { enable = true; - proxies."eth1".rules."fd42::/112" = {}; + proxies.eth1.rules."fd42::/112" = {}; }; containers.client = { autoStart = true; diff --git a/nixpkgs/nixos/tests/networking.nix b/nixpkgs/nixos/tests/networking.nix index 6ce64dcebea0..7452768033ab 100644 --- a/nixpkgs/nixos/tests/networking.nix +++ b/nixpkgs/nixos/tests/networking.nix @@ -440,12 +440,12 @@ let virtual = { name = "Virtual"; machine = { - networking.interfaces."tap0" = { + networking.interfaces.tap0 = { ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ]; virtual = true; }; - networking.interfaces."tun0" = { + networking.interfaces.tun0 = { ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ]; virtual = true; @@ -561,7 +561,7 @@ let name = "routes"; machine = { networking.useDHCP = false; - networking.interfaces."eth0" = { + networking.interfaces.eth0 = { ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ]; ipv6.routes = [ diff --git a/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix index c0d347238b47..aaf37ee4c810 100644 --- a/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -50,7 +50,7 @@ in { ''; }; - systemd.services."nextcloud-setup"= { + systemd.services.nextcloud-setup= { requires = ["mysql.service"]; after = ["mysql.service"]; }; diff --git a/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 8a840a608753..81c269c23788 100644 --- a/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -51,7 +51,7 @@ in { serviceConfig.PermissionsStartOnly = true; }; - systemd.services."nextcloud-setup"= { + systemd.services.nextcloud-setup= { requires = ["postgresql.service"]; after = [ "postgresql.service" @@ -62,7 +62,7 @@ in { # At the time of writing, redis creates its socket with the "nobody" # group. I figure this is slightly less bad than making the socket world # readable. - systemd.services."chown-redis-socket" = { + systemd.services.chown-redis-socket = { enable = true; script = '' until ${pkgs.redis}/bin/redis-cli ping; do diff --git a/nixpkgs/nixos/tests/nghttpx.nix b/nixpkgs/nixos/tests/nghttpx.nix index d41fa01aa9a8..11611bfe1063 100644 --- a/nixpkgs/nixos/tests/nghttpx.nix +++ b/nixpkgs/nixos/tests/nghttpx.nix @@ -15,7 +15,7 @@ in services.nginx = { enable = true; - virtualHosts."server" = { + virtualHosts.server = { locations."/".root = nginxRoot; }; }; diff --git a/nixpkgs/nixos/tests/pgmanage.nix b/nixpkgs/nixos/tests/pgmanage.nix index 110cbd5c5b40..bacaf3f41588 100644 --- a/nixpkgs/nixos/tests/pgmanage.nix +++ b/nixpkgs/nixos/tests/pgmanage.nix @@ -21,7 +21,7 @@ in pgmanage = { enable = true; connections = { - "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres"; + ${conn} = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres"; }; }; }; diff --git a/nixpkgs/nixos/tests/printing.nix b/nixpkgs/nixos/tests/printing.nix index 74583ae55623..4d0df289cf75 100644 --- a/nixpkgs/nixos/tests/printing.nix +++ b/nixpkgs/nixos/tests/printing.nix @@ -1,99 +1,114 @@ # Test printing via CUPS. -import ./make-test.nix ({pkgs, ... }: { +import ./make-test.nix ({pkgs, ... }: +let + printingServer = startWhenNeeded: { + services.printing.enable = true; + services.printing.startWhenNeeded = startWhenNeeded; + services.printing.listenAddresses = [ "*:631" ]; + services.printing.defaultShared = true; + services.printing.extraConf = + '' + <Location /> + Order allow,deny + Allow from all + </Location> + ''; + networking.firewall.allowedTCPPorts = [ 631 ]; + # Add a HP Deskjet printer connected via USB to the server. + hardware.printers.ensurePrinters = [{ + name = "DeskjetLocal"; + deviceUri = "usb://foobar/printers/foobar"; + model = "drv:///sample.drv/deskjet.ppd"; + }]; + }; + printingClient = startWhenNeeded: { + services.printing.enable = true; + services.printing.startWhenNeeded = startWhenNeeded; + # Add printer to the client as well, via IPP. + hardware.printers.ensurePrinters = [{ + name = "DeskjetRemote"; + deviceUri = "ipp://${if startWhenNeeded then "socketActivatedServer" else "serviceServer"}/printers/DeskjetLocal"; + model = "drv:///sample.drv/deskjet.ppd"; + }]; + hardware.printers.ensureDefaultPrinter = "DeskjetRemote"; + }; + +in + +{ name = "printing"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ domenkozar eelco matthewbauer ]; }; nodes = { + socketActivatedServer = { ... }: (printingServer true); + serviceServer = { ... }: (printingServer false); - server = - { ... }: - { services.printing.enable = true; - services.printing.listenAddresses = [ "*:631" ]; - services.printing.defaultShared = true; - services.printing.extraConf = - '' - <Location /> - Order allow,deny - Allow from all - </Location> - ''; - networking.firewall.allowedTCPPorts = [ 631 ]; - }; - - client = - { ... }: - { services.printing.enable = true; - }; - + socketActivatedClient = { ... }: (printingClient true); + serviceClient = { ... }: (printingClient false); }; testScript = '' startAll; - $client->succeed("lpstat -r") =~ /scheduler is running/ or die; - # check local encrypted connections work without error - $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die; - # Test that UNIX socket is used for connections. - $client->succeed("lpstat -H") =~ "/run/cups/cups.sock" or die; - # Test that HTTP server is available too. - $client->succeed("curl --fail http://localhost:631/"); - $client->succeed("curl --fail http://server:631/"); - $server->fail("curl --fail --connect-timeout 2 http://client:631/"); - - # Add a HP Deskjet printer connected via USB to the server. - $server->succeed("lpadmin -p DeskjetLocal -E -v usb://foobar/printers/foobar"); - - # Add it to the client as well via IPP. - $client->succeed("lpadmin -p DeskjetRemote -E -v ipp://server/printers/DeskjetLocal"); - $client->succeed("lpadmin -d DeskjetRemote"); - - # Do some status checks. - $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die; - $client->succeed("lpstat -h server:631 -a") =~ /DeskjetLocal accepting requests/ or die; - $client->succeed("cupsdisable DeskjetRemote"); - $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die; - $client->succeed("cupsenable DeskjetRemote"); - $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die; - - # Test printing various file types. - foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", - "${pkgs.groff.doc}/share/doc/*/meref.ps", - "${pkgs.cups.out}/share/doc/cups/images/cups.png", - "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt") - { - $file =~ /([^\/]*)$/; my $fn = $1; - - subtest "print $fn", sub { - - # Print the file on the client. - $client->succeed("lp $file"); - $client->sleep(10); - $client->succeed("lpq") =~ /active.*root.*$fn/ or die; - - # Ensure that a raw PCL file appeared in the server's queue - # (showing that the right filters have been applied). Of - # course, since there is no actual USB printer attached, the - # file will stay in the queue forever. - $server->waitForFile("/var/spool/cups/d*-001"); - $server->sleep(10); - $server->succeed("lpq -a") =~ /$fn/ or die; - - # Delete the job on the client. It should disappear on the - # server as well. - $client->succeed("lprm"); - $client->sleep(10); - $client->succeed("lpq -a") =~ /no entries/; - Machine::retry sub { - return 1 if $server->succeed("lpq -a") =~ /no entries/; + # Make sure that cups is up on both sides. + $serviceServer->waitForUnit("cups.service"); + $serviceClient->waitForUnit("cups.service"); + # wait until cups is fully initialized and ensure-printers has executed with 10s delay + $serviceClient->sleep(20); + $socketActivatedClient->waitUntilSucceeds("systemctl status ensure-printers | grep -q -E 'code=exited, status=0/SUCCESS'"); + sub testPrinting { + my ($client, $server) = (@_); + my $clientHostname = $client->name(); + my $serverHostname = $server->name(); + $client->succeed("lpstat -r") =~ /scheduler is running/ or die; + # Test that UNIX socket is used for connections. + $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; + # Test that HTTP server is available too. + $client->succeed("curl --fail http://localhost:631/"); + $client->succeed("curl --fail http://$serverHostname:631/"); + $server->fail("curl --fail --connect-timeout 2 http://$clientHostname:631/"); + # Do some status checks. + $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die; + $client->succeed("lpstat -h $serverHostname:631 -a") =~ /DeskjetLocal accepting requests/ or die; + $client->succeed("cupsdisable DeskjetRemote"); + $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die; + $client->succeed("cupsenable DeskjetRemote"); + $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die; + # Test printing various file types. + foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", + "${pkgs.groff.doc}/share/doc/*/meref.ps", + "${pkgs.cups.out}/share/doc/cups/images/cups.png", + "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt") + { + $file =~ /([^\/]*)$/; my $fn = $1; + subtest "print $fn", sub { + # Print the file on the client. + $client->succeed("lp $file"); + $client->waitUntilSucceeds("lpq | grep -q -E 'active.*root.*$fn'"); + # Ensure that a raw PCL file appeared in the server's queue + # (showing that the right filters have been applied). Of + # course, since there is no actual USB printer attached, the + # file will stay in the queue forever. + $server->waitForFile("/var/spool/cups/d*-001"); + $server->waitUntilSucceeds("lpq -a | grep -q -E '$fn'"); + # Delete the job on the client. It should disappear on the + # server as well. + $client->succeed("lprm"); + $client->waitUntilSucceeds("lpq -a | grep -q -E 'no entries'"); + Machine::retry sub { + return 1 if $server->succeed("lpq -a") =~ /no entries/; + }; + # The queue is empty already, so this should be safe. + # Otherwise, pairs of "c*"-"d*-001" files might persist. + $server->execute("rm /var/spool/cups/*"); }; - # The queue is empty already, so this should be safe. - # Otherwise, pairs of "c*"-"d*-001" files might persist. - $server->execute("rm /var/spool/cups/*"); - }; + } } - ''; + testPrinting($serviceClient, $serviceServer); + testPrinting($socketActivatedClient, $socketActivatedServer); + ''; }) diff --git a/nixpkgs/nixos/tests/prometheus-2.nix b/nixpkgs/nixos/tests/prometheus-2.nix deleted file mode 100644 index 219c47c73d95..000000000000 --- a/nixpkgs/nixos/tests/prometheus-2.nix +++ /dev/null @@ -1,239 +0,0 @@ -let - grpcPort = 19090; - queryPort = 9090; - minioPort = 9000; - pushgwPort = 9091; - - s3 = { - accessKey = "BKIKJAA5BMMU2RHO6IBB"; - secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; - }; - - objstore.config = { - type = "S3"; - config = { - bucket = "thanos-bucket"; - endpoint = "s3:${toString minioPort}"; - region = "us-east-1"; - access_key = s3.accessKey; - secret_key = s3.secretKey; - insecure = true; - signature_version2 = false; - encrypt_sse = false; - put_user_metadata = {}; - http_config = { - idle_conn_timeout = "0s"; - insecure_skip_verify = false; - }; - trace = { - enable = false; - }; - }; - }; - -in import ./make-test.nix { - name = "prometheus-2"; - - nodes = { - prometheus = { pkgs, ... }: { - virtualisation.diskSize = 2 * 1024; - environment.systemPackages = [ pkgs.jq ]; - networking.firewall.allowedTCPPorts = [ grpcPort ]; - services.prometheus2 = { - enable = true; - scrapeConfigs = [ - { - job_name = "prometheus"; - static_configs = [ - { - targets = [ "127.0.0.1:${toString queryPort}" ]; - labels = { instance = "localhost"; }; - } - ]; - } - { - job_name = "pushgateway"; - scrape_interval = "1s"; - static_configs = [ - { - targets = [ "127.0.0.1:${toString pushgwPort}" ]; - } - ]; - } - ]; - rules = [ - '' - groups: - - name: test - rules: - - record: testrule - expr: count(up{job="prometheus"}) - '' - ]; - globalConfig = { - external_labels = { - some_label = "required by thanos"; - }; - }; - extraFlags = [ - # Required by thanos - "--storage.tsdb.min-block-duration=5s" - "--storage.tsdb.max-block-duration=5s" - ]; - }; - services.prometheus.pushgateway = { - enable = true; - web.listen-address = ":${toString pushgwPort}"; - persistMetrics = true; - persistence.interval = "1s"; - stateDir = "prometheus-pushgateway"; - }; - services.thanos = { - sidecar = { - enable = true; - grpc-address = "0.0.0.0:${toString grpcPort}"; - inherit objstore; - }; - - # TODO: Add some tests for these services: - #rule = { - # enable = true; - # http-address = "0.0.0.0:19194"; - # grpc-address = "0.0.0.0:19193"; - # query.addresses = [ - # "localhost:19191" - # ]; - # labels = { - # just = "some"; - # nice = "labels"; - # }; - #}; - # - #receive = { - # http-address = "0.0.0.0:19195"; - # enable = true; - # labels = { - # just = "some"; - # nice = "labels"; - # }; - #}; - }; - }; - - query = { pkgs, ... }: { - environment.systemPackages = [ pkgs.jq ]; - services.thanos.query = { - enable = true; - http-address = "0.0.0.0:${toString queryPort}"; - store.addresses = [ - "prometheus:${toString grpcPort}" - ]; - }; - }; - - store = { pkgs, ... }: { - virtualisation.diskSize = 2 * 1024; - environment.systemPackages = with pkgs; [ jq thanos ]; - services.thanos.store = { - enable = true; - http-address = "0.0.0.0:10902"; - grpc-address = "0.0.0.0:${toString grpcPort}"; - inherit objstore; - sync-block-duration = "1s"; - }; - services.thanos.compact = { - enable = true; - http-address = "0.0.0.0:10903"; - inherit objstore; - consistency-delay = "5s"; - }; - services.thanos.query = { - enable = true; - http-address = "0.0.0.0:${toString queryPort}"; - store.addresses = [ - "localhost:${toString grpcPort}" - ]; - }; - }; - - s3 = { pkgs, ... } : { - # Minio requires at least 1GiB of free disk space to run. - virtualisation.diskSize = 2 * 1024; - networking.firewall.allowedTCPPorts = [ minioPort ]; - - services.minio = { - enable = true; - inherit (s3) accessKey secretKey; - }; - - environment.systemPackages = [ pkgs.minio-client ]; - }; - }; - - testScript = { nodes, ... } : '' - # Before starting the other machines we first make sure that our S3 service is online - # and has a bucket added for thanos: - $s3->start; - $s3->waitForUnit("minio.service"); - $s3->waitForOpenPort(${toString minioPort}); - $s3->succeed( - "mc config host add minio " . - "http://localhost:${toString minioPort} ${s3.accessKey} ${s3.secretKey} S3v4"); - $s3->succeed("mc mb minio/thanos-bucket"); - - # Now that s3 has started we can start the other machines: - $prometheus->start; - $query->start; - $store->start; - - # Check if prometheus responds to requests: - $prometheus->waitForUnit("prometheus2.service"); - $prometheus->waitForOpenPort(${toString queryPort}); - $prometheus->succeed("curl -s http://127.0.0.1:${toString queryPort}/metrics"); - - # Let's test if pushing a metric to the pushgateway succeeds: - $prometheus->waitForUnit("pushgateway.service"); - $prometheus->succeed( - "echo 'some_metric 3.14' | " . - "curl --data-binary \@- http://127.0.0.1:${toString pushgwPort}/metrics/job/some_job"); - - # Now check whether that metric gets ingested by prometheus. - # Since we'll check for the metric several times on different machines - # we abstract the test using the following function: - - # Function to check if the metric "some_metric" has been received and returns the correct value. - local *Machine::waitForMetric = sub { - my ($self) = @_; - $self->waitUntilSucceeds( - "curl -sf 'http://127.0.0.1:${toString queryPort}/api/v1/query?query=some_metric' " . - "| jq '.data.result[0].value[1]' | grep '\"3.14\"'"); - }; - - $prometheus->waitForMetric; - - # Let's test if the pushgateway persists metrics to the configured location. - $prometheus->waitUntilSucceeds("test -e /var/lib/prometheus-pushgateway/metrics"); - - # Test thanos - $prometheus->waitForUnit("thanos-sidecar.service"); - - # Test if the Thanos query service can correctly retrieve the metric that was send above. - $query->waitForUnit("thanos-query.service"); - $query->waitForMetric; - - # Test if the Thanos sidecar has correctly uploaded its TSDB to S3, if the - # Thanos storage service has correctly downloaded it from S3 and if the Thanos - # query service running on $store can correctly retrieve the metric: - $store->waitForUnit("thanos-store.service"); - $store->waitForMetric; - - $store->waitForUnit("thanos-compact.service"); - - # Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket - # and check if the blocks have the correct labels: - $store->succeed( - "thanos bucket ls" . - " --objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file}" . - " --output=json | jq .thanos.labels.some_label | grep 'required by thanos'"); - ''; -} diff --git a/nixpkgs/nixos/tests/prometheus.nix b/nixpkgs/nixos/tests/prometheus.nix index f1b20a33d71e..52f61046be39 100644 --- a/nixpkgs/nixos/tests/prometheus.nix +++ b/nixpkgs/nixos/tests/prometheus.nix @@ -1,48 +1,239 @@ -import ./make-test.nix { +let + grpcPort = 19090; + queryPort = 9090; + minioPort = 9000; + pushgwPort = 9091; + + s3 = { + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + }; + + objstore.config = { + type = "S3"; + config = { + bucket = "thanos-bucket"; + endpoint = "s3:${toString minioPort}"; + region = "us-east-1"; + access_key = s3.accessKey; + secret_key = s3.secretKey; + insecure = true; + signature_version2 = false; + encrypt_sse = false; + put_user_metadata = {}; + http_config = { + idle_conn_timeout = "0s"; + insecure_skip_verify = false; + }; + trace = { + enable = false; + }; + }; + }; + +in import ./make-test.nix { name = "prometheus"; nodes = { - one = { ... }: { + prometheus = { pkgs, ... }: { + virtualisation.diskSize = 2 * 1024; + environment.systemPackages = [ pkgs.jq ]; + networking.firewall.allowedTCPPorts = [ grpcPort ]; services.prometheus = { enable = true; - scrapeConfigs = [{ - job_name = "prometheus"; - static_configs = [{ - targets = [ "127.0.0.1:9090" ]; - labels = { instance = "localhost"; }; - }]; - }]; - rules = [ ''testrule = count(up{job="prometheus"})'' ]; - - # a very simple version of the alertmanager configuration just to see if - # configuration checks & service startup are working - alertmanager = { - enable = true; - listenAddress = "[::1]"; - port = 9093; - configuration = { - route.receiver = "webhook"; - receivers = [ + scrapeConfigs = [ + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ "127.0.0.1:${toString queryPort}" ]; + labels = { instance = "localhost"; }; + } + ]; + } + { + job_name = "pushgateway"; + scrape_interval = "1s"; + static_configs = [ { - name = "webhook"; - webhook_configs = [ - { url = "http://localhost"; } - ]; + targets = [ "127.0.0.1:${toString pushgwPort}" ]; } ]; + } + ]; + rules = [ + '' + groups: + - name: test + rules: + - record: testrule + expr: count(up{job="prometheus"}) + '' + ]; + globalConfig = { + external_labels = { + some_label = "required by thanos"; }; }; + extraFlags = [ + # Required by thanos + "--storage.tsdb.min-block-duration=5s" + "--storage.tsdb.max-block-duration=5s" + ]; + }; + services.prometheus.pushgateway = { + enable = true; + web.listen-address = ":${toString pushgwPort}"; + persistMetrics = true; + persistence.interval = "1s"; + stateDir = "prometheus-pushgateway"; + }; + services.thanos = { + sidecar = { + enable = true; + grpc-address = "0.0.0.0:${toString grpcPort}"; + inherit objstore; + }; + + # TODO: Add some tests for these services: + #rule = { + # enable = true; + # http-address = "0.0.0.0:19194"; + # grpc-address = "0.0.0.0:19193"; + # query.addresses = [ + # "localhost:19191" + # ]; + # labels = { + # just = "some"; + # nice = "labels"; + # }; + #}; + # + #receive = { + # http-address = "0.0.0.0:19195"; + # enable = true; + # labels = { + # just = "some"; + # nice = "labels"; + # }; + #}; + }; + }; + + query = { pkgs, ... }: { + environment.systemPackages = [ pkgs.jq ]; + services.thanos.query = { + enable = true; + http-address = "0.0.0.0:${toString queryPort}"; + store.addresses = [ + "prometheus:${toString grpcPort}" + ]; }; }; + + store = { pkgs, ... }: { + virtualisation.diskSize = 2 * 1024; + environment.systemPackages = with pkgs; [ jq thanos ]; + services.thanos.store = { + enable = true; + http-address = "0.0.0.0:10902"; + grpc-address = "0.0.0.0:${toString grpcPort}"; + inherit objstore; + sync-block-duration = "1s"; + }; + services.thanos.compact = { + enable = true; + http-address = "0.0.0.0:10903"; + inherit objstore; + consistency-delay = "5s"; + }; + services.thanos.query = { + enable = true; + http-address = "0.0.0.0:${toString queryPort}"; + store.addresses = [ + "localhost:${toString grpcPort}" + ]; + }; + }; + + s3 = { pkgs, ... } : { + # Minio requires at least 1GiB of free disk space to run. + virtualisation.diskSize = 2 * 1024; + networking.firewall.allowedTCPPorts = [ minioPort ]; + + services.minio = { + enable = true; + inherit (s3) accessKey secretKey; + }; + + environment.systemPackages = [ pkgs.minio-client ]; + }; }; - testScript = '' - startAll; - $one->waitForUnit("prometheus.service"); - $one->waitForOpenPort(9090); - $one->succeed("curl -s http://127.0.0.1:9090/metrics"); - $one->waitForUnit("alertmanager.service"); - $one->waitForOpenPort("9093"); - $one->succeed("curl -f -s http://localhost:9093/"); + testScript = { nodes, ... } : '' + # Before starting the other machines we first make sure that our S3 service is online + # and has a bucket added for thanos: + $s3->start; + $s3->waitForUnit("minio.service"); + $s3->waitForOpenPort(${toString minioPort}); + $s3->succeed( + "mc config host add minio " . + "http://localhost:${toString minioPort} ${s3.accessKey} ${s3.secretKey} S3v4"); + $s3->succeed("mc mb minio/thanos-bucket"); + + # Now that s3 has started we can start the other machines: + $prometheus->start; + $query->start; + $store->start; + + # Check if prometheus responds to requests: + $prometheus->waitForUnit("prometheus.service"); + $prometheus->waitForOpenPort(${toString queryPort}); + $prometheus->succeed("curl -s http://127.0.0.1:${toString queryPort}/metrics"); + + # Let's test if pushing a metric to the pushgateway succeeds: + $prometheus->waitForUnit("pushgateway.service"); + $prometheus->succeed( + "echo 'some_metric 3.14' | " . + "curl --data-binary \@- http://127.0.0.1:${toString pushgwPort}/metrics/job/some_job"); + + # Now check whether that metric gets ingested by prometheus. + # Since we'll check for the metric several times on different machines + # we abstract the test using the following function: + + # Function to check if the metric "some_metric" has been received and returns the correct value. + local *Machine::waitForMetric = sub { + my ($self) = @_; + $self->waitUntilSucceeds( + "curl -sf 'http://127.0.0.1:${toString queryPort}/api/v1/query?query=some_metric' " . + "| jq '.data.result[0].value[1]' | grep '\"3.14\"'"); + }; + + $prometheus->waitForMetric; + + # Let's test if the pushgateway persists metrics to the configured location. + $prometheus->waitUntilSucceeds("test -e /var/lib/prometheus-pushgateway/metrics"); + + # Test thanos + $prometheus->waitForUnit("thanos-sidecar.service"); + + # Test if the Thanos query service can correctly retrieve the metric that was send above. + $query->waitForUnit("thanos-query.service"); + $query->waitForMetric; + + # Test if the Thanos sidecar has correctly uploaded its TSDB to S3, if the + # Thanos storage service has correctly downloaded it from S3 and if the Thanos + # query service running on $store can correctly retrieve the metric: + $store->waitForUnit("thanos-store.service"); + $store->waitForMetric; + + $store->waitForUnit("thanos-compact.service"); + + # Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket + # and check if the blocks have the correct labels: + $store->succeed( + "thanos bucket ls" . + " --objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file}" . + " --output=json | jq .thanos.labels.some_label | grep 'required by thanos'"); ''; } diff --git a/nixpkgs/nixos/tests/quake3.nix b/nixpkgs/nixos/tests/quake3.nix index fbb798515e1a..4253ce4a8672 100644 --- a/nixpkgs/nixos/tests/quake3.nix +++ b/nixpkgs/nixos/tests/quake3.nix @@ -4,7 +4,7 @@ let # Build Quake with coverage instrumentation. overrides = pkgs: - rec { + { quake3game = pkgs.quake3game.override (args: { stdenv = pkgs.stdenvAdapters.addCoverageInstrumentation args.stdenv; }); @@ -12,9 +12,9 @@ let # Only allow the demo data to be used (only if it's unfreeRedistributable). unfreePredicate = pkg: with pkgs.lib; let - allowDrvPredicates = [ "quake3-demo" "quake3-pointrelease" ]; + allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ]; allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ]; - in any (flip hasPrefix pkg.name) allowDrvPredicates && + in elem pkg.pname allowPackageNames && elem (pkg.meta.license or null) allowLicenses; in @@ -42,7 +42,7 @@ rec { { server = { pkgs, ... }: - { systemd.services."quake3-server" = + { systemd.services.quake3-server = { wantedBy = [ "multi-user.target" ]; script = "${pkgs.quake3demo}/bin/quake3-server +set g_gametype 0 " + diff --git a/nixpkgs/nixos/tests/radarr.nix b/nixpkgs/nixos/tests/radarr.nix index 6b9a909e44b5..9bc5607ccd5a 100644 --- a/nixpkgs/nixos/tests/radarr.nix +++ b/nixpkgs/nixos/tests/radarr.nix @@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }: with lib; -rec { +{ name = "radarr"; meta.maintainers = with maintainers; [ etu ]; diff --git a/nixpkgs/nixos/tests/sonarr.nix b/nixpkgs/nixos/tests/sonarr.nix index 3d5c3b19b6ea..3e84445099ab 100644 --- a/nixpkgs/nixos/tests/sonarr.nix +++ b/nixpkgs/nixos/tests/sonarr.nix @@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }: with lib; -rec { +{ name = "sonarr"; meta.maintainers = with maintainers; [ etu ]; diff --git a/nixpkgs/nixos/tests/strongswan-swanctl.nix b/nixpkgs/nixos/tests/strongswan-swanctl.nix index 8bbebd423003..9bab9349ea73 100644 --- a/nixpkgs/nixos/tests/strongswan-swanctl.nix +++ b/nixpkgs/nixos/tests/strongswan-swanctl.nix @@ -65,16 +65,16 @@ in { enable = true; swanctl = { connections = { - "rw" = { + rw = { local_addrs = [ moonIp ]; - local."main" = { + local.main = { auth = "psk"; }; - remote."main" = { + remote.main = { auth = "psk"; }; children = { - "net" = { + net = { local_ts = [ vlan0 ]; updown = "${strongswan}/libexec/ipsec/_updown iptables"; inherit esp_proposals; @@ -85,8 +85,8 @@ in { }; }; secrets = { - ike."carol" = { - id."main" = carolIp; + ike.carol = { + id.main = carolIp; inherit secret; }; }; @@ -107,19 +107,19 @@ in { enable = true; swanctl = { connections = { - "home" = { + home = { local_addrs = [ carolIp ]; remote_addrs = [ moonIp ]; - local."main" = { + local.main = { auth = "psk"; id = carolIp; }; - remote."main" = { + remote.main = { auth = "psk"; id = moonIp; }; children = { - "home" = { + home = { remote_ts = [ vlan0 ]; start_action = "trap"; updown = "${strongswan}/libexec/ipsec/_updown iptables"; @@ -131,8 +131,8 @@ in { }; }; secrets = { - ike."moon" = { - id."main" = moonIp; + ike.moon = { + id.main = moonIp; inherit secret; }; }; diff --git a/nixpkgs/nixos/tests/virtualbox.nix b/nixpkgs/nixos/tests/virtualbox.nix index 844ce47d743f..32637d2c1efe 100644 --- a/nixpkgs/nixos/tests/virtualbox.nix +++ b/nixpkgs/nixos/tests/virtualbox.nix @@ -10,17 +10,10 @@ # to run 32-bit guests. useKvmNestedVirt ? false, # Whether to run 64-bit guests instead of 32-bit. Requires nested KVM. - use64bitGuest ? false, - # Whether to enable the virtual UART in VirtualBox guests, allowing to see - # the guest console. There is currently a bug in VirtualBox where this will - # cause a crash if running with SW virtualization - # (https://www.virtualbox.org/ticket/18632). If you need to debug the tests - # then enable this and nested KVM to work around the crash (see above). - enableVBoxUART ? false + use64bitGuest ? false }: assert use64bitGuest -> useKvmNestedVirt; -assert enableVBoxUART -> useKvmNestedVirt; # VirtualBox bug, see above with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; @@ -65,9 +58,6 @@ let "init=${pkgs.writeScript "mini-init.sh" miniInit}" ]; - # XXX: Remove this once TSS location detection has been fixed in VirtualBox - boot.kernelPackages = pkgs.linuxPackages_4_9; - fileSystems."/" = { device = "vboxshare"; fsType = "vboxsf"; @@ -162,11 +152,9 @@ let "--register" ]; - vmFlags = mkFlags ( - (optionals enableVBoxUART [ - "--uart1 0x3F8 4" - "--uartmode1 client /run/virtualbox-log-${name}.sock" - ]) ++ [ + vmFlags = mkFlags ([ + "--uart1 0x3F8 4" + "--uartmode1 client /run/virtualbox-log-${name}.sock" "--memory 768" "--audio none" ] ++ (attrs.vmFlags or [])); @@ -199,7 +187,7 @@ let ]; in { machine = { - systemd.sockets."vboxtestlog-${name}" = mkIf enableVBoxUART { + systemd.sockets."vboxtestlog-${name}" = { description = "VirtualBox Test Machine Log Socket For ${name}"; wantedBy = [ "sockets.target" ]; before = [ "multi-user.target" ]; @@ -207,7 +195,7 @@ let socketConfig.Accept = true; }; - systemd.services."vboxtestlog-${name}@" = mkIf enableVBoxUART { + systemd.services."vboxtestlog-${name}@" = { description = "VirtualBox Test Machine Log For ${name}"; serviceConfig.StandardInput = "socket"; serviceConfig.StandardOutput = "syslog"; diff --git a/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix index b94fed413412..283317200484 100644 --- a/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix +++ b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix @@ -4,7 +4,7 @@ let inherit (python2Packages) python dbus-python; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "a2jmidid"; version = "8"; diff --git a/nixpkgs/pkgs/applications/audio/amarok/default.nix b/nixpkgs/pkgs/applications/audio/amarok/default.nix index a4aa64280975..ff3c456c3644 100644 --- a/nixpkgs/pkgs/applications/audio/amarok/default.nix +++ b/nixpkgs/pkgs/applications/audio/amarok/default.nix @@ -6,21 +6,18 @@ , curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: -let +mkDerivation { pname = "amarok"; - version = "2.9.0-20180618"; - -in mkDerivation { - name = "${pname}-${version}"; + version = "2.9.0-20190731"; src = fetchgit { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out url = git://anongit.kde.org/amarok.git; - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96"; - sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3"; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.CZ"; + rev = "783da6d8e93737f5e41a3bc017906dc1f94bb94f"; + sha256 = "08bypxk5kaay98hbwz9pj3hwgiyk3qmn9qw99bnjkkkw9wzsxiy6"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/nixpkgs/pkgs/applications/audio/cantata/default.nix b/nixpkgs/pkgs/applications/audio/cantata/default.nix index 292f28554d08..bdbf6a45a6d4 100644 --- a/nixpkgs/pkgs/applications/audio/cantata/default.nix +++ b/nixpkgs/pkgs/applications/audio/cantata/default.nix @@ -35,7 +35,7 @@ let withUdisks = (withTaglib && withDevices); -in mkDerivation rec { +in mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/caudec/default.nix b/nixpkgs/pkgs/applications/audio/caudec/default.nix index 9c2f17c5cc9c..1ab39311258b 100644 --- a/nixpkgs/pkgs/applications/audio/caudec/default.nix +++ b/nixpkgs/pkgs/applications/audio/caudec/default.nix @@ -4,7 +4,7 @@ let version = "1.7.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "caudec"; inherit version; diff --git a/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/nixpkgs/pkgs/applications/audio/cmusfm/default.nix index 51b88607208e..54f1050da466 100644 --- a/nixpkgs/pkgs/applications/audio/cmusfm/default.nix +++ b/nixpkgs/pkgs/applications/audio/cmusfm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-10-11"; pname = "cmusfm-unstable"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix b/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix index f9a53f59e4d4..865bc130db91 100644 --- a/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - description = "A modern audio book player for Linux using GTK+ 3"; + description = "A modern audio book player for Linux using GTK 3"; homepage = https://cozy.geigi.de/; maintainers = [ maintainers.makefu ]; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix b/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix index df0fcb0ee9cd..5cc8d71383b7 100644 --- a/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix @@ -4,7 +4,7 @@ libxslt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "csound-manual"; version = "unstable-2019-02-22"; diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index 97e054bda64c..699f9d86f68d 100644 --- a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "deadbeef-lyricbar-plugin"; version = "unstable-2019-01-29"; diff --git a/nixpkgs/pkgs/applications/audio/dirt/default.nix b/nixpkgs/pkgs/applications/audio/dirt/default.nix index 6d56f53bd16f..1fcdda408966 100644 --- a/nixpkgs/pkgs/applications/audio/dirt/default.nix +++ b/nixpkgs/pkgs/applications/audio/dirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dirt-2018-01-01"; src = fetchFromGitHub { repo = "Dirt"; diff --git a/nixpkgs/pkgs/applications/audio/faust/faustlive.nix b/nixpkgs/pkgs/applications/audio/faust/faustlive.nix index 4268a783c8d8..3b6ca9e4053f 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faustlive.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faustlive.nix @@ -3,7 +3,7 @@ , bc, coreutils, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "faustlive"; version = "2017-12-05"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/flac/default.nix b/nixpkgs/pkgs/applications/audio/flac/default.nix index fb5390cb46ef..df3aa987c3fb 100644 --- a/nixpkgs/pkgs/applications/audio/flac/default.nix +++ b/nixpkgs/pkgs/applications/audio/flac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { - name = "flac-1.3.2"; + name = "flac-1.3.3"; src = fetchurl { url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz"; - sha256 = "0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi"; + sha256 = "0j0p9sf56a2fm2hkjnf7x3py5ir49jyavg4q5zdyd7bcf6yq4gi1"; }; buildInputs = [ libogg ]; diff --git a/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index 404c9cc825e9..bb86787a3cf0 100644 --- a/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -19,7 +19,7 @@ in with versionMap.${version}; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fluidsynth-${fluidsynthVersion}"; version = fluidsynthVersion; diff --git a/nixpkgs/pkgs/applications/audio/fmsynth/default.nix b/nixpkgs/pkgs/applications/audio/fmsynth/default.nix index dc163de8ade7..5e95d7179689 100644 --- a/nixpkgs/pkgs/applications/audio/fmsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/fmsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fmsynth-unstable"; version = "2015-02-07"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix b/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix index 330ae56f13f0..b17561e1567a 100644 --- a/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix +++ b/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2015-05-21"; pname = "foo-yc20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index 3406f3178847..eeafdc80344d 100644 --- a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -3,7 +3,7 @@ # TODO: build from git for easier updates # rustPlatform.buildRustPackage rec { -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4.6"; pname = "gnome-podcasts"; diff --git a/nixpkgs/pkgs/applications/audio/gradio/default.nix b/nixpkgs/pkgs/applications/audio/gradio/default.nix index 94d0f5eb50f5..c4a8f2fce026 100644 --- a/nixpkgs/pkgs/applications/audio/gradio/default.nix +++ b/nixpkgs/pkgs/applications/audio/gradio/default.nix @@ -18,7 +18,7 @@ let version = "7.2"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gradio"; inherit version; diff --git a/nixpkgs/pkgs/applications/audio/helm/default.nix b/nixpkgs/pkgs/applications/audio/helm/default.nix index d32c55122c5f..64de722afe9e 100644 --- a/nixpkgs/pkgs/applications/audio/helm/default.nix +++ b/nixpkgs/pkgs/applications/audio/helm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 , lv2, pkgconfig, libGLU_combined }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { version = "0.9.0"; pname = "helm"; diff --git a/nixpkgs/pkgs/applications/audio/iannix/default.nix b/nixpkgs/pkgs/applications/audio/iannix/default.nix index 1fd8531fb7f3..a893390d74ed 100644 --- a/nixpkgs/pkgs/applications/audio/iannix/default.nix +++ b/nixpkgs/pkgs/applications/audio/iannix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "iannix"; version = "2016-01-31"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/jackmix/default.nix b/nixpkgs/pkgs/applications/audio/jackmix/default.nix index 83644dd5ea51..fe7c83dd56f1 100644 --- a/nixpkgs/pkgs/applications/audio/jackmix/default.nix +++ b/nixpkgs/pkgs/applications/audio/jackmix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "jackmix-0.5.2"; src = fetchurl { url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; diff --git a/nixpkgs/pkgs/applications/audio/lv2bm/default.nix b/nixpkgs/pkgs/applications/audio/lv2bm/default.nix index 7288d39ce779..f1eddb626245 100644 --- a/nixpkgs/pkgs/applications/audio/lv2bm/default.nix +++ b/nixpkgs/pkgs/applications/audio/lv2bm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lv2bm"; version = "git-2015-11-29"; diff --git a/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix b/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix index 3fbe927be4ba..c20f04ec9470 100644 --- a/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix +++ b/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lv2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mod-distortion-git"; version = "2016-08-19"; diff --git a/nixpkgs/pkgs/applications/audio/muse/default.nix b/nixpkgs/pkgs/applications/audio/muse/default.nix index 8582fd781929..02b1d8ea5111 100644 --- a/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -16,7 +16,7 @@ , gitAndTools }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "muse-sequencer"; version = "3.1pre1"; diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index 2e69c3cda7a3..5368fcb61656 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "musescore"; - version = "3.0.5"; + version = "3.2.3"; src = fetchzip { - url = "https://download.musescore.com/releases/MuseScore-${version}/MuseScore-${version}.zip"; - sha256 = "1pbf6v0l3nixxr8k5igwhj09wnqvw92av6q6yjrbb3kyjh5br2d8"; + url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip"; + sha256 = "17mr0c8whw6vz86lp1j36rams4h8virc4z68fld0q3rpq6g05szs"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/audio/musly/default.nix b/nixpkgs/pkgs/applications/audio/musly/default.nix index 47370d4bc2f7..e7a9e22c2d68 100644 --- a/nixpkgs/pkgs/applications/audio/musly/default.nix +++ b/nixpkgs/pkgs/applications/audio/musly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, eigen, libav_all }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/non/default.nix b/nixpkgs/pkgs/applications/audio/non/default.nix index 94cf32f8f823..5f8c82b98d04 100644 --- a/nixpkgs/pkgs/applications/audio/non/default.nix +++ b/nixpkgs/pkgs/applications/audio/non/default.nix @@ -2,7 +2,7 @@ , libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "non"; version = "2018-02-15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/nova-filters/default.nix b/nixpkgs/pkgs/applications/audio/nova-filters/default.nix index 91443bb1ef7f..0bb970500bdc 100644 --- a/nixpkgs/pkgs/applications/audio/nova-filters/default.nix +++ b/nixpkgs/pkgs/applications/audio/nova-filters/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2-2"; pname = "nova-filters"; diff --git a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix index 8116bcaf0bda..c9d69b5c7f23 100644 --- a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix @@ -3,7 +3,7 @@ let version = "0.4.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openmpt123"; inherit version; diff --git a/nixpkgs/pkgs/applications/audio/patchage/default.nix b/nixpkgs/pkgs/applications/audio/patchage/default.nix index 4f76aefb5ed3..e7c4cab9af18 100644 --- a/nixpkgs/pkgs/applications/audio/patchage/default.nix +++ b/nixpkgs/pkgs/applications/audio/patchage/default.nix @@ -2,7 +2,7 @@ , gtkmm2, libjack2, pkgconfig, python2, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "patchage"; version = "1.0.1"; src = fetchsvn { diff --git a/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix index 0cff6c419a08..fee86cb5bcae 100644 --- a/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix +++ b/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "PulseAudio Volume Control"; longDescription = '' - PulseAudio Volume Control (pavucontrol) provides a GTK+ + PulseAudio Volume Control (pavucontrol) provides a GTK graphical user interface to connect to a PulseAudio server and easily control the volume of all clients, sinks, etc. ''; diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index faa914e13287..6c7a4b03ef59 100644 --- a/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, puredata }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "helmholtz"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 9e7de39218d5..028a4667cb2d 100644 --- a/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, puredata }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mrpeach"; version = "1.1"; diff --git a/nixpkgs/pkgs/applications/audio/pianobooster/default.nix b/nixpkgs/pkgs/applications/audio/pianobooster/default.nix index c2c4672be12b..448b219a1afa 100644 --- a/nixpkgs/pkgs/applications/audio/pianobooster/default.nix +++ b/nixpkgs/pkgs/applications/audio/pianobooster/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pianobooster"; version = "0.6.4b"; diff --git a/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix b/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix index 346387be7e3c..f444ad6cb323 100644 --- a/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix +++ b/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "plugin-torture"; version = "2016-07-25"; diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix index d414cb756114..a9f56cca0015 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -17,7 +17,7 @@ assert vorbisSupport -> vorbisTools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; -in pythonPackages.buildPythonApplication rec { +in pythonPackages.buildPythonApplication { pname = "pulseaudio-dlna"; version = "2017-11-01"; diff --git a/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/nixpkgs/pkgs/applications/audio/qmmp/default.nix index 03f6bb1b7936..ef52c65b1051 100644 --- a/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, xlibsWrapper +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms @@ -28,7 +28,7 @@ # Qmmp installs working .desktop file(s) all by itself, so we don't need to # handle that. -stdenv.mkDerivation rec { +mkDerivation rec { name = "qmmp-1.3.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/quodlibet/default.nix b/nixpkgs/pkgs/applications/audio/quodlibet/default.nix index 8db837105f82..c874bdd40d24 100644 --- a/nixpkgs/pkgs/applications/audio/quodlibet/default.nix +++ b/nixpkgs/pkgs/applications/audio/quodlibet/default.nix @@ -46,11 +46,11 @@ python3.pkgs.buildPythonApplication rec { preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; meta = with stdenv.lib; { - description = "GTK+-based audio player written in Python, using the Mutagen tagging library"; + description = "GTK-based audio player written in Python, using the Mutagen tagging library"; license = licenses.gpl2Plus; longDescription = '' - Quod Libet is a GTK+-based audio player written in Python, using + Quod Libet is a GTK-based audio player written in Python, using the Mutagen tagging library. It's designed around the idea that you know how to organize your music better than we do. It lets you make playlists based on regular expressions (don't worry, diff --git a/nixpkgs/pkgs/applications/audio/rhvoice/default.nix b/nixpkgs/pkgs/applications/audio/rhvoice/default.nix index c34b27edd96d..e3eb750496ba 100644 --- a/nixpkgs/pkgs/applications/audio/rhvoice/default.nix +++ b/nixpkgs/pkgs/applications/audio/rhvoice/default.nix @@ -3,7 +3,7 @@ let version = "unstable-2018-02-10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "rhvoice"; inherit version; diff --git a/nixpkgs/pkgs/applications/audio/sayonara/default.nix b/nixpkgs/pkgs/applications/audio/sayonara/default.nix index 7776fa0c166e..c4258174500f 100644 --- a/nixpkgs/pkgs/applications/audio/sayonara/default.nix +++ b/nixpkgs/pkgs/applications/audio/sayonara/default.nix @@ -1,46 +1,82 @@ -{ stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }: +{ mkDerivation +, cmake +, fetchgit +, gst_all_1 +, lib +, libpulseaudio +, ninja +, pcre +, pkgconfig +, qtbase +, qttools +, taglib +, zlib +}: -let - version = "1.1.1-git1-20180828"; -in -stdenv.mkDerivation { +mkDerivation rec { pname = "sayonara-player"; - inherit version; + version = "1.5.1-stable5"; - src = fetchurl { - url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz"; - sha256 = "0rvy47qvavrp03zjdrw025dmq9fq5aaii3q1qq8b94byarl0c5kn"; + src = fetchgit { + url = "https://git.sayonara-player.com/sayonara.git"; + rev = version; + sha256 = "13l7r3gaszrkyf4z8rdijfzxvcnilax4ki2mcm30wqk8d4g4qdzj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = with qt5; with gst_all_1; - [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly - pcre qtbase qttools taglib zlib - ]; - - # CMake Error at src/GUI/Resources/Icons/cmake_install.cmake:49 (file): - # file cannot create directory: /usr/share/icons. Maybe need administrative - # privileges. - # Call Stack (most recent call first): - # src/GUI/Resources/cmake_install.cmake:50 (include) - # src/GUI/cmake_install.cmake:50 (include) - # src/cmake_install.cmake:59 (include) - # cmake_install.cmake:42 (include) + # all this can go with version 1.5.2 postPatch = '' - substituteInPlace src/GUI/Resources/Icons/CMakeLists.txt \ - --replace "/usr/share" "$out/share" + # if we don't delete this, sayonara will look here instead of the provided taglib + rm -r src/3rdParty/taglib + + for f in \ + src/DBus/DBusNotifications.cpp \ + src/Gui/Resources/Icons/CMakeLists.txt \ + src/Utils/Utils.cpp \ + test/Util/FileHelperTest.cpp \ + ; do + + substituteInPlace $f --replace /usr $out + done + + substituteInPlace src/Components/Shutdown/Shutdown.cpp \ + --replace /usr/bin/systemctl systemctl ''; - # [ 65%] Building CXX object src/Components/Engine/CMakeFiles/say_comp_engine.dir/AbstractPipeline.cpp.o - # /tmp/nix-build-sayonara-player-1.0.0-git5-20180115.drv-0/sayonara-player/src/Components/Engine/AbstractPipeline.cpp:28:32: fatal error: gst/app/gstappsink.h: No such file or directory - # #include <gst/app/gstappsink.h> + nativeBuildInputs = [ cmake ninja pkgconfig qttools ]; + + buildInputs = [ + libpulseaudio + pcre + qtbase + taglib + zlib + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + # we carry the patched taglib 1.11.1 that doesn't break ogg but sayonara just + # checks for the version + cmakeFlags = [ + "-DWITH_SYSTEM_TAGLIB=ON" + ]; + + # gstreamer cannot otherwise be found NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; - meta = with stdenv.lib; - { description = "Sayonara music player"; - homepage = https://sayonara-player.com/; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.deepfire ]; - }; + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Sayonara music player"; + homepage = "https://sayonara-player.com/"; + license = licenses.gpl3; + maintainers = with maintainers; [ deepfire ]; + platforms = platforms.unix; + }; } diff --git a/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix b/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix index 5708ef0ce0a6..706d0faa3bc1 100644 --- a/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix +++ b/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchFromGitHub +{ lib +, mkDerivation +, fetchFromGitHub , cmake -, qtbase, qtquickcontrols2 +, qtbase +, qtquickcontrols2 , SDL , python3 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "sfxr-qt"; version = "1.2.0"; src = fetchFromGitHub { @@ -20,12 +23,13 @@ stdenv.mkDerivation rec { (python3.withPackages (pp: with pp; [ pyyaml jinja2 ])) ]; buildInputs = [ - qtbase qtquickcontrols2 + qtbase + qtquickcontrols2 SDL ]; configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/agateau/sfxr-qt; description = "A sound effect generator, QtQuick port of sfxr"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/audio/shntool/default.nix b/nixpkgs/pkgs/applications/audio/shntool/default.nix index dc8d95d2c490..e3bfc60a40a5 100644 --- a/nixpkgs/pkgs/applications/audio/shntool/default.nix +++ b/nixpkgs/pkgs/applications/audio/shntool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flac }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "3.0.10"; pname = "shntool"; diff --git a/nixpkgs/pkgs/applications/audio/sonata/default.nix b/nixpkgs/pkgs/applications/audio/sonata/default.nix index d5985f097e9f..ce2a4e9d2c80 100644 --- a/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -41,7 +41,7 @@ in buildPythonApplication rec { longDescription = '' Sonata is an elegant client for the Music Player Daemon. - Written in Python and using the GTK+ 3 widget set, its features + Written in Python and using the GTK 3 widget set, its features include: - Expanded and collapsed views diff --git a/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix b/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix index 01f0708d1157..30ff41da3695 100644 --- a/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix @@ -14,7 +14,7 @@ , libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soundscape-renderer-unstable"; version = "2016-11-03"; diff --git a/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix b/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix index 2401dc60b09a..6598d24fb07a 100644 --- a/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix +++ b/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix @@ -8,7 +8,7 @@ let sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4"; }; - rnnoise-nu = stdenv.mkDerivation rec { + rnnoise-nu = stdenv.mkDerivation { pname = "rnnoise-nu"; version = "unstable-07-10-2019"; src = speech-denoiser-src; @@ -18,7 +18,7 @@ let installTargets = [ "install-rnnoise-nu" ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "speech-denoiser"; version = "unstable-07-10-2019"; diff --git a/nixpkgs/pkgs/applications/audio/spotify/default.nix b/nixpkgs/pkgs/applications/audio/spotify/default.nix index 403075f91352..3f99e22a4cbd 100644 --- a/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -78,8 +78,6 @@ stdenv.mkDerivation { buildInputs = [ squashfsTools makeWrapper ]; - doConfigure = false; - doBuild = false; dontStrip = true; dontPatchELF = true; diff --git a/nixpkgs/pkgs/applications/audio/spotifywm/default.nix b/nixpkgs/pkgs/applications/audio/spotifywm/default.nix index 3447049099b1..2380c8e5d9ed 100644 --- a/nixpkgs/pkgs/applications/audio/spotifywm/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotifywm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spotifywm-unstable"; version = "2016-11-28"; diff --git a/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/nixpkgs/pkgs/applications/audio/strawberry/default.nix new file mode 100644 index 000000000000..83455460123c --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -0,0 +1,97 @@ +{ mkDerivation +, stdenv +, lib +, fetchFromGitHub +, cmake +, pkgconfig +, alsaLib +, boost +, chromaprint +, fftw +, gnutls +, libcdio +, libmtp +, libpthreadstubs +, libtasn1 +, libXdmcp +, ninja +, pcre +, protobuf +, sqlite +, taglib +, libpulseaudio ? null +, libselinux ? null +, libsepol ? null +, p11_kit ? null +, utillinux ? null +, qtbase +, qtx11extras +, qttools +, withGstreamer ? true +, gst_all_1 ? null +, withVlc ? true +, vlc ? null +}: + +mkDerivation rec { + pname = "strawberry"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "jonaski"; + repo = pname; + rev = version; + sha256 = "01j5jzzicy895kg9sjy46lbcm5kvf3642d3q5wwb2fyvyq1fbcv0"; + }; + + buildInputs = [ + alsaLib + boost + chromaprint + fftw + gnutls + libcdio + libmtp + libpthreadstubs + libtasn1 + libXdmcp + pcre + protobuf + sqlite + taglib + qtbase + qtx11extras + ] + ++ lib.optionals stdenv.isLinux [ + libpulseaudio + libselinux + libsepol + p11_kit + utillinux + ] + ++ lib.optionals withGstreamer (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + ]) + ++ lib.optional withVlc vlc; + + nativeBuildInputs = [ cmake ninja pkgconfig qttools ]; + + cmakeFlags = [ + "-DUSE_SYSTEM_TAGLIB=ON" + ]; + + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Music player and music collection organizer"; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + # upstream says darwin should work but they lack maintainers as of 0.6.3 + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/svox/default.nix b/nixpkgs/pkgs/applications/audio/svox/default.nix index d25e61c37f5d..8acd8e0b88b1 100644 --- a/nixpkgs/pkgs/applications/audio/svox/default.nix +++ b/nixpkgs/pkgs/applications/audio/svox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "svox"; version = "2017-07-18"; diff --git a/nixpkgs/pkgs/applications/audio/traverso/default.nix b/nixpkgs/pkgs/applications/audio/traverso/default.nix index 0f70f9567131..9188003ce66d 100644 --- a/nixpkgs/pkgs/applications/audio/traverso/default.nix +++ b/nixpkgs/pkgs/applications/audio/traverso/default.nix @@ -2,7 +2,7 @@ , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "traverso"; version = "0.49.6"; diff --git a/nixpkgs/pkgs/applications/audio/uade123/default.nix b/nixpkgs/pkgs/applications/audio/uade123/default.nix index b5ff8e41fe0b..844eea11f514 100644 --- a/nixpkgs/pkgs/applications/audio/uade123/default.nix +++ b/nixpkgs/pkgs/applications/audio/uade123/default.nix @@ -2,7 +2,7 @@ let version = "2.13"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "uade123"; inherit version; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix b/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix index cc04632cfb5c..eeeb8ae2ea44 100644 --- a/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zam-plugins"; version = "3.11"; diff --git a/nixpkgs/pkgs/applications/backup/areca/default.nix b/nixpkgs/pkgs/applications/backup/areca/default.nix index a9647b11eeea..d02aa4b8444f 100644 --- a/nixpkgs/pkgs/applications/backup/areca/default.nix +++ b/nixpkgs/pkgs/applications/backup/areca/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "areca-7.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/backup/deja-dup/default.nix b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix index 2ff51db54041..7120a1934f6e 100644 --- a/nixpkgs/pkgs/applications/backup/deja-dup/default.nix +++ b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/blockchains/ethabi.nix b/nixpkgs/pkgs/applications/blockchains/ethabi.nix index 21d69f14d7f3..5bc81a6daf66 100644 --- a/nixpkgs/pkgs/applications/blockchains/ethabi.nix +++ b/nixpkgs/pkgs/applications/blockchains/ethabi.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "ethabi-${version}"; + pname = "ethabi"; version = "7.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/default.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/default.nix deleted file mode 100644 index ed8086f742f9..000000000000 --- a/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoPackage, fetchgit }: - -buildGoPackage rec { - pname = "go-ethereum-classic"; - version = "4.0.0"; - - goPackagePath = "github.com/ethereumproject/go-ethereum"; - subPackages = [ "cmd/evm" "cmd/geth" ]; - - src = fetchgit { - rev = "v${version}"; - url = "https://github.com/ethereumproject/go-ethereum"; - sha256 = "06f1w7s45q4zva1xjrx92xinsdrixl0m6zhx5hvdjmg3xqcbwr79"; - }; - - goDeps = ./deps.nix; - - meta = { - description = "Golang implementation of Ethereum Classic"; - homepage = https://github.com/ethereumproject/go-ethereum; - license = with lib.licenses; [ lgpl3 gpl3 ]; - maintainers = with lib.maintainers; [ sorpaas ]; - }; -} diff --git a/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/deps.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/deps.nix deleted file mode 100644 index 0aa6755ee960..000000000000 --- a/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/deps.nix +++ /dev/null @@ -1,39 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/maruel/panicparse"; - fetch = { - type = "git"; - url = "https://github.com/maruel/panicparse"; - rev = "ae43f192cef2add653fe1481a3070ed00a4a6981"; - sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; - sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; - sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "4163cd39dda1c0dda883a713640bc01e08951c24"; - sha256 = "1vzrhxf8823lrnwf1bfyxwlm52pph5iq2hgr1d0n07v8kjgqkrmx"; - }; - } -] diff --git a/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index 740ecfa228fd..5f347fe91e9c 100644 --- a/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-ethereum"; - version = "1.9.2"; + version = "1.9.3"; goPackagePath = "github.com/ethereum/go-ethereum"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0lymwylh4j63fzj9jy7mcw676a2ksgpsj9mazif1r3d2q73h9m88"; + sha256 = "0lv6gxp34j26hqazcvyr4c7rsl1vljm6cfzkcmlapsjdgym505bg"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix index a8d29ae149d9..5b8b17232b90 100644 --- a/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,15 +1,16 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL +, qtbase}: stdenv.mkDerivation rec { pname = "nano-wallet"; - version = "18.0"; + version = "19.0"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "03f9g1x7rs7vic9yzsjxsh5ddx9ys78rssbfghbccfw9qrwylh3y"; + sha256 = "1y5fc4cvfqh33imjkh91sqhy5bb9kh0icwyvdgm1cl564vnjax80"; fetchSubmodules = true; }; @@ -32,13 +33,19 @@ stdenv.mkDerivation rec { optionToFlag = name: value: "-D${name}=${value}"; in lib.mapAttrsToList optionToFlag options; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ boost libGL qtbase ]; buildPhase = '' make nano_wallet ''; + # Move executables under bin directory + postInstall = '' + mkdir -p $out/bin + mv $out/nano* $out/bin/ + ''; + checkPhase = '' ./core_test ''; diff --git a/nixpkgs/pkgs/applications/blockchains/parity/parity.nix b/nixpkgs/pkgs/applications/blockchains/parity/parity.nix index fbc43cd3402c..7f28d97bf81a 100644 --- a/nixpkgs/pkgs/applications/blockchains/parity/parity.nix +++ b/nixpkgs/pkgs/applications/blockchains/parity/parity.nix @@ -13,7 +13,7 @@ , systemd }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "parity"; inherit version; inherit cargoSha256; diff --git a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 26c9192ee6fa..100c0f8ba41f 100644 --- a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -6,7 +6,7 @@ }: rustPlatform.buildRustPackage rec { - name = "polkadot-${version}"; + pname = "polkadot"; version = "0.2.17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index 7185b3510601..933e5773edad 100644 --- a/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -2,37 +2,37 @@ stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.5"; + version = "1.1.6"; - src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; - sha256 = "1iq7qkpq073yq1bz8pam4cbm2myznhpjr3g9afblvmxwgbdjxak0"; - }; + src = fetchurl { + url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; + sha256 = "1i7fhaj9chjlm7qg0h3azy4djnm9rxskbr3dzjj0n9rw8cjdqyq6"; + }; - dontBuild = true; - dontPatchELF = true; + dontBuild = true; + dontPatchELF = true; - desktopItem = makeDesktopItem { - name = "wasabi"; - exec = "wasabiwallet"; - desktopName = "Wasabi"; - genericName = "Bitcoin wallet"; - comment = meta.description; - categories = "Application;Network;Utility;"; - }; + desktopItem = makeDesktopItem { + name = "wasabi"; + exec = "wasabiwallet"; + desktopName = "Wasabi"; + genericName = "Bitcoin wallet"; + comment = meta.description; + categories = "Application;Network;Utility;"; + }; installPhase = '' - mkdir -p $out/opt/${pname} $out/bin $out/share/applications - cp -Rv . $out/opt/${pname} - cd $out/opt/${pname} - for i in $(find . -type f -name '*.so') wassabee - do - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i - done - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee - ln -s $out/opt/${pname}/wassabee $out/bin/${pname} - cp -v $desktopItem/share/applications/* $out/share/applications - ''; + mkdir -p $out/opt/${pname} $out/bin $out/share/applications + cp -Rv . $out/opt/${pname} + cd $out/opt/${pname} + for i in $(find . -type f -name '*.so') wassabee + do + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i + done + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee + ln -s $out/opt/${pname}/wassabee $out/bin/${pname} + cp -v $desktopItem/share/applications/* $out/share/applications + ''; meta = with stdenv.lib; { description = "Privacy focused Bitcoin wallet"; diff --git a/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 3aeee7e6972f..634d4e8538a1 100644 --- a/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "librustzcash-unstable-${version}"; + pname = "librustzcash-unstable"; version = "2017-03-17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 8302303a08e7..accdea3ae2d3 100644 --- a/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -2,7 +2,7 @@ , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2.1"; pname = "lightdm-enso-os-greeter"; diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix index 61d65cb64b6b..1df67578b3ac 100644 --- a/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix @@ -61,13 +61,12 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--disable-tests" - "--disable-static" "--disable-dmrc" ] ++ optional withQt4 "--enable-liblightdm-qt" ++ optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ - "sysconfdir=${placeholder ''out''}/etc" + "sysconfdir=${placeholder "out"}/etc" "localstatedir=\${TMPDIR}" ]; diff --git a/nixpkgs/pkgs/applications/display-managers/sddm/default.nix b/nixpkgs/pkgs/applications/display-managers/sddm/default.nix index fc61d43436da..526041124bcc 100644 --- a/nixpkgs/pkgs/applications/display-managers/sddm/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/sddm/default.nix @@ -6,7 +6,7 @@ let version = "0.18.1"; -in mkDerivation rec { +in mkDerivation { pname = "sddm"; inherit version; diff --git a/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 50a752b3eb96..0d406ad2d360 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -40,7 +40,7 @@ let drvName = "android-studio-${channel}-${version}"; androidStudio = stdenv.mkDerivation { - name = drvName; + name = "${drvName}-unwrapped"; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; @@ -133,7 +133,7 @@ let multiPkgs = pkgs: [ pkgs.ncurses5 ]; }; in runCommand - "${drvName}-wrapper" + drvName { startScript = '' #!${bash}/bin/bash diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 9f7997860c61..b5381983240a 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -14,11 +14,11 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.9"; # "Android Studio 3.6 Canary 9" - build = "192.5830636"; - sha256Hash = "0c9zmxf2scsf9pygcbabzngl7cdyjgpir5pggjaj535ni0nsrr7p"; + version = "3.6.0.10"; # "Android Studio 3.6 Canary 10" + build = "192.5842447"; + sha256Hash = "0qyvqm0ihp6czx77skia87qnz87wrsp1a6la04dr4b0xln2c8m5b"; }; -in rec { +in { # Attributes are named by their corresponding release channels stable = mkStudio (stableVersion // { diff --git a/nixpkgs/pkgs/applications/editors/aseprite/skia.nix b/nixpkgs/pkgs/applications/editors/aseprite/skia.nix index 038ff96ad3bd..8bf2adf484e2 100644 --- a/nixpkgs/pkgs/applications/editors/aseprite/skia.nix +++ b/nixpkgs/pkgs/applications/editors/aseprite/skia.nix @@ -7,7 +7,7 @@ let # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' depSrcs = import ./skia-deps.nix { inherit fetchgit; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "skia-aseprite-m71"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/edit/default.nix b/nixpkgs/pkgs/applications/editors/edit/default.nix index acda484ba3a3..27c13c0cb396 100644 --- a/nixpkgs/pkgs/applications/editors/edit/default.nix +++ b/nixpkgs/pkgs/applications/editors/edit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "edit-nightly"; version = "20160425"; diff --git a/nixpkgs/pkgs/applications/editors/elvis/default.nix b/nixpkgs/pkgs/applications/editors/elvis/default.nix index 078b8a03b5d9..4b7e4c8a3ca4 100644 --- a/nixpkgs/pkgs/applications/editors/elvis/default.nix +++ b/nixpkgs/pkgs/applications/editors/elvis/default.nix @@ -1,6 +1,6 @@ { fetchurl, fetchpatch, stdenv, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "elvis-2.2_0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix index ce9f57ef40b6..3af53cda492f 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix @@ -1,6 +1,6 @@ { stdenv, cedille, emacs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cedille-mode"; version = cedille.version; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index fb3de6ea3d9e..3d34c7a462e3 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -2,7 +2,7 @@ let commit = "412713a0fcedd520d208a7b783fea03d710bcc61"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "color-theme-solarized-1.0.0"; src = fetchzip { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix index 73d66dc2b3c4..0529fce2b16d 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -53,7 +53,7 @@ in { , sha256 ? null , ... }@args: let - sourceArgs = args."${variant}"; + sourceArgs = args.${variant}; version = sourceArgs.version or null; deps = sourceArgs.deps or null; error = sourceArgs.error or args.error or null; @@ -78,7 +78,7 @@ in { inherit sha256; }; packageRequires = lib.optional (! isNull deps) - (map (dep: pkgargs."${dep}" or self."${dep}" or null) + (map (dep: pkgargs.${dep} or self.${dep} or null) deps); meta = (sourceArgs.meta or {}) // { inherit broken; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix index 582a8b5e71b3..545ad5a5e0c3 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -59,7 +59,7 @@ font-lock-plus = callPackage ./font-lock-plus { }; - ghc-mod = melpaBuild rec { + ghc-mod = melpaBuild { pname = "ghc"; version = external.ghc-mod.version; src = external.ghc-mod.src; @@ -75,7 +75,7 @@ }; }; - haskell-unicode-input-method = melpaBuild rec { + haskell-unicode-input-method = melpaBuild { pname = "emacs-haskell-unicode-input-method"; version = "20110905.2307"; src = pkgs.fetchFromGitHub { @@ -104,7 +104,7 @@ icicles = callPackage ./icicles { }; - rtags = melpaBuild rec { + rtags = melpaBuild { inherit (external.rtags) version src meta; pname = "rtags"; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 8b83b5562469..fe440c146ae8 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -418,7 +418,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }; }); - in pkgs.stdenv.mkDerivation rec { + in pkgs.stdenv.mkDerivation { inherit (super.vterm) name version src; nativeBuildInputs = [ pkgs.cmake ]; @@ -451,6 +451,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }; }; - in super // overrides."${variant}"); + in super // overrides.${variant}); in generateMelpa { } diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix index 1937a94cad11..241ec3b42c9e 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "org-mac-link-1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/perl-completion/default.nix index 97d063d452cd..9f251f54d6aa 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/perl-completion/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/perl-completion/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "perl-completion"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 1f218439a5ff..54e5a89dd9f6 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rect-mark-1.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index f5aeb35d1840..165e0c13c8fe 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "session-management-for-emacs-2.2a"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index aa27e302e5d6..fcb37e7ebad3 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchgit, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "sunrise-commander-6r435"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix index e147fd53b229..209a99245ecd 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "yaoddmuse-0.1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/gobby/default.nix b/nixpkgs/pkgs/applications/editors/gobby/default.nix index ec05f0f82622..3abe2834db46 100644 --- a/nixpkgs/pkgs/applications/editors/gobby/default.nix +++ b/nixpkgs/pkgs/applications/editors/gobby/default.nix @@ -4,7 +4,7 @@ let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "gobby-unstable-2018-04-03"; src = fetchFromGitHub { owner = "gobby"; diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 92355552fcec..a33b9531730f 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -11,7 +11,7 @@ let # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct rec { + lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { @@ -121,7 +121,7 @@ let }); buildIdea = { name, version, src, license, description, wmClass, ... }: - (mkJetBrainsProduct rec { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { @@ -156,7 +156,7 @@ let }); buildPycharm = { name, version, src, license, description, wmClass, ... }: - (mkJetBrainsProduct rec { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { @@ -183,7 +183,7 @@ let }; buildRider = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct rec { + lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Rider"; meta = with stdenv.lib; { @@ -209,7 +209,7 @@ let }); buildRubyMine = { name, version, src, license, description, wmClass, ... }: - (mkJetBrainsProduct rec { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/editors/jupyter/kernel.nix b/nixpkgs/pkgs/applications/editors/jupyter/kernel.nix index 4a079625d183..205c32d5f806 100644 --- a/nixpkgs/pkgs/applications/editors/jupyter/kernel.nix +++ b/nixpkgs/pkgs/applications/editors/jupyter/kernel.nix @@ -26,7 +26,7 @@ in # Definitions is an attribute set. - create = { definitions ? default }: with lib; stdenv.mkDerivation rec { + create = { definitions ? default }: with lib; stdenv.mkDerivation { name = "jupyter-kernels"; diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins.nix deleted file mode 100644 index d2f3607d63cb..000000000000 --- a/nixpkgs/pkgs/applications/editors/kakoune/plugins.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ parinfer-rust }: - -{ - inherit parinfer-rust; -} diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix new file mode 100644 index 000000000000..f53d345d49ed --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix @@ -0,0 +1,11 @@ +{ pkgs, parinfer-rust }: + +{ + inherit parinfer-rust; + + kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { }; + kak-buffers = pkgs.callPackage ./kak-buffers.nix { }; + kak-fzf = pkgs.callPackage ./kak-fzf.nix { }; + kak-powerline = pkgs.callPackage ./kak-powerline.nix { }; + kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; +} diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix new file mode 100644 index 000000000000..48dc7106b626 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation { + name = "kak-auto-pairs"; + version = "2019-07-27"; + src = fetchFromGitHub { + owner = "alexherbo2"; + repo = "auto-pairs.kak"; + rev = "886449b1a04d43e5deb2f0ef4b1aead6084c7a5f"; + sha256 = "0knfhdvslzw1f1r1k16733yhkczrg3yijjz6n2qwira84iv3239j"; + }; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins + cp -r rc $out/share/kak/autoload/plugins/auto-pairs + ''; + + meta = with stdenv.lib; + { description = "Kakoune extension to enable automatic closing of pairs"; + homepage = "https://github.com/alexherbo2/auto-pairs.kak"; + license = licenses.publicDoman; + maintainers = with maintainers; [ nrdxp ]; + platform = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix new file mode 100644 index 000000000000..8a2474f07622 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation { + name = "kak-buffers"; + version = "2019-04-03"; + src = fetchFromGitHub { + owner = "Delapouite"; + repo = "kakoune-buffers"; + rev = "3b35b23ac2be661a37c085d34dd04d066450f757"; + sha256 = "0f3g0v1sjinii3ig9753jjj35v2km4h9bcfw9xgzwz8b10d75bax"; + }; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins + cp -r buffers.kak $out/share/kak/autoload/plugins + ''; + + meta = with stdenv.lib; + { description = "Ease navigation between opened buffers in Kakoune"; + homepage = "https://github.com/Delapouite/kakoune-buffers"; + license = licenses.publicDoman; + maintainers = with maintainers; [ nrdxp ]; + platform = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix new file mode 100644 index 000000000000..9877c72252be --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, fzf }: + +assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; + +stdenv.mkDerivation { + name = "kak-fzf"; + version = "2019-07-16"; + src = fetchFromGitHub { + owner = "andreyorst"; + repo = "fzf.kak"; + rev = "ede90d3e02bceb714f997adfcbab8260b42e0a19"; + sha256 = "18w90j3fpk2ddn68497s33n66aap8phw5636y1r7pqsa641zdxcv"; + }; + + configurePhase = '' + if [[ -x "${fzf}/bin/fzf" ]]; then + fzfImpl='${fzf}/bin/fzf' + else + fzfImpl='${fzf}/bin/sk' + fi + + substituteInPlace rc/fzf.kak \ + --replace \'fzf\' \'"$fzfImpl"\' + ''; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins + cp -r rc $out/share/kak/autoload/plugins/fzf + ''; + + meta = with stdenv.lib; + { description = "Kakoune plugin that brings integration with fzf"; + homepage = "https://github.com/andreyorst/fzf.kak"; + license = licenses.publicDoman; + maintainers = with maintainers; [ nrdxp ]; + platform = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix new file mode 100644 index 000000000000..76af06504ea3 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix @@ -0,0 +1,29 @@ +{ stdenv, git, fetchFromGitHub }: +stdenv.mkDerivation { + name = "kak-powerline"; + version = "2019-07-23"; + src = fetchFromGitHub { + owner = "andreyorst"; + repo = "powerline.kak"; + rev = "82b01eb6c97c7380b7da253db1fd484a5de13ea4"; + sha256 = "1480wp2jc7c84z1wqmpf09lzny6kbnbhiiym2ffaddxrd4ns9i6z"; + }; + + configurePhase = '' + substituteInPlace rc/modules/git.kak \ + --replace \'git\' \'${git}/bin/git\' + ''; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins + cp -r rc $out/share/kak/autoload/plugins/powerline + ''; + + meta = with stdenv.lib; + { description = "Kakoune modeline, but with passion"; + homepage = "https://github.com/andreyorst/powerline.kak"; + license = licenses.publicDoman; + maintainers = with maintainers; [ nrdxp ]; + platform = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix new file mode 100644 index 000000000000..280fb664b8f4 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation { + name = "kak-vertical-selection"; + version = "2019-04-11"; + src = fetchFromGitHub { + owner = "occivink"; + repo = "kakoune-vertical-selection"; + rev = "c420f8b867ce47375fac303886e31623669a42b7"; + sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb"; + }; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins + cp -r vertical-selection.kak $out/share/kak/autoload/plugins + ''; + + meta = with stdenv.lib; + { description = "Select up and down lines that match the same pattern in Kakoune"; + homepage = "https://github.com/occivink/kakoune-vertical-selection"; + license = licenses.publicDoman; + maintainers = with maintainers; [ nrdxp ]; + platform = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix index 54e99b35b5eb..e367b586f307 100644 --- a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "07j06k2f5rbwgknwcbj70wwn831a54is4kiwlpfd4la2c05slmy5"; + sha256 = "1ilazq2y671wifcrh7pa0zf9yqymqxwj1m2kd389ik2p6wm68jx8"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix index 8763905fbfd8..1052c5e1ba34 100644 --- a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1dazd77bkjs11h318q4ia6ijk0d0s04v0zm8lwqlgcj271sqrfqb"; + sha256 = "1nnspa1mixdb5z0a8m4nbpsk6c4s81iwrirhrl7091hsw02bsx3f"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix index be80587ef3a6..4c2011b5b035 100644 --- a/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -9,11 +9,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "12iqgmhaxm9q085h50dzkswcmsp02jzm4jjgrhkx4jlzmf4w4jb8"; + sha256 = "1i665m4jd1r5bl77pcfybpn9szxzccrajs4m0prqwhlj93d57qjj"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/kodestudio/default.nix b/nixpkgs/pkgs/applications/editors/kodestudio/default.nix index df46cb123386..a106c3166747 100644 --- a/nixpkgs/pkgs/applications/editors/kodestudio/default.nix +++ b/nixpkgs/pkgs/applications/editors/kodestudio/default.nix @@ -20,7 +20,7 @@ let in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "kodestudio"; inherit version; diff --git a/nixpkgs/pkgs/applications/editors/leafpad/default.nix b/nixpkgs/pkgs/applications/editors/leafpad/default.nix index 795342fba5d8..508d2329edc4 100644 --- a/nixpkgs/pkgs/applications/editors/leafpad/default.nix +++ b/nixpkgs/pkgs/applications/editors/leafpad/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "A notepad clone for GTK+ 2.0"; + description = "A notepad clone for GTK 2.0"; homepage = http://tarot.freeshell.org/leafpad; platforms = platforms.linux; maintainers = [ maintainers.flosse ]; diff --git a/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/nixpkgs/pkgs/applications/editors/leo-editor/default.nix index ff824d8b45bf..bd433436eb02 100644 --- a/nixpkgs/pkgs/applications/editors/leo-editor/default.nix +++ b/nixpkgs/pkgs/applications/editors/leo-editor/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper python3 ]; propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ]; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "leo-editor"; exec = "leo %U"; icon = "leoapp32"; diff --git a/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix b/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix index 7902ddc410cf..eab37fba19a7 100644 --- a/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix +++ b/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nanorc"; version = "2018-09-05"; diff --git a/nixpkgs/pkgs/applications/editors/nvi/default.nix b/nixpkgs/pkgs/applications/editors/nvi/default.nix index 82c89ebdca6e..a7a6b35a24a0 100644 --- a/nixpkgs/pkgs/applications/editors/nvi/default.nix +++ b/nixpkgs/pkgs/applications/editors/nvi/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nvi-1.79"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/retext/default.nix b/nixpkgs/pkgs/applications/editors/retext/default.nix index a7dc02a9a636..dd49b0a1cf77 100644 --- a/nixpkgs/pkgs/applications/editors/retext/default.nix +++ b/nixpkgs/pkgs/applications/editors/retext/default.nix @@ -8,7 +8,7 @@ let version = "7.0.4"; python = let packageOverrides = self: super: { - markdown = super.markdown.overridePythonAttrs(old: rec { + markdown = super.markdown.overridePythonAttrs(old: { src = super.fetchPypi { version = "3.0.1"; pname = "Markdown"; @@ -16,7 +16,7 @@ let }; }); - chardet = super.chardet.overridePythonAttrs(old: rec { + chardet = super.chardet.overridePythonAttrs(old: { src = super.fetchPypi { version = "2.3.0"; pname = "chardet"; diff --git a/nixpkgs/pkgs/applications/editors/scite/default.nix b/nixpkgs/pkgs/applications/editors/scite/default.nix index 2dceee0a37df..78dd0d095414 100644 --- a/nixpkgs/pkgs/applications/editors/scite/default.nix +++ b/nixpkgs/pkgs/applications/editors/scite/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "scite"; version = "4.0.5"; diff --git a/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix index 629bd9d019d2..5a13d91aef2c 100644 --- a/nixpkgs/pkgs/applications/editors/standardnotes/default.nix +++ b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix @@ -4,17 +4,17 @@ let version = "3.0.15"; plat = { - "i386-linux" = "i386"; - "x86_64-linux" = "x86_64"; + i386-linux = "i386"; + x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system}; sha256 = { - "i386-linux" = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; - "x86_64-linux" = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; + i386-linux = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; + x86_64-linux = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; }.${stdenv.hostPlatform.system}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "standardnotes"; inherit version; diff --git a/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix index b8fef39d3ea2..82d92ba2fe11 100644 --- a/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix +++ b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix @@ -3,7 +3,7 @@ let common = opts: callPackage (import ./common.nix opts); in - rec { + { sublime3-dev = common { buildVersion = "3208"; dev = true; diff --git a/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix b/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix index efbca2949dd4..6714f917315c 100644 --- a/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix +++ b/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2014-08-20"; pname = "supertux-editor"; diff --git a/nixpkgs/pkgs/applications/editors/uemacs/default.nix b/nixpkgs/pkgs/applications/editors/uemacs/default.nix index fad4e82d37ff..0a2df6b6d4bb 100644 --- a/nixpkgs/pkgs/applications/editors/uemacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/uemacs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uemacs"; version = "2014-12-08"; diff --git a/nixpkgs/pkgs/applications/editors/vim/common.nix b/nixpkgs/pkgs/applications/editors/vim/common.nix index 63d8add3a012..567da2a08f20 100644 --- a/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.1547"; + version = "8.1.1967"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "01v35wq8wjrbzmdf5r02gp0sfa9yyfswsi3fqzn94cd68qhskkpr"; + sha256 = "0cdfi67jwv8j982i1jxdfqv4aqglig8f0hzadgygk69i0wwkymwk"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/editors/vim/configurable.nix b/nixpkgs/pkgs/applications/editors/vim/configurable.nix index 1d65be3e73dd..d21d0ad5ee00 100644 --- a/nixpkgs/pkgs/applications/editors/vim/configurable.nix +++ b/nixpkgs/pkgs/applications/editors/vim/configurable.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; src = builtins.getAttr source { - "default" = common.src; # latest release + default = common.src; # latest release }; patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; diff --git a/nixpkgs/pkgs/applications/editors/vim/default.nix b/nixpkgs/pkgs/applications/editors/vim/default.nix index 732bfbf0bfd3..ae4e9ac8a9c9 100644 --- a/nixpkgs/pkgs/applications/editors/vim/default.nix +++ b/nixpkgs/pkgs/applications/editors/vim/default.nix @@ -12,7 +12,7 @@ let common = callPackage ./common.nix {}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vim"; inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; diff --git a/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/nixpkgs/pkgs/applications/editors/vim/macvim.nix index 82977c2e6bc5..6081bbc8b0ca 100644 --- a/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -24,7 +24,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "macvim"; version = "8.1.1722"; diff --git a/nixpkgs/pkgs/applications/editors/vis/default.nix b/nixpkgs/pkgs/applications/editors/vis/default.nix index 5b9548df7f17..1bda6958206b 100644 --- a/nixpkgs/pkgs/applications/editors/vis/default.nix +++ b/nixpkgs/pkgs/applications/editors/vis/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "vis"; exec = "vis %U"; type = "Application"; diff --git a/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix index e42ca8a0bbf8..7b7209a5e1f4 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -11,7 +11,7 @@ let inherit (stdenv.hostPlatform) system; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit pname version src sourceRoot; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 369ed7728909..fb0c32f72d7c 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -4,20 +4,20 @@ let inherit (stdenv.hostPlatform) system; plat = { - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; + x86_64-linux = "linux-x64"; + x86_64-darwin = "darwin"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "1np7j6xv0bxmq7762ml0h6pib8963s2vdmyvigi0fz2iik92zv8z"; - "x86_64-darwin" = "0f87cv1sbcvix9f7hhw0vsypp0bf627xdyh4bmh0g41k17ls8wvc"; + "x86_64-linux" = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q"; + "x86_64-darwin" = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky"; }.${system}; in callPackage ./generic.nix rec { - version = "1.37.1"; + version = "1.38.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 49472fde464b..33a6a26d8b35 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -4,20 +4,20 @@ let inherit (stdenv.hostPlatform) system; plat = { - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; + x86_64-linux = "linux-x64"; + x86_64-darwin = "darwin"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "0j6188gm66bwffyg0vn3ak8242vs2vb2cw92b9wfkiml6sfg555n"; - "x86_64-darwin" = "0iblg0hn6jdds7d2hzp0icb5yh6hhw3fd5g4iim64ibi7lpwj2cj"; + "x86_64-linux" = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132"; + "x86_64-darwin" = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4"; }.${system}; in callPackage ./generic.nix rec { - version = "1.37.1"; + version = "1.38.0"; pname = "vscodium"; executableName = "codium"; diff --git a/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix index 09ccbad6cd75..4725d8143b47 100644 --- a/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix +++ b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix @@ -26,11 +26,10 @@ stdenv.mkDerivation rec { url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch; sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj"; }) + ./missing-semicolon.patch ]; - buildPhase = '' - make OPTFLAGS="-fopenmp" - ''; + makeFlags = [ "OPTFLAGS=-fopenmp" ]; meta = { description = "Hex Editor / Disk Editor for Huge Files or Devices"; diff --git a/nixpkgs/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch b/nixpkgs/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch new file mode 100644 index 000000000000..75722c9c7c55 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch @@ -0,0 +1,35 @@ +diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp +index 091a6f9..12e6a78 100644 +--- a/src/HexDialogs.cpp ++++ b/src/HexDialogs.cpp +@@ -420,7 +420,7 @@ void FindDialog::OnChar( wxKeyEvent& event ){ + } + + void FindDialog::EventHandler( wxCommandEvent& event ){ +- WX_CLEAR_ARRAY(parent->HighlightArray ) ++ WX_CLEAR_ARRAY(parent->HighlightArray ); + parent->HighlightArray.Shrink(); + + if( event.GetId() == btnFind->GetId()) +diff --git a/src/HexEditorCtrl/HexEditorCtrl.cpp b/src/HexEditorCtrl/HexEditorCtrl.cpp +index 7a3b0e2..f12097f 100644 +--- a/src/HexEditorCtrl/HexEditorCtrl.cpp ++++ b/src/HexEditorCtrl/HexEditorCtrl.cpp +@@ -64,9 +64,9 @@ HexEditorCtrl::~HexEditorCtrl( void ){ + Dynamic_Disconnector(); + Clear(); + +- WX_CLEAR_ARRAY(MainTagArray) +- WX_CLEAR_ARRAY(HighlightArray) +- WX_CLEAR_ARRAY(CompareArray) ++ WX_CLEAR_ARRAY(MainTagArray); ++ WX_CLEAR_ARRAY(HighlightArray); ++ WX_CLEAR_ARRAY(CompareArray); + + MainTagArray.Shrink(); + HighlightArray.Shrink(); +@@ -1224,4 +1224,3 @@ void wxHugeScrollBar::OnOffsetScroll( wxScrollEvent& event ){ + #endif + event.Skip(); + } +- diff --git a/nixpkgs/pkgs/applications/editors/yi/wrapper.nix b/nixpkgs/pkgs/applications/editors/yi/wrapper.nix index 100e64fc1975..fe5fcc1724b4 100644 --- a/nixpkgs/pkgs/applications/editors/yi/wrapper.nix +++ b/nixpkgs/pkgs/applications/editors/yi/wrapper.nix @@ -8,7 +8,7 @@ let yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "yi-custom"; version = "0.0.0.1"; dontUnpack = true; diff --git a/nixpkgs/pkgs/applications/gis/saga/default.nix b/nixpkgs/pkgs/applications/gis/saga/default.nix index 1ae1221a330c..feb79f444b81 100644 --- a/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -2,7 +2,7 @@ libharu, opencv, vigra, postgresql, Cocoa, unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "saga"; version = "7.3.0"; diff --git a/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix b/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix index d82bdc665498..4c7f9cde5ce7 100644 --- a/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix +++ b/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, rustPlatform , fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { - name = "whitebox_tools-${version}"; + pname = "whitebox_tools"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index cbd930668f99..654363d36f24 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -19,7 +19,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imagemagick"; inherit (cfg) version; diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 59f471ab4e34..993d4ba7ecdb 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -31,7 +31,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imagemagick"; inherit (cfg) version; diff --git a/nixpkgs/pkgs/applications/graphics/antimony/default.nix b/nixpkgs/pkgs/applications/graphics/antimony/default.nix index 7d800d57b631..3c39aadda98e 100644 --- a/nixpkgs/pkgs/applications/graphics/antimony/default.nix +++ b/nixpkgs/pkgs/applications/graphics/antimony/default.nix @@ -8,7 +8,7 @@ let gitBranch = "develop"; gitTag = "0.9.3"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "antimony"; version = "2018-10-20"; diff --git a/nixpkgs/pkgs/applications/graphics/autotrace/autofig.nix b/nixpkgs/pkgs/applications/graphics/autotrace/autofig.nix index 31ee0ff0d07b..0f53965786b9 100644 --- a/nixpkgs/pkgs/applications/graphics/autotrace/autofig.nix +++ b/nixpkgs/pkgs/applications/graphics/autotrace/autofig.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "autofig-0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix b/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix index 43f8f561e2f1..b827a12f81c8 100644 --- a/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix +++ b/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix @@ -22,7 +22,7 @@ let install -D bin-linux/QtnPEG $out/bin/QtnPEG ''; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "awesomebump"; inherit version; diff --git a/nixpkgs/pkgs/applications/graphics/azpainter/default.nix b/nixpkgs/pkgs/applications/graphics/azpainter/default.nix new file mode 100644 index 000000000000..b2060f5db31e --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/azpainter/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoreconfHook +, libX11, libXext, libXi +, freetype, fontconfig +, libpng, libjpeg +, zlib +}: + +stdenv.mkDerivation rec { + pname = "azpainter"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "Symbian9"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "1hrr9lhsbjyzar3nxvli6cazr7zhyzh0p8hwpg4g9ga6njs8vi8m"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ + libX11 libXext libXi + freetype fontconfig + libpng libjpeg + zlib + ]; + + configureFlags = [ + "--with-freetype-dir=${stdenv.lib.getDev freetype}/include/freetype2" + ]; + + meta = with stdenv.lib; { + description = "Full color painting software for illustration drawing"; + homepage = "https://osdn.net/projects/azpainter"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/c3d/default.nix b/nixpkgs/pkgs/applications/graphics/c3d/default.nix index 4e864d953dfd..ad86e66204b2 100644 --- a/nixpkgs/pkgs/applications/graphics/c3d/default.nix +++ b/nixpkgs/pkgs/applications/graphics/c3d/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, itk, Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "c3d"; version = "2018-10-04"; diff --git a/nixpkgs/pkgs/applications/graphics/dia/default.nix b/nixpkgs/pkgs/applications/graphics/dia/default.nix index b0e32678a141..a1f96337d743 100644 --- a/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -3,7 +3,7 @@ libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, gtk-mac-integration-gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dia"; version = "0.97.3.20170622"; diff --git a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index 5db104f031c4..46bfe64dd030 100644 --- a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, mkDerivation , fetchurl , cmake , extra-cmake-modules @@ -31,7 +32,7 @@ , enableKisTablet ? false # enable improved graphics tablet support }: -with stdenv.lib; +with lib; let commonDeps = [ @@ -57,7 +58,7 @@ let qtx11extras ]; -in stdenv.mkDerivation rec { +in mkDerivation rec { pname = "drawpile"; version = "2.1.11"; diff --git a/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix b/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix index 103f40fc9c70..2762748bc1ad 100644 --- a/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ++ (with perlPackages; [ perl XMLParser ]); meta = { - description = "Simple GTK+2 color selector"; + description = "Simple GTK 2 color selector"; homepage = http://gcolor2.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; diff --git a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index 62e2ebfa4b1e..4275c6f0dcfd 100644 --- a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Lightweight GTK+ based image viewer"; + description = "Lightweight GTK based image viewer"; longDescription = '' - Geeqie is a lightweight GTK+ based image viewer for Unix like + Geeqie is a lightweight GTK based image viewer for Unix like operating systems. It features: EXIF, IPTC and XMP metadata browsing and editing interoperability; easy integration with other software; geeqie works on files and directories, there is no need to diff --git a/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix b/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix index be8885caff1f..9517aa78ee46 100644 --- a/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -1,6 +1,6 @@ { stdenv, graphicsmagick }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "graphicsmagick-imagemagick-compat"; inherit (graphicsmagick) version; diff --git a/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/nixpkgs/pkgs/applications/graphics/imagej/default.nix index 7d5a90130359..6472712bcb40 100644 --- a/nixpkgs/pkgs/applications/graphics/imagej/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imagej/default.nix @@ -7,7 +7,7 @@ # on linux systems, but we here do not attempt to fix it.) let - imagej150 = stdenv.mkDerivation rec { + imagej150 = stdenv.mkDerivation { pname = "imagej"; version = "150"; diff --git a/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix b/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix index 5fdd20825cd5..49868bbd831f 100644 --- a/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libX11, libXinerama, imlib2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imlibsetroot"; version = "1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/imv/default.nix b/nixpkgs/pkgs/applications/graphics/imv/default.nix index 38e536c70cbb..5f06feb7c622 100644 --- a/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -1,27 +1,53 @@ -{ stdenv, fetchFromGitHub, SDL2, SDL2_ttf +{ stdenv, fetchFromGitHub , freeimage, fontconfig, pkgconfig , asciidoc, docbook_xsl, libxslt, cmocka -, librsvg +, librsvg, pango, libxkbcommon, wayland +, libGLU }: stdenv.mkDerivation rec { pname = "imv"; - version = "3.1.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "eXeC64"; repo = "imv"; rev = "v${version}"; - sha256 = "0gg362x2f7hli6cr6s7dmlanh4cqk7fd2pmk4zs9438jvqklf4cl"; + sha256 = "sha256:01fbkbwwsyr00k3mwans8jfb9p4gl02v6z62vgx0pkgrzxjkcz07"; }; + preBuild = '' + # Version is 4.0.1, but Makefile was not updated + sed -i 's/echo v4\.0\.0/echo v4.0.1/' Makefile + ''; + + nativeBuildInputs = [ + asciidoc + cmocka + docbook_xsl + libxslt + ]; + buildInputs = [ - SDL2 SDL2_ttf freeimage fontconfig pkgconfig - asciidoc docbook_xsl libxslt cmocka librsvg + freeimage + libGLU + librsvg + libxkbcommon + pango + pkgconfig + wayland ]; installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ]; + postFixup = '' + # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, + # so we have to fix those to the binaries we installed into the /nix/store + + sed -i "s|\bimv-wayland\b|$out/bin/imv-wayland|" $out/bin/imv + sed -i "s|\bimv-x11\b|$out/bin/imv-x11|" $out/bin/imv + ''; + doCheck = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 1729f3c5cdab..547e2914399b 100644 --- a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -3,6 +3,7 @@ , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme +, librsvg, wrapGAppsHook }: let @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ] + nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ] ++ (with perlPackages; [ perl XMLParser ]); buildInputs = [ libXft libpng zlib popt boehmgc @@ -48,6 +49,8 @@ stdenv.mkDerivation rec { gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif potrace hicolor-icon-theme + librsvg # for loading icons + python2Env perlPackages.perl ]; diff --git a/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix b/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix index b5664d51a144..97c15d2eec09 100644 --- a/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jpeg-archive"; version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15 diff --git a/nixpkgs/pkgs/applications/graphics/mcomix/default.nix b/nixpkgs/pkgs/applications/graphics/mcomix/default.nix index eea0e501cb8e..7ae5286f7622 100644 --- a/nixpkgs/pkgs/applications/graphics/mcomix/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mcomix/default.nix @@ -19,7 +19,7 @@ python27Packages.buildPythonApplication rec { MComix is an user-friendly, customizable image viewer. It is specifically designed to handle comic books, but also serves as a generic viewer. It reads images in ZIP, RAR, 7Zip or tar archives as well as plain image - files. It is written in Python and uses GTK+ through the PyGTK bindings, + files. It is written in Python and uses GTK through the PyGTK bindings, and runs on both Linux and Windows. MComix is a fork of the Comix project, and aims to add bug fixes and diff --git a/nixpkgs/pkgs/applications/graphics/meh/default.nix b/nixpkgs/pkgs/applications/graphics/meh/default.nix index c25c1277ee0b..7ad8c388a203 100644 --- a/nixpkgs/pkgs/applications/graphics/meh/default.nix +++ b/nixpkgs/pkgs/applications/graphics/meh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "meh-unstable-2015-04-11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix b/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix index 8a2a218d9891..7274bdacd9d0 100644 --- a/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ]; meta = { - description = "A simple GTK+1/2 painting program"; + description = "A simple GTK painting program"; longDescription = '' - mtPaint is a simple GTK+1/2 painting program designed for + mtPaint is a simple GTK painting program designed for creating icons and pixel based artwork. It can edit indexed palette or 24 bit RGB images and offers basic painting and palette manipulation tools. It also has several other more powerful features such as channels, diff --git a/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix index 5ad5ab6acc61..1b51732b918c 100644 --- a/nixpkgs/pkgs/applications/graphics/mypaint/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix @@ -3,7 +3,7 @@ let inherit (python2Packages) python pycairo pygobject3 numpy; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "mypaint"; version = "1.2.1"; diff --git a/nixpkgs/pkgs/applications/graphics/pbrt/default.nix b/nixpkgs/pkgs/applications/graphics/pbrt/default.nix index a0aaed49c9c0..78f6d8bcbaff 100644 --- a/nixpkgs/pkgs/applications/graphics/pbrt/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pbrt/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-08-15"; pname = "pbrt-v3"; diff --git a/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index c1b2beadcd53..7b1077d18a9d 100644 --- a/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "11q57j3wzmy2glkv53i9n7jkp14x4bqm20f3rqs3gkm4j9bcas4y"; + sha256 = "0inlwrpv5zkcv48g5gq1xdrvd7w1zkhf8p57fpr2cpd7hd3am7n8"; }; - modSha256 = "0cz4gs88s9z2yv1gc9ap92vv2j93ab6kr25zjgl2r7z6clbl5fzp"; + modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs"; subPackages = [ "cmd/pdfcpu" ]; diff --git a/nixpkgs/pkgs/applications/graphics/photivo/default.nix b/nixpkgs/pkgs/applications/graphics/photivo/default.nix index 6bd2fa98b1bb..09b5bd378397 100644 --- a/nixpkgs/pkgs/applications/graphics/photivo/default.nix +++ b/nixpkgs/pkgs/applications/graphics/photivo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "photivo-2014-01-25"; src = fetchhg { diff --git a/nixpkgs/pkgs/applications/graphics/scantailor/default.nix b/nixpkgs/pkgs/applications/graphics/scantailor/default.nix index 395179ff70ae..14efe48f30db 100644 --- a/nixpkgs/pkgs/applications/graphics/scantailor/default.nix +++ b/nixpkgs/pkgs/applications/graphics/scantailor/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "scantailor-0.9.12.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/shutter/default.nix b/nixpkgs/pkgs/applications/graphics/shutter/default.nix index 527a21f93fe3..957692b4ba17 100644 --- a/nixpkgs/pkgs/applications/graphics/shutter/default.nix +++ b/nixpkgs/pkgs/applications/graphics/shutter/default.nix @@ -13,7 +13,7 @@ let EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "shutter-0.94.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix b/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix index 34294d271292..188f7cb29343 100644 --- a/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix +++ b/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix @@ -6,7 +6,7 @@ let version = "1.0.2"; - ETL = stdenv.mkDerivation rec { + ETL = stdenv.mkDerivation { name = "ETL-0.04.19"; src = fetchFromGitHub { @@ -21,7 +21,7 @@ let nativeBuildInputs = [ autoreconfHook ]; }; - synfig = stdenv.mkDerivation rec { + synfig = stdenv.mkDerivation { pname = "synfig"; inherit version; @@ -47,7 +47,7 @@ let meta.broken = true; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "synfigstudio"; inherit version; diff --git a/nixpkgs/pkgs/applications/graphics/ufraw/default.nix b/nixpkgs/pkgs/applications/graphics/ufraw/default.nix index 39b4640dc431..131d83f0d58e 100644 --- a/nixpkgs/pkgs/applications/graphics/ufraw/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ufraw/default.nix @@ -24,7 +24,7 @@ assert withGimpPlugin -> gimp != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ufraw"; version = "unstable-2019-06-12"; diff --git a/nixpkgs/pkgs/applications/kde/default.nix b/nixpkgs/pkgs/applications/kde/default.nix index 6027d8daa9d4..9b146aa50364 100644 --- a/nixpkgs/pkgs/applications/kde/default.nix +++ b/nixpkgs/pkgs/applications/kde/default.nix @@ -38,7 +38,7 @@ let let inherit (args) name; sname = args.sname or name; - inherit (srcs."${sname}") src version; + inherit (srcs.${sname}) src version; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; in @@ -129,6 +129,7 @@ let kmix = callPackage ./kmix.nix {}; kmplot = callPackage ./kmplot.nix {}; knotes = callPackage ./knotes.nix {}; + kolf = callPackage ./kolf.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; diff --git a/nixpkgs/pkgs/applications/kde/fetch.sh b/nixpkgs/pkgs/applications/kde/fetch.sh index 5c72e78c5820..ee19f5cebfe2 100644 --- a/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.08.1/ ) diff --git a/nixpkgs/pkgs/applications/kde/kolf.nix b/nixpkgs/pkgs/applications/kde/kolf.nix new file mode 100644 index 000000000000..f9fa31b665b2 --- /dev/null +++ b/nixpkgs/pkgs/applications/kde/kolf.nix @@ -0,0 +1,16 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, libkdegames, kconfig, kio, ktextwidgets +}: + +mkDerivation { + name = "kolf"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libkdegames kio ktextwidgets ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; +} diff --git a/nixpkgs/pkgs/applications/kde/srcs.nix b/nixpkgs/pkgs/applications/kde/srcs.nix index fb0581cb3411..9e5346be9cd5 100644 --- a/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/nixpkgs/pkgs/applications/kde/srcs.nix @@ -3,1739 +3,1739 @@ { akonadi = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-19.08.0.tar.xz"; - sha256 = "ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831"; - name = "akonadi-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-19.08.1.tar.xz"; + sha256 = "32233b59c696a5053f2ee4b7368804635a04e2a5f6d3605848eadafa0306c44d"; + name = "akonadi-19.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-19.08.0.tar.xz"; - sha256 = "74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b"; - name = "akonadi-calendar-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-calendar-19.08.1.tar.xz"; + sha256 = "5e8c66d4c86e6458469dbb393458ee8b5e6afc1b4712ce8395709d4226864d6c"; + name = "akonadi-calendar-19.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-tools-19.08.0.tar.xz"; - sha256 = "9620a4418245a74334c6f57db4ba5558825879440aee5903f5614db08f61e976"; - name = "akonadi-calendar-tools-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-calendar-tools-19.08.1.tar.xz"; + sha256 = "033fae40bcbdcfa52981026f783b7cc8fecde384d6683747cd3f307bd43b2570"; + name = "akonadi-calendar-tools-19.08.1.tar.xz"; }; }; akonadiconsole = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadiconsole-19.08.0.tar.xz"; - sha256 = "a683b184109cddbc4d66c55ee3efa2c69092a72e2cd9e78903c4dcf7f442c055"; - name = "akonadiconsole-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadiconsole-19.08.1.tar.xz"; + sha256 = "9a0f88903757eaf0d3271d4438b3a170640b7cb01a7b2f0fbf10a75fa0093184"; + name = "akonadiconsole-19.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-contacts-19.08.0.tar.xz"; - sha256 = "912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4"; - name = "akonadi-contacts-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-contacts-19.08.1.tar.xz"; + sha256 = "f182883b4cc16034a798feb966df268e84d9c5b8d3c6e14d5698f7ead85a21d7"; + name = "akonadi-contacts-19.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-import-wizard-19.08.0.tar.xz"; - sha256 = "e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915"; - name = "akonadi-import-wizard-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-import-wizard-19.08.1.tar.xz"; + sha256 = "d66088ded8917f6034de8981ce71d5d0e1808f6d58f7fdb7e0a806ff0834e27b"; + name = "akonadi-import-wizard-19.08.1.tar.xz"; }; }; akonadi-mime = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-mime-19.08.0.tar.xz"; - sha256 = "32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4"; - name = "akonadi-mime-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-mime-19.08.1.tar.xz"; + sha256 = "0a4f4652a665229b290431adb59940890effba0804fe33a0e79a24322f90b35c"; + name = "akonadi-mime-19.08.1.tar.xz"; }; }; akonadi-notes = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-notes-19.08.0.tar.xz"; - sha256 = "26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3"; - name = "akonadi-notes-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-notes-19.08.1.tar.xz"; + sha256 = "44896f17fc2f625f9fc8c77690acd787291c5e08e8261c5d113c94045bd5bdd8"; + name = "akonadi-notes-19.08.1.tar.xz"; }; }; akonadi-search = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-search-19.08.0.tar.xz"; - sha256 = "fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0"; - name = "akonadi-search-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-search-19.08.1.tar.xz"; + sha256 = "c68387f3452bcd390f1c99549531c72d95db0def29d8ba10330e68891b0d0b53"; + name = "akonadi-search-19.08.1.tar.xz"; }; }; akregator = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akregator-19.08.0.tar.xz"; - sha256 = "d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820"; - name = "akregator-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akregator-19.08.1.tar.xz"; + sha256 = "b73fcf1c509398ff496864f0105491792b5b15f37c52f9a8ca74ca254a75494a"; + name = "akregator-19.08.1.tar.xz"; }; }; analitza = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/analitza-19.08.0.tar.xz"; - sha256 = "516f29f089be92fecf5e17dcf466a9daf8525ec9e594f52f04338603914c2003"; - name = "analitza-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/analitza-19.08.1.tar.xz"; + sha256 = "f963a8abe31d4c0d2b0e0a7e78ec78ced8eb7a0af60df1620ccc2f2409df6a91"; + name = "analitza-19.08.1.tar.xz"; }; }; ark = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ark-19.08.0.tar.xz"; - sha256 = "0685285486ca933e3467f35c3d5d4e8633ae80f1e5529f8a4d8257d0b53d9512"; - name = "ark-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ark-19.08.1.tar.xz"; + sha256 = "b5638bc4559d775d0a0c2aee022cadc021543bf92e8be6b9b803c50e7e7f1835"; + name = "ark-19.08.1.tar.xz"; }; }; artikulate = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/artikulate-19.08.0.tar.xz"; - sha256 = "40f1ecb2e6d0d2e8bb1c86d64935c9f2411e0e72781e3211ed0014a02acd72ba"; - name = "artikulate-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/artikulate-19.08.1.tar.xz"; + sha256 = "856488a4914ae0cfa594106b4d5c7b5ffd996b009075dfa009ab9cdd2cbc2f9d"; + name = "artikulate-19.08.1.tar.xz"; }; }; audiocd-kio = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/audiocd-kio-19.08.0.tar.xz"; - sha256 = "46013e95fa358004083c185d43afe48b96bd18acba1a33e5706f75b128a3e954"; - name = "audiocd-kio-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/audiocd-kio-19.08.1.tar.xz"; + sha256 = "e072ed20f07fe246267b3e7c459812fe63d94125a1d2fbcda1c0403e9fe0a520"; + name = "audiocd-kio-19.08.1.tar.xz"; }; }; baloo-widgets = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/baloo-widgets-19.08.0.tar.xz"; - sha256 = "3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008"; - name = "baloo-widgets-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/baloo-widgets-19.08.1.tar.xz"; + sha256 = "83429a70de735edc4714dc1b6f1a5a8c7d3d68a93165e98d2cadeecafa82af7b"; + name = "baloo-widgets-19.08.1.tar.xz"; }; }; blinken = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/blinken-19.08.0.tar.xz"; - sha256 = "9b993586d8ddab3821b1b4f805cd8b6603822faca93402d42775bea2eb346971"; - name = "blinken-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/blinken-19.08.1.tar.xz"; + sha256 = "dbe7b13bc6cad69f049f9eefa56f99012bc0906233193bf951477b3f5c8eb87e"; + name = "blinken-19.08.1.tar.xz"; }; }; bomber = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/bomber-19.08.0.tar.xz"; - sha256 = "5274f8ef6cd94fcbd887220d6c7b08c1f71050c601d14cf53d847f41f254e043"; - name = "bomber-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/bomber-19.08.1.tar.xz"; + sha256 = "750110da07a1e316e2a55d043a0e988c91e6e57866b941a5cce1b6f569096f4f"; + name = "bomber-19.08.1.tar.xz"; }; }; bovo = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/bovo-19.08.0.tar.xz"; - sha256 = "829ecfe3a46bc1c009fea14c5860aa17ea18f36ed33fdc9296c499992aeed466"; - name = "bovo-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/bovo-19.08.1.tar.xz"; + sha256 = "0d923b6b0eaf2ffd7a1eca833d1f110cc6fdaade3b11d07e8fa53a244a778658"; + name = "bovo-19.08.1.tar.xz"; }; }; calendarsupport = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/calendarsupport-19.08.0.tar.xz"; - sha256 = "af590cf5443c1205a8bd59d00c430bbdf65a185a36ed36e92e6ef78bba8551e4"; - name = "calendarsupport-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/calendarsupport-19.08.1.tar.xz"; + sha256 = "74d1b19a924f2aad7f5a034a7e3b11f2ed5bb94cd21458f0255a64ac6163de97"; + name = "calendarsupport-19.08.1.tar.xz"; }; }; cantor = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/cantor-19.08.0.tar.xz"; - sha256 = "b1d1a735e83ca03d51b79f1fc59612153e94b274d716d65ff3fa94ffdd2f3adc"; - name = "cantor-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/cantor-19.08.1.tar.xz"; + sha256 = "93b43426c3383718e6ff7b62f073e3c39371a519b98e890c2b7c15cb5086c039"; + name = "cantor-19.08.1.tar.xz"; }; }; cervisia = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/cervisia-19.08.0.tar.xz"; - sha256 = "a72c3a7bad3b30a466d6793318248329d7ddb1a0e00c832744b628a9eb8b8257"; - name = "cervisia-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/cervisia-19.08.1.tar.xz"; + sha256 = "726c8d4bd942280e08891e15e47d0a0a88ee951addb3c10e1e9955fad2794b7f"; + name = "cervisia-19.08.1.tar.xz"; }; }; dolphin = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/dolphin-19.08.0.tar.xz"; - sha256 = "fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0"; - name = "dolphin-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/dolphin-19.08.1.tar.xz"; + sha256 = "a612dac0cf50301af46ad5fa29aad630bb33a8a4bd416a4d6023b65fb00f25cc"; + name = "dolphin-19.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/dolphin-plugins-19.08.0.tar.xz"; - sha256 = "f074aa7151f4b4d9202d90257952638652a1bf09d02699762f346d85b61c5f54"; - name = "dolphin-plugins-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/dolphin-plugins-19.08.1.tar.xz"; + sha256 = "ce2452d9f878dfcff45739ff9eb4a3bde69c449c36182dee6b768f362e75ae2e"; + name = "dolphin-plugins-19.08.1.tar.xz"; }; }; dragon = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/dragon-19.08.0.tar.xz"; - sha256 = "3d792f6dfd4a5d8ad7726fa942840ebed2b2bb6f25ec6f68883b83859c21cacc"; - name = "dragon-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/dragon-19.08.1.tar.xz"; + sha256 = "b015dbba4b8278a4987164f12a9d9e42745d2eb1772da8b8b0c849b28ba03c90"; + name = "dragon-19.08.1.tar.xz"; }; }; eventviews = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/eventviews-19.08.0.tar.xz"; - sha256 = "2f7713173b3820800d7927aff64eb7bcc84c643d9da43adbe6560cb842081295"; - name = "eventviews-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/eventviews-19.08.1.tar.xz"; + sha256 = "a44d82e774017171f2eef3ef94b3c5b2765ce08fab5eec0a87b286fd5ea815f7"; + name = "eventviews-19.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ffmpegthumbs-19.08.0.tar.xz"; - sha256 = "13f5f8b40c0f6146cdd4d1d9e6a7b7dd19cda9650fe08f9731c050e58f11efee"; - name = "ffmpegthumbs-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ffmpegthumbs-19.08.1.tar.xz"; + sha256 = "527ef798db833e71e2faf315fc89596716bd2bd7d11c78bc1bb2ef9b1549a71b"; + name = "ffmpegthumbs-19.08.1.tar.xz"; }; }; filelight = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/filelight-19.08.0.tar.xz"; - sha256 = "bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6"; - name = "filelight-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/filelight-19.08.1.tar.xz"; + sha256 = "170e633e0d2f8c9b13cccfd5957590100be435f9e7258e84c6f15fabc636768e"; + name = "filelight-19.08.1.tar.xz"; }; }; granatier = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/granatier-19.08.0.tar.xz"; - sha256 = "b61bf45df63dc3fb324e1a74ec84ae4f2d58371af88ccd28593b0716673dc00a"; - name = "granatier-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/granatier-19.08.1.tar.xz"; + sha256 = "3015a25f961ae3d746db2814a322bfb204e4e39cd95145fbf2aa819f1dc0417e"; + name = "granatier-19.08.1.tar.xz"; }; }; grantlee-editor = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/grantlee-editor-19.08.0.tar.xz"; - sha256 = "00a7d07aeffc35ac6e3dd39434194ba35c855a603cdc6eca0ece5b00ae1e0e30"; - name = "grantlee-editor-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/grantlee-editor-19.08.1.tar.xz"; + sha256 = "77661ac1d125349cd3439d130164ad172f0022376d6c6038c860c0440939e52c"; + name = "grantlee-editor-19.08.1.tar.xz"; }; }; grantleetheme = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/grantleetheme-19.08.0.tar.xz"; - sha256 = "c966ad7ef55a784c8cf97a69d4885b9b9d7956c84a4e323404e5cf88154cc543"; - name = "grantleetheme-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/grantleetheme-19.08.1.tar.xz"; + sha256 = "61ec8f4902573727d5a292ba55c3663b267d3b1b8017c003ac3445164c2627cb"; + name = "grantleetheme-19.08.1.tar.xz"; }; }; gwenview = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/gwenview-19.08.0.tar.xz"; - sha256 = "1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3"; - name = "gwenview-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/gwenview-19.08.1.tar.xz"; + sha256 = "1ed46507ea30c43e4672b51996ac413683a863978999be91a9df135f9369f3cb"; + name = "gwenview-19.08.1.tar.xz"; }; }; incidenceeditor = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/incidenceeditor-19.08.0.tar.xz"; - sha256 = "43915613a5db71847be425bc4434c0e04f5410b3575cea3141ffcd99b2cdb9ea"; - name = "incidenceeditor-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/incidenceeditor-19.08.1.tar.xz"; + sha256 = "591781da9b3bc4b0f366ffa8de658aa31f48e1f435a434669b7c11b5f3a55403"; + name = "incidenceeditor-19.08.1.tar.xz"; }; }; juk = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/juk-19.08.0.tar.xz"; - sha256 = "d2549c709f8934a5306a16e3a1e2b9e057ead54dc85efe17009e7aacd395edd0"; - name = "juk-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/juk-19.08.1.tar.xz"; + sha256 = "f91de1fa697fba3fe73a086b0f3c254959fbceb769d3752353ee2078b86611f9"; + name = "juk-19.08.1.tar.xz"; }; }; k3b = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/k3b-19.08.0.tar.xz"; - sha256 = "6a740724945496395cea1b5850ea9567a9aa9cc8a28c5366c9709b4226dc4b10"; - name = "k3b-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/k3b-19.08.1.tar.xz"; + sha256 = "8995f39457932fb6597f0f6124e0dfe09ecb2a25a6ec8506ce3ef870da293749"; + name = "k3b-19.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kaccounts-integration-19.08.0.tar.xz"; - sha256 = "b6602a1270037c8c9dc366e3bf6ddf6d7dcd14ca66623e3ecc6641fd474c0d2a"; - name = "kaccounts-integration-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kaccounts-integration-19.08.1.tar.xz"; + sha256 = "7436bb0c8e024122d7137971749ef975878dee557befa4b95bc02ce0801a8450"; + name = "kaccounts-integration-19.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kaccounts-providers-19.08.0.tar.xz"; - sha256 = "9fc235e2140e76e4b95589a8a5b1e98f7aac00f4c9ad8ba774be0d0d360df8c3"; - name = "kaccounts-providers-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kaccounts-providers-19.08.1.tar.xz"; + sha256 = "ce885be3c0d59b7f65373fbadc8ff4510998f9067d3a7c96dc1eb05df78b071b"; + name = "kaccounts-providers-19.08.1.tar.xz"; }; }; kaddressbook = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kaddressbook-19.08.0.tar.xz"; - sha256 = "9639047be5c5ea245844831e315fa0f0baca40d243f611a98bbab3503af127cf"; - name = "kaddressbook-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kaddressbook-19.08.1.tar.xz"; + sha256 = "8091a3bd77ec17757386d71a98a0ef2b6d68e35ca2f9f9b71e4e36c2a3cce5c9"; + name = "kaddressbook-19.08.1.tar.xz"; }; }; kajongg = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kajongg-19.08.0.tar.xz"; - sha256 = "0f522477939de09d4d56d2947fb02b0f20ca0cbac4d21326a9477e11fc173244"; - name = "kajongg-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kajongg-19.08.1.tar.xz"; + sha256 = "ae40b7ceb7c591f8d92371e3c7584eeae0d84e4680927834eca7ffacd5b9bbf6"; + name = "kajongg-19.08.1.tar.xz"; }; }; kalarm = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kalarm-19.08.0.tar.xz"; - sha256 = "e0ddabb2abfc2d593ec88864179c30eda219f7db4c25b7fc9951ac3b388eee84"; - name = "kalarm-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kalarm-19.08.1.tar.xz"; + sha256 = "9eb7c6b160e82ae8d5d294ebd781ef2ac5579e556a564c70598c08925e2021fa"; + name = "kalarm-19.08.1.tar.xz"; }; }; kalarmcal = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kalarmcal-19.08.0.tar.xz"; - sha256 = "5f764d58716e7d271fac4cb3a4df6ab157014533782c47c38bacab59ca669419"; - name = "kalarmcal-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kalarmcal-19.08.1.tar.xz"; + sha256 = "add9ee09287491236c9a25cfcb32d437845d094d8fef3682954f561dc2917984"; + name = "kalarmcal-19.08.1.tar.xz"; }; }; kalgebra = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kalgebra-19.08.0.tar.xz"; - sha256 = "b875b2bfe985e5c595f60fbb146fb4545c34321bb86f7fc04164a23f0bb3e9eb"; - name = "kalgebra-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kalgebra-19.08.1.tar.xz"; + sha256 = "c9859e0b2b847652007a3244bc658f7e160fe88fc70ea7da6e60f003f54f46c9"; + name = "kalgebra-19.08.1.tar.xz"; }; }; kalzium = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kalzium-19.08.0.tar.xz"; - sha256 = "0dac199871b8d01890b8959cd5c4776eb2f938f7fb4a558b23364f9dd8e15111"; - name = "kalzium-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kalzium-19.08.1.tar.xz"; + sha256 = "2519866172476bec297e9d02ff917b1c676b980edc2f20a9c3297bc255e045f0"; + name = "kalzium-19.08.1.tar.xz"; }; }; kamera = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kamera-19.08.0.tar.xz"; - sha256 = "f287f1db119946d2e62d4ccd52a66671343042563cc87da246f2692fa1b775c6"; - name = "kamera-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kamera-19.08.1.tar.xz"; + sha256 = "109a030ef55b941758e8d4a58b2abed4c5e1bb7e13e8d239b7132867c801acf5"; + name = "kamera-19.08.1.tar.xz"; }; }; kamoso = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kamoso-19.08.0.tar.xz"; - sha256 = "2aa8765f71109e813836dced26994a953973ef6f4d517ab224691f2342d64129"; - name = "kamoso-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kamoso-19.08.1.tar.xz"; + sha256 = "76d7a9ea70646f8e86e912b72bd9f9ab42711f0cd53c7bed1403a274de036675"; + name = "kamoso-19.08.1.tar.xz"; }; }; kanagram = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kanagram-19.08.0.tar.xz"; - sha256 = "4f4ccf9cf48711d8fe9a5966294ba16b43092b8df3fdb03b5c236d22157d275c"; - name = "kanagram-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kanagram-19.08.1.tar.xz"; + sha256 = "85ba60dc1485f61054847262832edd112224a618effe8759a2dcc8ee73b130a6"; + name = "kanagram-19.08.1.tar.xz"; }; }; kapman = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kapman-19.08.0.tar.xz"; - sha256 = "e0e53e60e7af1f0002343969b2ce0ce47e0cd3d7318b44d2827478291c2a9cd4"; - name = "kapman-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kapman-19.08.1.tar.xz"; + sha256 = "e80057b4fa9b8af86ecae30871005d4c7508bbc99618cf36dcf1c9c7fa905321"; + name = "kapman-19.08.1.tar.xz"; }; }; kapptemplate = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kapptemplate-19.08.0.tar.xz"; - sha256 = "a25170f3527e85bea9509fe5cb991544c0a1dab8f7025c71fd5b0d4c82d9e169"; - name = "kapptemplate-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kapptemplate-19.08.1.tar.xz"; + sha256 = "c1e5d239ce3749e72bcce30dfc8c0a12c3d347b72a2566caa0d23dcc930499a2"; + name = "kapptemplate-19.08.1.tar.xz"; }; }; kate = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kate-19.08.0.tar.xz"; - sha256 = "6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878"; - name = "kate-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kate-19.08.1.tar.xz"; + sha256 = "5389e1620a7eb8d7bab7396ee0db1a886fbdd44c8415291db6a917e89dcc77b7"; + name = "kate-19.08.1.tar.xz"; }; }; katomic = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/katomic-19.08.0.tar.xz"; - sha256 = "12b2a0e703312159a8a217ddb5e19c9a9bea1825d668dd4377fe8e52101f3c90"; - name = "katomic-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/katomic-19.08.1.tar.xz"; + sha256 = "05453f2a1cba1a9bb7c558e9628361685d9b9b44fc4d65599eb05fec6ca3bd5d"; + name = "katomic-19.08.1.tar.xz"; }; }; kbackup = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kbackup-19.08.0.tar.xz"; - sha256 = "2cd447ef7d53e7ee55868086e7a894f550fd81515cf5d87d0561520f45145127"; - name = "kbackup-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kbackup-19.08.1.tar.xz"; + sha256 = "93ec83cdb8cb1ad28f444f85aaec2270fbbf3108b3ce0cf22f42a737e0f9cc59"; + name = "kbackup-19.08.1.tar.xz"; }; }; kblackbox = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kblackbox-19.08.0.tar.xz"; - sha256 = "44907aed2a2a24f57cb5ae0046a857645788d8d7aeb9383187b516c9f519a72c"; - name = "kblackbox-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kblackbox-19.08.1.tar.xz"; + sha256 = "478b235e9498e9c5bf1c3626db651c85cf41bdd824dec484bccd38f6e73ffcc7"; + name = "kblackbox-19.08.1.tar.xz"; }; }; kblocks = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kblocks-19.08.0.tar.xz"; - sha256 = "3337c6fb57fdb8439e6e6edc0186fec76641196714daa955465e009923573b84"; - name = "kblocks-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kblocks-19.08.1.tar.xz"; + sha256 = "15afc3b7083fc1ea08d6caa196d883a6ec7f9603302b5774c7ad97eea833f449"; + name = "kblocks-19.08.1.tar.xz"; }; }; kblog = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kblog-19.08.0.tar.xz"; - sha256 = "15abd5dfd0499633703273823ceddc8e64b52b0217b04bea3d86cb9ac54da189"; - name = "kblog-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kblog-19.08.1.tar.xz"; + sha256 = "e1926ebfb352f6b8c35963fdece240b03be8d3ec094cee46ba694e2869c85cae"; + name = "kblog-19.08.1.tar.xz"; }; }; kbounce = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kbounce-19.08.0.tar.xz"; - sha256 = "3df779542c1d74d63e66a4db86210d75e37939f8f29947851b9c76c347856025"; - name = "kbounce-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kbounce-19.08.1.tar.xz"; + sha256 = "e3d67ab3fac471b07a45abbcd78d02912392ad3f25e9d48b70a050bfda4a5fb0"; + name = "kbounce-19.08.1.tar.xz"; }; }; kbreakout = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kbreakout-19.08.0.tar.xz"; - sha256 = "87748c5bda9b7563531e0b0701ec4a745cd95121b9bd426448e5ed476292fdd4"; - name = "kbreakout-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kbreakout-19.08.1.tar.xz"; + sha256 = "1f086f6794b40c6054f0c00d7fbebecea845f2ee7e7e3253efe33942f4ebe19e"; + name = "kbreakout-19.08.1.tar.xz"; }; }; kbruch = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kbruch-19.08.0.tar.xz"; - sha256 = "29c83039af494703e9d665eca2acde30bb4b94666b3dfe9092833e35f83a9541"; - name = "kbruch-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kbruch-19.08.1.tar.xz"; + sha256 = "74b387e6eafc5fac8b7a75df6f8d61a2b4b0380a82b5c43f3a10c9b75855318f"; + name = "kbruch-19.08.1.tar.xz"; }; }; kcachegrind = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kcachegrind-19.08.0.tar.xz"; - sha256 = "676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b"; - name = "kcachegrind-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kcachegrind-19.08.1.tar.xz"; + sha256 = "e677f82e5527caecb0cdacad3f001665c40ba9e6a542a6a4d91fb898b45026c1"; + name = "kcachegrind-19.08.1.tar.xz"; }; }; kcalc = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kcalc-19.08.0.tar.xz"; - sha256 = "58c26a9698bfc9e0d3a5614ab26c53878e87fc601688ad6c5848fbdbc21c4103"; - name = "kcalc-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kcalc-19.08.1.tar.xz"; + sha256 = "7b3c110a97b851e8db03302484cadc59a59ec8378501ee61dd094ac2c7caa203"; + name = "kcalc-19.08.1.tar.xz"; }; }; kcalcore = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kcalcore-19.08.0.tar.xz"; - sha256 = "7c7bbca70ada8c8317d6d3d91e0357b2b5886328189423e0b7fac1d326f8ed85"; - name = "kcalcore-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kcalcore-19.08.1.tar.xz"; + sha256 = "8c1bbd8e7673907de2c3682cbc1c4fe4a165cbe0b9a2fe399c4b0ae73894228a"; + name = "kcalcore-19.08.1.tar.xz"; }; }; kcalutils = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kcalutils-19.08.0.tar.xz"; - sha256 = "ce0cb6633d7f85fdfa54085710c421f0465b286e9236f55c0297737abdfbaf7e"; - name = "kcalutils-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kcalutils-19.08.1.tar.xz"; + sha256 = "b0f17fd7ced68d03666038ee97e6ca96bd504fc8b7f0ae9b53443cefb57558d7"; + name = "kcalutils-19.08.1.tar.xz"; }; }; kcharselect = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kcharselect-19.08.0.tar.xz"; - sha256 = "31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020"; - name = "kcharselect-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kcharselect-19.08.1.tar.xz"; + sha256 = "8b5c418e9b35a12eeaa1ebf7834f2a13613926e824699e13214fe35276c42457"; + name = "kcharselect-19.08.1.tar.xz"; }; }; kcolorchooser = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kcolorchooser-19.08.0.tar.xz"; - sha256 = "bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb"; - name = "kcolorchooser-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kcolorchooser-19.08.1.tar.xz"; + sha256 = "a36cccbbf5dda16c0d97bff2ce415e678481fee5c2a7640b2c2db2f0ea7c70cb"; + name = "kcolorchooser-19.08.1.tar.xz"; }; }; kcontacts = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kcontacts-19.08.0.tar.xz"; - sha256 = "b245832fe6150a915d3bcbf1ec4c2c37b6aab541b2568f4955dcd76afa1c486e"; - name = "kcontacts-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kcontacts-19.08.1.tar.xz"; + sha256 = "020177eb155d3df44314e89da1824916d125aab48131fce76c2131b40eae8f39"; + name = "kcontacts-19.08.1.tar.xz"; }; }; kcron = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kcron-19.08.0.tar.xz"; - sha256 = "1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c"; - name = "kcron-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kcron-19.08.1.tar.xz"; + sha256 = "e60eb14cb2aef0b0398088930102d68817c96a83c54895af6626693fc18c7ed9"; + name = "kcron-19.08.1.tar.xz"; }; }; kdav = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdav-19.08.0.tar.xz"; - sha256 = "8bfd0657c0eaa74068c7601208baacb9d11bc6574cd353d4d346473c6c43b6f6"; - name = "kdav-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdav-19.08.1.tar.xz"; + sha256 = "38f34f39e165ba3a843acbc9efc3296c111a6bfa8c5ba23e1f55f98860b84d41"; + name = "kdav-19.08.1.tar.xz"; }; }; kdebugsettings = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdebugsettings-19.08.0.tar.xz"; - sha256 = "b47987cabffe464c21c96b31991643efafc24f77d31b768ed9dff075567aa361"; - name = "kdebugsettings-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdebugsettings-19.08.1.tar.xz"; + sha256 = "4195a000558b56d849eb6e79880c5140fc30cd8b0657d4a9932035434f4c2649"; + name = "kdebugsettings-19.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kde-dev-scripts-19.08.0.tar.xz"; - sha256 = "8028d1f5390f608974235123a7c14342fb0c247456e6088d4f16797875efdf18"; - name = "kde-dev-scripts-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kde-dev-scripts-19.08.1.tar.xz"; + sha256 = "36af795eaa175f142556949fa4cc678a6d3fdad3607d169877d94bea785850d1"; + name = "kde-dev-scripts-19.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kde-dev-utils-19.08.0.tar.xz"; - sha256 = "fc95211b92fa76e53558111d5cd64227f194df15fb13f2d81c809facd796f2c5"; - name = "kde-dev-utils-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kde-dev-utils-19.08.1.tar.xz"; + sha256 = "c529bb33dbd3b80e5c4737c3be0d17e88901ece48d3b19e61c8c14adab60177c"; + name = "kde-dev-utils-19.08.1.tar.xz"; }; }; kdeedu-data = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdeedu-data-19.08.0.tar.xz"; - sha256 = "658063227b9d4d7e4e238038ffa9c76e5c5f3015c923967477f514b063940eb0"; - name = "kdeedu-data-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdeedu-data-19.08.1.tar.xz"; + sha256 = "107dff744219210c732aa007d97c8c8d8e87cff5cd446d987b8ac2600ea1f1b7"; + name = "kdeedu-data-19.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-mobipocket-19.08.0.tar.xz"; - sha256 = "28c6566f32855a43d10829070cc47d0f4c879ca89eb3228ea6274d0f32fa90fe"; - name = "kdegraphics-mobipocket-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdegraphics-mobipocket-19.08.1.tar.xz"; + sha256 = "b1760e3a22869715881f571c0bc79c1b91876e41f508a5ba53659be774a6628c"; + name = "kdegraphics-mobipocket-19.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-thumbnailers-19.08.0.tar.xz"; - sha256 = "127a99fffdaee3772b03a6c197357311ec56047caccce967f0d74b5489722ddf"; - name = "kdegraphics-thumbnailers-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdegraphics-thumbnailers-19.08.1.tar.xz"; + sha256 = "86a81ff786168778cbe0ad7c185320dbf052b1df2e6269f14323df04b48ed2ff"; + name = "kdegraphics-thumbnailers-19.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdenetwork-filesharing-19.08.0.tar.xz"; - sha256 = "a7e2e7d79c7e6486e2d2efe8f85e2be2f6231ca5e4e49e2bd332befb9d6d4288"; - name = "kdenetwork-filesharing-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdenetwork-filesharing-19.08.1.tar.xz"; + sha256 = "b7d229d06926ad53dcffd4508fde70060260a03cdfc6b59551f5ea551274bdac"; + name = "kdenetwork-filesharing-19.08.1.tar.xz"; }; }; kdenlive = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdenlive-19.08.0.tar.xz"; - sha256 = "01b60bf58f6818a5ca9aa6e7a79111965700e6948da0bc0edd1184c26fd872e4"; - name = "kdenlive-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdenlive-19.08.1.tar.xz"; + sha256 = "0d19c0d24e16518fd3b57eddffeb7d004723942889bd62e869749f02a1dcc036"; + name = "kdenlive-19.08.1.tar.xz"; }; }; kdepim-addons = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdepim-addons-19.08.0.tar.xz"; - sha256 = "8eb692f9dcb86fec2ec207f719c774492df222fceab2ccc2bdf530cb57aa1c3e"; - name = "kdepim-addons-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdepim-addons-19.08.1.tar.xz"; + sha256 = "eff8e21ae66bf99a33c946886e7d84f5d717b123b06f86e891c9528858b9ec32"; + name = "kdepim-addons-19.08.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdepim-apps-libs-19.08.0.tar.xz"; - sha256 = "2a19e9b0c3b6b2fecaeb4054bf101170056b8c9e831e45fb796b59666f103f2e"; - name = "kdepim-apps-libs-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdepim-apps-libs-19.08.1.tar.xz"; + sha256 = "40a265cde8770a3fd6181b656da49d460dc67ed06d175067da0092116cd9862e"; + name = "kdepim-apps-libs-19.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdepim-runtime-19.08.0.tar.xz"; - sha256 = "634419978329902a1877810d87d4ddae8cb07adbabbfa4540b521689d8bc85ef"; - name = "kdepim-runtime-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdepim-runtime-19.08.1.tar.xz"; + sha256 = "d7dd6c0108f6c7a37dc1ac0d7b9449664c76ecd3ca4f303f3a1b214862a4b20e"; + name = "kdepim-runtime-19.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdesdk-kioslaves-19.08.0.tar.xz"; - sha256 = "cb49f23038d6841ea3a08f840328372aaee53dd915ab5a923753a4a899199ae0"; - name = "kdesdk-kioslaves-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdesdk-kioslaves-19.08.1.tar.xz"; + sha256 = "4bf6d32a33f53b7668313d0e5be81568934b8309f86c9554b25e9346344b2051"; + name = "kdesdk-kioslaves-19.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdesdk-thumbnailers-19.08.0.tar.xz"; - sha256 = "e640f1a484482f6dd4ba4ebda92832a027a20e64e1e12d2306bd7dd618b36356"; - name = "kdesdk-thumbnailers-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdesdk-thumbnailers-19.08.1.tar.xz"; + sha256 = "3da4aa540435fbc848bfc4f1b39f37145072e0856da31b4f5ac3d89719308f03"; + name = "kdesdk-thumbnailers-19.08.1.tar.xz"; }; }; kdf = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdf-19.08.0.tar.xz"; - sha256 = "e6effd6aaf08c9bfa649b194313e7719b65a9d53f00570e14d2752ce68d13bfe"; - name = "kdf-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdf-19.08.1.tar.xz"; + sha256 = "2aedb0a4f64d2417728b67e4a289488b59153683d5dd15bca259a64f9c51325e"; + name = "kdf-19.08.1.tar.xz"; }; }; kdialog = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdialog-19.08.0.tar.xz"; - sha256 = "dc60f9ea0c59435b0da37f4bc50716d43ebfb9b9d0b05955c96393e6d06ea687"; - name = "kdialog-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdialog-19.08.1.tar.xz"; + sha256 = "6b2ed8636d50d13104b0029f33b11943d6f7087297ad089d61c76a57d3b425a0"; + name = "kdialog-19.08.1.tar.xz"; }; }; kdiamond = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kdiamond-19.08.0.tar.xz"; - sha256 = "f37d526610fa0579d5be9de19325ed82e14763c997d9ea026dfcf1068bf2428a"; - name = "kdiamond-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kdiamond-19.08.1.tar.xz"; + sha256 = "20280e44742d57508b0a0c4a70f7545bdbacf913300ca35f427801b46c808f8e"; + name = "kdiamond-19.08.1.tar.xz"; }; }; keditbookmarks = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/keditbookmarks-19.08.0.tar.xz"; - sha256 = "98c539e63a0e2bb62680003022d9ea5aececc4aa1c2d19a7b4c4aa3d8999e7ac"; - name = "keditbookmarks-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/keditbookmarks-19.08.1.tar.xz"; + sha256 = "f023c7b3d362c19373e3f886300420488ef53835f753c318f9fd9c0bb7e53a8a"; + name = "keditbookmarks-19.08.1.tar.xz"; }; }; kfind = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kfind-19.08.0.tar.xz"; - sha256 = "25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff"; - name = "kfind-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kfind-19.08.1.tar.xz"; + sha256 = "a4910d5a3f2b918090084c776ca16bf1e9ae47ced0c2e4eb2a3d0071204527de"; + name = "kfind-19.08.1.tar.xz"; }; }; kfloppy = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kfloppy-19.08.0.tar.xz"; - sha256 = "312345286fa1dba2cac782523d95c1e4ed0d7ef272c93c5d7bf2f9d8f635fa82"; - name = "kfloppy-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kfloppy-19.08.1.tar.xz"; + sha256 = "c22864e0dfef37ccb9a5329467b9058a14880e88b54c448b5933b57aa98b021b"; + name = "kfloppy-19.08.1.tar.xz"; }; }; kfourinline = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kfourinline-19.08.0.tar.xz"; - sha256 = "f84ad6a3e0b2ecbb8c8ab7f451e9534f47627d9d90ff21f188df23dfd23ce22e"; - name = "kfourinline-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kfourinline-19.08.1.tar.xz"; + sha256 = "a138908ccb21ab16399edf6a0aa6f95d6197a77dfef9e4ed87c8914ceb8d5b84"; + name = "kfourinline-19.08.1.tar.xz"; }; }; kgeography = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kgeography-19.08.0.tar.xz"; - sha256 = "83eb429851360d848e3e028ef2748a9d66470b8f3dc3bf66fbbfd08b534a7a75"; - name = "kgeography-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kgeography-19.08.1.tar.xz"; + sha256 = "c0c04e902626d52118e81da9fc24fbd87d49d0bcf4ad229f83eef8e4f84fb551"; + name = "kgeography-19.08.1.tar.xz"; }; }; kget = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kget-19.08.0.tar.xz"; - sha256 = "4db589499c8e5fc3cbb5e398054b1292f68fa23ad1798f2bb2065ba56723d06b"; - name = "kget-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kget-19.08.1.tar.xz"; + sha256 = "ecc9cc31f23304baa8c909335db57460460db27fbffb97438c1ed12703c6b9b9"; + name = "kget-19.08.1.tar.xz"; }; }; kgoldrunner = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kgoldrunner-19.08.0.tar.xz"; - sha256 = "db203add309e10902a0e2b770929bf002b22ab78668ea432ecbf4497dfdc06b6"; - name = "kgoldrunner-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kgoldrunner-19.08.1.tar.xz"; + sha256 = "78c284edc000ec3f3f64bcf0d6c92a50f79632804696de676ed149055de7a6f8"; + name = "kgoldrunner-19.08.1.tar.xz"; }; }; kgpg = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kgpg-19.08.0.tar.xz"; - sha256 = "3aa31f524c7f8ab50a86d83066590b98cd4ffbeb94b5a6fb7dadec9fe3072845"; - name = "kgpg-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kgpg-19.08.1.tar.xz"; + sha256 = "441a0bfa58df14bad87f5f446b89113dc20365424f6a87aec30125c9221815c5"; + name = "kgpg-19.08.1.tar.xz"; }; }; khangman = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/khangman-19.08.0.tar.xz"; - sha256 = "ff14cefbd78f047b6250ec3cf4d11e13484f30cc5610616c0a9270008b36f1a1"; - name = "khangman-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/khangman-19.08.1.tar.xz"; + sha256 = "eb95c48baa57475319f456ee1df11b715e7ceb5b1912e2657a2b1f4617bf2b26"; + name = "khangman-19.08.1.tar.xz"; }; }; khelpcenter = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/khelpcenter-19.08.0.tar.xz"; - sha256 = "36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f"; - name = "khelpcenter-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/khelpcenter-19.08.1.tar.xz"; + sha256 = "ae3243fcdc1281937772a091d902adaba0681abe82c222bf7ef895df0899ab63"; + name = "khelpcenter-19.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kidentitymanagement-19.08.0.tar.xz"; - sha256 = "9fe5c473af0d042b482f1d1dac499c1d8227b60a79f1b5678043f0f49f19013d"; - name = "kidentitymanagement-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kidentitymanagement-19.08.1.tar.xz"; + sha256 = "3ff41eddf047fb1074473fd028b22ddd0fb467c062918148305f10c2fd74f42e"; + name = "kidentitymanagement-19.08.1.tar.xz"; }; }; kig = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kig-19.08.0.tar.xz"; - sha256 = "ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee"; - name = "kig-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kig-19.08.1.tar.xz"; + sha256 = "8b073fd0310e62483a548ada000b4230f2b70dec8ab11ac8303bd64961829675"; + name = "kig-19.08.1.tar.xz"; }; }; kigo = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kigo-19.08.0.tar.xz"; - sha256 = "0100195b3289b88b9813e453fc7ec6229a648718a6525bb3e6d0e0c0ead97595"; - name = "kigo-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kigo-19.08.1.tar.xz"; + sha256 = "7afc2e08192d7e7bf17d67e00aebc498e37b40b47ce78cb7cf2d943a5563817b"; + name = "kigo-19.08.1.tar.xz"; }; }; killbots = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/killbots-19.08.0.tar.xz"; - sha256 = "909ce7808251a5d0537e2d35fae944b932973c36035f1c08f3143227e2d5cf4f"; - name = "killbots-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/killbots-19.08.1.tar.xz"; + sha256 = "16fb2338125d342166e630cf589a346a69874ea1da32c0a3c591d6e17241e05e"; + name = "killbots-19.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kimagemapeditor-19.08.0.tar.xz"; - sha256 = "e2c0b75b65176a9ccbdccbae57be90ee8084593a64bee10b133787077affbde9"; - name = "kimagemapeditor-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kimagemapeditor-19.08.1.tar.xz"; + sha256 = "0baa2f3fa5810ab63d08db2d0223af04407bb14e4bda20ad17dbfb6c63f33b3a"; + name = "kimagemapeditor-19.08.1.tar.xz"; }; }; kimap = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kimap-19.08.0.tar.xz"; - sha256 = "d9e3af3e1bb03d929a08287b1a29540915d25dbb6a38d152560302c93e4c5060"; - name = "kimap-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kimap-19.08.1.tar.xz"; + sha256 = "a4fde0c17fcdbc672b8e7ad6ed727e18b6bc2cc3c7f23857a6b1455d99999bbf"; + name = "kimap-19.08.1.tar.xz"; }; }; kio-extras = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kio-extras-19.08.0.tar.xz"; - sha256 = "792a6a6d1ea2457dda10aedc6cefd3518064c8f47c62f9c3c4a508442b83d3cd"; - name = "kio-extras-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kio-extras-19.08.1.tar.xz"; + sha256 = "de0ba7f3ce73db34b878cb88e36711d6b31aad57a5a735744330f92920666c52"; + name = "kio-extras-19.08.1.tar.xz"; }; }; kipi-plugins = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kipi-plugins-19.08.0.tar.xz"; - sha256 = "21fb6b997aeeeb462fd83ff90a36597b5c74b5711a837959f1e6cdc9a300c4e9"; - name = "kipi-plugins-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kipi-plugins-19.08.1.tar.xz"; + sha256 = "6cc8fdc47fbfa5d8b4f9aeb4d82b5f1c9779a300cffbc17f8776dcb2ed61f0e4"; + name = "kipi-plugins-19.08.1.tar.xz"; }; }; kirigami-gallery = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kirigami-gallery-19.08.0.tar.xz"; - sha256 = "e32f596c188911336060838c071f7856aba02438b335f107bf057644948cf9d6"; - name = "kirigami-gallery-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kirigami-gallery-19.08.1.tar.xz"; + sha256 = "b981b26fb268448f20077f3e69b3e12f45de91289f5b2026c618cdbff9ec5241"; + name = "kirigami-gallery-19.08.1.tar.xz"; }; }; kiriki = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kiriki-19.08.0.tar.xz"; - sha256 = "42f69734c0268f4c3c4ed0b915318d9570d599c6a0fd8a2a02597f1e31cd50d7"; - name = "kiriki-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kiriki-19.08.1.tar.xz"; + sha256 = "ca22215394b7ea172cd1c5eef301871df2526a321b4f3c6b1aa042d4f15abf7c"; + name = "kiriki-19.08.1.tar.xz"; }; }; kiten = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kiten-19.08.0.tar.xz"; - sha256 = "891ccf6c610099c63045aedccee4d1ac87c5189066fd2763e0743a40b2538b53"; - name = "kiten-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kiten-19.08.1.tar.xz"; + sha256 = "01e963fd76c87a631bb5a4f86bc8be624907571c60368e6bf5bdce55cff6b59a"; + name = "kiten-19.08.1.tar.xz"; }; }; kitinerary = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kitinerary-19.08.0.tar.xz"; - sha256 = "76db853705b87015a934334985c216d11b48e853a3dd31429abb3bc6bd7f52e6"; - name = "kitinerary-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kitinerary-19.08.1.tar.xz"; + sha256 = "f84dafa874c958b335ee80dbe85dce3605b40b83ac9468e6555250da8f480967"; + name = "kitinerary-19.08.1.tar.xz"; }; }; kjumpingcube = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kjumpingcube-19.08.0.tar.xz"; - sha256 = "d72c1164777f27b7711a0b74575ba38a9e34fca45c22915e10e7e792f7c00b33"; - name = "kjumpingcube-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kjumpingcube-19.08.1.tar.xz"; + sha256 = "18c7bc9ab96308a4b874226f92f15da38cbb293372fdae8deec45029d6d31f20"; + name = "kjumpingcube-19.08.1.tar.xz"; }; }; kldap = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kldap-19.08.0.tar.xz"; - sha256 = "4bee7b041aff8e1a76330bde12ab9368176181136be1136c4b0c0b733eb9bc16"; - name = "kldap-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kldap-19.08.1.tar.xz"; + sha256 = "b6fb822df67449870fb5c0bfe1adb1bd3d44535e3f2186ef6be286e4a590bd54"; + name = "kldap-19.08.1.tar.xz"; }; }; kleopatra = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kleopatra-19.08.0.tar.xz"; - sha256 = "161e6f7cf39aadfc856446642bf4c95c97b21647ba90698b17ab557e9c9e70ef"; - name = "kleopatra-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kleopatra-19.08.1.tar.xz"; + sha256 = "ef63fbe1a24a24b8c6b491fe19e0bebd9518a2e1340a9dfee7215eb3740369c7"; + name = "kleopatra-19.08.1.tar.xz"; }; }; klettres = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/klettres-19.08.0.tar.xz"; - sha256 = "0a680ff0c2c3868a2478da0e2a5eb8db8579e5ba9165743c8a2c20704c062be4"; - name = "klettres-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/klettres-19.08.1.tar.xz"; + sha256 = "9d9616e35f2b82e39916b89a049bee4faca5a4235eb22989c9e8485c7e75239b"; + name = "klettres-19.08.1.tar.xz"; }; }; klickety = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/klickety-19.08.0.tar.xz"; - sha256 = "aad8c7b9e4c07ca8bd64beae71330e51d45dcaa9929a9ce56b7c675fc9e583f0"; - name = "klickety-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/klickety-19.08.1.tar.xz"; + sha256 = "cb12f79123e96920b323e752b057f21942aba0844d79e310ad343bda0108b273"; + name = "klickety-19.08.1.tar.xz"; }; }; klines = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/klines-19.08.0.tar.xz"; - sha256 = "c49ff3c4bb1612d5699c4a3b0613c6599cf23c0baa79806b8616dbea757d48f8"; - name = "klines-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/klines-19.08.1.tar.xz"; + sha256 = "e8ac5d344c6b9e6d8a9fa9a0fe7da5ebdceec049fbdc8ff476604a0760877aab"; + name = "klines-19.08.1.tar.xz"; }; }; kmag = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmag-19.08.0.tar.xz"; - sha256 = "7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4"; - name = "kmag-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmag-19.08.1.tar.xz"; + sha256 = "28504935665df18246cc6db4288dc2b33f24ed7114007df008f4310ce8792ceb"; + name = "kmag-19.08.1.tar.xz"; }; }; kmahjongg = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmahjongg-19.08.0.tar.xz"; - sha256 = "f601963d0670639a11c4100ed1f53a0e308f79ddf98e1b4fc6a0a4674e117f22"; - name = "kmahjongg-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmahjongg-19.08.1.tar.xz"; + sha256 = "621e30ce5d76ab9f8736cfe13a076501c8822d7d1402d195bfe12c21ffa507c3"; + name = "kmahjongg-19.08.1.tar.xz"; }; }; kmail = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmail-19.08.0.tar.xz"; - sha256 = "052d5b0da402024646673f5e57785b509c328bd5f5ac064f742f9c63e75f3b28"; - name = "kmail-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmail-19.08.1.tar.xz"; + sha256 = "4deb5d7c5304c0856fbbafeb7bf09436e28782b96dc5ec342a09b2c26ea386c0"; + name = "kmail-19.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmail-account-wizard-19.08.0.tar.xz"; - sha256 = "5eddd4029047b3c37146c49e043d17c1f9086bc738726d5da2756cbe9ad28622"; - name = "kmail-account-wizard-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmail-account-wizard-19.08.1.tar.xz"; + sha256 = "b4f2f769b44845dd02632ce282fc740a35f7f784e9fb54091153365ee88fb864"; + name = "kmail-account-wizard-19.08.1.tar.xz"; }; }; kmailtransport = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmailtransport-19.08.0.tar.xz"; - sha256 = "cc5f865f2059e8fd8d45d1597d8483bbfe0b743e472d91dd4e7cc3837c3fa2dd"; - name = "kmailtransport-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmailtransport-19.08.1.tar.xz"; + sha256 = "521bcfd334a0e7e4986e6cebff3bae4095175a11fd45f777da673f1460d733da"; + name = "kmailtransport-19.08.1.tar.xz"; }; }; kmbox = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmbox-19.08.0.tar.xz"; - sha256 = "6600033298b0d5ff84705dc66fa529156cb08aeda7503ba7890581b618f83228"; - name = "kmbox-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmbox-19.08.1.tar.xz"; + sha256 = "5fa59ffd16df1ae28f7ebf026f67df708c5b84e54e1ab47fd5de957c5b8fc75e"; + name = "kmbox-19.08.1.tar.xz"; }; }; kmime = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmime-19.08.0.tar.xz"; - sha256 = "1422e6235659b66b3ee5e91cdd732d8c3738d42f81435e69f3cbb18f04a0be75"; - name = "kmime-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmime-19.08.1.tar.xz"; + sha256 = "e8693458734f11a9d33a4d761f2b5ccae8f9ed87bb1e9dfc97f4bd0fa7089557"; + name = "kmime-19.08.1.tar.xz"; }; }; kmines = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmines-19.08.0.tar.xz"; - sha256 = "290efbc208d2fa6ad5552fe8c0679fd0669f4abf6dc31fafd267bd9444add981"; - name = "kmines-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmines-19.08.1.tar.xz"; + sha256 = "8aedc9eeb3426a394a6e048508f700d466c18b262a9b98e01eff379a8d6003fb"; + name = "kmines-19.08.1.tar.xz"; }; }; kmix = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmix-19.08.0.tar.xz"; - sha256 = "3d9cf6dcb35ded0091d16f5e9f4cb384ae21ea4065547b52d5f13f199d3d7b08"; - name = "kmix-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmix-19.08.1.tar.xz"; + sha256 = "a6006ab35bdfc2896188aa99ba50f1b28e8d5172ec8a1068efb15a50c43f87a7"; + name = "kmix-19.08.1.tar.xz"; }; }; kmousetool = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmousetool-19.08.0.tar.xz"; - sha256 = "3b2f5a4fcc3231c249923431059285e3f8371f7c8d53fcaea76dec3945a13b09"; - name = "kmousetool-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmousetool-19.08.1.tar.xz"; + sha256 = "d9a3164a0709fa0d2fc3e30ade2bd42c86fb73c7cf4adc341dd7e11e686f7956"; + name = "kmousetool-19.08.1.tar.xz"; }; }; kmouth = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmouth-19.08.0.tar.xz"; - sha256 = "608479db4b2a98ecd17bdc1b1ef20203f492647b43311e903fb10338a59e0098"; - name = "kmouth-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmouth-19.08.1.tar.xz"; + sha256 = "531b7b3716fea8c679c5c39c7c04214cb561430182747ce08a9854a76105821e"; + name = "kmouth-19.08.1.tar.xz"; }; }; kmplot = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kmplot-19.08.0.tar.xz"; - sha256 = "66384c96ba1e82b32427a873f944d5efa915bb2bf7d9ee886c94f368bd1f5e94"; - name = "kmplot-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kmplot-19.08.1.tar.xz"; + sha256 = "7797dc95f64738b918cb19481bc74cebd1f66b5a537592bb53e98e1715701fe2"; + name = "kmplot-19.08.1.tar.xz"; }; }; knavalbattle = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/knavalbattle-19.08.0.tar.xz"; - sha256 = "7fbf132662e12f785390dbef7086dad5372ebaea8f8c3f55c24fe37bf17df35e"; - name = "knavalbattle-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/knavalbattle-19.08.1.tar.xz"; + sha256 = "6fa3cc1b7de95d22a6c356f411367399626a334ce648abc50ac724a860468915"; + name = "knavalbattle-19.08.1.tar.xz"; }; }; knetwalk = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/knetwalk-19.08.0.tar.xz"; - sha256 = "135e8c3b0d46eda0eda2429c6fa89226cba184fb7357b86a3d3101797a7a8c96"; - name = "knetwalk-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/knetwalk-19.08.1.tar.xz"; + sha256 = "0c62b756d3375f0c51046e92904f380544ba77bcc0109607bb38055907579ccf"; + name = "knetwalk-19.08.1.tar.xz"; }; }; knights = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/knights-19.08.0.tar.xz"; - sha256 = "1e22413a23b8afeab8b5d46a4d6d81a5e00a891636676b99c5bd08806f97795c"; - name = "knights-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/knights-19.08.1.tar.xz"; + sha256 = "bdd99e6ba75e03f19eac5fe6e50c84496eb614725da021208db9119539cea132"; + name = "knights-19.08.1.tar.xz"; }; }; knotes = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/knotes-19.08.0.tar.xz"; - sha256 = "578afb9d879023db9fef4e58e326927d0e2e24edd1e1ac0d46eee968a0ab7030"; - name = "knotes-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/knotes-19.08.1.tar.xz"; + sha256 = "30b835c063e03d3d9047cbaacf389ee1e261368d2cf73fdfab71b4f9138b8bf7"; + name = "knotes-19.08.1.tar.xz"; }; }; kolf = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kolf-19.08.0.tar.xz"; - sha256 = "1a2a7e9809fd6551518d1393dcfd365976b06ddf17aaa1056a36e8f167e7db5a"; - name = "kolf-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kolf-19.08.1.tar.xz"; + sha256 = "5199274d7ec557d396e74485debe4c7572050de6d31f128cca9ab737062f83bc"; + name = "kolf-19.08.1.tar.xz"; }; }; kollision = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kollision-19.08.0.tar.xz"; - sha256 = "24a8ae084443359d59c16cbbafc450bbc467bd8b2a2516572e70ef24823750fd"; - name = "kollision-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kollision-19.08.1.tar.xz"; + sha256 = "0f2bac3898ceb26bd17bdcc3481d76709b793a83ace75ba8f6f45fbf54428697"; + name = "kollision-19.08.1.tar.xz"; }; }; kolourpaint = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kolourpaint-19.08.0.tar.xz"; - sha256 = "00596d813eff27e45de7f51ae411b144ee21a7ae2baf576e248046dbd97e097d"; - name = "kolourpaint-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kolourpaint-19.08.1.tar.xz"; + sha256 = "59c1a2a9d8f012ff1c483dae4f1019232ec667bd88e61c6c8fc07e47312ef23f"; + name = "kolourpaint-19.08.1.tar.xz"; }; }; kompare = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kompare-19.08.0.tar.xz"; - sha256 = "695c4096c3ac15ab38e5cfb4114f9425c8ccb2f618a65b5f36f3ddee5edec212"; - name = "kompare-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kompare-19.08.1.tar.xz"; + sha256 = "325a14529c8e015fbae0231511ddd5c61dd3d78cbc6ad92eaccfd1c90a2f1afd"; + name = "kompare-19.08.1.tar.xz"; }; }; konqueror = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/konqueror-19.08.0.tar.xz"; - sha256 = "cc37709dcf183c68effb5332c29527b13fe7aae78216b84680ef6cc73192f971"; - name = "konqueror-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/konqueror-19.08.1.tar.xz"; + sha256 = "48a2847c7fcd5e30ae02d64523c3053b958ae9d3a7a649685660b1340aa644df"; + name = "konqueror-19.08.1.tar.xz"; }; }; konquest = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/konquest-19.08.0.tar.xz"; - sha256 = "94919dce58182859f7e720ece73be81b5bafc359afdc1c29f4f45a3b24155e60"; - name = "konquest-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/konquest-19.08.1.tar.xz"; + sha256 = "114e76a10a992efb3fbd094bd1b66c3d6266c540c41289a0627ec04a8db52ec0"; + name = "konquest-19.08.1.tar.xz"; }; }; konsole = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/konsole-19.08.0.tar.xz"; - sha256 = "4d495bf42fad1f457282a57f19fe2aece1ddbc88239352f0ebadfbcebf52ad6e"; - name = "konsole-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/konsole-19.08.1.tar.xz"; + sha256 = "7530157a3fa01a9b21971e271a9d46addb5c71dce290db97265928803b57d37f"; + name = "konsole-19.08.1.tar.xz"; }; }; kontact = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kontact-19.08.0.tar.xz"; - sha256 = "e47d3b4133e24b1c90a3a15f99a77cef442eefa0f2570dd34d5a9e302e845d9b"; - name = "kontact-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kontact-19.08.1.tar.xz"; + sha256 = "7b57b44ee72211b30fc743fae6580867100ede718909617b90cb926732ecbabb"; + name = "kontact-19.08.1.tar.xz"; }; }; kontactinterface = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kontactinterface-19.08.0.tar.xz"; - sha256 = "e490fb4dc0e762d4f12a837ecbddc2f14276672d8f46d10029987222b372f3bc"; - name = "kontactinterface-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kontactinterface-19.08.1.tar.xz"; + sha256 = "adb5c380fd73102b84c72ea27975689dc289b0f5c8dd10f86bf0a857e00170be"; + name = "kontactinterface-19.08.1.tar.xz"; }; }; kopete = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kopete-19.08.0.tar.xz"; - sha256 = "ef777cc2840db7fc462c3b00a8a289be3db3786ff16ae51ac9a988621848d7b7"; - name = "kopete-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kopete-19.08.1.tar.xz"; + sha256 = "c4943c5cbb384eb8697668be2a38dcc0dc16f26485a38c3657658c1cc4dbd2a8"; + name = "kopete-19.08.1.tar.xz"; }; }; korganizer = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/korganizer-19.08.0.tar.xz"; - sha256 = "fbb6db9e517f7065ed978c6356989a38cea0c9520693d5e67fa04d8cfa625722"; - name = "korganizer-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/korganizer-19.08.1.tar.xz"; + sha256 = "d7e347df36986926d0e0d1af38130a089b581e400a90cc8bf199cecb29b78023"; + name = "korganizer-19.08.1.tar.xz"; }; }; kpat = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kpat-19.08.0.tar.xz"; - sha256 = "1d68ac9094ad8f9bf0487daced786508f96ce2a63fd8d9884c2d03960fda9328"; - name = "kpat-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kpat-19.08.1.tar.xz"; + sha256 = "65bf7299c59d3d7512ab39174fd0e5d044f307784c02895130399534e044831c"; + name = "kpat-19.08.1.tar.xz"; }; }; kpimtextedit = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kpimtextedit-19.08.0.tar.xz"; - sha256 = "45fcc5898e921c41eb28bb64ddd6d8240f4261360b9149a149ae4c281844dfcb"; - name = "kpimtextedit-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kpimtextedit-19.08.1.tar.xz"; + sha256 = "f7e0dc9c706c94fa74a561d42d41246eae57f60c03da1ec52f2311172052d7fe"; + name = "kpimtextedit-19.08.1.tar.xz"; }; }; kpkpass = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kpkpass-19.08.0.tar.xz"; - sha256 = "1555856e987d3667eea8a210e3dd592742ca953dfa2d381e50bc9670183e7137"; - name = "kpkpass-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kpkpass-19.08.1.tar.xz"; + sha256 = "893ee1f127c2d0c7135fe77c5c2895d04f95c9a6ed3b162c30856f4e99d4afb3"; + name = "kpkpass-19.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kqtquickcharts-19.08.0.tar.xz"; - sha256 = "6b25edca7643287acaf436ba58124077b89d067e2881a5dbfbd8833b68f3cb05"; - name = "kqtquickcharts-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kqtquickcharts-19.08.1.tar.xz"; + sha256 = "af191d150a4777e53b27c39c86f32f80cec8b6eb2442d03425496902f78e79c8"; + name = "kqtquickcharts-19.08.1.tar.xz"; }; }; krdc = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/krdc-19.08.0.tar.xz"; - sha256 = "62c995dc1b6eabf2486d475ad089cb3e286d37c6927e4c5bd2455489f52a3e75"; - name = "krdc-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/krdc-19.08.1.tar.xz"; + sha256 = "319bccbc3c3274b89ae58679d063a303df4b95504b1bef97f925da70a0fbcbde"; + name = "krdc-19.08.1.tar.xz"; }; }; kreversi = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kreversi-19.08.0.tar.xz"; - sha256 = "1dbfcce80813c238d5a9084ffcde828b0abeb7b370cfb1e82b55de75a5f02ba9"; - name = "kreversi-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kreversi-19.08.1.tar.xz"; + sha256 = "f4c691dcc5c7864c8201f7e06470e2856996c35c5317020e56822c48af0b810e"; + name = "kreversi-19.08.1.tar.xz"; }; }; krfb = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/krfb-19.08.0.tar.xz"; - sha256 = "1142e493a37ce867b069ac278215377b56061b2412ee2dd46b0db456fb1419d4"; - name = "krfb-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/krfb-19.08.1.tar.xz"; + sha256 = "3abe42f6e648f171fa38652fe03184725d1abcccf16bf1c1039ebada1f3c64c3"; + name = "krfb-19.08.1.tar.xz"; }; }; kross-interpreters = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kross-interpreters-19.08.0.tar.xz"; - sha256 = "d0cda357a32d755d6eba373871c0903a5e6ee5f63289aa6f40c623e985453ecd"; - name = "kross-interpreters-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kross-interpreters-19.08.1.tar.xz"; + sha256 = "d6acb31bd4c97364aa4a77767e012af32ecd0f560da939901a81be5776f2de49"; + name = "kross-interpreters-19.08.1.tar.xz"; }; }; kruler = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kruler-19.08.0.tar.xz"; - sha256 = "a78d054359b559b612dd1dac8f0974f554fb7a52bd8de7152de88866719f9226"; - name = "kruler-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kruler-19.08.1.tar.xz"; + sha256 = "040eef3746a660798e1701af6d9d17f4d091c30db9321dd5d37b172f5b91d59c"; + name = "kruler-19.08.1.tar.xz"; }; }; kshisen = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kshisen-19.08.0.tar.xz"; - sha256 = "f591834b26ff622c995be81acdb07b6d25cf2e25745688a7c162d0b92532066d"; - name = "kshisen-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kshisen-19.08.1.tar.xz"; + sha256 = "1631baaff368ca40a386c60998a9a491a2054a951f5b7311bea74f708d61d65f"; + name = "kshisen-19.08.1.tar.xz"; }; }; ksirk = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ksirk-19.08.0.tar.xz"; - sha256 = "a929c6b10a01d765c8702afc1fa8e77ada7357cf8064c45cff34623d23a2c94c"; - name = "ksirk-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ksirk-19.08.1.tar.xz"; + sha256 = "42e00d3591fbfbe1db6de4caad963606a0ca5ee9a224b757157594bebb8c733c"; + name = "ksirk-19.08.1.tar.xz"; }; }; ksmtp = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ksmtp-19.08.0.tar.xz"; - sha256 = "2947d49f183fe25dc340dd3fa6145c85b1896c8adb08bab9966e1f99a927a003"; - name = "ksmtp-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ksmtp-19.08.1.tar.xz"; + sha256 = "71401abcbb6aedd2845c84bca65f77297722b3414f4d4caeaa6ac6b8f2edc46c"; + name = "ksmtp-19.08.1.tar.xz"; }; }; ksnakeduel = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ksnakeduel-19.08.0.tar.xz"; - sha256 = "51799e15ce35237cf410bfd69cca40eeea6ec75ac3b3b98686b44028e8fd2b0b"; - name = "ksnakeduel-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ksnakeduel-19.08.1.tar.xz"; + sha256 = "130e6545102a4e39f284a409213e9d45066ed27c077ff881839f33db78f62dd5"; + name = "ksnakeduel-19.08.1.tar.xz"; }; }; kspaceduel = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kspaceduel-19.08.0.tar.xz"; - sha256 = "fcd3b90e5a61cb27753cbacf4699c156317cfe30d50732f1f89ac4973dfb39f2"; - name = "kspaceduel-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kspaceduel-19.08.1.tar.xz"; + sha256 = "47a6d9c78b1d24e80803b7e1765bb6de37157e9f1e733ef5ce50a54612c16bf9"; + name = "kspaceduel-19.08.1.tar.xz"; }; }; ksquares = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ksquares-19.08.0.tar.xz"; - sha256 = "649a89da0a928c8977218a76023044205b20f07af9b3abda042e46bc450bd00f"; - name = "ksquares-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ksquares-19.08.1.tar.xz"; + sha256 = "39fd1b73c3c13c3322a5658b8deed31261b0e68edc5cb9666ade374d5d9d8283"; + name = "ksquares-19.08.1.tar.xz"; }; }; ksudoku = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ksudoku-19.08.0.tar.xz"; - sha256 = "0f773ce70fbc05f30285b7123c5e28fe241ff56677c5b80c1201238bdbc375f8"; - name = "ksudoku-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ksudoku-19.08.1.tar.xz"; + sha256 = "cae801e0c595009e35aa11df370de421164f10d9840ae4dede2cd57f19cd6866"; + name = "ksudoku-19.08.1.tar.xz"; }; }; ksystemlog = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ksystemlog-19.08.0.tar.xz"; - sha256 = "1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259"; - name = "ksystemlog-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ksystemlog-19.08.1.tar.xz"; + sha256 = "7dde2a350b32011027d6ab9648859218a053c5509ad08bce8c2de875d2ae73db"; + name = "ksystemlog-19.08.1.tar.xz"; }; }; kteatime = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kteatime-19.08.0.tar.xz"; - sha256 = "3be9667867ef41a638c8f97fefb213b078b0ba3171add881438588bc8afba342"; - name = "kteatime-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kteatime-19.08.1.tar.xz"; + sha256 = "a4b80c5ca6f48c1d291a9502c43293cd0aa383f2e089b9435b02ff79b317c310"; + name = "kteatime-19.08.1.tar.xz"; }; }; ktimer = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktimer-19.08.0.tar.xz"; - sha256 = "c7f684b9c7f0c92638153fabdfdb1082c900a8da2f660eeebe4b8b3b669f8c8d"; - name = "ktimer-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktimer-19.08.1.tar.xz"; + sha256 = "f81af279e9e79bb3044718fa868973524e85df65dfaf654b8f45824b6f9d17cb"; + name = "ktimer-19.08.1.tar.xz"; }; }; ktnef = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktnef-19.08.0.tar.xz"; - sha256 = "54b2e09a872e8f8e4e8a1ef77975b1d063ef0d07999b1bf2a696675659e6d52f"; - name = "ktnef-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktnef-19.08.1.tar.xz"; + sha256 = "bab23e40af2fe5ba2dd0be71687fbdd56d0868f2ef2a399721da88b12c65764f"; + name = "ktnef-19.08.1.tar.xz"; }; }; ktouch = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktouch-19.08.0.tar.xz"; - sha256 = "23ae45be76371fa40aac875551b5de8956a2d2b0980024bd788b8b7835b902ba"; - name = "ktouch-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktouch-19.08.1.tar.xz"; + sha256 = "d97ee5f253dd4e4d802bb8109c2e12d4d48bc7741686d07783e5687a499a2da7"; + name = "ktouch-19.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-accounts-kcm-19.08.0.tar.xz"; - sha256 = "f849b7a9b2cee5b328e726dd254b1e606b740e5b75cdc59a1ea18601e131c0b5"; - name = "ktp-accounts-kcm-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-accounts-kcm-19.08.1.tar.xz"; + sha256 = "2f76fc870bd7a96540aa91054b3cac38b917f90c129fada86c3639815dfa27a5"; + name = "ktp-accounts-kcm-19.08.1.tar.xz"; }; }; ktp-approver = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-approver-19.08.0.tar.xz"; - sha256 = "8662a7b3e4f67a5ed2faa12187faef9dd7e056ee9f2d4b69d68f7a381e258e85"; - name = "ktp-approver-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-approver-19.08.1.tar.xz"; + sha256 = "a446c23836f6e38bb739246595cf1773f4909279cf1522b96ccd6626ba36430a"; + name = "ktp-approver-19.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-auth-handler-19.08.0.tar.xz"; - sha256 = "5674ebf51565854262b5ae0a5fbf8d0837c87b016ea5b32f56f96aa8583a7e39"; - name = "ktp-auth-handler-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-auth-handler-19.08.1.tar.xz"; + sha256 = "9a86ce184596cd54b914a7ff0424cadbee24b98f00b8736380e4153ee8596f64"; + name = "ktp-auth-handler-19.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-call-ui-19.08.0.tar.xz"; - sha256 = "1f7922a1920770decfd3e17aaf42e46db60b5c3660efc544a9be743d9a85d08f"; - name = "ktp-call-ui-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-call-ui-19.08.1.tar.xz"; + sha256 = "bab48fcdc4f4a7becfeca99dbe9061b9d08a510f94548c6ebdf720100ddb5a4c"; + name = "ktp-call-ui-19.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-common-internals-19.08.0.tar.xz"; - sha256 = "bdbf20e4e0ad7ba7bdc76a0087ff7307cf813c711da6fba3acb0104756ef1559"; - name = "ktp-common-internals-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-common-internals-19.08.1.tar.xz"; + sha256 = "985d55a259df9cb0593db50ac88bd5d3ab155c6e26563386230fe66294c3dc63"; + name = "ktp-common-internals-19.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-list-19.08.0.tar.xz"; - sha256 = "e6ba69a5a8a6b841e5babd8cb7ddb0a799d34b881ab4bdd0495062a23e59d3e1"; - name = "ktp-contact-list-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-contact-list-19.08.1.tar.xz"; + sha256 = "a3ade7f7bacd53c90062923b488a7f60968a45d6d63890a618638f514dd3a5b2"; + name = "ktp-contact-list-19.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-runner-19.08.0.tar.xz"; - sha256 = "2a90784f7f266399c41a2b64cdb4ae748fca6739c026beed6bfef91b037c2b28"; - name = "ktp-contact-runner-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-contact-runner-19.08.1.tar.xz"; + sha256 = "385bc8bebb7847cefdd17738ecaf03b102794ac7f38dc58ebe10d100385b769f"; + name = "ktp-contact-runner-19.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-desktop-applets-19.08.0.tar.xz"; - sha256 = "56562f335767e1071b36e7e31474a371b862785babeb4f5181b48065f6513221"; - name = "ktp-desktop-applets-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-desktop-applets-19.08.1.tar.xz"; + sha256 = "ec26ba5893998f1e5c293d40e5410a7170ae4e0dea46f03bd5241c51c3240951"; + name = "ktp-desktop-applets-19.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-filetransfer-handler-19.08.0.tar.xz"; - sha256 = "a3a298058e5f6d135abac474a4cd788cea16ccfb4763948f007b6f769fd47de4"; - name = "ktp-filetransfer-handler-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-filetransfer-handler-19.08.1.tar.xz"; + sha256 = "34f7eed85709524efaa89924de85842c3532b1ade8572fe28dc2e8ce3f6026eb"; + name = "ktp-filetransfer-handler-19.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-kded-module-19.08.0.tar.xz"; - sha256 = "a225a4e16cb18b19c5750d27c7a3834bbbe362c40c7cad8a9e500488682d67cc"; - name = "ktp-kded-module-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-kded-module-19.08.1.tar.xz"; + sha256 = "323b538c08da82aaf66503463b4334bc603a37bb358fa6f1d5794562c05eed4f"; + name = "ktp-kded-module-19.08.1.tar.xz"; }; }; ktp-send-file = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-send-file-19.08.0.tar.xz"; - sha256 = "d69e48d1f69e04618c97f8e83e8909e97d3f1793fff41277bb883885a8c9da8f"; - name = "ktp-send-file-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-send-file-19.08.1.tar.xz"; + sha256 = "1e4f9348dab9546d344d00783d6a5ad93b9b299b96d551dd09325c95932cbcd2"; + name = "ktp-send-file-19.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktp-text-ui-19.08.0.tar.xz"; - sha256 = "1858215d519efdcf4a0e4ef771e0d0a33f7c918ce2b70fbc95a56b61d240855a"; - name = "ktp-text-ui-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktp-text-ui-19.08.1.tar.xz"; + sha256 = "21c9c58bd498623a6bc9bbfa01c82548af29fdf7f690a359eb57ccd9a3de3105"; + name = "ktp-text-ui-19.08.1.tar.xz"; }; }; ktuberling = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/ktuberling-19.08.0.tar.xz"; - sha256 = "ca751ad3cc06475955fa9cb037a1a60539f59b7e3d22aa7d47e9fd4f2771cd5f"; - name = "ktuberling-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/ktuberling-19.08.1.tar.xz"; + sha256 = "b373c7552ff695e7d3428b7f2551315de00786177a5dc4bb96f777bdb84887cc"; + name = "ktuberling-19.08.1.tar.xz"; }; }; kturtle = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kturtle-19.08.0.tar.xz"; - sha256 = "0e7453e785344a792747b5d51d2c4a190d41e87ddf7e0a9ea49d107a2dd03db8"; - name = "kturtle-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kturtle-19.08.1.tar.xz"; + sha256 = "5643434e861391471674e6cf86347c362b076e1d3fe1396022b5080b899bf934"; + name = "kturtle-19.08.1.tar.xz"; }; }; kubrick = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kubrick-19.08.0.tar.xz"; - sha256 = "3a69a6d9a519db9fd25793d532da561a77e7033d71cd3dc67d0ee48c332b71c3"; - name = "kubrick-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kubrick-19.08.1.tar.xz"; + sha256 = "51ff60a682c69f829af7f7e4748128d48e691aacd584379e099c437473a45c03"; + name = "kubrick-19.08.1.tar.xz"; }; }; kwalletmanager = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kwalletmanager-19.08.0.tar.xz"; - sha256 = "aaf6c646cc8e7387dc034636fb94029fc0fda3c7fc89b6b633dc42349fd0a471"; - name = "kwalletmanager-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kwalletmanager-19.08.1.tar.xz"; + sha256 = "b6206da5001f79b67264f641210925b0400b41dc59562b978d402b9524835c14"; + name = "kwalletmanager-19.08.1.tar.xz"; }; }; kwave = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kwave-19.08.0.tar.xz"; - sha256 = "60f5408e9a67e934c67332b9a9643513f35946796d1ccf70369e411f804b1043"; - name = "kwave-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kwave-19.08.1.tar.xz"; + sha256 = "6febc3d01c15f94fa0f75a731a375b76642c2cdce9afc373a5c1e92fb3753891"; + name = "kwave-19.08.1.tar.xz"; }; }; kwordquiz = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/kwordquiz-19.08.0.tar.xz"; - sha256 = "ed4278c1ca0e6e7da548e563a4248fa9e0ff0707b67e06e53ae26dbc2069fc71"; - name = "kwordquiz-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/kwordquiz-19.08.1.tar.xz"; + sha256 = "ead21c1caa1d1665a8ef685c4b46a442b7423aba63153617008985e84ff4c318"; + name = "kwordquiz-19.08.1.tar.xz"; }; }; libgravatar = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libgravatar-19.08.0.tar.xz"; - sha256 = "f8dd753abdc868623b878433c0b2ed53d4d4ab2cb62c69cb94c433e51cb713a9"; - name = "libgravatar-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libgravatar-19.08.1.tar.xz"; + sha256 = "d39d6970b5113b2b805b048ca9b14770ab16d59c8ec755b0c5f6d4f7d6df73a2"; + name = "libgravatar-19.08.1.tar.xz"; }; }; libkcddb = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkcddb-19.08.0.tar.xz"; - sha256 = "f97b90660bfd403aa64be8e6221a89087f74ab443431a9f692fe14cc90d82151"; - name = "libkcddb-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkcddb-19.08.1.tar.xz"; + sha256 = "f73d3f802e1ffec6b75246505cbec5a7baa328b808c23b42608e05fd8c7b30a5"; + name = "libkcddb-19.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkcompactdisc-19.08.0.tar.xz"; - sha256 = "cc940df2a1e499965fe05b466c60014082d205f0ae606562980e6088d714eac5"; - name = "libkcompactdisc-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkcompactdisc-19.08.1.tar.xz"; + sha256 = "53d206967d98e9ee8254aca58d1ba34458761106c323deb449fa94bed1e24037"; + name = "libkcompactdisc-19.08.1.tar.xz"; }; }; libkdcraw = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkdcraw-19.08.0.tar.xz"; - sha256 = "5c00a6f28445ba5a45284c3cee0ee3f158ad9e184fea5ee8adc83ac3000b26b1"; - name = "libkdcraw-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkdcraw-19.08.1.tar.xz"; + sha256 = "b159a669cb4c01770c363b4dd53033248402d37b29acb416ec45e71ac12449e2"; + name = "libkdcraw-19.08.1.tar.xz"; }; }; libkdegames = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkdegames-19.08.0.tar.xz"; - sha256 = "cb1135a86b373543410f3eb0677aed033bad2b8ef60130753c699338e0c22d1b"; - name = "libkdegames-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkdegames-19.08.1.tar.xz"; + sha256 = "1b365627bd0a3a42a32a0a8d401b53d2ac09f0f9cf040b4b0483c5574991b774"; + name = "libkdegames-19.08.1.tar.xz"; }; }; libkdepim = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkdepim-19.08.0.tar.xz"; - sha256 = "4ff394bda799ebe700d12d60ab8171c64e054c6acb105870cd955b5ddce42eab"; - name = "libkdepim-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkdepim-19.08.1.tar.xz"; + sha256 = "46966eaae2bc71a5bab0c22bcfff858e299d7f1cec2203c1d12cebbc084ee9ce"; + name = "libkdepim-19.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkeduvocdocument-19.08.0.tar.xz"; - sha256 = "7b0314bc1f06a4ea4cbb4b4b203a9a0f4a0370f355f8def4398dc452075f6fcf"; - name = "libkeduvocdocument-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkeduvocdocument-19.08.1.tar.xz"; + sha256 = "9e7eb36b0c649231a792f618b28fd110b3782ea086cce81436191e9f73c6674e"; + name = "libkeduvocdocument-19.08.1.tar.xz"; }; }; libkexiv2 = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkexiv2-19.08.0.tar.xz"; - sha256 = "42bb1a8b69efbb4ab8b1d939279d3eb02b2d8030bcb917739f4f61fb5a10db15"; - name = "libkexiv2-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkexiv2-19.08.1.tar.xz"; + sha256 = "bee9a16eda002146b42f358b0dc58c5db832719870761264cc6cf0a199ab0537"; + name = "libkexiv2-19.08.1.tar.xz"; }; }; libkgapi = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkgapi-19.08.0.tar.xz"; - sha256 = "bc8a54e0997f4e3e0e840e350c6a9dee26582028415c5e9863d53a3280faa9f6"; - name = "libkgapi-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkgapi-19.08.1.tar.xz"; + sha256 = "1ad2491348cc97f591aa681f7a649f2337c9a92e845980304c1110c69eecd579"; + name = "libkgapi-19.08.1.tar.xz"; }; }; libkgeomap = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkgeomap-19.08.0.tar.xz"; - sha256 = "267c3bb6d033dcbcfabb6822eebc69410de2d13b792ce62af47034bbcf3a5e54"; - name = "libkgeomap-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkgeomap-19.08.1.tar.xz"; + sha256 = "aed369217007698beaa3230bf5b5360602d44ca6d333026158b15666f3670555"; + name = "libkgeomap-19.08.1.tar.xz"; }; }; libkipi = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkipi-19.08.0.tar.xz"; - sha256 = "94b184c3128fe7ded9e816e2a6124ee0dcf016b1325636dd41b157866b461989"; - name = "libkipi-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkipi-19.08.1.tar.xz"; + sha256 = "ec2012821c90062e43ad7c77861ab519b24aea429ed9f0b7bdf6ef9c00e82ba4"; + name = "libkipi-19.08.1.tar.xz"; }; }; libkleo = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkleo-19.08.0.tar.xz"; - sha256 = "a0a022f3da4d8f73c020ab55221c74d5c1590b2cbdb3b754218be17622a59cc6"; - name = "libkleo-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkleo-19.08.1.tar.xz"; + sha256 = "5808a40d9c9358048d558a4c96f90e8c51b2dab3588ab3c678b02d5810020a31"; + name = "libkleo-19.08.1.tar.xz"; }; }; libkmahjongg = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkmahjongg-19.08.0.tar.xz"; - sha256 = "b51aea6773b609cc1c3a297e72e15b7b504c2877938030e1afac86319e855694"; - name = "libkmahjongg-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkmahjongg-19.08.1.tar.xz"; + sha256 = "c4e3a29bb923ead76f1fb528fa62c677423ebb4ac07dd149a6fc3f6ae055eb39"; + name = "libkmahjongg-19.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libkomparediff2-19.08.0.tar.xz"; - sha256 = "d86765e6514bdcf838ed36ae5968f9b2b7cb2e74f4fe884ae87f58b9bcc963fe"; - name = "libkomparediff2-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libkomparediff2-19.08.1.tar.xz"; + sha256 = "a020ba9287ee084a0f5a10896f1559f11aff1c97957405f47deeda32a0874b31"; + name = "libkomparediff2-19.08.1.tar.xz"; }; }; libksane = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libksane-19.08.0.tar.xz"; - sha256 = "62c670c316a47facbd0beedb0fcc35247fbbd285892a90ab06ebb8f74b8a6329"; - name = "libksane-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libksane-19.08.1.tar.xz"; + sha256 = "215fae62d8ea1f70908cafc5bc8667c02d4f0329669d056c99443a7b14a6e589"; + name = "libksane-19.08.1.tar.xz"; }; }; libksieve = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/libksieve-19.08.0.tar.xz"; - sha256 = "48d0925a8dd0adfa6ccd4945b14e2e562b8855faa6bed43de0442a273fd41966"; - name = "libksieve-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/libksieve-19.08.1.tar.xz"; + sha256 = "ab384877148710e7de92e88a192f52beaad667804bbc641b63c21cfdaa0aee31"; + name = "libksieve-19.08.1.tar.xz"; }; }; lokalize = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/lokalize-19.08.0.tar.xz"; - sha256 = "bb51159c803890af82a38e5a4bd4df0895cc34ed68fa8ed3a4c66adafc9ea6b6"; - name = "lokalize-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/lokalize-19.08.1.tar.xz"; + sha256 = "fe1e1f8fb2f2ad3cde1830b2ddbcce0e41ffe5696c6e32b0639c8931967b3943"; + name = "lokalize-19.08.1.tar.xz"; }; }; lskat = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/lskat-19.08.0.tar.xz"; - sha256 = "b321f58772eab7f569c76ff4afb56b1e3324dc5febf45bf5ed90993cf38696b5"; - name = "lskat-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/lskat-19.08.1.tar.xz"; + sha256 = "e4b073cc65be0f1e7e01b4b2aa28bed30480aef097f5185eb608b4e45b9352e9"; + name = "lskat-19.08.1.tar.xz"; }; }; mailcommon = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/mailcommon-19.08.0.tar.xz"; - sha256 = "6c69b70356d9d96578c3fd472aaa36e33feb0677d7e65c36981c0596daf3aea3"; - name = "mailcommon-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/mailcommon-19.08.1.tar.xz"; + sha256 = "3fb6f09ce8bc9ccddfa1420fa1a7c60a47065afdfbb5a30292179efbcebba833"; + name = "mailcommon-19.08.1.tar.xz"; }; }; mailimporter = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/mailimporter-19.08.0.tar.xz"; - sha256 = "242f1a93b3521abc68ca8e1abfc75acd0b59e1e2d553df80a057645102246dd7"; - name = "mailimporter-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/mailimporter-19.08.1.tar.xz"; + sha256 = "4236938a2dca5ea0bc572afbe76ae28fc6ad1e65f383743de98a4e505f674962"; + name = "mailimporter-19.08.1.tar.xz"; }; }; marble = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/marble-19.08.0.tar.xz"; - sha256 = "c1c951a1357c94a61b38f0ae8a1235d194150cd351dbf25d2db3508b22b44cc1"; - name = "marble-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/marble-19.08.1.tar.xz"; + sha256 = "7e09e3037287be117e47de402d1f5ea7dd49f625ccf4a46d1d016a527d487e9e"; + name = "marble-19.08.1.tar.xz"; }; }; mbox-importer = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/mbox-importer-19.08.0.tar.xz"; - sha256 = "e03fd814c70b15fca3b5dd2cde1dcece436b831ceb04323d7ffcca66daf3ce1c"; - name = "mbox-importer-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/mbox-importer-19.08.1.tar.xz"; + sha256 = "3f4c96ee65ffa0488df09522e1bda2ea38c0adf420ae66fff11f670566c5536c"; + name = "mbox-importer-19.08.1.tar.xz"; }; }; messagelib = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/messagelib-19.08.0.tar.xz"; - sha256 = "0797b11452874a1d8264f92e8cc6d6977f3b0416dc66ff558b124bf2a52b118d"; - name = "messagelib-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/messagelib-19.08.1.tar.xz"; + sha256 = "ec43d913028124a49eaa440e4b55dba23b6ab503728b897a3ad8e1fc5e446802"; + name = "messagelib-19.08.1.tar.xz"; }; }; minuet = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/minuet-19.08.0.tar.xz"; - sha256 = "3827a7e8dd3c48e12521fd0aa76eccbeaf9f2627935f19647f2147e87db63554"; - name = "minuet-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/minuet-19.08.1.tar.xz"; + sha256 = "524c389060c13b37a3df4662ca9ca5e2862d20ea71f47b1a5157a088d2d065d4"; + name = "minuet-19.08.1.tar.xz"; }; }; okular = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/okular-19.08.0.tar.xz"; - sha256 = "721a0d02d5ff9277c4a9a13dbde0ede3528eff848622e83abc36d57d9759b3ec"; - name = "okular-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/okular-19.08.1.tar.xz"; + sha256 = "9e363b73febd5da1a17e53a8f89914784b555c1f0085ddc0f55ef56082b0bd54"; + name = "okular-19.08.1.tar.xz"; }; }; palapeli = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/palapeli-19.08.0.tar.xz"; - sha256 = "fcdefb41685728cd9e01cc3249d2676a589f61a611e32c2e1a2e3d4d30721dde"; - name = "palapeli-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/palapeli-19.08.1.tar.xz"; + sha256 = "c9eeafe854529ea5a09e9ef6fd37b8be3d0d370322938c009c826bd936953adc"; + name = "palapeli-19.08.1.tar.xz"; }; }; parley = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/parley-19.08.0.tar.xz"; - sha256 = "d3c8f8e7ceee62ffa9b95dbf539a509260b5f759fadd136a966d90a67e8a94a4"; - name = "parley-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/parley-19.08.1.tar.xz"; + sha256 = "6ee4d538ddaecd5b6c3d855db62a4b5061240b2089b3dcc592712398fd1d066b"; + name = "parley-19.08.1.tar.xz"; }; }; picmi = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/picmi-19.08.0.tar.xz"; - sha256 = "1d7a6152b05ad22f98762a5a6cd96edbc03ae63bdbc0154f387dc5cce31243eb"; - name = "picmi-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/picmi-19.08.1.tar.xz"; + sha256 = "47e0dd79ee4ae86d8be6822f9328fac2f00ce68cf862202e889c0f77a88d0d91"; + name = "picmi-19.08.1.tar.xz"; }; }; pimcommon = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/pimcommon-19.08.0.tar.xz"; - sha256 = "23be57010127831c3ad9b9475e467e8078ff92410c80609660498c5dc6fbaf9a"; - name = "pimcommon-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/pimcommon-19.08.1.tar.xz"; + sha256 = "5956e2767ea88efd73cbefef9cb80d16bb4cb5cb63857975fbb6ead1b984026c"; + name = "pimcommon-19.08.1.tar.xz"; }; }; pim-data-exporter = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/pim-data-exporter-19.08.0.tar.xz"; - sha256 = "f5ff68dcbad1df7ea132b409b70b9b4269badb26e28b4b7cd50239172507f7d8"; - name = "pim-data-exporter-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/pim-data-exporter-19.08.1.tar.xz"; + sha256 = "766e8b15f7853d84629bc49ad33aa59291d6d95cfd9db279e9e0ad70b0fab1fe"; + name = "pim-data-exporter-19.08.1.tar.xz"; }; }; pim-sieve-editor = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/pim-sieve-editor-19.08.0.tar.xz"; - sha256 = "1ea0cc219d6776968d81ff1a606a9a11e1714f864fda9f00a13a5d7c84b45b46"; - name = "pim-sieve-editor-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/pim-sieve-editor-19.08.1.tar.xz"; + sha256 = "b49045d7326cf0ca7fabbf58d8508d61986701887871c4df53fad1f960a64438"; + name = "pim-sieve-editor-19.08.1.tar.xz"; }; }; poxml = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/poxml-19.08.0.tar.xz"; - sha256 = "82393645a5f97890bba866554c0e05d7b216f0ed7eafea00fe1c2708ac12e0b2"; - name = "poxml-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/poxml-19.08.1.tar.xz"; + sha256 = "d38dce3114b01bc72163329dac629c4e5d36db15e09d52dd0ffbcaa645408d98"; + name = "poxml-19.08.1.tar.xz"; }; }; print-manager = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/print-manager-19.08.0.tar.xz"; - sha256 = "56fe89f6bc3be64848adee20a22c712ba8f72602e28fb3288cd5328797e32c7b"; - name = "print-manager-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/print-manager-19.08.1.tar.xz"; + sha256 = "b1fd9aa067329a4f5bb715e7db736160954bbec303be0ba5bc8f98852071e731"; + name = "print-manager-19.08.1.tar.xz"; }; }; rocs = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/rocs-19.08.0.tar.xz"; - sha256 = "2e9346781bb6198a3fb3c3357ef796c0e86fdd104146de87a481619d3cbe78fe"; - name = "rocs-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/rocs-19.08.1.tar.xz"; + sha256 = "eaa2fefae8123071e5802d0c13016d0b99608f91c75c7c6e4fbe6f2c6dc12adf"; + name = "rocs-19.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/signon-kwallet-extension-19.08.0.tar.xz"; - sha256 = "f8cd646365f82c82de6c9f2dda8250579a2e469504e4358a334786f8f8e8b61f"; - name = "signon-kwallet-extension-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/signon-kwallet-extension-19.08.1.tar.xz"; + sha256 = "7d558509cf015641c76d4203c8dadc4e9720278fb39b4561eb2bce4e5412bb83"; + name = "signon-kwallet-extension-19.08.1.tar.xz"; }; }; spectacle = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/spectacle-19.08.0.tar.xz"; - sha256 = "8ada4f765f81ee496f9fd00b74764690df9c479e343a035e363f7159f93c35a4"; - name = "spectacle-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/spectacle-19.08.1.tar.xz"; + sha256 = "21057fd4990048df33f5d739fc98af2a555ca4b7db50688333fecabc12f24786"; + name = "spectacle-19.08.1.tar.xz"; }; }; step = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/step-19.08.0.tar.xz"; - sha256 = "7a2dc38617822c8118c721ccaaa9907ec3e109eacf57e46b599c6731b325a993"; - name = "step-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/step-19.08.1.tar.xz"; + sha256 = "533750dda4adcd0f3d8ec269103f35ee1ab4b4e9eae9721522b1b278660577a6"; + name = "step-19.08.1.tar.xz"; }; }; svgpart = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/svgpart-19.08.0.tar.xz"; - sha256 = "7e1f4b3f8807e996b2acb496971bd7ebcb1e456ac090e269e42d15fce629858d"; - name = "svgpart-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/svgpart-19.08.1.tar.xz"; + sha256 = "4ed6277d3f2c12a4a53dd308911c613af5ae65f53819aeacf42e08dcd08dbd5b"; + name = "svgpart-19.08.1.tar.xz"; }; }; sweeper = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/sweeper-19.08.0.tar.xz"; - sha256 = "3cab8817b5c52bd0064e49e6062d3295328604d96e355779a766075d5ae10764"; - name = "sweeper-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/sweeper-19.08.1.tar.xz"; + sha256 = "cc539649fa4a2698ad07653f9427981381bf8b5344f05dab76acdf1704b4479a"; + name = "sweeper-19.08.1.tar.xz"; }; }; umbrello = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/umbrello-19.08.0.tar.xz"; - sha256 = "8df6e0394670ee3f91f449a3110312a37876d3aa047442ed8439d8b876a6b0e2"; - name = "umbrello-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/umbrello-19.08.1.tar.xz"; + sha256 = "ce56fa6d96bbc78cf69246d6f45e9b098f8fcc75d7771875a8e638b01bbf6efa"; + name = "umbrello-19.08.1.tar.xz"; }; }; yakuake = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/yakuake-19.08.0.tar.xz"; - sha256 = "f0931fffbcd6f17687f13ab766e628961c6caf6dcf8cad79f6e311a0b5692a49"; - name = "yakuake-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/yakuake-19.08.1.tar.xz"; + sha256 = "184fec9d07505faf820821e197582f7733694848cc17e71ee4f525772e78fc10"; + name = "yakuake-19.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/zeroconf-ioslave-19.08.0.tar.xz"; - sha256 = "0fbe1e0d1c30cc570d96e6a5aa12692bd8e5d11bfd4b9af5077f4c5e80c8f183"; - name = "zeroconf-ioslave-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/zeroconf-ioslave-19.08.1.tar.xz"; + sha256 = "0c5f8931dd2997345fc6d3e8ef73c36615a73f8c906fb6be9c27432bc038000a"; + name = "zeroconf-ioslave-19.08.1.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix b/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix index f21438dfcec5..8108b9e4ddb4 100644 --- a/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "antfs-cli"; version = "unstable-2017-02-11"; diff --git a/nixpkgs/pkgs/applications/misc/artha/default.nix b/nixpkgs/pkgs/applications/misc/artha/default.nix index 791e2d0f52e8..b03d2aa208b5 100644 --- a/nixpkgs/pkgs/applications/misc/artha/default.nix +++ b/nixpkgs/pkgs/applications/misc/artha/default.nix @@ -1,6 +1,6 @@ { stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "artha"; version = "1.0.3"; diff --git a/nixpkgs/pkgs/applications/misc/autospotting/default.nix b/nixpkgs/pkgs/applications/misc/autospotting/default.nix index 444a8da7036d..b00686fb24f6 100644 --- a/nixpkgs/pkgs/applications/misc/autospotting/default.nix +++ b/nixpkgs/pkgs/applications/misc/autospotting/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "autospotting"; version = "unstable-2018-11-17"; goPackagePath = "github.com/AutoSpotting/AutoSpotting"; diff --git a/nixpkgs/pkgs/applications/misc/avrdudess/default.nix b/nixpkgs/pkgs/applications/misc/avrdudess/default.nix index 4227b4155acf..165bee76b69b 100644 --- a/nixpkgs/pkgs/applications/misc/avrdudess/default.nix +++ b/nixpkgs/pkgs/applications/misc/avrdudess/default.nix @@ -1,6 +1,6 @@ { stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "avrdudess-2.2.20140102"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/nixpkgs/pkgs/applications/misc/bemenu/default.nix index 89c32668be9c..8945ffbb384f 100644 --- a/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -9,7 +9,7 @@ assert ncursesSupport -> ncurses != null; assert waylandSupport -> wayland != null; assert x11Support -> xlibs != null && xorg != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bemenu"; version = "0.1.0"; diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index b4c8bbb3f311..dd85156b3ef0 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "calibre"; - version = "3.47.0"; + version = "3.47.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "0mjj47w9pa7ihycialijrfq2qk107dcxwcwriz3b2mg4lixlawy4"; + sha256 = "17lz6rawlv268vv8i5kj59rswsipq3c14066adaz1paw54zr62dk"; }; patches = [ @@ -105,7 +105,7 @@ mkDerivation rec { disallowedReferences = [ podofo.dev ]; calibreDesktopItem = makeDesktopItem { - name = "calibre"; + name = "calibre-gui"; desktopName = "calibre"; exec = "@out@/bin/calibre --detach %F"; genericName = "E-book library management"; @@ -151,7 +151,7 @@ mkDerivation rec { }; ebookEditDesktopItem = makeDesktopItem { - name = "calibre-edit-ebook"; + name = "calibre-edit-book"; desktopName = "Edit E-book"; genericName = "E-book Editor"; comment = "Edit e-books"; diff --git a/nixpkgs/pkgs/applications/misc/cataract/build.nix b/nixpkgs/pkgs/applications/misc/cataract/build.nix index dae6e404a9dd..5f4e24f4d3cc 100644 --- a/nixpkgs/pkgs/applications/misc/cataract/build.nix +++ b/nixpkgs/pkgs/applications/misc/cataract/build.nix @@ -10,7 +10,7 @@ , sha256 , rev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "cataract"; diff --git a/nixpkgs/pkgs/applications/misc/catclock/default.nix b/nixpkgs/pkgs/applications/misc/catclock/default.nix index 75f5ab406fe0..09c36f9eb2f1 100644 --- a/nixpkgs/pkgs/applications/misc/catclock/default.nix +++ b/nixpkgs/pkgs/applications/misc/catclock/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, xlibsWrapper, motif }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "catclock-2015-10-04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/cgminer/default.nix b/nixpkgs/pkgs/applications/misc/cgminer/default.nix index 04f32a67b84c..c05c7423d9a5 100644 --- a/nixpkgs/pkgs/applications/misc/cgminer/default.nix +++ b/nixpkgs/pkgs/applications/misc/cgminer/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake , curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "3.7.2"; pname = "cgminer"; diff --git a/nixpkgs/pkgs/applications/misc/clipit/default.nix b/nixpkgs/pkgs/applications/misc/clipit/default.nix index 693ce84c97ac..7a4e25560c7b 100644 --- a/nixpkgs/pkgs/applications/misc/clipit/default.nix +++ b/nixpkgs/pkgs/applications/misc/clipit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ]; meta = with stdenv.lib; { - description = "Lightweight GTK+ Clipboard Manager"; + description = "Lightweight GTK Clipboard Manager"; homepage = "http://clipit.rspwn.com"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 589111df78b8..4d32328af8b2 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "libarcus"; version = "3.6.18"; format = "other"; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index 7a1781f62ce7..f8ffbf041bda 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: -buildPythonPackage rec { +buildPythonPackage { pname = "libsavitar-lulzbot"; name = "libsavitar-lulzbot"; version = "3.6.18"; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix index 43869a0edc62..1ad755cdfbdd 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { version = "3.6.18"; pname = "uranium"; name = "uraniumLulzbot"; diff --git a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index d8cf86461acf..2e8217012160 100644 --- a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "6.1.4"; + version = "6.1.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1l4skcannbzddhm773dm3hwv3a7b3xy569gydcfczgdlgzgmlfjq"; + sha256 = "0lkycm1152wd56i1hjq7q3sd05h51fyz99qr2n65lwi33vz2qk9m"; }; installPhase = '' @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.samueldr ]; + maintainers = [ maintainers.jojosch ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix index 5df7c0b06727..1bfb6bbfeaf3 100644 --- a/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix +++ b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }: +{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }: let version = "git-2016-01-10"; in -stdenv.mkDerivation { +mkDerivation { pname = "dfilemanager"; inherit version; src = fetchgit { @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ cmake qtbase qttools file solid ]; - cmakeFlags = "-DQT5BUILD=true"; + cmakeFlags = [ "-DQT5BUILD=true" ]; meta = { homepage = http://dfilemanager.sourceforge.net/; diff --git a/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix b/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix index 283b66318ea5..0016f89746d6 100644 --- a/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix @@ -7,7 +7,7 @@ let else [ wxGTK ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "diff-pdf"; version = "2017-12-30"; diff --git a/nixpkgs/pkgs/applications/misc/doing/default.nix b/nixpkgs/pkgs/applications/misc/doing/default.nix index 20c802a1cbdf..d72a5b848261 100644 --- a/nixpkgs/pkgs/applications/misc/doing/default.nix +++ b/nixpkgs/pkgs/applications/misc/doing/default.nix @@ -1,7 +1,7 @@ { lib, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { pname = "doing"; version = (import ./gemset.nix).doing.version; diff --git a/nixpkgs/pkgs/applications/misc/doomseeker/default.nix b/nixpkgs/pkgs/applications/misc/doomseeker/default.nix index 8cfadd77ece9..1332b265d54c 100644 --- a/nixpkgs/pkgs/applications/misc/doomseeker/default.nix +++ b/nixpkgs/pkgs/applications/misc/doomseeker/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "doomseeker"; version = "2018-03-05"; diff --git a/nixpkgs/pkgs/applications/misc/electrum/dash.nix b/nixpkgs/pkgs/applications/misc/electrum/dash.nix index 98ed10b0c7cc..8ba562de1cb7 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/dash.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/dash.nix @@ -2,7 +2,7 @@ python2Packages.buildPythonApplication rec { version = "2.9.3.1"; - name = "electrum-dash-${version}"; + pname = "electrum-dash"; src = fetchurl { url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index 8940c8dfd221..c48d458567dc 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -40,7 +40,7 @@ let }; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "electrum"; inherit version; diff --git a/nixpkgs/pkgs/applications/misc/epdfview/default.nix b/nixpkgs/pkgs/applications/misc/epdfview/default.nix index 1a87b7f5c8be..de922bb39900 100644 --- a/nixpkgs/pkgs/applications/misc/epdfview/default.nix +++ b/nixpkgs/pkgs/applications/misc/epdfview/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://packages.debian.org/wheezy/epdfview; - description = "A lightweight PDF document viewer using Poppler and GTK+"; + description = "A lightweight PDF document viewer using Poppler and GTK"; longDescription = '' - ePDFView is a free lightweight PDF document viewer using Poppler and - GTK+ libraries. The aim of ePDFView is to make a simple PDF document - viewer, in the lines of Evince but without using the Gnome libraries. + ePDFView is a free lightweight PDF document viewer using Poppler and + GTK libraries. The aim of ePDFView is to make a simple PDF document + viewer, in the lines of Evince but without using the Gnome libraries. ''; license = licenses.gpl2; maintainers = [ maintainers.astsmtl ]; diff --git a/nixpkgs/pkgs/applications/misc/evilvte/default.nix b/nixpkgs/pkgs/applications/misc/evilvte/default.nix index d1161aa68226..984ade077a8a 100644 --- a/nixpkgs/pkgs/applications/misc/evilvte/default.nix +++ b/nixpkgs/pkgs/applications/misc/evilvte/default.nix @@ -3,7 +3,7 @@ configH ? "" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "evilvte"; version = "0.5.2-20140827"; diff --git a/nixpkgs/pkgs/applications/misc/evtest/default.nix b/nixpkgs/pkgs/applications/misc/evtest/default.nix index 3d715a1d16bd..d6d20367b060 100644 --- a/nixpkgs/pkgs/applications/misc/evtest/default.nix +++ b/nixpkgs/pkgs/applications/misc/evtest/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: stdenv.mkDerivation rec { - name = "evtest-1.33"; + pname = "evtest"; + version = "1.34"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libxml2 ]; src = fetchgit { - url = "git://anongit.freedesktop.org/evtest"; - rev = "refs/tags/evtest-1.33"; + url = "git://anongit.freedesktop.org/${pname}"; + rev = "refs/tags/${pname}-${version}"; sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g"; }; diff --git a/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix index f0da4e883517..5df34c84f096 100644 --- a/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://fontmanager.github.io/; - description = "Simple font management for GTK+ desktop environments"; + description = "Simple font management for GTK desktop environments"; longDescription = '' Font Manager is intended to provide a way for average users to easily manage desktop fonts, without having to resort to command line tools or editing configuration files by hand. While designed primarily with the Gnome Desktop Environment in mind, it should - work well with other Gtk+ desktop environments. + work well with other GTK desktop environments. Font Manager is NOT a professional-grade font management solution. ''; diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 6b57c74c1234..169c5c11b8ce 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.10.2"; + version = "1.10.3"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "09q9l747vv6nrkscj08dv970qs6nm2azjcm015xf3bd5ab91l44r"; + sha256 = "1ippn0zbjy69n178vh4wgyzy6723ynvj2w23mzqw7v2mzcvkhmdz"; }; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/girara/default.nix b/nixpkgs/pkgs/applications/misc/girara/default.nix index 4d990c69b4a3..c2b7487cd72f 100644 --- a/nixpkgs/pkgs/applications/misc/girara/default.nix +++ b/nixpkgs/pkgs/applications/misc/girara/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://pwmt.org/projects/girara/; description = "User interface library"; longDescription = '' - girara is a library that implements a GTK+ based VIM-like user interface + girara is a library that implements a GTK based VIM-like user interface that focuses on simplicity and minimalism. ''; license = licenses.zlib; diff --git a/nixpkgs/pkgs/applications/misc/gksu/default.nix b/nixpkgs/pkgs/applications/misc/gksu/default.nix index b5d008579ac7..4a806cbb183d 100644 --- a/nixpkgs/pkgs/applications/misc/gksu/default.nix +++ b/nixpkgs/pkgs/applications/misc/gksu/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "A graphical frontend for libgksu"; longDescription = '' - GKSu is a library that provides a Gtk+ frontend to su and sudo. + GKSu is a library that provides a GTK frontend to su and sudo. It supports login shells and preserving environment when acting as a su frontend. It is useful to menu items or other graphical programs that need to ask a user's password to run another program diff --git a/nixpkgs/pkgs/applications/misc/gmrun/default.nix b/nixpkgs/pkgs/applications/misc/gmrun/default.nix index 8a54cefaab04..50dda9510b91 100644 --- a/nixpkgs/pkgs/applications/misc/gmrun/default.nix +++ b/nixpkgs/pkgs/applications/misc/gmrun/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Gnome Completion-Run Utility"; longDescription = '' A simple program which provides a "run program" window, featuring a bash-like TAB completion. - It uses GTK+ interface. + It uses GTK interface. Also, supports CTRL-R / CTRL-S / "!" for searching through history. Running commands in a terminal with CTRL-Enter. URL handlers. ''; diff --git a/nixpkgs/pkgs/applications/misc/gnome15/default.nix b/nixpkgs/pkgs/applications/misc/gnome15/default.nix index e2cf8245ce67..7a918d961f63 100644 --- a/nixpkgs/pkgs/applications/misc/gnome15/default.nix +++ b/nixpkgs/pkgs/applications/misc/gnome15/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnome15-2016-06-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/goldendict/default.nix b/nixpkgs/pkgs/applications/misc/goldendict/default.nix index 6a5f4c9ce034..e917cc024d5b 100644 --- a/nixpkgs/pkgs/applications/misc/goldendict/default.nix +++ b/nixpkgs/pkgs/applications/misc/goldendict/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell , libao, ffmpeg, libeb, lzo, xz, libtiff, opencc , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }: -mkDerivation rec { +mkDerivation { name = "goldendict-2019-08-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix index 5bcaccb43bcf..d10507b10449 100644 --- a/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" "GTK=3" "CC=cc" "CXX=c++" diff --git a/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix b/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix index 308f084bd586..d86db7adb9d0 100644 --- a/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "green-pdfviewer"; version = "nightly-2014-04-22"; diff --git a/nixpkgs/pkgs/applications/misc/grip/default.nix b/nixpkgs/pkgs/applications/misc/grip/default.nix index cb407fca66cb..7f2057b2947a 100644 --- a/nixpkgs/pkgs/applications/misc/grip/default.nix +++ b/nixpkgs/pkgs/applications/misc/grip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - description = "GTK+-based audio CD player/ripper"; + description = "GTK-based audio CD player/ripper"; homepage = http://nostatic.org/grip; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix b/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix index 204624f24390..9b8d6a7f976b 100644 --- a/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { preferLocalBuild = true; meta = with stdenv.lib; { - description = "A font selection program for X11 using the GTK2 toolkit"; + description = "A font selection program for X11 using the GTK 2 toolkit"; longDescription = '' - Font selection tool similar to xfontsel implemented using GTK+ 2. + Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; homepage = http://gtk2fontsel.sourceforge.net/; diff --git a/nixpkgs/pkgs/applications/misc/guake/default.nix b/nixpkgs/pkgs/applications/misc/guake/default.nix index 37352915cb84..97303c43fb1a 100644 --- a/nixpkgs/pkgs/applications/misc/guake/default.nix +++ b/nixpkgs/pkgs/applications/misc/guake/default.nix @@ -3,7 +3,7 @@ let version = "3.6.3"; -in python3.pkgs.buildPythonApplication rec { +in python3.pkgs.buildPythonApplication { name = "guake-${version}"; format = "other"; diff --git a/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix index a2d2e8ad735c..a5a9187ab0f2 100644 --- a/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix +++ b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix @@ -1,6 +1,6 @@ { stdenv, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "example-unfree-package"; version = "1.0"; diff --git a/nixpkgs/pkgs/applications/misc/houdini/default.nix b/nixpkgs/pkgs/applications/misc/houdini/default.nix index 607dff293189..ce35e91d9278 100644 --- a/nixpkgs/pkgs/applications/misc/houdini/default.nix +++ b/nixpkgs/pkgs/applications/misc/houdini/default.nix @@ -2,7 +2,7 @@ let houdini-runtime = callPackage ./runtime.nix { }; -in buildFHSUserEnv rec { +in buildFHSUserEnv { name = "houdini-${houdini-runtime.version}"; extraBuildCommands = '' diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 034b9c79201a..720445be9bea 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.57.2"; + version = "0.58.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1cqvm2fj6hh2n9iv67vamhn23fbxmmwciks0r4h4y0hapzlzpyd8"; + sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d"; }; - modSha256 = "09r7r1s5b2fvnzpzjarpv2lnvp6bxdfschiq6352hw631n7kkyz1"; + modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790"; buildFlags = "-tags extended"; diff --git a/nixpkgs/pkgs/applications/misc/jekyll/default.nix b/nixpkgs/pkgs/applications/misc/jekyll/default.nix index 9ae9ab254e80..4d4dd248bc53 100644 --- a/nixpkgs/pkgs/applications/misc/jekyll/default.nix +++ b/nixpkgs/pkgs/applications/misc/jekyll/default.nix @@ -21,7 +21,7 @@ let # Else: Don't modify the arguments: exec ${ruby}/bin/ruby "$@" ''; -in bundlerApp rec { +in bundlerApp { pname = "jekyll"; exes = [ "jekyll" ]; diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index 56b28dbc8db9..4b70530987f1 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "josm"; - version = "15238"; + version = "15322"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0zh84glb4545av0s1qnccqqp8nrnfsr7rnwgbqpwwzvc2ngk91gv"; + sha256 = "1i6cxs6rvqjwh7yfji5701xdzpnaxcv97gsd692fjrwasnsx1f1i"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/kiwix/default.nix b/nixpkgs/pkgs/applications/misc/kiwix/default.nix index 89778f670ff3..898186b714b6 100644 --- a/nixpkgs/pkgs/applications/misc/kiwix/default.nix +++ b/nixpkgs/pkgs/applications/misc/kiwix/default.nix @@ -82,7 +82,6 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-static" "--disable-staticbins" ]; diff --git a/nixpkgs/pkgs/applications/misc/kjv/default.nix b/nixpkgs/pkgs/applications/misc/kjv/default.nix index 79f0b8dc6df2..7868e74d010c 100644 --- a/nixpkgs/pkgs/applications/misc/kjv/default.nix +++ b/nixpkgs/pkgs/applications/misc/kjv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches = [ add-apocrypha add-install-target ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/lilyterm/default.nix b/nixpkgs/pkgs/applications/misc/lilyterm/default.nix index 38078d11931b..e9dba4bcf469 100644 --- a/nixpkgs/pkgs/applications/misc/lilyterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/lilyterm/default.nix @@ -29,7 +29,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lilyterm"; inherit (stuff) src version; diff --git a/nixpkgs/pkgs/applications/misc/loxodo/default.nix b/nixpkgs/pkgs/applications/misc/loxodo/default.nix index 291e225d6c4f..f84ac6d600a6 100644 --- a/nixpkgs/pkgs/applications/misc/loxodo/default.nix +++ b/nixpkgs/pkgs/applications/misc/loxodo/default.nix @@ -3,7 +3,7 @@ let py = python27Packages; python = py.python; in -py.buildPythonApplication rec { +py.buildPythonApplication { name = "loxodo-0.20150124"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix index 42905fa3cb41..61151cb15506 100644 --- a/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix +++ b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix @@ -1,6 +1,6 @@ { stdenv, libusb1, pkgconfig, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ltwheelconf"; version = "0.2.7"; diff --git a/nixpkgs/pkgs/applications/misc/lutris/default.nix b/nixpkgs/pkgs/applications/misc/lutris/default.nix index 5435080e8318..c9ea146f063b 100644 --- a/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -31,13 +31,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.2.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv"; + sha256 = "0n6xa3pnwvsvfipinrkbhxwjzfbw2cjpc9igv97nffcmpydmn5xv"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/lxterminal/default.nix b/nixpkgs/pkgs/applications/misc/lxterminal/default.nix index 8ce353e85b91..0802a32d92b1 100644 --- a/nixpkgs/pkgs/applications/misc/lxterminal/default.nix +++ b/nixpkgs/pkgs/applications/misc/lxterminal/default.nix @@ -4,7 +4,7 @@ let version = "0.3.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lxterminal"; inherit version; diff --git a/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix b/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix index 318c7c252427..a81aec9d0364 100644 --- a/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix +++ b/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix @@ -2,7 +2,7 @@ , python27, python2Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "metamorphose2"; version = "0.9.0beta"; diff --git a/nixpkgs/pkgs/applications/misc/michabo/default.nix b/nixpkgs/pkgs/applications/misc/michabo/default.nix new file mode 100644 index 000000000000..015a326fdc9b --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/michabo/default.nix @@ -0,0 +1,53 @@ +{ lib +, mkDerivation +, makeDesktopItem +, fetchFromGitLab +, qmake +# qt +, qtbase +, qtwebsockets +}: + +let + desktopItem = makeDesktopItem { + type = "Application"; + name = "Michabo"; + desktopName = "Michabo"; + exec = "Michabo"; + }; + +in mkDerivation rec { + pname = "michabo"; + version = "0.1"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + owner = "kaniini"; + repo = "michabo"; + rev = "v${version}"; + sha256 = "0pl4ymdb36r0kwlclfjjp6b1qml3fm9ql7ag5inprny5y8vcjpzn"; + }; + + nativeBuildInputs = [ + qmake + ]; + buildInputs = [ + qtbase + qtwebsockets + ]; + + qmakeFlags = [ "michabo.pro" "DESTDIR=${placeholder "out"}/bin" ]; + + postInstall = '' + ln -s ${desktopItem}/share $out/share + ''; + + meta = with lib; { + description = "A native desktop app for Pleroma and Mastodon servers"; + homepage = "https://git.pleroma.social/kaniini/michabo"; + license = licenses.gpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/applications/misc/milu/default.nix b/nixpkgs/pkgs/applications/misc/milu/default.nix index 6c1dcd5e1505..2eee9ad40c16 100644 --- a/nixpkgs/pkgs/applications/misc/milu/default.nix +++ b/nixpkgs/pkgs/applications/misc/milu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "milu-nightly"; version = "2016-05-09"; diff --git a/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix index 95ceaddb4f03..eff93c8e99c1 100644 --- a/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, makeWrapper, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.2"; pname = "minergate-cli"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/minergate/default.nix b/nixpkgs/pkgs/applications/misc/minergate/default.nix index fdd1238d8700..a8402d975931 100644 --- a/nixpkgs/pkgs/applications/misc/minergate/default.nix +++ b/nixpkgs/pkgs/applications/misc/minergate/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.1"; pname = "minergate"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/mlterm/default.nix b/nixpkgs/pkgs/applications/misc/mlterm/default.nix index d3e7f9e8cd46..303b9fe5e8bc 100644 --- a/nixpkgs/pkgs/applications/misc/mlterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/mlterm/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/applications $desktopItem/share/applications/* ''; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "mlterm"; exec = "mlterm %U"; icon = "mlterm"; diff --git a/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/nixpkgs/pkgs/applications/misc/moolticute/default.nix index 0f4e72502bba..e734e44a2e04 100644 --- a/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "moolticute-${version}"; + pname = "moolticute"; version = "0.30.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/mpvc/default.nix b/nixpkgs/pkgs/applications/misc/mpvc/default.nix index fffa95952622..35de284c0baa 100644 --- a/nixpkgs/pkgs/applications/misc/mpvc/default.nix +++ b/nixpkgs/pkgs/applications/misc/mpvc/default.nix @@ -1,6 +1,6 @@ { stdenv, socat, fetchFromGitHub, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mpvc-unstable-2017-03-18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/omegat.nix b/nixpkgs/pkgs/applications/misc/omegat.nix index 411b318a3925..27d7ad8730b6 100644 --- a/nixpkgs/pkgs/applications/misc/omegat.nix +++ b/nixpkgs/pkgs/applications/misc/omegat.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "4.3.0"; pname = "omegat"; diff --git a/nixpkgs/pkgs/applications/misc/orca/default.nix b/nixpkgs/pkgs/applications/misc/orca/default.nix index 332c696d8da2..1a8d5b76fe3d 100644 --- a/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -64,7 +64,7 @@ buildPythonApplication rec { access to the graphical desktop via speech and refreshable braille. It works with applications and toolkits that support the Assistive Technology Service Provider Interface (AT-SPI). That includes the GNOME - Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and + GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. diff --git a/nixpkgs/pkgs/applications/misc/osmctools/default.nix b/nixpkgs/pkgs/applications/misc/osmctools/default.nix index 4cbd7cb71190..2dfbb7a23705 100644 --- a/nixpkgs/pkgs/applications/misc/osmctools/default.nix +++ b/nixpkgs/pkgs/applications/misc/osmctools/default.nix @@ -16,7 +16,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osmctools"; version = "0.8.5plus1.4.0"; diff --git a/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix b/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix index 633c1d82159a..c6cd118aea80 100644 --- a/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix +++ b/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://blog.lxde.org/category/pcmanfm/; license = licenses.gpl2Plus; - description = "File manager with GTK+ interface"; + description = "File manager with GTK interface"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix b/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix index 482ac7ad0667..17253173a5e4 100644 --- a/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://pcman.ptt.cc; license = licenses.gpl2; - description = "Telnet BBS browser with GTK+ interface"; + description = "Telnet BBS browser with GTK interface"; maintainers = [ maintainers.sifmelcara ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix index bc6f5965e89b..9756d9b42b0a 100644 --- a/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "pdf-quench"; version = "1.0.5"; diff --git a/nixpkgs/pkgs/applications/misc/perkeep/default.nix b/nixpkgs/pkgs/applications/misc/perkeep/default.nix index 8804e438b7e8..ae81ef3c9f6c 100644 --- a/nixpkgs/pkgs/applications/misc/perkeep/default.nix +++ b/nixpkgs/pkgs/applications/misc/perkeep/default.nix @@ -1,18 +1,37 @@ -{ buildGo110Package, fetchzip, lib }: +{ buildGoPackage, fetchurl, fetchFromGitHub, lib }: -buildGo110Package rec { +let + gouiJS = fetchurl { + url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js"; + sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g"; + }; + + publisherJS = fetchurl { + url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js"; + sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; + }; + +in buildGoPackage rec { name = "perkeep-${version}"; - version = "0.10.1"; + version = "unstable-2019-07-29"; - src = fetchzip { - url = "https://perkeep.org/dl/perkeep-${version}-src.zip"; - sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422"; + src = fetchFromGitHub { + owner = "perkeep"; + repo = "perkeep"; + rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41"; + sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg"; }; goPackagePath = "perkeep.org"; buildPhase = '' cd "$NIX_BUILD_TOP/go/src/$goPackagePath" + + # Skip network fetches + sed -i '/fetchAllJS/a if true { return nil }' make.go + cp ${publisherJS} app/publisher/publisher.js + cp ${gouiJS} server/perkeepd/ui/goui.js + go run make.go ''; diff --git a/nixpkgs/pkgs/applications/misc/phwmon/default.nix b/nixpkgs/pkgs/applications/misc/phwmon/default.nix index e8ddec91e62a..6fb70f1c9a26 100644 --- a/nixpkgs/pkgs/applications/misc/phwmon/default.nix +++ b/nixpkgs/pkgs/applications/misc/phwmon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "phwmon"; version = "2017-04-10"; diff --git a/nixpkgs/pkgs/applications/misc/plank/default.nix b/nixpkgs/pkgs/applications/misc/plank/default.nix index 10c8a03fa0a2..dfc92e38f63c 100644 --- a/nixpkgs/pkgs/applications/misc/plank/default.nix +++ b/nixpkgs/pkgs/applications/misc/plank/default.nix @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; # Make plank's application launcher hidden in Pantheon diff --git a/nixpkgs/pkgs/applications/misc/pmenu/default.nix b/nixpkgs/pkgs/applications/misc/pmenu/default.nix index 16c49d5f946c..bd3796a572b0 100644 --- a/nixpkgs/pkgs/applications/misc/pmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/pmenu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, python2Packages, gnome-menus }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pmenu"; version = "2018-01-01"; diff --git a/nixpkgs/pkgs/applications/misc/posterazor/default.nix b/nixpkgs/pkgs/applications/misc/posterazor/default.nix index 45db856dbb9e..7209ee3e4009 100644 --- a/nixpkgs/pkgs/applications/misc/posterazor/default.nix +++ b/nixpkgs/pkgs/applications/misc/posterazor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "posterazor-1.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/qolibri/default.nix b/nixpkgs/pkgs/applications/misc/qolibri/default.nix index ecc372dc674c..ab15855b910b 100644 --- a/nixpkgs/pkgs/applications/misc/qolibri/default.nix +++ b/nixpkgs/pkgs/applications/misc/qolibri/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase , qtmultimedia, qttools, qtwebengine }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qolibri"; version = "2018-11-14"; diff --git a/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix b/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix index 47b4641234f3..702cadfdaa91 100644 --- a/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix +++ b/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix @@ -7,7 +7,7 @@ , tesseract }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qt-box-editor"; version = "unstable-2019-07-12"; diff --git a/nixpkgs/pkgs/applications/misc/rofi/default.nix b/nixpkgs/pkgs/applications/misc/rofi/default.nix index 94381d4f6f96..eabf77f0e951 100644 --- a/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, makeWrapper , autoreconfHook, pkgconfig, libxkbcommon, pango, which, git , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check @@ -19,11 +19,16 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; + postInstall = '' + wrapProgram $out/bin/rofi-theme-selector \ + --prefix XDG_DATA_DIRS : $out/share + ''; + doCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/roxterm/default.nix b/nixpkgs/pkgs/applications/misc/roxterm/default.nix index 1cff3635bf9d..3dbe7790d185 100644 --- a/nixpkgs/pkgs/applications/misc/roxterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/roxterm/default.nix @@ -1,55 +1,40 @@ -{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat -, gsettings-desktop-schemas, gdk-pixbuf, gtk3, hicolor-icon-theme -, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper -, pkgconfig, python, pythonPackages, vte -, wrapGAppsHook}: +{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub +, glib, gtk3, harfbuzz, hicolor-icon-theme, libXdmcp, libXtst, libpthreadstubs +, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre +, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto +}: -# TODO: Still getting following warning. -# WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files -# Seems related to this: -# https://forums.gentoo.org/viewtopic-t-947210-start-0.html - -let version = "3.3.2"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "roxterm"; - inherit version; + version = "3.7.5"; - src = fetchurl { - url = "mirror://sourceforge/roxterm/${pname}-${version}.tar.xz"; - sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k"; + src = fetchFromGitHub { + owner = "realh"; + repo = "roxterm"; + rev = version; + sha256 = "042hchvgk9jzz035zsgnfhh8105zvspbzz6b78waylsdlgqn0pp1"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = - [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus dbus-glib - gdk-pixbuf gsettings-desktop-schemas gtk3 - hicolor-icon-theme vte ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" - "-I${dbus.dev}/include/dbus-1.0" - "-I${dbus.lib}/lib/dbus-1.0/include" ]; - - # Fix up python path so the lockfile library is on it. - PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [ - pythonPackages.lockfile + patches = [ + # This is the commit directly after v3.7.5. It is needed to get roxterm to + # build correctly. It can be removed when v3.7.6 (or v3.8.0) has been + # released. + (fetchpatch { + url = "https://github.com/realh/roxterm/commit/f7c38fd48bd1810e16d82794bdfb61a9760a2fe1.patch"; + sha256 = "1v77b7ilgf8zy1npxxcyc06mq6lck6bi6lw4aksnq3mi61n5znmx"; + }) ]; - buildPhase = '' - # Fix up the LD_LIBRARY_PATH so that expat is on it - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib" - - python mscript.py configure --prefix="$out" --disable-nls --disable-translations - python mscript.py build - ''; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; - installPhase = '' - python mscript.py install - ''; + buildInputs = + [ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp + utillinuxMinimal glib hicolor-icon-theme docbook_xsl xmlto libselinux + libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit + ]; meta = with stdenv.lib; { - homepage = http://roxterm.sourceforge.net/; + homepage = "https://github.com/realh/roxterm"; license = licenses.gpl3; description = "Tabbed, VTE-based terminal emulator"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix index 17cea90ac27c..b6676a0bf70e 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix @@ -18,7 +18,7 @@ let }; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}"; diff --git a/nixpkgs/pkgs/applications/misc/sequelpro/default.nix b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix index 114404c2597d..e81c0b99264e 100644 --- a/nixpkgs/pkgs/applications/misc/sequelpro/default.nix +++ b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, undmg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sequel-pro"; version = "1.1.2"; diff --git a/nixpkgs/pkgs/applications/misc/solaar/default.nix b/nixpkgs/pkgs/applications/misc/solaar/default.nix index cb2cd3f1e62f..f2e1aa6bdb68 100644 --- a/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -3,7 +3,7 @@ # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "solaar-unstable"; version = "2019-01-30"; diff --git a/nixpkgs/pkgs/applications/misc/ssocr/default.nix b/nixpkgs/pkgs/applications/misc/ssocr/default.nix index eb408eaf6ee3..bb1655b44632 100644 --- a/nixpkgs/pkgs/applications/misc/ssocr/default.nix +++ b/nixpkgs/pkgs/applications/misc/ssocr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, imlib2, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ssocr"; version = "unstable-2018-08-11"; diff --git a/nixpkgs/pkgs/applications/misc/stupidterm/default.nix b/nixpkgs/pkgs/applications/misc/stupidterm/default.nix index 1fc96e551ac7..ecaf9d5a34a2 100644 --- a/nixpkgs/pkgs/applications/misc/stupidterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/stupidterm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stupidterm"; version = "2019-03-26"; @@ -27,10 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Simple wrapper around the VTE terminal emulator widget for GTK+"; - longDescription = '' - Simple wrapper around the VTE terminal emulator widget for GTK+ - ''; + description = "Simple wrapper around the VTE terminal emulator widget for GTK"; homepage = https://github.com/esmil/stupidterm; license = licenses.lgpl3Plus; maintainers = [ maintainers.etu ]; diff --git a/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/nixpkgs/pkgs/applications/misc/subsurface/default.nix index a29dad2c4447..960b7b9eeef5 100644 --- a/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -6,7 +6,7 @@ let version = "4.8.2"; - libdc = stdenv.mkDerivation rec { + libdc = stdenv.mkDerivation { pname = "libdivecomputer-ssrf"; inherit version; @@ -66,7 +66,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "subsurface"; inherit version; diff --git a/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index ee42c1389fcd..9dcdf8fd2b0e 100644 --- a/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -71,7 +71,7 @@ let d2u = stdenv.lib.replaceChars ["."] ["_"]; -in rec { +in { application = mkSweetHome3D rec { version = "6.2"; diff --git a/nixpkgs/pkgs/applications/misc/taskell/default.nix b/nixpkgs/pkgs/applications/misc/taskell/default.nix index 00b96f459cb7..702c3124d8ab 100644 --- a/nixpkgs/pkgs/applications/misc/taskell/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { lib, haskellPackages, fetchFromGitHub }: let - version = "1.6.0"; - sha256 = "1yq7lbqg759i3hyxcskx3924b7xmw6i4ny6n8yq80k4hikw2k6mf"; + version = "1.6.1"; + sha256 = "047gvpq52pif9sfb4qcfdiwz50x3wlnjvsnnjzypm1qlwyl2rbz1"; in (haskellPackages.mkDerivation { pname = "taskell"; diff --git a/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix index e65ab3451a62..deeeac106943 100644 --- a/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix +++ b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix @@ -1,5 +1,5 @@ { - "mail" = { + mail = { version = "2.6.3"; source = { type = "gem"; @@ -9,14 +9,14 @@ "mime-types" ]; }; - "mime-types" = { + mime-types = { version = "2.6.1"; source = { type = "gem"; sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; }; }; - "taskjuggler" = { + taskjuggler = { version = "3.5.0"; source = { type = "gem"; @@ -27,7 +27,7 @@ "term-ansicolor" ]; }; - "term-ansicolor" = { + term-ansicolor = { version = "1.3.2"; source = { type = "gem"; @@ -37,7 +37,7 @@ "tins" ]; }; - "tins" = { + tins = { version = "1.6.0"; source = { type = "gem"; diff --git a/nixpkgs/pkgs/applications/misc/taskopen/default.nix b/nixpkgs/pkgs/applications/misc/taskopen/default.nix index 9f1773b191d2..847092356d28 100644 --- a/nixpkgs/pkgs/applications/misc/taskopen/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskopen/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, makeWrapper, which, perl, perlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "taskopen-1.1.4"; src = fetchurl { url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/tdrop/default.nix b/nixpkgs/pkgs/applications/misc/tdrop/default.nix index 15ee275c0e19..547eea4f2d23 100644 --- a/nixpkgs/pkgs/applications/misc/tdrop/default.nix +++ b/nixpkgs/pkgs/applications/misc/tdrop/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper , xwininfo, xdotool, xprop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tdrop"; version = "unstable-2018-11-13"; diff --git a/nixpkgs/pkgs/applications/misc/tilix/default.nix b/nixpkgs/pkgs/applications/misc/tilix/default.nix index 095681d136d8..aae17905cb71 100644 --- a/nixpkgs/pkgs/applications/misc/tilix/default.nix +++ b/nixpkgs/pkgs/applications/misc/tilix/default.nix @@ -19,7 +19,7 @@ , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tilix"; version = "unstable-2019-08-03"; diff --git a/nixpkgs/pkgs/applications/misc/todiff/default.nix b/nixpkgs/pkgs/applications/misc/todiff/default.nix index 5bb2b5b94616..93f233a4f925 100644 --- a/nixpkgs/pkgs/applications/misc/todiff/default.nix +++ b/nixpkgs/pkgs/applications/misc/todiff/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "todiff-${version}"; + pname = "todiff"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/tootle/default.nix b/nixpkgs/pkgs/applications/misc/tootle/default.nix index 413f082fb22a..4ccf204357ca 100644 --- a/nixpkgs/pkgs/applications/misc/tootle/default.nix +++ b/nixpkgs/pkgs/applications/misc/tootle/default.nix @@ -7,7 +7,7 @@ let pname = "tootle"; version = "0.2.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/twmn/default.nix b/nixpkgs/pkgs/applications/misc/twmn/default.nix index 04c6cc3606e3..2aef45748cac 100644 --- a/nixpkgs/pkgs/applications/misc/twmn/default.nix +++ b/nixpkgs/pkgs/applications/misc/twmn/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "twmn-git-2018-10-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/volnoti/default.nix b/nixpkgs/pkgs/applications/misc/volnoti/default.nix index e482e7e7c02d..3561135ce618 100644 --- a/nixpkgs/pkgs/applications/misc/volnoti/default.nix +++ b/nixpkgs/pkgs/applications/misc/volnoti/default.nix @@ -2,7 +2,7 @@ , pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg , dbus-glib, autoreconfHook, wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "volnoti-unstable"; version = "2013-09-23"; diff --git a/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix b/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix index 6ed2ff10aaa7..e381af4f403e 100644 --- a/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix +++ b/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ glib pcre json-glib ]; cmakeFlags = [ - "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder ''out''}/etc/chromium/native-messaging-hosts" - "-DCHROME_MANIFEST_DESTINATION=${placeholder ''out''}/etc/opt/chrome/native-messaging-hosts" - "-DFIREFOX_MANIFEST_DESTINATION=${placeholder ''out''}/lib/mozilla/native-messaging-hosts" + "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts" + "-DCHROME_MANIFEST_DESTINATION=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" + "-DFIREFOX_MANIFEST_DESTINATION=${placeholder "out"}/lib/mozilla/native-messaging-hosts" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/wtf/default.nix b/nixpkgs/pkgs/applications/misc/wtf/default.nix index 52462d1c1f34..60ff84ffe593 100644 --- a/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -1,30 +1,33 @@ { buildGoModule , fetchFromGitHub , lib +, makeWrapper +, ncurses }: buildGoModule rec { pname = "wtf"; - version = "0.20.0"; + version = "0.21.0"; + + overrideModAttrs = _oldAttrs : _oldAttrs // { + preBuild = ''export GOPROXY="https://gocenter.io"''; + }; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "03k3x3fnxz23b75n5x8mlr6srr063q3dwq05wh55b4bgqsf7lgzd"; + sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9"; }; - modSha256 = "1nqnjpkrjbb75yfbzh3v3vc4xy5a2aqm9jr40hwq589a4l9p5pw2"; + modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - # As per https://github.com/wtfutil/wtf/issues/501, one of the - # dependencies can't be fetched, so vendored dependencies should - # be used instead - modBuildPhase = '' - runHook preBuild - make build -mod=vendor - runHook postBuild + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/xautoclick/default.nix b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix index 9040bb4318d5..295d721d3c5f 100644 --- a/nixpkgs/pkgs/applications/misc/xautoclick/default.nix +++ b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix @@ -3,7 +3,7 @@ , qtSupport ? true, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.31"; pname = "xautoclick"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/xneur/default.nix b/nixpkgs/pkgs/applications/misc/xneur/default.nix index 0661a625e97f..f3bbbf42d5bc 100644 --- a/nixpkgs/pkgs/applications/misc/xneur/default.nix +++ b/nixpkgs/pkgs/applications/misc/xneur/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xneur"; version = "0.20.0"; diff --git a/nixpkgs/pkgs/applications/misc/xrq/default.nix b/nixpkgs/pkgs/applications/misc/xrq/default.nix index fe65004b32ae..244a2c43a155 100644 --- a/nixpkgs/pkgs/applications/misc/xrq/default.nix +++ b/nixpkgs/pkgs/applications/misc/xrq/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xrq-unstable-2016-01-15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/yarssr/default.nix b/nixpkgs/pkgs/applications/misc/yarssr/default.nix index 06e12416baa0..f2da2957bd3e 100644 --- a/nixpkgs/pkgs/applications/misc/yarssr/default.nix +++ b/nixpkgs/pkgs/applications/misc/yarssr/default.nix @@ -23,7 +23,7 @@ let gtk2 ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2017-12-01"; pname = "yarssr"; diff --git a/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix index 975c6e4a4680..88e4a9043931 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix @@ -21,7 +21,7 @@ in symlinkJoin { description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the - poppler rendering library and the gtk+ toolkit. The idea behind zathura + poppler rendering library and the GTK toolkit. The idea behind zathura is an application that provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction. ''; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 45c125985120..a3645e97e255 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -150,21 +150,11 @@ let ] ++ optionals (useVaapi) [ # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi ./patches/chromium-vaapi.patch - ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [ - ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" ) - ] ++ optional stdenv.isAarch64 - (if (versionOlder version "71") then - fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; - sha256 = "0dkchqair8cy2f5a5p5vi24r9b4d28pgn2bfvm1568lypbjw6iab"; - } - else - fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; - postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64"; - sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; - } - ); + ] ++ optional stdenv.isAarch64 (fetchpatch { + url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; + postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64"; + sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; + }); postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix index 2334dc6a71e4..6dff17c69ddb 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix @@ -35,7 +35,7 @@ let "http://repo.fdzh.org/chrome/deb/pool/main/g" ]; -in rec { +in { getChannel = channel: let chanAttrs = builtins.getAttr channel sources; in { diff --git a/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix index 4f4741ce0bdf..da6a7bc47155 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix @@ -10,7 +10,7 @@ assert enableGuile -> guile != null; assert enablePython -> python != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "elinks-0.12pre6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index dea752874ddb..537a30c01a2e 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -58,8 +58,8 @@ let inherit (generated) version sources; mozillaPlatforms = { - "i686-linux" = "linux-i686"; - "x86_64-linux" = "linux-x86_64"; + i686-linux = "linux-i686"; + x86_64-linux = "linux-x86_64"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index cd9d3bd88a09..386707351108 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,935 +1,935 @@ { - version = "68.0.2"; + version = "69.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ach/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ach/firefox-69.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f4ef9741a880475331f3cfd6aa9315d64c6cabc68fcea85e9f04f6a4f6cf9df952c05ef810b1eeaa5afbbc4001735840849c2dc180694bc76b5a3812f83ee50b"; + sha512 = "300639491b6ca69d7f594df35fbaae3f0e452f8c5280aee71f64ebfdb2592f3948ea2b936f04f01660e3b296e07650b72c583771a90902e62ca3efaea67d291e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/af/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/af/firefox-69.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "891d435d29154ebff8caa7942196c593ae350f490a411d05de1af247ca371f8f531d9a90e52c666f530ae5a4145ff99f686629921f908712c7931bf43d21b9c1"; + sha512 = "5da9dee3ec659045f282dd76c821cc62ac20fda014ce04fdd756ad0ebbba73f054f520f89e227c5b6590255e275d0cdece2c2c16e42733c7395ecde18f42f2f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/an/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/an/firefox-69.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "d7f587357777b7bf70add4162cd62364d8c2be0bf7219e4c1b25335b66645ae4c1e5581a7d0a03e30d4eab5c5664cf05b1b85ce0dd13827a29c0ce227549c9e6"; + sha512 = "7ef4a311136988c57194e9388862f68b30cc4e5f9c4303da4105389188abb4453f592e9d0819b337e7ef9b482a76df19a9d84a06eeb287f93dbc7e43a41bda15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ar/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ar/firefox-69.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2b04ba04cdfb1ad488fd5a183a862c2f6d0166d73ee637a25d64a7e9ff962d0fe7ab8970afa83cf28c5976f16257c42f6a26499b49b2d01f4e655499ec85cb0d"; + sha512 = "a16636cfced17bccf2932e14c6b4c2260c713c538d774802c1dc8598bc47635238549a4332c4cf69b3d3946397bc8f2ba5b330be5716dbb8a81570bea1acc5e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ast/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ast/firefox-69.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "2267f7a3a8a27816e550e567d5b9a9639df31b86e24c17216e9843bf5211e520d3303200f5c15b9a342e90754db9a9646ad87615b6b490d6058f26fd21db6ffe"; + sha512 = "2239a47cd8869cb7cd50820e1faef0eae66245f04cab81e36250b4be1ae3e7619a994b68c2256777636f8da8fb10aee781715b11bbd7ea857300b7a5afcb085f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/az/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/az/firefox-69.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "69f2e026ddc3c26f7f8a6ee2d239289c1e154a9147a20dcfb07be571bd57ed3492c2b770c768dd0b6ace979410649af5193140757b1d5131391706ce156746d3"; + sha512 = "d79ad1be25e9eb3123ba89a5589abfdc58e161bf3ab0c90ff3306639f1a43bd80b9175695f7d5a24aad7c3fb16a616bb90eeb67d2f3f820db5b5b5556e774cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/be/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/be/firefox-69.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "11efb3f3a123d29814be1e4f72e2a0424f05d5c2d5da67fd0ae4f23909d8da910e2b9efde472c85fc3c0b2d51492eae2b41575e6a84954073842d210cbc4de5c"; + sha512 = "38b340353be185502214945665b846ca73f1ace1528f0426ae702d8dda88a104f79a879e99873bc9f418a753572ab3bd597a9f820f0e0e94daeb21e05793b90a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bg/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bg/firefox-69.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "75b57ec04a5a56691e31d4d10acca2e28d1d8975f4cd277c4e1e523e9ab0860789c83f63ce2a7c41f8b3308c7f75539d3c833c2cd62bcecf8677114b053322ec"; + sha512 = "addf46d8ac6a823d9f1a00e55bd814abb27732484560399aacc7f704fcfbc7d239380c0857df7a4d445fac8724caada49981c2dd4ee288f47c63a7613aefed9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bn/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bn/firefox-69.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "6942ef38de37525233bc24aa993fb9ef3e723fb21a4627f0edd53412b2129c1326b85f3c828383080d7fbff3fecaca63d69e765b61b1d45a2edebc0c037f710f"; + sha512 = "3d0e90b85b5d91f01ae4e84182d071f9b07436a3d9f088ca9178a72140a7d3fcd6c1506b7899ec7bc6ef82a6dd132ea5345c2c8b41c1e2977a5d1aa95f916453"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/br/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/br/firefox-69.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "d34947348a7e6ebdfc6d4f91f2b567e6623175dc61a774bc79d137e4bc9679dff381d3e454029d35028ee1019fc806b26e7c85ce4fe36868f01978e4540480e5"; + sha512 = "aae8493b79569b0e096193c05de56197e01c9f8f7e89b8db2d021bed6ab6e553af4e44c36ad66d427e80840e631d7b85f8c9d1c5ca17fd0bb94a0bfdaab94d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bs/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bs/firefox-69.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "ee1c6343ea3aef7852ca240608f80dc9279469422e6730f0eb2cc8c532ffb5c6eba01bc3f1f2f759724661c53d329be619593d741771187057fdb903100f1153"; + sha512 = "19efd698f911401b32b3affa6e5a371566eca8aaafde96e38704e48871f69d4e6c4c3a8f189519f8b8022ad2782ea5076e53e75db9c1c12e504eb31c827c243a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ca/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ca/firefox-69.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f22b424240fb8858a9960f96384e81f8609deca0adda0deb29e18328b4f4dd71048c4b450121f53c29d6a4b3d63a4cba8a72a7194da3e93645bbcc00d7d7951a"; + sha512 = "527d672c469bbea18d727e276fd53ca26d65a169f665b32190c6db47c549e7e3155dd04c65fb2720e1d45658a3c8c1f2567f62fc807a8993bf00a2cf280db548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cak/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cak/firefox-69.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5b4332b617917f5aaeb315f51262cd444e09bf8c0ba6c147c11ffd23a3eadf4a27bc67067baf17424138b3d26760780a0e8a482701dc9ee8b12a1de229fb8026"; + sha512 = "def5f01b180c354ecf2248d36f12778a2dbb5df8e376bc1eff4eefe3cb3b383cdb1b03b7a83784325ecbef330e5449687b36cbd239090973f1bb3098717bc2ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cs/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cs/firefox-69.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a9037bd4feceaa7db14d342ba6bcb07526f847650bafbf40615b1f209a8992739ce82729c3b02230a295638292d219c327fc752fa206945261c3897a888ec4f5"; + sha512 = "5490aff5d9c693e22104607dd8ef342fb3ed79905995854930c7eee876cb2da3f940bf339570b68f008557ea16312af614ef65895a6831c22849e9818ea91b52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cy/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cy/firefox-69.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0eef12e6d28dd7b0adeea318eb17fed6325c4417d3b05e72fc106118d43d6d152e2b858888164344dfbced5708adb88615490c8e7f784707b6f9e30f52d877c7"; + sha512 = "9b5e9518f89a9777150fecb25951ca02c232b526784161a8b55aa09b4cab9ed23743dbf62c5f365802beffab4c62d5991da83b138889d7894e5f1b1dc2edcb17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/da/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/da/firefox-69.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d3f1ee58db717a3b04d1cdda1790243d776bc8c0670501ad74b1871c61fa788f143ac3c43a9b5c6635f4e5d7f2daf15e293994ba0fd6d5d4dc70b3a39c9f872f"; + sha512 = "9482ccaa5e3ab92522f60a28571c020c3acce55acbd7c38d7d4f7559396cb71ea96a47210213d1ff15a0d97fbb1a3b6e07453d09ace9cdbee13381fb68829bed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/de/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/de/firefox-69.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "86c38b2a5c8507de6949c153ffc98a2451cc3fb4d35aa534c36ff1b723a0153ccc5c5a92ccdd470826edbd844b02476c58800c2a7c6472a4cfec860e13a7e270"; + sha512 = "055948aa2b9ef551d0348b4a24437648cf7613446cabf1290ce429c0ed70c7f2b81ca82f0dbbe9359a0bdb6cce673f9472a3fe74e1ef8359ff3fb8903763a7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/dsb/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/dsb/firefox-69.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "2c8bcafe89dbbf2361af22789a3743ecd2c12fea2b457d75bb24b3ba2b7fbd9638c418158ee70961a25b4a273ab07894ca166dbc783199ab406699c42828fbbf"; + sha512 = "a19cc34132f07635eebfc0d521c0177cd24f8c800f9be2750e2e653e8732fb93b39343eceefffacfbebed5656ad4ba0fb05557bd55e993f27c3327b171020f81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/el/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/el/firefox-69.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4dd8368090c6af5995d63f84bc2a3fb612fa57acb0c38bea48a7371b4c8fbec22017b665b3801f5419ebfceabca5a7b5eb2fc6d21cbf287d6c2427c89457e7ee"; + sha512 = "f70a195f748c546fd76f5f2e73a379eda8a079475b3e03e67af41c8b0da1ddeb70c335ffa3f6019b406e49944c329eee1ac600d8fcd2daf393d0348d8bbb8048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-CA/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-CA/firefox-69.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "22badc05493fc477984190c5e839b44e8991f4b43592e84eab093fae3b4720de41965d389ab3dd6425a7ea8a44038222c474be57cddfbd5b30e34b49e3aabdd8"; + sha512 = "eac808b225a6ef8162ddf82d8f975d8c0c77a4f8aec110fec017dad38ee4070d4a754f74566cbfe4d8dbbd65a022e1f168c2ffbac3f8ce84f10fb3eafcd114e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-GB/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-GB/firefox-69.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "7fd1739f7da9aebb19c698b45cae649fd63ae0d573956ce1289c1dc51bd5964d1419f90f4d7c29abf344cf523b8f1ac4063678e70568468db35752ccfd5dfe13"; + sha512 = "ba5d57b5596aef987b07354db04bd930fee66a58672c246c9769b2205f96f8d80360d1d212e560a7897ecca95f0b10385eb9d947c4b71126cae5d4893a2a7a47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-US/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-US/firefox-69.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "8742f7831dbb888554532583c0dae319c1e30424901bbfeab62011088755067df63f360e5aed8fe3675706c4a64dbfaafbf832e66f559dd3c1f58afe8468bff0"; + sha512 = "f4f57ec920bed699a986512dac01adff30fa446ffc35b50039f9b321d4c5a1ede9ccd311f81aa3b7a0ed844a5ba4de1e676ce50bfe138f69f786e6d86afa790f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eo/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eo/firefox-69.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "93a7d92b10d3927edf5870cc46091933b88372c8ebb55d6a60831671f3501b62557037e38d25e18ee61f4e65c14c057d24a3453083adb9383eb3f21b16550f3f"; + sha512 = "0697adf7b3b68b1b11018c690868a28389c2579f96886d5e2d70c7a66abd14778291e2f7efacb3467022dfcb0368bd2d04814aadc7356a536791e0613026db2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-AR/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-AR/firefox-69.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "4b775586020624d238d7ab0c09a420a9328fc46f6238f397b569fd60bf56cf424c70e016c2f5814c0e9fe42fecb703f68a366ec7de1c68b11e4b43565b3a3929"; + sha512 = "0adc717397ddac8b49e5d86bbd702d122ce0f09add74b2246a98d2b686cdebfecef1011dfca5b54752671c7019b153ef9994e983cdcb78023b35e166177bd6c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-CL/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-CL/firefox-69.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "172daa90a8062c4d7884aa0d2df32d8a9219ef04bedcbb270f785dbf6a9d3d5369f69f9dee589d95593ef464e4dee84384c39462a81eb87ec7c0679cf415bbd7"; + sha512 = "fa5fbee9d58121faeb0d3a2d17375410e7eea9e7a92b0f803c7b922c936b78cb8db55f9dc6745d9fbe12474a5baba5e7c11e2a83426b19c29bad0262cd046fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-ES/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-ES/firefox-69.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "96ef9f02a019947e9502abc583389b0f06fff8e8bb00149108c0dc15799bb556326c4d79905348d02860efd3a090af93998206c17dda6e88819f531837c97f27"; + sha512 = "40d61b149da156b3008b131a9a4cb46a00c05a700e72a84575ce33f0b6dcf0bf317f64f54c1b0a0e6b03e817afdead048c530ff068da3cf8cb4ef53d60e57ea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-MX/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-MX/firefox-69.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "8f120aef18b76259f84e43c1a2c82fca04c56bed10891381e875758c53334cc2987e7ad78a3f9d9aa34edc79352dcd1bf4a7d2b1bc03099dce59b5423de9687e"; + sha512 = "518bec00e953c8adb7f5c7a0ea460b9d92b0b001f960e31ca5ef1771e74309782056760593f7f976795acfe020498b67d94f80f87fab37469b0c219e86c0158e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/et/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/et/firefox-69.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "227f0bf21042f11ebf33988803274fe6dddc73f9fb357335e24c1c82cb396bd74fcb913fd9c9c848f34de57f518c924a0c1b8952ad9bb3be18f20ad4328cf629"; + sha512 = "7a5fd6b36dee306446d94d33150004115da55002ee11ba1daebc6cef7d1485e023dc08d9cfdc419d76b7c1335bd7e0f24f3cf197a31003c71569111f5edcc316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eu/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eu/firefox-69.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "733f75308c4991f73e6c2dd673d380af1d1c6ad25643aa4994424763df1d25df3df3a9a77dcca5e00176d1dae248373aeac914528d5aaff79f73eddb740dacae"; + sha512 = "5ac8e602ee20afaba5b7501ecb3af0cc4358d61a729299eb6189a932af19d86f409b66853576ae4c259bb14df43003b395dae7f713572babce62bc549b7ef0e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fa/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fa/firefox-69.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5b863546dddb8c5fa4c59d53cf2f5b622dc4296378290c85926d49685e06231f0cbcc6030257f356af71ccbc6ff32359f387ef70eed9ae3c72a9acd34eb58350"; + sha512 = "7e0e98538caae2345b88e9e9921b1eb3e8d4e226950aebe6a9b6d927aab47d40e59ef93fa33b0b175460db44e906e64e3f4974706ec0b3d85a3e6ed1adc99a52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ff/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ff/firefox-69.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5995cca653238629bc6a1930d40550f957b1e3176ccdfad5e65b16584214858fabbe92ad2a4b1aaa3a3fe920b66aab4e0f74646d42174af82d59c0bcdccf8867"; + sha512 = "02cfea4fe949c4105d5cf2836de867c21c9ca8fb73cf0b3702493d409cb36a70f9f195c53d755840d7696500ea7e1a03f4bdeeafaa67833ff60aa96d854b14c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fi/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fi/firefox-69.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "32188abe02e4fe36312835a19ab3f76c8e67cfaf0857f98aed4435840acc432a411b8b06727175a8d3d3a1ece6a5baa9ce5249de7019d02d43ef6dd2aaa69e9d"; + sha512 = "470e499c26f9120d68904775e9ec2396020b91dfae504bdd6219d2932e5588240f9f25458425895c2d74fd6aa4c9c525f117f0a0f69adf98703af2570cec40b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fr/firefox-69.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2035d9a5a078e8fac32604aad679a9f01db60cf872ed3b546fdaeeb7031a8d38db19bd8556fca7377eb10768a53dbc1f70c7e812561cbf0cf926d352a6ccbf8d"; + sha512 = "44f4df351b0a34bd3126753a785f9a36856686d9df9648c9a3a1f678dcbca9585c19b576d6deb31967aa9448ef45aaf602558e87040ef19d1cb812d42c5894d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fy-NL/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fy-NL/firefox-69.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5539c97e6b8a4f51113434df7a75937dcdeaf3ac8acef1ef8b4bf7b500d387051969d13356dd6663c8c0e7a429748160721fb4f864db29fe77087c4f15a652f3"; + sha512 = "1f336759e304747cfb6932dd433c31123b153a04b4600952d0dc622b442901e1642acba220508373b915caff68e87e026ef54e24eb5c001a1e6e3f4d1b9736d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ga-IE/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ga-IE/firefox-69.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4c60bc16af21fc552f62cf6e9057871e220f9ad718844e28f8ea60a5122dbd941dbe1b9e4e0a2bc6b7c62798b178134cba15095e31dee6e25341de5e832a791a"; + sha512 = "dc0109a75094fe53caa78bb5c02257118aa9c992b4633cecf8a6e60a5daf4fdf488aa5e5309233aa1882bf69e3c8a01a527c2e2878ab9655c4810b3e54244ba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gd/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gd/firefox-69.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1851d0bc3a21828c4d89a8c2338205a7e7a9aad14f60a33061dd229d96d8681008ead1651f7d5a501868b29fb3b50bce0587c142e9bfc4423e398fbf5dc7fb6f"; + sha512 = "69362cd2b58066646dc62ad0022d82ce6b010ade0abbf779d7d3ed7b9bf6ee808c848a9404c3beb966751d3aed0d3a5da2be3f2b262580e8b6211a3f8444727d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gl/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gl/firefox-69.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "a728a158992d2fbcd292c13df36c2b4599d0972dfcdd84d3885d0146e8435808cb92afec7823388906d46d80431b14aebd7e831eb1d80a6995b4c81a933896c0"; + sha512 = "787a3a454d59daabd81cc734f15232622f3e2cd0253c98c10fcfc5eb47b8d329f89740474f7f754ab6f17bcb50e1fee38012df9183e061629490582c677da68f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gn/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gn/firefox-69.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5ccfa691379cfba11e4f11854ebc3eeea7eb6ccd58b4f73b48a631279a99d0848972cbf924335db7b65ecba47605220df53b847eb361d721e1fddde30b1dac49"; + sha512 = "cf05696e4b0e3ba6c9316166f56e99505d4419062d77cc0438d0fbb66729d354c59026018828ec7d46db4f99e6367dea9911d4bdf7e80ba68fe32f8e0d5c09c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gu-IN/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gu-IN/firefox-69.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "a5d5fc55935a4e9f66d6a549ac4f64649bb3efb335129f04c0e72e2849fb69153e312987233dd81bd58e23aa610b46af35fcd091a566e604c799d83dbdabd703"; + sha512 = "0b38a698358012e0cc3ff1091b82d1eb82673f124b34ee4156cc36bb49d5d69efc32874de2a2050339e73d6f386f6d4a468e6d906be0b22567b867dde7e0ff9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/he/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/he/firefox-69.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "483850929a93239d40871aae236f698afa4a195d1c42b4f07db1b72c2bf9e7e5ac9a24745c56cdfd2d52e725585be7feed1a3ee9aa4b1516fed85ca33d3874f2"; + sha512 = "8250cf4c8b18edb35e8c601cb6df8bc7825a96064064b6d46a6dfb77e297c64dcc7a2f7937750d4734ab56f843a65b6174b4c9d523f9b5877e0e26ce9fecae01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hi-IN/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hi-IN/firefox-69.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "6d4c3269fd2216c7e9f258fdf0c3ccf01a4fcf1af6113bc91e68f65f0e0a060bb13bcc5f5db24a47870906ae5ae7a3cfc0a5c2e2068308eca6dd1926a7a4936e"; + sha512 = "a0262214be3ebae877300b54720b4b74defe46bb641b989a1d65df02c62d78d51274386b0997a45189fa86d5974e56670a852d24d76a655baebd3c5aad8149db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hr/firefox-69.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "cb4dbda71d92af15873e849b7c6291132cc1bca6f108f89d07132b1b34d00cc9d3f887c9af593eff4163accb4e645626fa4ca0725d3b81a19f5a52ab944fcca9"; + sha512 = "a5254f81f1ae432b50ac9b0a1732134b32bd460502baf51eef7242c37b37f2a6f0cfb6ce9c10bc3ce6ce509287fde824bede15534b010ab2f55721e43d85a8f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hsb/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hsb/firefox-69.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "156b1c20d452edef51a816dc18c57d0baa84add78ea7e507e037d2a78f433351001d85e4da9ec9e70bb93ee439458d23be93438db98f786fe0efa4f6b031dd78"; + sha512 = "7081a889a6689e2d6fb4550474840085724cb4a583a9618a03a88ebca706ebdd32ccadd64ec8491332e342293634903ee52122ec9a5e49efb0f3cc8c09ac891c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hu/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hu/firefox-69.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "0a5bf1362575ca38a69e790ad34029ae587c8e59b122c86adb3e10762e0633246bd73617a9a7475eca86b30b433c6e958c53206a6c2c9dae37c635ffd8364f00"; + sha512 = "0a6bd225ee22562da294a0a6753949f6e627d1076579c514b4c93719cd0acfab90ce28c241d05cfa58a9b723610169f7e3a8b65dcf3bce7615e56cede10f0064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hy-AM/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hy-AM/firefox-69.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "86b8411a12d6d20f85eca026fff9dac6de8c2680708906f551d28bff4adb93a48d6a82db864a609904e9aa73fd3449a38cf1ac74a8c074393f89d9f64aa1e771"; + sha512 = "dc21bc95a2ef7e66b04fe9900458754db5fe51047b3e166a48bfc1c6c7d8048846049356778515556be0184b5f40a08b29bffb27eca2d85cf90e47c42a9ff086"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ia/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ia/firefox-69.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "a323485c9780d46087a9e698d958ac9e8348b00b14b4761dcb86d5f2fb1f9b23ab812a9ef9bfd0a7e7612ee40b505e50569afc3c16b2813065495f0b3e12dae7"; + sha512 = "b2ab4096778dab01ec722c90daabdd8b0a892de1cd01ffc2bf5b6c403a74bbb6ab1180b1331635861c29b05db9662ec1d973d8506170c7227d574848a6281678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/id/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/id/firefox-69.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "76767d2e032973adffa08e0b0e49e233373ce95c94aaf61d0911cf0be45cdd0daa092f5b722cf396956f0f3f2abbf7ff063c76524f8b1e3761afeff6ee02ba80"; + sha512 = "a416e7ff14facaf80a8edec2b1100f65bd4ca13b6ba10ebd8ca181c65683deba962c276b4b32372f9d8aca33213ffdc882ede3c8bf6dac883c819b85ae84789a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/is/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/is/firefox-69.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ce9a41ffb2482e0c3049cd3d9984b5094310ed2ee15c60e0bd102f98d9511b3e139ebdd4607c37fcce1c23407fb5c1f969d6ae53816838c32d2ed2b399b710a3"; + sha512 = "f5b0e2b1bf63db7a3e4bb14b0332d5b365be87f7c256c7c4a34dc4d4107a139bbe0415c757d7274209e82a1219863db3862426621cd2453d24864776c0ffbd83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/it/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/it/firefox-69.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "babc698b40f4d84a6c8f4cb159b676893724a5b1cea2f1b004d74699f8dfc1a7cd3137bbf9ebcc90f89c59c4e9980be95eae25ed152977fa652d5e8a35418742"; + sha512 = "655def933c7a17d5417fd319158a3a8f21a0263bb7aa539641b1f3d3eb0087148198975a9961a789b3e944c812c857a35afd5e973018a82e409ae438c160aead"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ja/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ja/firefox-69.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1073dea454de8796d7094d99805f05db293a41d871111fb4495745dc6bc9d2199587abd53c7d3bbd09768104d51408dde8e1fc56e85197f5f035e9cbd314e222"; + sha512 = "19b9a42561727da209614222f618512a8ff714f0edb21baae1efab69fc384d3ba0766475fa76e0f1fb4cf298cfec01c0e3bf3879e1b730cd0254d6174f764df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ka/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ka/firefox-69.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "77ea45eb051b34f136f8b295ad05cb14d43e526120c30ad028eb94c28531272563a1db80b164a19de28b3304d364558297be9a1305a1407e1aa644a003722202"; + sha512 = "4949b620ef6ca2e23472d721bded35091028048633f8393ef9a68b780928e11e779527b8b62f02e27288456fd939a5d273dd3dc6096ead80107b3c4266deee2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kab/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kab/firefox-69.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8e44bb0dd05028c8a3e689ce273360f24bfbba157a9e5d7562b08d8e4f448b7324a5bcc3c0fc878f8783754ba104206ce82efa84d767fd9cabb0f4c25d75513d"; + sha512 = "a1e9f7afe4c09a1056ad0f9f81dd30af5c6a62582a19c5ab437e42281b312f8cbf9f3ddc5e4e9e6553d4c68ac268f5cfd6080d8aeeef51032387b8bf1915382d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kk/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kk/firefox-69.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "aa3ce16fb30d08ff1e2d0b27518aa281d559735edf07dbd1471e148bb1fc2d85d9f812870d891e67f96cead4e49be25f66e07e4f52fd1bf08a877da602fa1b27"; + sha512 = "47b2963dbc9333b30627ef1583a87adb23962dbbd71e01be2b58f6ff7a6d226076f9193310038884000c6ff7a4f96bd1eaa33767bf96bea3ecbd0715ccdcfd37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/km/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/km/firefox-69.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6e1ad54977f61330d80f310317f1d97d9563e92637c91bdf7a0292e2abceb8f3f1cf3831627ebfa5967061b79ad565d37d2891aa83685ca599d782a4554e586a"; + sha512 = "758c7dd7eb7a91e09bc7f921e0506a4e719ae818b5794abe7a090e9af230c6d5240ab7077a9ca4636599566faab83dac92c64e1f97bcd3515e27a2ccf4e9f6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kn/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kn/firefox-69.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "798a1d1b5d3a4f7057d5ad05e5d93f08255ebb302170dc80a8b86238823c8a19a15cfa1368b81187ce389ee3992634ab9be58713e1097bdafdde96bc48dc4036"; + sha512 = "fe0c88f827e0b4581e3f72367c19ddf2396cb654eaf2d5457babcc1be8761ca6fd7a7cedc79c580abd7e9a336439ce24d84ad37a6f1d0907bbd548232a9c3d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ko/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ko/firefox-69.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8ce6490378cc3499155d26db216da44eb51f7b5d0220168882fdd16be63073927eb14fdc4c586c603b049a1be06837290417626f17c17b4620484ebf3e0a0d1a"; + sha512 = "52d0cf33a3a6d083f63c03c5076be9e68829560ece3c5729c5694c989a1179df8ba6f9c5ad4c3d720394cae351ff078af13e07d194b175a364e3f529dd7983f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lij/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lij/firefox-69.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "ead703e84f5b7d2dcebe84c86c49f9aa751fcdfcd30d2c9646288a7ec50d8807160e84333743cb4f97ee6f6e45909ee4678cfccc6ff9729461826d228dd1de0c"; + sha512 = "7acba227856b3bb015745f5239bbdd06a88e30ae7f17129e8b104ff800fe7b60f24646962348177e7efef71144a7cdf2415b6daebd2eb75574cd6ca6b708c892"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lt/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lt/firefox-69.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0fac4c345e3d543d0cf1b986c5a81d9fbbeb4617f88c679a2230a6f0605e24eda60a4133f38f496d2df0d027fe029cd9f53f17efb60512263d6fbdd55369d239"; + sha512 = "0829cd18857660588330c306ec7db6e64d52346ead593ffc7e4022c25d8ea5451329e7bb70667645b0bc4894f20d8d6251111449dd3f48362165e9f583f89e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lv/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lv/firefox-69.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "fd172b285d01771aca741f584e101d66190c29df5dda5e6ef120d41a9488a2e5679339c93478d1e86b869d67d54c226f4e1b7756e5040ab71ba415e5319965bc"; + sha512 = "3c19e724d31b20bbec4a9a4267c5cb9ce1e4aa5ff522beefdf35b468d220964eb547ed1b3a4354624cc653764f62d41a294eac10d90bdafacd290e192786a73a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mk/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mk/firefox-69.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "370dc43f9bc1b33f3e1babadd16d8fb63850b8e68be13a22843bb09db530dfbdb22218507b04c406f3b386ef683572ba262a3a16b62c4273ff3fa2c014b4ef54"; + sha512 = "1223ff81d9162d87db9d71948d34b677eae86d3ea06953a939cd18836c8b820c0fcbc468d124a3b0ab37346716db06fec7a4510806b7f2f98caaa0a30642746b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mr/firefox-69.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "533b32b98deedfa31a62c80663b4aa0805c3b2eeb0da8267918f377183b40058a229f6dd357f9226f0149526c0c37e90c4f13b1041496054d662ab805f8d1d88"; + sha512 = "202bf4f9b7250a73f70f0503e53f1f55b9466d4daa13092d9674b21edfc61a0dc6af3daee4cc229372eb2e3e3d97e13f686d9f6d8d702f4dfdad19ff52792eb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ms/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ms/firefox-69.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "9092ed4ac8ec60b55c4b5324ebbd9f7b5940ca66dcaa66eaf9bfd808e3755db931568e4f788b3e2bcdd574de0655af16260a86065394536f916254b366188a42"; + sha512 = "7c1e2b00ead7cb7b2a3ef516c0137f1cb2fcdc4fddd44c5b5887e949797b42218ae66fd58a4b207ec9519704ad8b26a71edd2fe3a36ae152e589fad48a4e2754"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/my/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/my/firefox-69.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "64759c70abd171c374cc73485a4ce8e4cec21222a4fbd707d03fdac79b983af9d928b516c926a1558cbee1af374171272c04597d0523839befc8bd7659f24c42"; + sha512 = "bd92ec45173af70a10715f16e8043e7d41900607bbf2acbef566002f8ae8855cb604963d2cf2a1e5a9c610120c24b6d192c0e32c7ba29c635c2d92d1fe4b73bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nb-NO/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nb-NO/firefox-69.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "940c9dcd597dd135fc351c09a6c1c1aaf20ef1305c4c9dafd90915a8ef040bdd02321dae130469985faaf871f24e7ab0b164e2cc1a0e661da886b16687cc4951"; + sha512 = "c032c4d91c67d11ced6b47caad8ed04554e08fa78e7bb49c2ee1176ca192131b9372e35c121d5747f59672d1c9f8f1fd7f2d29ab24ce3b6e681eafae7a821e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ne-NP/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ne-NP/firefox-69.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "094b0a3b2a38cf9a21698ece463517efdecd9784711220701815b472ca27b6fcd3358e982aba6fd579cd5b256d52cfdfb6cddbae17d08d1ca2818bcd8eba7f07"; + sha512 = "5c6a5e7cd3555bef6de3f02e566349a5e4797efed99c0b161e0de38f8391657c963446ab7e9b57a3728a81350bd98a7de66029bc0fcbe611b39f93e804cb1302"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nl/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nl/firefox-69.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "eff62b73a52a649a4072da79dc0cb5bae23f81360c2727bdad2925514c6f9de861b00f2c7310246da8037f1305da1ad6326023e06fb032ae636169ecfc9a33e1"; + sha512 = "a1ae9b567eb05c28443886b49351532c92d5e29d65386e3c3d0d842574be355f49544de1302a485d71b9962483eeba4d7f8c855089b5fb8fc3dd1b86e47f70c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nn-NO/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nn-NO/firefox-69.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b1351dac5e08a6bbf2ba50baedfe5a6ca6b98de40cf89ebbe0672c98b8c900021b9bae2e8391b3cf55b433bd9c655d2a3be2422a7a0ad2067d4a465a9695fbdf"; + sha512 = "3926a8efcbe5cf785cf687e10b5d7a846cafcc5e9a09fb77f517ec071c5b2afec954fa6f870c3688d07ecc17d64fd71080201b4646d8547cb3446201ffc30944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/oc/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/oc/firefox-69.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "8dcb8884541f272cdc97ebb9fbc0ac7cc98c3f3d252ad53cd94aee3c5d9768fd123d87a4b8c111ed92239e90f6d54daf67c5efa3823f8b1b6682eb8ad2c3876a"; + sha512 = "05ce37349d320e94547531cabd995d21107c64b87d52b0e08c465abc709526e4504019657ee2c49079fd8bef012f1ea7c55f595828602ca1d74f8a18940eee2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pa-IN/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pa-IN/firefox-69.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6f8ac6668fc556f051cd735325cfa3b3c16c43298828171b89c17ce22a66a788ec219b7bdad9f9b1d3d0a425778b373962033468f196e999a2ddf8b6ca86233c"; + sha512 = "48f6a34384b79b6a0104b33073c32589a9a66da64c83c0f205f7cdbf940ff75a162c9612ab7f457377f018c4508ff398c2410239efe0a22862d36aecc7b409af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pl/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pl/firefox-69.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "8518a8eff1920aec34cd0ffdb66b4242d55b805e3b489fb0d5c29986b3d7efc62ee6a014ab3fbbe9b40a54aec9c6c76e052d0982f72a4ea4bed82814ae6ba2f1"; + sha512 = "912149f85fd055d5e9ee3ec9f40ce9308bef4580a265f6ff8a782b5db1dbc8e82bc6ab6cb40df14968b3d00e11aeb539c6768d755acc3e5a96bf2bb952b86f1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-BR/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-BR/firefox-69.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "693d6b6227deb670bd3608cd873eccc3848c76a930c3e8922cf80c18350bdb5429b52e7d7551350a8b565d859adf067ebbd553531e00c6da95c480cf932de03e"; + sha512 = "e167770aa356ab88af89d1ff8de492ff0e31c9e45b64bcdbc3ed76749bf2027b70085c34b95490047f3a71f72fb29da5d771dddb7b445b70a2986d22088c7964"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-PT/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-PT/firefox-69.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c77e539aa7d2175d793c8ae4dca548332d98efb6cad62ba2ca9f3b94982b7a4d180179ad65b89a460e04462210ee201bc2226105ecff27b5a4b78cf1fb0a5b97"; + sha512 = "a06e26bc1285a39ccc4399e98ba523c39b9f7573444f5793bc5278908454c717dc3198be5f3985280af4869bd68987f5cc0d4c4a4000eb65d6eff4c7d3e61a15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/rm/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/rm/firefox-69.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "22ec2647ede04fe74dd7e6c99801c15d4ea131f010a75c0a9e5c8b568179f9230208616147e78179b81a7441f720d9f41dc4d784b9dc6c40e00e886612bd68ac"; + sha512 = "41e9519e6e10cbdf20eec17ccdcf7120417c477a3358a0fd0f6b770dce64b5528a51271b9257cf981ac21dd0e118e8193c0885c5039955b84d331d29e881455c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ro/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ro/firefox-69.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b9e3811280859103e202f0dbaa1c278c8a9cdb451a3cb63a35967bb43625d5f6f6ad2e15871dd727546532edff3f6373013e8bb0eccd83e7f80a31dcbf8e3643"; + sha512 = "63845db9011089101b6350e5b13c3e614a198ba24343d386e46b4219f0e006c346b6ef103791dbd5013a89138c1facfbd81b3e144e04cb8690c996969af6afe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ru/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ru/firefox-69.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a7383beae7ab2514b0e2f5d86d0317ed0c33b5695eed1526457f14b545a63d036dfcab907fb7090055e6ca29144f5f11c7fc2c00bb389d83074a20eda6173df2"; + sha512 = "ba844bebc9469c2372815821d751fe3146d8f7d0c4c18002ae617f1d42a03369a13eb3a2cbe2087135164a30784bd476a4512867145a57613a8611f1af47227b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/si/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/si/firefox-69.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5d9bee0a705d1250dd07636a0e8bb3dc3e0150607d58f7eee28c5050270e8786fee2f843e4b801e7de6de56f284025bb13f5dbaa131676796f69973ca45a209e"; + sha512 = "67df7f6a6d32c37db778237b2cde1418d8b4d19360f752960129c94dc3ed4736a8b1eeef73966b54a531e3e3c6ddceb5cab33d758124ba375a2a46a7768b99e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sk/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sk/firefox-69.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "de0eb221142cce4cf6272be9323b2a851385d539a739b0b2ccbd7b98926673cea695fd7debf11aded37a57b551309a7c93cba244b64128e074c93e23b68942c0"; + sha512 = "5d748ec7f889e8465cfdf6304db6403a346ed6b9c433fa482365b82bdf39cd600a9926b5e3355e4e8cb911bfb03bb9ed14df83ac0b4cfc2019b71b2006e1ef51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sl/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sl/firefox-69.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "09d4936cd5e3f0592751699bda3b4164004e7e2651cd0b28f5eb191677352a61901725357bcdf5f2744b6090d47b6754b910a7c34e611f813b12fc7566bbaa92"; + sha512 = "f870acdda0da2fb373718d2218d0db79de90c6153d7dcab4163102b220c265d502691f525f9db77ab2403e528e578b9e45d839c2296f16665179c838703aef23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/son/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/son/firefox-69.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "564306bc98a0a0a9e54d2f315cbb1414107f49deb4bf25cb729e10ede60620df0a1abdadcc675e531e364d1338c746cd9cb6d4afdf6e46a420b12920db1e304d"; + sha512 = "f8c702a54be2f9b15ffc183de2853b8da7d7809d2c02e3a7a2a2d001878236102c35383879c0f66ceeaefcd6a676adf23d766a80682af4122c82561fe7eaf36d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sq/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sq/firefox-69.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "28c300db3616e510733133f0868cd42e7b05a15fb066575dd7386ac4e53b4526e86ae7d24907e3f7e98b3a9c189ccf2004c958d122b47e476eb3e411f17c29ac"; + sha512 = "4da3b8e0c0a012e5f78ef1c10f9f462b9e5a716c95e9d8134da274dc1461d60d094af2de314987c6a68c1a50c17f09dc00ce9cd039553b406efc2306968b38a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sr/firefox-69.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "0ca1a926600075e7e8348ee2ad55c435b3775c8aa6d1f27717ce1c35fd1e108c7600547302f072213e7c54903e6c0faa6ad299a9af991c8234ecff454d336427"; + sha512 = "1a41de2409ecf00fd94690c0f452395c3318590e9b9f2164f2d82112e51057680d2c758d1e0b9d9a372e3080afdb611d30a2c74b9bb6377da63352cdddcd1099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sv-SE/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sv-SE/firefox-69.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "ef4fe5ba87db3dfba62490022f1b91ddca96fff6035328b07608e56a3247b4021f6fdc007d65e5adbd52cd0adaea9f0b59dbb5f01d71535655d0bc5e0800202f"; + sha512 = "f09d3024b2f9032512aa10ce9b5c72b44a673f324190e1e971ad3c09837545b79a784e6a10e5cd9997f701903c4445284f64a9eec7d40b857a8386b2b72eaeb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ta/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ta/firefox-69.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6fb48f0c09d74228317eed041b4f8d2670dca7ed043c133e8bd6a01a0d7bb310144434960be9b9916bfdfc3139de2cdcd3b8282d1568e67d29cec425420b1e06"; + sha512 = "60666bb1ec53979b6b614a4c31a04085b1542deec9908bd485db2e0f09ad833a2dbd81f84f483f24d73689cde5fdad2554079b3a54e4b98e148d3f6f144b8de0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/te/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/te/firefox-69.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "bea99c4f34bfb5860bb5885d4697f18bd45de423943c5d15952bb99c7e4cccf125f041f1378b693b805ef4d623fed52ba8b13a76b87bb383da95d06a4032f8db"; + sha512 = "03fb5b9cb18402657b77cee2f7bfff3474a84c32204ce5163e028680cff75ad0faefc398975fb98378fbaaa86ad247cb43970cf86bfb383512fc4e890a928842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/th/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/th/firefox-69.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "4a03397a288a7414ee5ad9f42a7333d30b7a6448321e4507cdff71a2e3b0933292e6ae937ca96c1f6a5ba906e54013b6d6d8501c4a9be4741fd3505dd24b0424"; + sha512 = "53d525b0309e5f0d02314c0ceb568f067e858588befa64047a3163fc0623d0afbc05167df34fffbcf97b1f5fb127dcb8fb45c05ef117de42d42e8e7d37a04a6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/tr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/tr/firefox-69.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "85378409bb2ae8953c1f90736cfc3e00551d77e3aaa6a7fb76a157291e99be18d55f5d07b1171a7137d982442f55ed70ccb3f6f6dfd73869e9cb37019e976590"; + sha512 = "ef3c0a7f2ef67b92cf22bd6a69b237db8b9d1d85a018cc7c33f767fe71f483ab479bead36af874f4c6bdf99f7eb58b86b564825de897abbf8809aef41d95ff4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uk/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uk/firefox-69.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "5ba9df05480e7852d894925248c7550a36db59c8a4c37792de325aca02b8e5feac0c20719077d718292eb262794668bcfe810dde7229faad6f2370a97c05e973"; + sha512 = "bece51aaa6fa0131f55364b3a8079382db4d8415e19f3b5ee7333b4111ecd282012f55343b44df95cfe3006f3226c7ec6b6d4bc71d1f30aefbf203e24c282b5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ur/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ur/firefox-69.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "bef12893d73b1c9583302562781907d0fb121003dd1714ccc4c3b2a27160384795ac8d85cec4858849004b020e0ff5e73f512925b9d5561948ef16bb26e0ceb7"; + sha512 = "1f5373231283004843f8d87a53ee5eb92c7c79d4c15cdd611baaa5ec56ea6ba6eefc5ed63ad66e0a3b66b4748eb21af201fd98dea645754bcca3731e8643dec6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uz/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uz/firefox-69.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "5961e478d0cfee99edb3a7ec20a0368f8b6604b4449dad835decff54c8a9f3add6bed22a131024682779922686dac0ea6d489ff111dfcdd476f7641e293b40fe"; + sha512 = "31708d41970b7184bca2686b8ee048afa732e24f05ed84bc7dfee1fa18c86ca8f3bfc27002f306bfd71423331567be2c952addd1af50ed85ca7377a87b1c91cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/vi/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/vi/firefox-69.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "31efeb8ee3ec4614f0e116e615db97f9836026c0c94f5452cd3c5ce338fb9b35f19c0a15fb6bf17ed945a37832a628e7fc16381d5e6393475d8b9053596a5c4e"; + sha512 = "f1abfcf9142310c6362b429d8d58f370c3fa9af20d7261e0e3328b37d4cc33b88d764d108167ae9b3aea6dde7593bf92591d41e71eaa233cd01d8583e1d8542f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/xh/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/xh/firefox-69.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "bf23c18c5a8c13c115e8ceea382eee8e5c7af24552c3feb92a5ffac0d2aa34effb7dffb0b41890d1af23f75b9581ee05451785c5ab2538af9082b13ceba04ed6"; + sha512 = "cbc4ec3f78d47276b1cc67948645b92fc891a0089bb81151d1b4ff8ec20b5ea7db714c7a386ef094a05040fb399d8de7a98d3c7ae7dc212c64955004474c4466"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-CN/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-CN/firefox-69.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ff490ea8b3b847343b3b7262154ec8815fe3c38d91c2fa0e92625db793f7d24bfcf3985ba07a5f5724b2463d00934925641bbade9f65f5c55627c15f1eefdb5c"; + sha512 = "5ca30257e96e8e7770fe8a7d626433932a06e56789cf6d84a09b633348570c59cf904707a2c6737267d111929830df8b1556d84c6dbccd62e4146926a87e68d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-TW/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-TW/firefox-69.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f3de7f3d53a47532dfded82ce25db7d7d0f89b2026bf3052c42f9b51087ff5905ff487f9dbc7e19b76a5816b9c2d8c1d350d5e9742244adf1c9d0818c6b048e3"; + sha512 = "bd3ddc2e9da6f1e47648ac4054c6568e48e3c01422623947f745016bd624350885a194b7dad600fcdeb0fc64cebf10b8f694764da0575332618cc948dad33cce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ach/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ach/firefox-69.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "515921cf97afec94b5853a7b6a7ed426cb1ba6b875ed1ceb8f6611cf052dddce40e519c4927ea50a02d23c7ed40d6ee882fbddff4293971b1c832e5a38b6573c"; + sha512 = "9f5876b495e56d195c01a278fa602c7686c52c662145d46dd4e7a9ab143801a26822c5a084683b74819fec15d66b21644ab6adcf160deb1d48fcb381fb395187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/af/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/af/firefox-69.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "1a9b041ddeab4a06257d9313761f288acfb4ca75e0a50edeaeeb7670f4b3fc7719b480a5d673d90ee9478cb1dc9e14ed07c47e2160527874c134db8a85908408"; + sha512 = "13516530c77ddd90e9a5380817acedd7d1843908f4cca8cbe523f2390236c7f37b50a5ea6286ed9a944a4de141d911af0ce425d557af338e8f7be20581717077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/an/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/an/firefox-69.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "8d56691644124b6038c2a61cb74332f38c4648163745d37d37ae07bbf868b0ab6dacafb6c2f1f6d0991a6bf7cb8ffac498f36afad067756b1b8fabcc634c2624"; + sha512 = "f947a2e74a8a1afcdfa64d4d70f123efc490403879037ac31bf082874a90cf4a40e143539bfdc5fed10a406cc1b446dfaa99e7c4c3c805ae37d23ebb420bbcfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ar/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ar/firefox-69.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "f443355a1778e087e14a214524cea2c66a58166c1832a5bff89a783c4ef1e3fcd614fedc00ca7b78a0595d29370da82de6f53c8b58c0fda15c79227ebe317f0a"; + sha512 = "d050acc7f518b00c231112364bc9a678c64905175c111380488adea3633945b3acd285195b10f6c7a0b624effb7006f742451df5ae95583e3e20990b9639145a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ast/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ast/firefox-69.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "50c4ab65a5c85822355fc6c1dfb57aea54f68c9e578784101d233c8d1f2ae678f32646bf36be5c21e0e32bf1ce0c7635be4482aff422100e55e6fd813d0c6343"; + sha512 = "33b64ed51cbf24703433087bf869a3ecbf16591ea4d870b902bc775c0a9d027b91d3d161e11be075072363da178f7ed02103fd57915ba43c2f21904f32709f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/az/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/az/firefox-69.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "070840441591f942491f64cf793f2e12d4a5038fef2804d0143c726f33874a06ecae36bc4f2bb3cc04aa6e46791a7f5148900f9aeb1954eb0e0717a5f8a7577f"; + sha512 = "5f281e9f1bcddf149c30266ebd80199c2c6c6645f5ac46c118f6aae13c87e61f34d84077f44bcc93fdf03d9c02fdf1e3e8c34fa124260e0b3da3cba7b02021f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/be/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/be/firefox-69.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4338a55b80c9e9a21570fb49dbf9595d6c0d51390d370cb8dbf541bd4c14605b1daf118193d2ba3f20d2b2f79e2f40f276e079046d8db65ea524f3bcea88d826"; + sha512 = "e912b6e121cfc3702585a68e8140c0a9ccfccd2f2a614f3b72bba2ba0794d665c0cc2596bacd2ac64e30b87837551e1b7758554b379301af650df1929003dfa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bg/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bg/firefox-69.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0a473653d6ff4b6c604e269243f781704c8fbf9f99b18e3fce83680793622b58de5aa655e5301dca2765d6526fb5aa88ee2caf7d35557047c4329994610d9502"; + sha512 = "9f7c3afbda97498d2377ebcfd6417801054018a7752b7c0e4bc03fd349d80779d43202139423f48adc3af14d71fe8203a144d567bf5b051484847321ba223fea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bn/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bn/firefox-69.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "fbaa81947143836f54f84e4e376ce31a21cf59a46debdb61c8a9db2f92703da3ac06218c560a639b5d6076e81d74dffd291f9d773b6b7ae5d65dcd0e77b5d1de"; + sha512 = "97f1e4bec660cd573717524b42490d84bbbc93976a973fba5dfe4ccf3a745b76a494f6386ffb3060e8bc0ede9a32e69a87fd28b9fef33bfae0294a4d8e08069a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/br/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/br/firefox-69.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "a5c69e995213a6f3066e685077b911093db15859e6dafdc2a385d012d0815520fa2e64c7b89deb279e307fa702c9bb57961a3147ff450f91ee8b3b31a2efee90"; + sha512 = "99e8bd11f12189b66e9f79c7b197b7b149d274e813a090e118e1823b159e87a335c890f3f257d39bc7ceab7089cf64d4665d2732919cd1ad29c7365ca2f5ca8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bs/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bs/firefox-69.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "82d585cdd034016265c43f0e70f09ba8cba1429a551491f6e8ef4c8f333a40179c4817ace39cbb4a2376b03c88c54849eb45904e148dbbb4f47f8fa32048d3fa"; + sha512 = "5b3947dafa7e7c1d0c7c47a1ee09de3b9cafb47bf39d4ffe536a9f35f56c7ca2a265289f1729b760f09cd3befef2fdedc1e5f7afbdabf03f3c3c0e553da8d925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ca/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ca/firefox-69.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9c884ea535c3192fec754dd891ddb2743afa400453d9299f26bac710ad5bd7c7d8cd0ebdce3f1ce88995c13e381701312fd9247b029c73f12ce7940297034e8b"; + sha512 = "3d83e71c9f3acfe3ac2838eaeba4134ba8cf9ddd6c7be2218e5200ab2507228f3af5ab7930a6a08f368c1c3a31a22b9816803e9ee66f67c1dc0280a0f5f5e98b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cak/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cak/firefox-69.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "367755d495f3b583a8f09d200f5828c10d8723017d691d6380515d3a4be65e6edcbd1318909c1652dfcc1cacecbe80d6b4e399e2192b335701e17764fe5598eb"; + sha512 = "97b0761c67aca6f6ea89e88154ffea95651f98aa5341f155d8f7a25c40f109e5f5ecc4aa7242b8291cd5b28d5df676503cbb52da25f58de4e1274996b412213b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cs/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cs/firefox-69.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "427ff1470de34928ec660d539fb6977145540608b36ac36fa0f7b98af0f814373105d9912681bd70fed069e94f58aa48f441818a3f4cd67dd7a65342133f2d62"; + sha512 = "6404cb3cbf6b5850c08fa1e222101f340550a30398413ac49c1a498ffe8a73172a65da20d4c71bc66bad840ce5cbab12d93f9a5e47a2969024981b3e3a6c3594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cy/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cy/firefox-69.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8ec2ee32b5dcbe1d9dc80ff8d518c640e9bf8b21b2a8ed2ef215193216b22e17de4d8c102c59eec4c773f0e3dd0eaad6b1502c91367f1bc1b1860e13a2b70151"; + sha512 = "2e2f45ab86409368d00af0e8684a2de8f779ae5ed21c4b7bfbbd9b1b6dd2c0cb89ef00ca0d678e2c2f8f0a946ee9576ae3a657e63188b357511da4e512ee0b15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/da/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/da/firefox-69.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "72bb5e0719382aa518b9a427f06946a85e7f8c8c0176a66720d47cd7fed6a85aad370888899553a029db1d841bdecdf55316fc8b4f67fccfd227bb48ac655126"; + sha512 = "f39a37f55d49e00074bafd58a1afff2b2fd2284eb14f43b78c1f0a63fede72458c61a34058a453bda0d537109914bf94ab3912d04cff91286bdddf76d0df9534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/de/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/de/firefox-69.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "39add77c78c64d77e052565fe058256fe9ec44886844b664bd9055b940fa0af89a60d4cae5f32523f62eb7909b18dfe2f521dc43b4a24a5d0fb67e0d543de28d"; + sha512 = "4db0be46edbd3443bbaf6d19f115a0dfd751dc08d55f22c905518f7e30fbdc9d765f905505a1908ab96baf16ac4a2f03b50230c565e278e75533c4379e39a0bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/dsb/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/dsb/firefox-69.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "1a0fdd365df8b034a4e05741d450209f685c22e6ef6b2d030f1981c711f46a9d561963c57a4da49c01dc2b92f6867b6296a013560501939788bf2b62ff622d71"; + sha512 = "2901e1d382dcc9f67217e15ca2d2575c96be02af1d853e61d4885c3c546171f8da067223a73b53c1176eaa03cf7cdfa80fbe2c74ff20860a8d31642f79ed93de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/el/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/el/firefox-69.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "3bff3c718c77af76bc10b13b7a816eeb37e6c2756249fdf441894350834e69ffe8868ba119f473d1cf07e8569fed6c604bbb1cbf1a1a51d5dccfe3f5018df2b7"; + sha512 = "a31c178ac0003f93ef62091bc1468f30814fd8919ac645b84e6ec5977d13ad983389d04ae7e986ddd0c31325e550c5f8593d64d48450fc50a2d37e32b785165a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-CA/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-CA/firefox-69.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "8400867a50bb1f677b41d2b030a66857697a95d155c50e0c57711a96ac13f6d236df86ae889d442df805eb56cee80050370df2210503d61c5a3d3a5f0f3a3c84"; + sha512 = "4ff8b109121ef8fd4f0a817a3d273e3a28ffb952faa072ed3d8822d48691de54035d45abf7fb84a7dfa6a0543c30281896a3eb840f64a658894b477918ecd902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-GB/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-GB/firefox-69.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b03559560ab0afa718a15bb0ca1e4d9b97eaedfd4b4ca42e3910425bf6bb6a0bf251208b7fc4848eba0285becb5509569bfb7ea609df3f60972e625addd20396"; + sha512 = "c514432dcbc3529ae58b1896621765da05c8a0511461bf6a09015d5b8e7eb14f8873029947d4d7f17b975ed73982746de8d92b651db70f7c6f97530028c7bc7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-US/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-US/firefox-69.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d6acd7725858a512805676f6fa215b949e631f4493bdb060921bc51c2f2526bd0e69641b41168ce756556510e354cd98fe1d1bced42a1e0a7100ee797c2eec00"; + sha512 = "da231783ed7ef640d02fa7bea95191af2081f694594e08160b682bd2725a49db56b54eed868ce11aac6f664d81d588243987ac80adc71bf11f0d03d85e90e14b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eo/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eo/firefox-69.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "25ba775be4e0329fce2a927174923c69e3dc38b61af4f29ec6e1d0dc74706b8becc6f6d139ca3007f7893f9bfb66cc71d9426cf420695f2494696902d5247d8e"; + sha512 = "599d9177a80ab92dcb0ed637f5b344d0e7c180985a04bfa213b5254dbaa932af7f920b8dc95a2a9ff2e276cc4ee8d22ac8ee84d9ae012ae085b59cbb6cc15ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-AR/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-AR/firefox-69.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a3616f6c7d9d7005ca8f76560bebf63b3a49f86d58d6c8c145400bb12e1574c1a3986347660c6da2700402c26441754991335bb199eee5a43292644fe935083b"; + sha512 = "01222211b16a3339bc56ead44cd8f9ef8035230c7f154d078ea444e07520d06add00ee100dc1b37af04ee444745cc9b514c90a8d18ff0af2a84276091c90bf0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-CL/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-CL/firefox-69.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9dd4f16594d3d53a9c6ab2c24a373dafa1c3d02cf1d2aff5725bdfaf7bdec7c0df254b133f1e1e63f235a69fae687fa261f36b08fa0d09d6bd141d01e4f10c74"; + sha512 = "16652520468f1a58798cb1ab6580114449cd7116e9f5564f3c886cbce6bfcc21ae93e5f559f45faa6c273ac9e07b584eec7d3c940c50a84f9c02d6ba9d17f192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-ES/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-ES/firefox-69.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a560d1c5b2142590d086bb645b76c91c664bb6b849d5a1e90a32feb87691615b7d943612048fc4c248e0c65a7532861a751f9b3a1537eaece9e6604df8388778"; + sha512 = "cf96ec9a0f40d4178f0724ca62c9da5208bded775ff0a2ebdf9ff6f0ec7fc919f1450a221050706bb0490347ace75b7bc0e6652f6ff2ca9c5565e06c2b6d4706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-MX/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-MX/firefox-69.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "481db1dfc9cdd02963235d5ae74a3fd9bfea1d4d4e2dfff8a15e621e2ed2027ebc4dc14095e1ce0013f1350ee73717393e8db4126e3ac707218eee3f4f7a247e"; + sha512 = "771da7d61622787543371266527ba41a24022a278788ff585f76208beb9936a6aa9449adf1cced85952aaf2c04f8c6f2a08883071378c66f297d3cb73a53ee9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/et/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/et/firefox-69.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7286f28029838e9b0ce5070afb9001fe01dcbac24dc85c5c2f93c5b9e5f6635daec7d42f0788c1ea2c03cfa8c03b190200be21bdf44acc2ea2bf9ba9aed62231"; + sha512 = "babfb53e1f5a805013eb149bbabc9e9968423c138bed3f8d6146983928210d44c57565a6abaf1f97fd741fd328a3df60d502b1357ccadde79ec1a228147b9334"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eu/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eu/firefox-69.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "472a773ebb672bbe0e523dd08cdd45d310f0ba599dbd2ef720ec9a2b199c77596c746cd1378d2853ab82c289b5b3a2001ef407aa3e250b082dd82072e858a5fc"; + sha512 = "d88809fb0dae2034f36080bd117bec9d2192c3ddea337ca0012391ed6a17d8f09894d0a3799e712fb3c0fe1f6f88074b265366fff92ade0a5f2db8cb96ab0afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fa/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fa/firefox-69.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "037df8470545afc445f30f269efa4cf981a20593ee3ab180a92dfa7f33affd03a6dcefba47d252275ceae2c9291a743f5cc1060253854d0ff94c5ebfcd81f464"; + sha512 = "acef056f215e333a29bbf8c13e17036e50e7763cad2a0e46324326f25de38b0c0060cd1c313cc7c3fdd43ed537e913a0885c6fe1e474ab7746c82531d3e27b39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ff/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ff/firefox-69.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e1293b2b8501bd30344ad54a8fe1ad0fb27292baca43ad791917d06441837004c8591bf54858852a8ca9de52048fd126937c81b2faa822f2140f73bdd8a4838b"; + sha512 = "dd13224227e1dd82b0b5e153ec4e43e66308fc38e1c8b68402b0a931eccf0e23afd67215832cd01428d975a3dcb72a5e6f876ec3fec2c1641c2058a93e623d83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fi/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fi/firefox-69.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f9acc483d78fa9e3a97d0d70dedd152f433106fe718198fdaf020bd4184595e0661d8086b2c680bb345165a57ea573a00e7484aaba99ad416c0fe4c08ce7ded7"; + sha512 = "3681a99b3ffa8294a81683395ca158a93ec87484d1490ec55c24b34f24437b6e6ab89b3aaf0430c49cf29dbed5a92e605b4a5dc7cf3d2868eb8bb935b61ecad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fr/firefox-69.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "bb28397f39be4e61dcb8cf783bdccb2fc0126e006d4fe8a8da7e15985335d5740cb3d41384f0592f0b7b4daa898066bc634397a680555dc720aec08ae0b8c989"; + sha512 = "3bf864381286094a373ed77df37d116424f2297c9efcdaf8fd73190253b77701afdda32ee692292bb4889eeb87bba8c1d6aed3c961a58f717c3ecbddc8fe098c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fy-NL/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fy-NL/firefox-69.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "edbb404ebdb71a2c6b1b66a2fff776ec467b0fd42a0710d1b796388674e62e70679b9490d70b92797bcdb5e32ace3691da88c50acd7e681d89bb9d166ca771cd"; + sha512 = "9468187b6afed9e2fe02cc72e1bb88e06c312af13de59ef97b54f135853ba47916f65dee7543578e01d18352367f4d4ff9c035e4c43666c9510c23f7977fa6f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ga-IE/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ga-IE/firefox-69.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7f16cd4796525f77fb2faf3ebdc08c61d14c35780107049a4ac2c00c208cdd1c36543933e64ae51c1cc65bf3896ccb2fb546735762762e25dd22c5bed71251ce"; + sha512 = "5135e19b3043ca9891af4035583f228d9a628f6b8717c124bbc9ffb6cb19866182521719e544555257a6921cdfd1619a67d21af8be327fe3f5582e39b9cd389a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gd/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gd/firefox-69.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5c875835f2c1a2cbcc97cf623f4a2d57a252d2741707847cdaf4a2fa21cf4a2ad0bbe9c0a075f29306580499a9d9420d77bc8db2da88551e36af006f946e21da"; + sha512 = "a7d079d791fbde00d83981080694fe813bb2abcd03a014abca9fb9a9df5af9e1daaf4cc6b35b1eaa2359aa9caa317a4352db6ed40a3adbe6021ac76fc48529ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gl/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gl/firefox-69.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "6a0e069836ee596e9e7c6b08a39ce15b073bff8ceb676f957285d26978d8768d7b60fec011d941b05644474add0ea00e37ced01eb43512037839c010ecd5b637"; + sha512 = "020c63d6ace98c964588040c15d0e8ecc6a74c63cfaf3e0e64b0bd42bcd2a4e7bf762ac93fc510beb1689203d56812e87be743886ca5eb6d1bafbbbc0fe56216"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gn/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gn/firefox-69.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6811327bd3d952ec59ec04cd21567ce347fd53fb401a5017558dee0f89ef0cc5437f9edb8a8e21626a7c379dcdb118fa8a27d5ee7d1bbb14eaf7daad5b08391b"; + sha512 = "0681b4cc593d63f4244bbdd6009287d89acb3709741281c6604c5de57593e53876e9448da46a718d2fdfe369feffba1d5b115f5372b68433d5b05ce2d06c3647"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gu-IN/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gu-IN/firefox-69.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5d8e5d339d350f151c8834d16fd26979b42d3ca32e5c7f72e280923252cea294eb4857725035eb40c282848b38efaaa79b974e795211d3d59598c6a53a6babc2"; + sha512 = "1e4afa88d7f153f2e653d754c71cfd960b51ecd016a533f868a96d3a4c076d5f0063d7aa169740c5f3c6e91c6c10f54edf1a4ad1829cda2fa83a462856d1f981"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/he/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/he/firefox-69.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e9e9bdd9698d7288dc89fa03a5461668dd67ba305a2d822a50b1325e797ad233dc727cbecece58da43e104fccf319ae2d884c39bdf4abdb3b5bfc88f989d1f52"; + sha512 = "3ea8ff7b1397ca2e2c15cd1fbfa63542d5d31fbea6fe9fe0c11b8bea0d953c2c2e35afe336714bf76baf2f38ed3894d869e9b467fa98fcc38796f1a31c6a0d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hi-IN/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hi-IN/firefox-69.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5b650fbefccd3768918a8203687e39fac96f3530236a40f1d73ef24ab2a25a58f901ba5cea0dddc9b9623ec84015eb6392182b1f02a14c46d382eb07a2078ced"; + sha512 = "eed63dbb1d8a702cd755383f967d859015040db231b464c3691376b3cd6e8ba5b23bec3460bc0c7dd6b0798735a196525530a533caf68e4056d54d54bc4ae50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hr/firefox-69.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "6cd3ab0dfe19ee2bc3725af08dbe54f12f214bf4b41047435f6fa8ff986bfcf45772626c7392858987e01e1fefcd5ba1b28872cf7774ca90413993343367705d"; + sha512 = "e79b0398e4a57751c87f11574b9bf6d7b92cd578b41cb80cfceb2f515e01c58bc17426fd7b3668b4d5b48d17abc60009ce1539b2a57355a90a1394f742c8916d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hsb/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hsb/firefox-69.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "ce300da3c7e1787fc205d904694ac84bf4fe4f271d95cadd9539b18c2b0fe8f35d12ba331ac098f56a56786f36e1cc2b2fbb62ae7fac25cd6368d8a66ea8efdf"; + sha512 = "704dce04396b78070853cb2ea8a0d6c4bf1da489864f4575a5d98c953b765fd7660e5c75bd3506bb05d94f5eca12d37a50be351fdd189592315e32c3fc361dc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hu/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hu/firefox-69.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "64d30bf6122ff4598603bca84d4d1ac30c2e84f106e4c68f6a0dc24dceabe67e34e514dcf58acdd8b6d3c4412a5e1a912e184ec13e8ddb5867943b2965a3f1be"; + sha512 = "613b525e8abc06e54dd985984b690c25e5c9ad8aa072cf5e48b20298b91853a8019696f7d7101d74efe200119a4a9d1196b71fc286bed7916d712dbf6c6b5686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hy-AM/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hy-AM/firefox-69.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "799faf34055822487b442da86ceecc7dbe36574a76a8e04e4fd76852182bd75d773b69c0ed19fb33c5dc23bc4ac6c0c21a6694256398629a984a1d2ebd63a63d"; + sha512 = "5d4088682997b0490ac49606dc8ad56158b3b7585ed4b89507a2596d119eae098d82fdf224eb047b6090572fd5b00cb95dfc5027afd6cea11b0f05e6d93ad439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ia/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ia/firefox-69.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "ebf9d05baf6b4963b0b5ff25b2747b3a90e4b664bca1c865638190dae85891499e3b1c5b3b656f83896117b430556efee039bd58a5728573e3be47e1da4b77bc"; + sha512 = "7ddcddfe7e3baf0bae0bac901b503fca8c344bd02d6b52d90face8b8575318c8805db618e8591372c4c4c60e1092a842f2bb17a920d96e0f15a1491ac847305b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/id/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/id/firefox-69.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0268c27fac89400ac179778f9e17b8b1e5d1f1e6bb9817576e03f4985f0aa7a57444eecdde69c1f7800e5128cdcb5829f62a4ebdce6124e3f4832a9fd44022cd"; + sha512 = "90cf509c70963750a4bbe5029e5e0512e98c8c7286d80120e39e299920d9331cb72dc7f39f2906e9a5b331b54d2f282b46c4b7f69dde51ce2b06c39e2601d335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/is/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/is/firefox-69.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "818f4173ff8e9bc01576c0d416b39519bcaf33d83760e91d1b4f8ba8e28389b81816c15f5d19f3fcaf6a8140b2bd8fb92e29a844e2da05f9d6344542c7b5f615"; + sha512 = "ad4c03603a8a81dbdd968ce4831ea40effe90b4cb044315a3c0566b647854fd4e95cdf6c085da8a4f4d901ef671392237aee70e4604552381959b65ea6d32089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/it/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/it/firefox-69.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6710ac5a6c98dd9010712acc29239f9f102bda2458d16fa3394ff0ef6128486b759c3e68d568614f793eb0959fae908f3fc519dd52fb27a7495956d1e66c6f53"; + sha512 = "04dcf6f3b9b3f22a44b74a2e9e20d6fa74a75707c3b3145d048fd9bc10eb4859127cff525367d0e7fdb8ba6d997a7ac1506e3611ddcb80256aa0cfb7d472d407"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ja/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ja/firefox-69.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "481206f6a36704b06d207f6b4eda96c307f61a2700a3da6fcf659c6b12c7880ca5ed69f1c3ae9da42d774e84e2e9c621095cfe3fd4c8e175304945272d51bbdf"; + sha512 = "d9d017a9279bafc6d7b440ea7b11ff945bd647601e85b395e0ac086684f58dfb15bfa18688748e934bd76ddb3729804e10a55ec3428f2e03413f9bce8921936f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ka/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ka/firefox-69.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "ea1bbb5f759060a45a62b605d82db9b560a05ce9f0f92b907bc92da1a30229e312bdaca3e78560ed698100099f1bf261b71abccb353930a77b9908d0b0862ee7"; + sha512 = "513d865cbda546448b77e7adbc236d24dc1d379fd5c74ada7a8fe6667c61237428f0751e1a9c0e067c9ec5684ddb8b0fe8041b8eaa04e98c4690ca1486c20281"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kab/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kab/firefox-69.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "4855f086d6d4028d18a6dfcb3da366c667e16a84e3b81d6e58408a2dcbeba77fc01668b90290e4ed49334d2afa5454b866dbc2ea3f4b446d5eef861bbb5b03cd"; + sha512 = "7747666dffb5a8836ee88669dfa7e5c848e27821911499c1b4d896172bc8f696dbb998c701b043177fe0370000529d8ef807cbebf9457e013ddd822faf4b7a19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kk/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kk/firefox-69.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e48bb95cdb2361cd274e064e879ffef3d4cf25c15712c716c278a16b31636b3ffe3585999f7477e58b26ec5fa4ba0a3d5c5e80f7af97b305aec3e899867e66ba"; + sha512 = "badeb493bbcd591359a283e930d9f042c2c81af24b2824cc4559f1a10a5372dba3eff457121744f0e5a8bc78394215535524f440cfe7435853f4b97db03a05a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/km/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/km/firefox-69.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3a987d55f2b113fe7ca2f47457d786b5d851605edc94e3a6467a2ce127075be4a2aa924892e053da6b9f854de60555941a875e0b94c8a8d736d84c791d5d7803"; + sha512 = "2e33e07d9a35eaff182ad012dbd2f59cfc70170cba518d066bb05bc4873867dc24dcd0dece4fabfc045cda6313d5aa86a31e4c5d42579eecd6a11596a8d806bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kn/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kn/firefox-69.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "36331d0774b85403d294b1240e1348a1aea9ea52df8ff8013a69f0b82cb5e8c799c87e3fbc9fdf0fc20f3537d0124d7dc291cd8fbc34063e4bd3b17c6810ea7c"; + sha512 = "9ba5560db5f127018b3c365da5c18942da60ce609fbd5ea24c2eac75bb683a0853f212d8c46d7ddbd6190b6158d733d9f9dcd146188940e2705e9ca84caf1c33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ko/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ko/firefox-69.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7534ba3a9df96088180efd8a9c1df50e674f1749edb9103c6efc6db8c72d8e82aee09081ad3a956b07e0ab6c57e8c8194317d39a933da977dc0afdd1142d1c2e"; + sha512 = "7f1ac38d2c303fa4d6ba628b3c57f5fbfde1b29e6830f5a2fc657f85d94f37d7474dd590e6b2933103cbabeefc5a51d6e59b434db7c8b422b8071b09a81e73fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lij/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lij/firefox-69.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "affa07c2eb1590fddf0c30c670b6c7b6f9f6969dd43858e277a750ac524063f5da5166d7d8326e1823e0258ec5f214d241a08dbe338a3cb979de8b19a9799009"; + sha512 = "9e8023da48c91b1e1eb5cd67ff661413a346fdd9a5062f71df712a4dd237c8b54ead00c49d03342eb32a614b85e55f6cc263a4968c8c6b09e307876483ce39ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lt/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lt/firefox-69.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "416a8a66b087dea18c577d839c151f958c084e8ee95fb0fd7f17a45015baed961de0ca138fcc12f58154f480df15d294d822dcf1f218f4c8082c9193ad57710d"; + sha512 = "1d422bfdb4fcdaf791541a778bacd27753e154e6093e0f8e76146f0eda6cbaa40346c519590fc78954d6d88c7fb0bd1c23b0ac5e359dd7a052ec124072a63c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lv/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lv/firefox-69.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1c5359efb53b0d4f0d9f33a321cac45ed112ede997c06b2279546183dd005c186f107701c895ced27a76086ca71374a49a067f5599a0d2ff166432b7eb7629df"; + sha512 = "5168aef4edacf147f4f26f8f6c9f9b051339bf8b3910d8cda527321c0a6bb410a4cccc016c939de7d99a2db3b096ca2a14bd9eb5889f468d8aea27d2d96db1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mk/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mk/firefox-69.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "db44f22e19d505a590749ac98d7b84354106d421e4a45eff70986af2c9d2ac581a0bd84cfa103196ae4cdc17dd1fe5d9f0cf0c710ee0fb5a0ff7701f6de5253f"; + sha512 = "af4d3216ac877e1fed003056ccb9ef502ee8ed9984df609043190946d7017f0e94838a00c1bbdaae9ff0078a8779bb3e0cef668e9f38dc94f546ef9cb4691e1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mr/firefox-69.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "db73d7706ec4b87e76f5d174f22f9b032d75d9aebe6001ecdaa7c2c8fe5db897efd57f0f2ec482a5ef22e629a6233f5ef7c5df19566a3df0f0ce58ce008a22fb"; + sha512 = "744196bffb399181b66ae4c192febdf595906809985807a596d2e482c2e1d519c0e3500ad98d04518b6f71dbdcbacfc481972bf2cf7802ad81f6627fe3b59877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ms/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ms/firefox-69.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "23dad70a4757bf8e9c67328bf43b9be2a9d6e7f88ecc9c2980314e68eff269f996535f43f9fb93419d81a2e7c922327e5642c191e15582cdfcd3e420433e4270"; + sha512 = "5d79b3b383d4163a4ae5ee84c28d8578b27e4fb42d09691fa7cd6fdf77e3a74e5e83c9bac581fa59e74b2aaaf8713f9f3b6b1d5ad778579f274d6f08fb4fc36c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/my/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/my/firefox-69.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "ba595429b7c637d06f703ae6bb1cb5ec6095a7f6fed7ea64a0b39825921f49f5f827c33a5cf3cd0bccc4b6398acbf4119a147014f1d2db1d8bd4b3e72b7733d2"; + sha512 = "60b128b6d0cc632667b496f8b61e39fd14ad4c1544b4d0041cf739622c5c1b1cae539e848fd5944d0c3286f0b03dc2de46a156457ec6e2efa155e13cf7ce279d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nb-NO/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nb-NO/firefox-69.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "8af331ca56c43c43b42061de4a7686bd2f944de845f9d94d088a4c1c913e1d7376abfd175dcebbb3ee78fac7fbea407cbdb2b81382919d12fca021dfccf59feb"; + sha512 = "32e52dc1b1221862c0e3243e29234b330d73cc99c4500faf785aa911c92019e655beaab6f79911a8661a5efbd1dc8784aa328216653c2a206e52f703057f15c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ne-NP/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ne-NP/firefox-69.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "497001fbf28df53edf13aec04de313a1353ce0eae894905d6a33b0c182ef589160eca2f0a8fc18d8e1644f573cd74de3e96dbf43141b05b6884be04fde28be76"; + sha512 = "04802130d9f08cfef7d0f5d29e0ed0b9757c3b7fbac001bd35431ea4851edd8c2e4837518fa893381f6c0c976684ffedeaa96b2bcdec3849cd2cca6bf170bdd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nl/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nl/firefox-69.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6c0836da50f14accbf536570bfea5fe4e587e87fe2e4203b2c94052476994949058ee2418f862312a95627730d648832f6a0ca39690513c6d96070108630e43d"; + sha512 = "fc02ea317fa90caf203608a31f2a188971bf5d6a900c8f03a422ffa76adb1eefd32c55f317c7c89c8443d11a79f0041a6a111a78519b441eaa7ec4832bd8ad38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nn-NO/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nn-NO/firefox-69.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "89be8b53fdc39bb39431584ea25cd6e5d660f75756d6c45f0157c1eb387cc625e927931c1cf0d1587c0819fef9635cb3ac2319af6a6f35825a6170518070cbd4"; + sha512 = "f7f1274605b79541ec6f93cc7f023fe437c93e969d3644c6867a7c2c448f5504f9a6fc29f47c4267f13187ff6eb1b240e32e17dd2e5d66afc96e0a3bbecd9922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/oc/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/oc/firefox-69.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "6b34edad11c141398d329d07e126eddf03bfd395bacd6856e947771ea65e274e78f96784f695542280f4530c395ebd0011946f1bdc95c1bf5c0f96ae8d7ea707"; + sha512 = "ce1c1a35de6ac933192cbdd49370d5cbf90dfb993dcc8e3c739f2e3ff2023cc793f7ffeec40b3ba4093449dcd37e221932a6c3771f8f70ec074bf79e50320f69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pa-IN/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pa-IN/firefox-69.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "025cdbfa14ae385fd87e71296b67f9b0313c60ac56cb3d0f2734bd803e990b846383d64f65ca9a3d643fe0f2fd678d54a2b2000c7dca1cff73e5ec47acf1e53d"; + sha512 = "50b4826d83cf08ebccae048c4dd3760f3ec639427d6354de398b77501e73df5062b8090590fcd74be54005a7df61a8cd7c2f4207142bdcd6468b1fbc126801a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pl/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pl/firefox-69.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "569b0dabacb30f8ed02cb1118a062c1e212c4b688a104d9afce8d846572a92723ca1ebbc495dd0e97c3365ab3e5010b9d812e88b111f40a6e87b14c646794dfb"; + sha512 = "ae77877e1eb03174a1899b2b5d0820b367553d56febea14df4f1545a7f10de16c9f4401efad4334ae04a4a5c8abe49b2e24c09263bc002937576ad5ce622ed17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-BR/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-BR/firefox-69.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "36e7914fee752f7cbddce0ec5e48ffc0f45a20dc4b62a825488ddb0b49c36f91d2df257ffe2b551bba2261d7786291a2a7fb3f518cef5c6f9b449205eaa733be"; + sha512 = "92cd33b35927dddc22e8a3ff3833ce2bb4913ae9ea12d4220d88861f7badcd69d1dd97be22cb6546a8f09b0e7620e17eedddee3d159660c9128c288e49a47dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-PT/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-PT/firefox-69.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fc6dcdec3e6d53111929a70f3cd22948006d9a5bc2c6e4cb305a07c4bc8ee0469297be01d85b68017a026e011c35252c25032156ff383cc708c470fabcbc7198"; + sha512 = "fb8d011fca706e6337e0b0b13b2e1ec619565b954c887c71720240905ec5c085aa7037b54e8b3df316c253483a3d3c7ad2182b27d8591d4e2840c6a4f9e39382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/rm/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/rm/firefox-69.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d5b2631fc3076cc251cb82e6c0930f7890750a73902480033ad0b5ec91aecc6f15c01e1e79b88ee4b2e74588a76cd0017fa520175559e1e68a6edd4149cd556d"; + sha512 = "fbf0e34fbae7da291cc132697b6505f3213ad07c78a47171827a9bd6c22b674629cd21a9f47187173cf21f1b168baad0f058365a9ab24e274a2d3aff5acd0e38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ro/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ro/firefox-69.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d88ea2b05b262e010b0e447f4480149ddc79874dcce3925d3768211d7016cff99a9a0aef594c7185eb81988edfa46497dc442a4d825358c821461cc0f689c593"; + sha512 = "cb712f917e0b70936ba1222f03c8874134e1cac6c901d94792aada224d894a607829b64993535f0cf61d8a2a050f488452c35404400587222418c8312e2b22f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ru/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ru/firefox-69.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "cc28f64e1ba7aa4771667a09e3ef9a2dfbe1af3c3ba552f14d16bf338eaa178c32eaafa39b6c0592e690fc10325b88966f555283669d241fe05bef113e533c02"; + sha512 = "7ba048f533655e5802347a6d409ed6db4441b421cb81d66269eb610336f3fe2077a5bea405f235c167390f745762ef29863e83e6e704bdec17404d26a97f8ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/si/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/si/firefox-69.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "9119703b2edc30023b0bf81fdf6083a46544273a5b0dbe0f1d76c00020f1a093ea1df2592375bff9e81af1190f7fbd269f0387e311211a8d806e7519164b24af"; + sha512 = "ea59ce14e80132d96f0419981dda30184809542978d158b8894c77cb4622c3f0bfb9bbbc4d456b386a023d9856ff6b02e5388ddfb0aced2ca764991ba8bab48e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sk/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sk/firefox-69.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fababc6cd6644be1404ee1b6ab6f0c01c161b13539702a932e67062bc6d7ca350d0b7c88957d0617b404d892b93fff1b736d93a4061ca0b154e2cf3fbd0972ba"; + sha512 = "4665b3b4b96a07ea0530acf4063dacfa48ff39a65d2e1da0f6d3f65703c3916ed65a8881d8a9d92109e252993f63edfec899d00a3559149a282b615624267431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sl/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sl/firefox-69.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5e16fd5446f742f259fcaaab1bf15e7d56cfd412065c268d625d87fb812312e6caffbdf0502d8d20bd9478bb4b2b3444604d8a1aea7a006c0dfe3d8120b2c1fe"; + sha512 = "f3d6486a3dfc435933871cc8abcd3a428d724dfccca26be63df29d9f5b34fec115bb6e185b2aaf839f428d0ab44d33583610bf9d1c7f02de442506d1fc06192d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/son/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/son/firefox-69.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0a36b7350d7cff22bd583bf7d811fac358046ddb0b85da52750e1687d7b82487ccac8575472683302c9a814abd07f81b227db3f2ecc8562f5d069d95045ba7d5"; + sha512 = "6486e2f291deb1fb241df996e7898a9d487889815195d01d77d6bfcab6e2cb4bdc24c7694b6b05a95758ef130cb3332842e36446ffc2a926940ded5031cfa13c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sq/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sq/firefox-69.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b18398395e0ea078117987704c962399a385e0ea2e4568291d8449d9fcf5f1784e4074b990e0e5e8a5b6b9dbd789772eeed689e722f4179e3f451064fb08ac92"; + sha512 = "b111d30e2cb7fd5edadc68b9d25fd8970db62d721e903d9874afe6b875b313d039dc7c4e98e3de07a09fe84ca7d0ed10da2e74cf3cd4953b2c25252e16e01516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sr/firefox-69.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "469ea3344ef2893333b7c967a72a08a86c24ce511f8d45f95ad159def204e2d5a2665829ddcf6783cb0602f0013f3924045410609b9e2a921f43c79750435648"; + sha512 = "14c98d156bcae234c12f28166ee5ffc7d034529efb76536ffb29ee8baf850cb3c934ba177956ceba9c4cde2481064c3a906515328d1d8b6f5d9258cc1d30da94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sv-SE/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sv-SE/firefox-69.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "4d9080b2bb8d3dbabd2ba6a14d0db8e5a983f5ab077d80dc7ddf892a82c1508b1b9bfe9b346d009b95a1ae89f300e72e37479c905b70ad924fc9d1c34f1317d4"; + sha512 = "a196eb9ec6b667d04dd787aae47a1dd22a99f01fdcbf6b36e9946038dad52ddc3d215e2307641c3f539e476c9b8e3f9470d78b914a243b51595f7d75cad2e114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ta/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ta/firefox-69.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "347edc360548f3a254c1eeaec47f1ece912fc79a0c19d3d9a1e455ec847749d8d531aef8bb44e2875afc4618a1eabfb77aaf581788138bb0a8607a443699da91"; + sha512 = "d76c3797cd752a2b8021694421c224c2e2afa2d1350cb86263b01a8efd84b49cbda40a5c6b64f981833865944798148508fd6ae3532e82b773d650b41980893f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/te/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/te/firefox-69.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "806a97bdf4030dd8de57f3e2af8e06d71ea17891f4cd08df3cb3e71bfef372f1029b78ec6a16bb6ec96dc5113a0e96616e2fb907e11c98b6f33c9b83f67d9c37"; + sha512 = "8bf86410d1d73cf355ecc4c2ef3308c35a31d55f90bba1c942f915e8cedee919c80729271c2d9e3aecbf499ca711f36bcf74c8b41c50024161e567d395485477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/th/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/th/firefox-69.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "a453c97807c46eae98a1fef4184dfe06c3101240e5d20c389b9cfdaf4dfb4c2c3c38758d0451789d326c2d76249651c2d1a7aa4134e514b9de3ef966e4bed60c"; + sha512 = "c757659188b17cfad880e70eab772517128bfa7d1dcdb86f313a63fb46c3f3d3504d66bf3ac99d1058848264ee4458bc5b77bf78009e9a7216c1fa359714a3d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/tr/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/tr/firefox-69.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "79fc0d00870d27ea7485c5807c5e4753b036364f68f71b3a66e11b23e8a6f5498af35411d5baf1dcebbc8959b3ec1870faed90b136aec6a71ee2ccc59832cd3d"; + sha512 = "635ad19f913a2d6dc46df50589229658dcea0bc570f45b7c5ff8eb6878b852ebde3a490512d679a6257c39b16fb986f40ea2894c08caed8c485a91e95f4addc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uk/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uk/firefox-69.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "87176598ed9df72c6b05a2469ff404520f8e4171ee42cfdecd4dd461c761bddaaf8735ec9a9d9e651299951a656dc9189c2bf91f2ad896ff387706aaf31614b9"; + sha512 = "99a3410ea2caf11911e7613568f7522230b13dcef48ffe6b95206a6a6d9f43f396b37bda1fad62dc4db097da55f96b30683626031491d88d116797b605d3cd2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ur/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ur/firefox-69.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "761089a4b9a9df1e8aeb61567db383cc7f1068a56a857f9ddd9f306ae0eadd0f1fd0d911243b86dbd7cf755a1d0d9e2728f710d5e4855286c897fbf1bae3621c"; + sha512 = "aeb60017d6ff2deb1675880c2358eb2a8561196e6148e8f796bc6964d26c303355339d7e6e4526be0814190a3bc4a98b48228457d6709a762e0e36bc83f6fb52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uz/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uz/firefox-69.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "16838912099255e703f45537810f9a125f162da46654356da5d7284cf5976af0ba47e77b5658f7a95ff63287379411356521fca2250daef3f8ec299231c561c4"; + sha512 = "99d025db18d86f75818354abfa56bb13041832605f25e0b91c87e18bda06d059ba62aec8be7141c8c6cc5f34edfeb83bfcff9234222ec88121b51fafdeab7ca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/vi/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/vi/firefox-69.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "26c8651de12544aff98d6657bcd3dfce453d394dd0f4e6045d8a29d8ffeded020335bfc958984e1b79dcc4b8bf4c3b3a29c1b20fb62c0df7a6dc76478f72dc65"; + sha512 = "5e5a586ed274f112ca20d729c89b949c46eefdf2d993e4bc27ecc4a40530f89ab68838dc458e510cb5d862e63c1b7b6188657650599dea920070092f091d6a2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xh/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xh/firefox-69.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "222a0a22c6e41a6f755ba881097c2c354924bfb809f3a04b588853da667444f8c922fda9bea0f3c7bc82f46938f86810d2cbd5900960180a2a25f9cffaac9088"; + sha512 = "fbcf97c7235c0a765fa083893dbd1e82e6b9befd8266bc86c1b1ca7a5d1674af2cdd8c86d6f2087683823eac2774e0b8983c4da93c72115ea4d53e6b73815140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-CN/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-CN/firefox-69.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3a3eea1dbb9c42c1740ee67b68e71ce84ef1f3f14a52c069a17956911464570429b3576e29ec7370a857dbcaec143bc4ae65e3f01e319b7ca065899e8f864eee"; + sha512 = "93cce943be38357705ce7d1d4c5d88e5256c34280479216a4f739b60665ba832ef7b18b23730256871ce3bbfcae744ec421ebd56aaa73acb6cee91de03d0abe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-TW/firefox-68.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-TW/firefox-69.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a8d53ff606b7bc82dfbec77b299b8f69985472486706f79c960da988063a0e86d232eefb4734b8a624e97e9849fad3e36a483190b8cbc6c3210b2c2d79bd2b25"; + sha512 = "407014668d7fd6802c1966cb8ac8571c151877ae3a9841e581784987a0337cff5c5ff191d13f305c371c7880a269b8483ac96b08bfd9f04b8ee4747adca5715d"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 58962c1362a2..cbf9736ec893 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -256,7 +256,7 @@ stdenv.mkDerivation rec { "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] - ++ lib.optionals (lib.versionAtLeast ffversion "57") [ + ++ lib.optionals (lib.versionAtLeast ffversion "57" && lib.versionOlder ffversion "69") [ "--enable-webrender=build" ] diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index e1cdf1208d23..ccbc02d10900 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - ffversion = "68.0.2"; + ffversion = "69.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2xzakpb6mp9hjqkim353afv059i4zfpmhflhv3l3qzajgjz36cacbmp4bkn4cghinm8krhp8z02264ww0bcraryjjwn5q0dzljrha2w"; + sha512 = "2q0gky7a6ayb6mw8bw3s35q3ggibf7vfyrxgggz1l4lpcv6dwjj01x45071h106jkvnh71hycvp1cywf98lkybjbfp8c9kd8sivkd43"; }; patches = [ @@ -99,10 +99,10 @@ rec { firefox-esr-68 = firefoxCommon rec { pname = "firefox-esr"; - ffversion = "68.0.2esr"; + ffversion = "68.1.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0dyjayrbcq6dg8vmzbf7303aixnhpd6r777chxpdvqq892rgvw5q4f8yfb6pr8j978hahn4dz968vzmi6sp40y3hf62hnzdqpzd2bx1"; + sha512 = "0n8iy9xwf8wldkknq3y3nlm0cmb48baamvz4wmmbpfb2kfrxbsj3wnnd9ayk9zxhrsdq0na9gvkc374mv06nyqijrahd67wljv08fx5"; }; patches = [ @@ -180,7 +180,7 @@ rec { }; }); -in rec { +in { icecat = iccommon rec { ffversion = "60.3.0"; @@ -270,7 +270,7 @@ in rec { in rec { - tor-browser-7-5 = (tbcommon rec { + tor-browser-7-5 = (tbcommon { ffversion = "52.9.0esr"; tbversion = "7.5.6"; @@ -286,7 +286,7 @@ in rec { gtk3Support = false; }; - tor-browser-8-5 = tbcommon rec { + tor-browser-8-5 = tbcommon { ffversion = "60.8.0esr"; tbversion = "8.5.4"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2a4db14b2c6d..3ed06717f6a2 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -129,6 +129,8 @@ let --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set SNAP_NAME "firefox" \ + --set MOZ_LEGACY_PROFILES 1 \ + --set MOZ_ALLOW_DOWNGRADE 1 \ ${lib.optionalString gdkWayland '' --set GDK_BACKEND "wayland" \ ''}${lib.optionalString (browser ? gtk3) diff --git a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index 977b40e4a7e3..9f49925b2672 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -64,7 +64,7 @@ let suffix = if channel != "stable" then "-" + channel else ""; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; name = "google-chrome${suffix}-${version}"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix index f2cc277f3dac..7bb443e22c33 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.19"; + version = "2.20"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "02ls11c02p7xvsdjyb43rrzr850i1yly003r812z0w5vv5yqqxbh"; + sha256 = "0bchwqa87dc8cb55spyybkqpc456pp4x2n9aw587wr7pn96cvp9v"; }; buildInputs = with stdenv.lib; diff --git a/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix b/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix index 69beeb167590..d679eb56f5bd 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { # TODO: why is not this the default? The test runner adds # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils # scripts don't add an equivalent - export LUA_PATH="$NIX_LUA_PATH;./?.lua;./?/init.lua" - export LUA_CPATH="$NIX_LUA_CPATH" + export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua" ''; makeFlags = [ @@ -49,8 +48,8 @@ stdenv.mkDerivation rec { in '' gappsWrapperArgs+=( --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" - --prefix LUA_PATH ';' "${luaKitPath};$NIX_LUA_PATH" - --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH" + --prefix LUA_CPATH ';' "$LUA_CPATH" ) ''; diff --git a/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix b/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix index fd21d9222d3d..a0bc0c743e46 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Lightweight WebKitGTK+ web browser"; + description = "Lightweight WebKitGTK web browser"; homepage = https://www.midori-browser.org/; license = with licenses; [ lgpl21Plus ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 2d2d2a691006..c603dc6cf9f0 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -48,7 +48,7 @@ , debug ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flashplayer-standalone"; version = "32.0.0.238"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index fa455eb0b7a4..10ae0eb1da60 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -9,7 +9,7 @@ let url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (srcData) name version; src = fetchurl{ diff --git a/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index c4182785e829..66b947946cdc 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -13,14 +13,13 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.6.0.1"; + version = "28.7.0"; src = fetchFromGitHub { - name = "${pname}-${version}"; owner = "MoonchildProductions"; repo = "UXP"; rev = "PM${version}_Release"; - sha256 = "1adgajy5vsghvjlv2nqyrbp6mnv3k6slqxxi8r949xlb5h6d210b"; + sha256 = "0i6fy1mvjy6vpqnvhh516mxbv4d2z73yghk3frln4ql8zavba7qq"; }; desktopItem = makeDesktopItem { @@ -91,8 +90,6 @@ in stdenv.mkDerivation rec { " ''; - hardeningDisable = [ "format" ]; - buildPhase = '' $src/mach build ''; @@ -129,7 +126,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://www.palemoon.org/"; license = licenses.mpl20; - maintainers = with maintainers; [ rnhmjoj AndersonTorres OPNA2608 ]; + maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix b/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix index a4979d3bcf2c..d9d4fda1aedd 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - description = "A simple web browser based on WebKit/GTK+"; + description = "A simple web browser based on WebKit/GTK"; longDescription = '' - Surf is a simple web browser based on WebKit/GTK+. It is able to display + Surf is a simple web browser based on WebKit/GTK. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties. diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index fc3cc2e89a91..c0cb85eb1777 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -94,7 +94,7 @@ let lang = "en-US"; srcs = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { urls = [ "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" @@ -102,7 +102,7 @@ let sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z"; }; - "i686-linux" = fetchurl { + i686-linux = fetchurl { urls = [ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { pname = "tor-browser-bundle-bin"; inherit version; - src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); preferLocalBuild = true; allowSubstitutes = false; diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index f15bf165e826..7ff099853e29 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -71,7 +71,7 @@ let ffmpeg ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tor-browser-bundle"; version = tor-browser-unwrapped.version; diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 246c5e7e60dc..6483b6d03e30 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.7.1628.30-1"; + version = "2.7.1628.33-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1lz8adwiwll8g246s5pa0ipfraph51s9f4lcfysdrp1s3s1qhw8x"; + sha256 = "1km5ccxqyd5xgmzm42zca670jf7wd4j7c726fhyj4wjni71zar34"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix b/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix index 136c14d34d48..373fa43c72c3 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix @@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null; with stdenv.lib; let - mktable = buildPackages.stdenv.mkDerivation rec { + mktable = buildPackages.stdenv.mkDerivation { name = "w3m-mktable"; inherit (w3m) src; nativeBuildInputs = [ pkgconfig boehmgc ]; diff --git a/nixpkgs/pkgs/applications/networking/charles/default.nix b/nixpkgs/pkgs/applications/networking/charles/default.nix index 09be379b2409..4c1f7ea77492 100644 --- a/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/nixpkgs/pkgs/applications/networking/charles/default.nix @@ -20,7 +20,7 @@ let startupNotify = "true"; }; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { pname = "charles"; inherit version; @@ -54,7 +54,7 @@ let }; }; -in rec { +in { charles4 = (generic { version = "4.2.8"; sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/click/default.nix b/nixpkgs/pkgs/applications/networking/cluster/click/default.nix index bd8eb5451526..f4d6fce3545e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/click/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/click/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "click-${version}"; + pname = "click"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix index 0c210dcc535b..9bf801ee93d7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "habitat-${version}"; + pname = "habitat"; version = "0.30.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix index 438fdfb2ebac..5fc35e6a0af1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix @@ -65,7 +65,7 @@ let installPhase = "mv hadoop-dist/target/hadoop-${version} $out"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "hadoop"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubectl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubectl/default.nix index 40d42408679e..fed40523a9b7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubectl/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; - doBuild = false; - installPhase = '' mkdir -p \ "$out/bin" \ diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index e4adabd75813..d665693439f0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.14.3"; + version = "1.15.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1r31ssf8bdbz8fdsprhkc34jqhz5rcs3ixlf0mbjcbq0xr7y651z"; + sha256 = "0vamr7m8i5svmvb0z01cngv3sffdfjj0bky2zalm7cfnapib8vz1"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; @@ -29,7 +29,10 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; postPatch = '' - substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" + # go env breaks the sandbox + substituteInPlace "hack/lib/golang.sh" \ + --replace 'echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"' 'echo "${go.GOOS}/${go.GOARCH}"' + substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" # hack/update-munge-docs.sh only performs some tests on the documentation. # They broke building k8s; disabled for now. @@ -52,13 +55,12 @@ stdenv.mkDerivation rec { cp build/pause/pause "$pause/bin/pause" cp -R docs/man/man1 "$man/share/man" - cp cluster/addons/addon-manager/namespace.yaml $out/share cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons patchShebangs $out/bin/kube-addons - substituteInPlace $out/bin/kube-addons \ - --replace /opt/namespace.yaml $out/share/namespace.yaml wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" + cp ${./mk-docker-opts.sh} $out/bin/mk-docker-opts.sh + $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl ''; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh new file mode 100755 index 000000000000..22a459f51349 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh @@ -0,0 +1,113 @@ +#!/usr/bin/env bash + +# Copyright 2014 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Generate Docker daemon options based on flannel env file. + +# exit on any error +set -e + +usage() { + echo "$0 [-f FLANNEL-ENV-FILE] [-d DOCKER-ENV-FILE] [-i] [-c] [-m] [-k COMBINED-KEY] + +Generate Docker daemon options based on flannel env file +OPTIONS: + -f Path to flannel env file. Defaults to /run/flannel/subnet.env + -d Path to Docker env file to write to. Defaults to /run/docker_opts.env + -i Output each Docker option as individual var. e.g. DOCKER_OPT_MTU=1500 + -c Output combined Docker options into DOCKER_OPTS var + -k Set the combined options key to this value (default DOCKER_OPTS=) + -m Do not output --ip-masq (useful for older Docker version) +" >/dev/stderr + exit 1 +} + +flannel_env="/run/flannel/subnet.env" +docker_env="/run/docker_opts.env" +combined_opts_key="DOCKER_OPTS" +indiv_opts=false +combined_opts=false +ipmasq=true +val="" + +while getopts "f:d:icmk:" opt; do + case $opt in + f) + flannel_env=$OPTARG + ;; + d) + docker_env=$OPTARG + ;; + i) + indiv_opts=true + ;; + c) + combined_opts=true + ;; + m) + ipmasq=false + ;; + k) + combined_opts_key=$OPTARG + ;; + \?) + usage + ;; + esac +done + +if [[ $indiv_opts = false ]] && [[ $combined_opts = false ]]; then + indiv_opts=true + combined_opts=true +fi + +if [[ -f "${flannel_env}" ]]; then + source "${flannel_env}" +fi + +if [[ -n "$FLANNEL_SUBNET" ]]; then + # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below + DOCKER_OPT_BIP="--bip=$FLANNEL_SUBNET" +fi + +if [[ -n "$FLANNEL_MTU" ]]; then + # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below + DOCKER_OPT_MTU="--mtu=$FLANNEL_MTU" +fi + +if [[ "$FLANNEL_IPMASQ" = true ]] && [[ $ipmasq = true ]]; then + # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below + DOCKER_OPT_IPMASQ="--ip-masq=false" +fi + +eval docker_opts="\$${combined_opts_key}" +docker_opts+=" " + +echo -n "" >"${docker_env}" + +# OPT_LOOP +for opt in $(compgen -v DOCKER_OPT_); do + eval val=\$"${opt}" + + if [[ "$indiv_opts" = true ]]; then + echo "$opt=\"$val\"" >>"${docker_env}" + fi + + docker_opts+="$val " +done + +if [[ "$combined_opts" = true ]]; then + echo "${combined_opts_key}=\"${docker_opts}\"" >>"${docker_env}" +fi diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix index 982f36def691..89d06474509f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix @@ -4,7 +4,7 @@ let # Cache schema as a package so network calls are not # necessary at runtime, allowing use in package builds - schema = stdenv.mkDerivation rec { + schema = stdenv.mkDerivation { name = "kubeval-schema"; src = fetchFromGitHub { owner = "garethr"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 256bce9b6ec2..8c0265d14914 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoModule }: -buildGoModule rec { +buildGoModule { pname = "linkerd-unstablle"; version = "2019-07-26"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index de1e86fa0736..9c07760355ca 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.7"; - sha256 = "09zsak1a9z2mk88vb6xs9jaxfpazhs0p7x68mw62c9mm13m8kq02"; + version = "0.12.8"; + sha256 = "1qlhbn6xj2nd8gwr6aiyjsb62qmj4j9jnxab006xgdr1avvl2p67"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/nixpkgs/pkgs/applications/networking/corebird/default.nix b/nixpkgs/pkgs/applications/networking/corebird/default.nix index 6dbc6954ef51..73c0e234945e 100644 --- a/nixpkgs/pkgs/applications/networking/corebird/default.nix +++ b/nixpkgs/pkgs/applications/networking/corebird/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Native Gtk+ Twitter client for the Linux desktop"; + description = "Native GTK Twitter client for the Linux desktop"; longDescription = "Corebird is a modern, easy and fun Twitter client."; homepage = https://corebird.baedert.org/; license = stdenv.lib.licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/networking/droopy/default.nix b/nixpkgs/pkgs/applications/networking/droopy/default.nix index c74f5789d84f..d71b863f881f 100644 --- a/nixpkgs/pkgs/applications/networking/droopy/default.nix +++ b/nixpkgs/pkgs/applications/networking/droopy/default.nix @@ -2,7 +2,7 @@ with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "droopy"; version = "20160830"; diff --git a/nixpkgs/pkgs/applications/networking/dropbox/cli.nix b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix index 54ed0f2eea04..9b3b99708dfc 100644 --- a/nixpkgs/pkgs/applications/networking/dropbox/cli.nix +++ b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix @@ -53,11 +53,11 @@ stdenv.mkDerivation { ]; configureFlags = [ - "--with-nautilus-extension-dir=${placeholder ''nautilusExtension''}/lib/nautilus/extensions-3.0" + "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0" ]; makeFlags = [ - "EMBLEM_DIR=${placeholder ''nautilusExtension''}/share/nautilus-dropbox/emblems" + "EMBLEM_DIR=${placeholder "nautilusExtension"}/share/nautilus-dropbox/emblems" ]; meta = { diff --git a/nixpkgs/pkgs/applications/networking/dropbox/default.nix b/nixpkgs/pkgs/applications/networking/dropbox/default.nix index d820d40f7a34..9a05a92cfb31 100644 --- a/nixpkgs/pkgs/applications/networking/dropbox/default.nix +++ b/nixpkgs/pkgs/applications/networking/dropbox/default.nix @@ -10,8 +10,8 @@ let version = "73.4.118"; arch = { - "x86_64-linux" = "x86_64"; - "i686-linux" = "x86"; + x86_64-linux = "x86_64"; + i686-linux = "x86"; }.${stdenv.hostPlatform.system}; installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix index a5b4c577b4cb..640421bef8f5 100644 --- a/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "cfdyndns-${version}"; + pname = "cfdyndns"; version = "0.0.1"; src = fetchFromGitHub { owner = "colemickens"; diff --git a/nixpkgs/pkgs/applications/networking/enhanced-ctorrent/default.nix b/nixpkgs/pkgs/applications/networking/enhanced-ctorrent/default.nix index bb3ab98d1a4c..59b48df1cd03 100644 --- a/nixpkgs/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/nixpkgs/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "3.3.2"; pname = "enhanced-ctorrent-dhn"; diff --git a/nixpkgs/pkgs/applications/networking/esniper/default.nix b/nixpkgs/pkgs/applications/networking/esniper/default.nix index 708d3c1ed800..2535d0dc31db 100644 --- a/nixpkgs/pkgs/applications/networking/esniper/default.nix +++ b/nixpkgs/pkgs/applications/networking/esniper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "esniper-2.35.0-15-g91d2665"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index 2795ac4e46e4..f7a9521c9937 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -2,11 +2,11 @@ , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }: rustPlatform.buildRustPackage rec { - name = "newsboat-${version}"; + pname = "newsboat"; version = "2.16.1"; src = fetchurl { - url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; + url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz"; sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0"; }; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix index 6bdaf2ffaf48..7304fd2f654b 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "rawdog-${version}"; + pname = "rawdog"; version = "2.23"; src = fetchurl { - url = "https://offog.org/files/${name}.tar.gz"; + url = "https://offog.org/files/${pname}-${version}.tar.gz"; sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp"; }; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix index c0a6185309ae..3e7909c91c05 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cppcheck, libmrss }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rsstail"; version = "2.1"; diff --git a/nixpkgs/pkgs/applications/networking/flent/http-getter.nix b/nixpkgs/pkgs/applications/networking/flent/http-getter.nix index 63c18d6e0929..2bebf4b09601 100644 --- a/nixpkgs/pkgs/applications/networking/flent/http-getter.nix +++ b/nixpkgs/pkgs/applications/networking/flent/http-getter.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake , curl, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "http-getter"; version = "unstable-2018-06-06"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index c333ae7ddcb0..8de098b85e78 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -14,8 +14,8 @@ , icu }: -stdenv.mkDerivation rec { - name = "dino-unstable-2019-08-27"; +stdenv.mkDerivation { + name = "dino-unstable-2019-03-07"; src = fetchFromGitHub { owner = "dino"; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Modern Jabber/XMPP Client using GTK+/Vala"; + description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = https://github.com/dino/dino; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 1d9d645b0ed5..6bedde3ebd64 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,20 +17,20 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.15"; + version = "0.0.16"; src = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/linux/0.0.15/discord-ptb-0.0.15.tar.gz"; - sha256 = "0znqb0a3yglgx7a9ypkb81jcm8kqgc6559zi7vfqn02zh15gqv6a"; + url = "https://dl-ptb.discordapp.net/apps/linux/0.0.16/discord-ptb-0.0.16.tar.gz"; + sha256 = "1ia94xvzygim9rx1sjnnss518ggw0i20mhp9pby33q70ha35n0aq"; }; }; canary = callPackage ./base.nix { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.95"; + version = "0.0.96"; src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/0.0.95/discord-canary-0.0.95.tar.gz"; - sha256 = "06qhm73kc88pq0lgbi7qjy4gx9ighkmx128fdm1dpzfv62fjdasw"; + url = "https://dl-canary.discordapp.net/apps/linux/0.0.96/discord-canary-0.0.96.tar.gz"; + sha256 = "1fxyh9v5xglwbgr5sidn0cv70qpzcd2q240wsv87k3nawhvfcwsp"; }; }; }.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix index f04afb6f1f71..9a4ab636c5fe 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,13 +3,13 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - version = "5.2.0"; -in stdenv.mkDerivation rec { + version = "5.3.1"; +in stdenv.mkDerivation { pname = "franz"; inherit version; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg"; + sha256 = "16ssg4cjjmq3cps8klyx3jxqma7f83cczwjnknlfqglrwwdpnb5d"; }; # don't remove runtime deps diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix index e2203dfe6eed..169ddf65b29c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -2,7 +2,7 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jackline"; version = "2019-08-08"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix index 7b76154021ab..7122a509215d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitLab }: -buildGoPackage rec { +buildGoPackage { pname = "mm"; version = "2016.11.04"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 9a1e46e5ac55..bb51adfbfee0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -3,7 +3,7 @@ let version = "54b2992"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pidgin-mra"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 34755809e392..057e447eb1c8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pidgin-opensteamworks"; version = "unstable-2018-08-02"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index 936974a1a880..7302ba89a715 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -3,7 +3,7 @@ let version = "0.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pidgin-xmpp-receipts"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 1e998bcc8065..6695f8cb69b8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-discord"; version = "unstable-2018-04-10"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index d226490b2755..5d2292b50ad0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-hangouts-hg"; version = "2018-12-02"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 3c4169274877..310d419718fe 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -3,7 +3,7 @@ let version = "2018-08-03"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-matrix-unstable"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 22554a4abf8b..9f73dba2d99d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -3,7 +3,7 @@ let version = "40ddb6d"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-vk-plugin"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index 8990aeee8ec0..83904531753b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pidgin, glib, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "purple-xmpp-upload-2017-12-31"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index 6a43344fbd3c..a78e5d1c2d12 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -10,7 +10,7 @@ let version = "1.16.3"; rev = "v${version}"; -in mkDerivation rec { +in mkDerivation { pname = "qtox"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 655628308971..569c7b68edc6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -3,7 +3,7 @@ , libqmatrixclient_0_5 }: let - generic = version: sha256: prefix: library: mkDerivation rec { + generic = version: sha256: prefix: library: mkDerivation { pname = "quaternion"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 97c722f09354..30b12963b337 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -14,7 +14,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "sencha-bare"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix index add337d3f085..3768ecd137fb 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "ratox-0.4.20180303"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 8dc053631e92..97c00924d6cf 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -78,7 +78,7 @@ let CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000"; }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ring-daemon"; version = "2017-07-11"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index d1f1c0333616..d4298a3d32f3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -6,7 +6,7 @@ , patches }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "restbed"; version = "2016-09-15"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c97a908d33d9..f217084585a2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -2,7 +2,7 @@ , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib -, cups, expat, udev, libnotify, libuuid +, cups, expat, udev, libnotify, libuuid, at-spi2-core # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -25,6 +25,7 @@ let alsaLib atk at-spi2-atk + at-spi2-core cairo cups dbus @@ -57,11 +58,17 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.26.2"; + version = "1.27.2"; # Please backport all updates to the stable channel. + # All releases have a limited lifetime and "expire" 90 days after the release. + # When releases "expire" the application becomes unusable until an update is + # applied. The expiration date for the current release can be extracted with: + # $ grep -a "^{\"buildExpiration" "${signal-desktop}/libexec/resources/app.asar" + # (Alternatively we could try to patch the asar archive, but that requires a + # few additional steps and might not be the best idea.) src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "08qx7k82x6ybqi3lln6ixzmdz4sr8yz8vfx0y408b85wjfc7ncjk"; + sha256 = "08qh7867bc6z6mdbdilqdacx67n0kaxl3m4m97k0jxhd093a8xfz"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix index 72069ec81c1a..29b314417c76 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -18,7 +18,7 @@ let qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "spectral"; version = "2019-03-03"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3d88e50221d6..020fdb2fb2c4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -8,7 +8,7 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.8.2"; + version = "1.8.4"; # Note: Due to our strong dependency on the Arch patches it's probably best # to also wait for the Arch update (especially if the patches don't apply). @@ -17,7 +17,7 @@ mkDerivation rec { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "0dls6s8721zjm8351fcgfbsifr9d7wsxbf5dra5cbk8r555ibf3j"; + sha256 = "1q6y05kb6jjarb690qq28fqkv6kfkxdmfx0va1qi7aqxlhd5rvyl"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix index cd5109320c79..923ce3737532 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -3,7 +3,7 @@ , xorgproto, libX11, libXScrnSaver , xz, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vacuum-im"; version = "1.3.0.20160104"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index b0824c780225..1b3e1c8ad81a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -3,7 +3,7 @@ libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "viber"; version = "7.0.0.1035"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix index da4c5073000a..9dbff13aca6c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -21,7 +21,7 @@ let tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "wavebox"; inherit version; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 36bd10781dc5..af253a5e03f9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -102,7 +102,7 @@ let ''; }; - darwin = stdenv.mkDerivation rec { + darwin = stdenv.mkDerivation { inherit pname version meta; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix index 39631bfc5c87..dc646f9471e1 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "ipfs-migrator"; version = "7"; diff --git a/nixpkgs/pkgs/applications/networking/iptraf/default.nix b/nixpkgs/pkgs/applications/networking/iptraf/default.nix index d1a0b2d4b029..d2d9a67fb4d9 100644 --- a/nixpkgs/pkgs/applications/networking/iptraf/default.nix +++ b/nixpkgs/pkgs/applications/networking/iptraf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, ncurses}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "iptraf-3.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/irc/irccloud/default.nix b/nixpkgs/pkgs/applications/networking/irc/irccloud/default.nix index 5648d027d9e2..93ab9f828f64 100644 --- a/nixpkgs/pkgs/applications/networking/irc/irccloud/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/irccloud/default.nix @@ -14,7 +14,7 @@ let inherit name src; }; -in appimageTools.wrapType2 rec { +in appimageTools.wrapType2 { inherit name src; extraPkgs = pkgs: with pkgs; [ at-spi2-core ]; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 2421d6d2bc14..373560c43efe 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -6,33 +6,33 @@ , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl -, pythonSupport ? true, pythonPackages +, pythonSupport ? true, python3Packages , rubySupport ? true, ruby , tclSupport ? true, tcl , extraBuildInputs ? [] }: let - inherit (pythonPackages) python; + inherit (python3Packages) python; plugins = [ { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } { name = "ruby"; enabled = rubySupport; cmakeFlag = "ENABLE_RUBY"; buildInputs = [ ruby ]; } { name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; } { name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; } - { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON"; buildInputs = [ python ]; } + { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; } ]; enabledPlugins = builtins.filter (p: p.enabled) plugins; in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.5"; + version = "2.6"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "14giv8j1phmpg3i9whx45nmskan501lwcq352ps9z52rkja2qxsc"; + sha256 = "1narazk28m7lmn1vqi7bhyvnr8apjrmaa4w1hbadn64hwr8ya1hb"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix index 2b48e7ee3ff9..aeb13323029c 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -1,23 +1,20 @@ -{ callPackage, luaPackages, pythonPackages }: +{ callPackage, luaPackages }: { colorize_nicks = callPackage ./colorize_nicks { }; go = callPackage ./go { }; - weechat-xmpp = callPackage ./weechat-xmpp { - inherit (pythonPackages) pydns; - }; - weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { inherit (luaPackages) cjson luaffi; }; - wee-slack = callPackage ./wee-slack { - inherit pythonPackages; - }; + wee-slack = callPackage ./wee-slack { }; weechat-autosort = callPackage ./weechat-autosort { }; + weechat-otr = callPackage ./weechat-otr { }; + zncplayback = callPackage ./zncplayback { }; + } diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 49616671507d..6811cb164e0e 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }: +{ stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { pname = "wee-slack"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { src = ./libpath.patch; env = "${buildEnv { name = "wee-slack-env"; - paths = with pythonPackages; [ websocket_client six ]; - }}/${pythonPackages.python.sitePackages}"; + paths = with python3Packages; [ websocket_client six ]; + }}/${python3Packages.python.sitePackages}"; }) ]; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix new file mode 100644 index 000000000000..9682aa3169ac --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix @@ -0,0 +1,64 @@ +{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, python3Packages, gmp }: + +let + # pure-python-otr (potr) requires an older version of pycrypto, which is + # not compatible with pycryptodome. Therefore, the latest patched version + # of pycrypto will be fetched from the Debian project. + # https://security-tracker.debian.org/tracker/source-package/python-crypto + + pycrypto = python3Packages.buildPythonPackage rec { + pname = "pycrypto"; + version = "2.6.1-10"; + + src = fetchgit { + url = "https://salsa.debian.org/sramacher/python-crypto.git"; + rev = "debian/${version}"; + sha256 = "10rgq8bmjfpiqqa1g1p1hh7pxlxs7x0nawvk6zip0pd6x2vsr661"; + }; + + buildInputs = [ gmp ]; + + preConfigure = '' + sed -i 's,/usr/include,/no-such-dir,' configure + sed -i "s!,'/usr/include/'!!" setup.py + ''; + }; + + potr = python3Packages.potr.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = [ pycrypto ]; + }); +in stdenv.mkDerivation rec { + pname = "weechat-otr"; + version = "1.9.2"; + + src = fetchFromGitHub { + repo = pname; + owner = "mmb"; + rev = "v${version}"; + sha256 = "1lngv98y6883vk8z2628cl4d5y8jxy39w8245gjdvshl8g18k5s2"; + }; + + patches = [ + (substituteAll { + src = ./libpath.patch; + env = "${buildEnv { + name = "weechat-otr-env"; + paths = [ potr pycrypto ]; + }}/${python3Packages.python.sitePackages}"; + }) + ]; + + passthru.scripts = [ "weechat_otr.py" ]; + + installPhase = '' + mkdir -p $out/share + cp weechat_otr.py $out/share/weechat_otr.py + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/mmb/weechat-otr"; + license = licenses.gpl3; + maintainers = with maintainers; [ geistesk ]; + description = "WeeChat script for Off-the-Record messaging"; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch new file mode 100644 index 000000000000..a7b77ed9b602 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch @@ -0,0 +1,13 @@ +diff --git a/weechat_otr.py b/weechat_otr.py +index 0ccfb35..c42bebf 100644 +--- a/weechat_otr.py ++++ b/weechat_otr.py +@@ -41,6 +41,8 @@ import shlex + import shutil + import sys + ++sys.path.append('@env@') ++ + import potr + import weechat + diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix deleted file mode 100644 index dad5b9c5e02a..000000000000 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }: - -stdenv.mkDerivation { - name = "weechat-jabber-2017-08-30"; - - src = fetchFromGitHub { - repo = "weechat-xmpp"; - owner = "sleduc"; - sha256 = "0s02xs0ynld9cxxzj07al364sfglyc5ir1i82133mq0s8cpphnxv"; - rev = "8f6c21f5a160c9318c7a2d8fd5dcac7ab2e0d843"; - }; - - installPhase = '' - mkdir -p $out/share - cp jabber.py $out/share/jabber.py - ''; - - patches = [ - (substituteAll { - src = ./libpath.patch; - env = "${buildEnv { - name = "weechat-xmpp-env"; - paths = [ pydns xmpppy ]; - }}/lib/python2.7/site-packages"; - }) - ]; - - passthru.scripts = [ "jabber.py" ]; - - meta = with stdenv.lib; { - description = "A fork of the jabber plugin for weechat"; - homepage = "https://github.com/sleduc/weechat-xmpp"; - maintainers = with maintainers; [ ma27 ]; - license = licenses.gpl3Plus; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch deleted file mode 100644 index 372c83944a27..000000000000 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/jabber.py b/jabber.py -index 27006a3..e53c2c0 100644 ---- a/jabber.py -+++ b/jabber.py -@@ -95,6 +95,11 @@ SCRIPT_COMMAND = SCRIPT_NAME - import re - import warnings - -+import sys -+ -+sys.path.append('@env@') -+ -+ - import_ok = True - - try: diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/wrapper.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/wrapper.nix index e6fa95488e10..5c06bb8517a2 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -1,5 +1,5 @@ { lib, runCommand, writeScriptBin, buildEnv -, pythonPackages, perlPackages, runtimeShell +, python3Packages, perlPackages, runtimeShell }: weechat: @@ -17,11 +17,11 @@ let in rec { python = (simplePlugin "python") // { extraEnv = '' - export PATH="${pythonPackages.python}/bin:$PATH" + export PATH="${python3Packages.python}/bin:$PATH" ''; withPackages = pkgsFun: (python // { extraEnv = '' - export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" + export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}" ''; }); }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix index 492cd640d871..cfaa7dcd4af6 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.21"; src = fetchurl { - url = "http://alpine.freeiz.com/alpine/release/src/${pname}-${version}.tar.xz"; + url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz"; sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30"; }; @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { "--with-passfile=.pine-passfile" ]; - meta = { + meta = with stdenv.lib; { description = "Console mail reader"; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = https://www.washington.edu/alpine/; + license = licenses.asl20; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + homepage = "http://alpine.x10host.com/"; }; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix index 23bed01907e1..7d62aa43888e 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; - description = "GTK+ frontend to the notmuch mail system"; + description = "GTK frontend to the notmuch mail system"; maintainers = with maintainers; [ bdimcheff SuprDewd ]; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix index 0f11d9a6df05..b37e0b00ce76 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { - name = "mailpile-${version}"; + pname = "mailpile"; version = "1.0.0rc2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 88e573f6cf42..fc8c167e9849 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -5,7 +5,7 @@ let name = "msgviewer-${version}"; uname = "MSGViewer-${version}"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix index b87728dd2cd1..fcf1464ba239 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "notbit"; version = "2018-01-09"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 67c673bc913c..86aef5011342 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -3,7 +3,7 @@ let version = "9"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "notmuch-addrlookup"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 5e005cd6669d..680d7652b5a0 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -21,12 +21,15 @@ , libX11 , libXScrnSaver , libXcomposite +, libXcursor , libXdamage , libXext , libXfixes +, libXi , libXinerama , libXrender , libXt +, libxcb , libcanberra-gtk2 , libgnome , libgnomeui @@ -101,12 +104,15 @@ stdenv.mkDerivation { libX11 libXScrnSaver libXcomposite + libXcursor libXdamage libXext libXfixes + libXi libXinerama libXrender libXt + libxcb libcanberra-gtk2 libgnome libgnomeui @@ -153,10 +159,12 @@ stdenv.mkDerivation { Categories=Application;Network; EOF + # SNAP_NAME: https://github.com/NixOS/nixpkgs/pull/61980 wrapProgram "$out/bin/thunderbird" \ --argv0 "$out/bin/.thunderbird-wrapped" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \ - --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \ + --set SNAP_NAME "thunderbird" ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 8e1f2a0f65f8..d8f5e58d9fe5 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,585 +1,615 @@ { - version = "60.8.0"; + version = "68.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ar/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ar/thunderbird-68.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a10386c0c55e52571c5b922a1531a891a98caa9a1b118ffa6e5e0655b838c207ba2638988d6fdeeb62135bbd19b071f9c2dfd2c52379e4f8ca2012c17aa5a065"; + sha512 = "4fad3c7c4099f70253bfee450bcefe458bec61430720fcadde1fe8a1cbb2e62a18d9c55943f850c57f8d788c973774e24590823086cfacbbb2ccd8a99ce4faae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ast/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ast/thunderbird-68.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "fecf4367234a794e22ccc6665622bf083bbaf8ecb1f8e03bf64c2bfa91028ff6a02497ae5ebdf474b4073fff121b23a55d8373ce16e282b9630bf6bd6223b555"; + sha512 = "aac850773381d7fdb4d50fafe670449301f073f7388f92a1ca38d9b7256ffcd244b63e9fc0ff2f8ef5ccd853b97016b7e05eb751be1bdc8df9623481f15d55e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/be/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/be/thunderbird-68.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3ffc3ab21f3a070d8f465591db242b5cc0485cb2655373fc697298825f46a5f2f93301684ff69510ea2d74743a8e00e23e7f56e2a29638484bed40089714b7ad"; + sha512 = "6521d818984bbfba195e847735c1228ff637d3079cff1f5a461ac20a079d325adfc1d7b2eca54f63e584a5cbd2007cef42a625597276a1810158931335f09cd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/bg/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/bg/thunderbird-68.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e789ca25f887bc9b228fd29796b38cb061ba931ebb0e2d2b15b290771b2312d4051d248dd467c64acc5cbdc1d5c1ae23e0d5b5dba4a35983ffa44062c7632bbe"; + sha512 = "a0a738b6877225a5b98691d53a8f4a4bf575472a0d5feb8b77a67cd1fc9951772f1ab507b7ba460c0b62b87ab476c5c94130cbe7275692e3a99e5d2ef0bd89bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/br/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/br/thunderbird-68.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5088057f31b2ff77f89b25e9c1638b2080981a489a392d928f259cce38916b9b7da89132d931363fc652c1711250e1e77fc56b0427674f0648229688ba3285dd"; + sha512 = "58d21d9e55abed644eb16ba98a5fb3277e0a31b935d279b09745262952895c2c2aed31817e6157410137ff82fc5d242b64268f646c3b7b691c55c5f3ea36e0e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ca/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ca/thunderbird-68.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "3eb939b9a811254487eca4920ae84d33773d0963c77dfd84df7cf02a98b975d13d9088a70c2e8863f3290c6c7bfe6c7a240eda8e3bfdf3de28883c5d1e842e5f"; + sha512 = "cd401259f2cc4ec71ff9d936a1f2f64a064afafed2e305bb359f79eddf1159cd6a7c84ce54cde6be94f6acd295dbedf54017d9f4592ee3637eea00496c7cfbf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cs/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cak/thunderbird-68.0.tar.bz2"; + locale = "cak"; + arch = "linux-x86_64"; + sha512 = "45ea4af30ff93500d1671c6a0eeda993692b7204a7504a91ad30bfd5155add5af902205240fd62f80abe339224e686473f2d13f466ba96269347207ed3f628b5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cs/thunderbird-68.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "867706fc4e459d0e7723e9ef0e86176822623ca85f446f1ab9935f7f7a95292da637d57ab6046a8ef4d8a40bd5fc37451a32cad71a2d45bf4e4cf7adccd44775"; + sha512 = "9f81f92a3b1710d006cda79f1b92923c1ea637a24654bd622af9be1f53a0024c5daa77619443514c9e607cb62f96403f5b7f426b3692227c0b56d1b14f51ca97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cy/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cy/thunderbird-68.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "56d6485c397984b3394831169efe8bc2d7078d958358a37f1c9775b17bef0a4a347429838f122291f10e3dbc289865aaa475d3d3f4e7deaa2d22205690110c05"; + sha512 = "c90467a78bc82667d974b1e94227b7d4185878654188967d97c11e419ec7a03e4e5e3636466a0b6d35beaa98b717a26341e3a652c3b21083ad8ad0b23f063ed1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/da/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/da/thunderbird-68.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "6d35e77a03b0a44e8629baa80eb1889892a0dcd7a1a7ef5f016a6133fd8c5555474fa3bae79e3c5c25b0618832e680ea505cdf82de268bb4cecad7187830ff4a"; + sha512 = "f49bd5689d2a4dd311b22a23da9f26559685f1c4663eb1e482b45b79544ab4401a17701f33b6ad083e7a8983185fcb16fca4c8026138f24be495c6cbb6401488"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/de/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/de/thunderbird-68.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "7b6f65c2146eccd91db9f2a050722c28ff3c9ed8a9e7a822fc1558c6b56761ba68ee5fdbbf1324c35dc98b0b33e8e54709664b972ad2318dcdf4472251ef1d1f"; + sha512 = "579d979cfa0bbe50fd0bbf0d15b38d90579bc065b488a2e9d4e3f18f505e71c50225d92185559578146097110760ed3807e1aefad4862d99e247447478d6bc42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/dsb/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/dsb/thunderbird-68.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "fef020d88b4560b8eae5b81d9d36179719389c742a462682ca0afff942474158b1cdedeca6f348598ca89268bae3d953ac63debd972f7349ed8a7cb56e96cdd7"; + sha512 = "8d16bf47d368a670cadb6a2655933d5b49a796272f7dafd948cac95a2ae541561a38fa418cd4ed0c4aa79ef63a441ee769eeb2a071734abf2cc1ba243d4f3ba5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/el/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/el/thunderbird-68.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "fae21025f07a7d0be663d6dda4cb43cdc2b4b488a76e4ab0bae304284b17598689ed32554066e1d00097479e1ca4f163473cee854b853acedc46887256a45d02"; + sha512 = "579b9114af9fda86e79e6812946da858945e2034ed2f00e4244724ecdd680b7db5601a4d573b530dc15207caac9245f6883343684eb43f3ae2abb64853c0b54f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-GB/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-GB/thunderbird-68.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "cfb8f7770d1fa2ad12ac19a2f069840a37f13c352d4271c4dc479cf4cc1d3ac381053ef9046b4b0fe891b67097f5db674ed6281853b2ebab1fe9744bd113bb08"; + sha512 = "f7caed8c3b49714e4449ef971ed1a21e40f28625c84e9342f63e5f73743689ee2c0e9ed4845f6667bd22732c62bd707db425f22a5c074dff8622cc4536ba9c29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-US/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-US/thunderbird-68.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea"; + sha512 = "257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-AR/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-AR/thunderbird-68.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "151e9ecb12ee13dc9cf87040c5f90d9dfeb528e25889fb48d7bd5a9a47f7a6166402c1c4ebf96c9a4184d27e89cc13ff31079151f7ca2860ac91100d2dc7f6a2"; + sha512 = "70a10e329b1031a2fd2ffb2b60459f0238ff3f5e5d80533f4be6cb22ae77692ec079ca3e146bd9a59edd09c266cec92d922a18ba45f8626a4bd44e290d3c0927"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-ES/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-ES/thunderbird-68.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "0209584bf7d1396d3d3f754e4f6cf3a6cfee2f7aeea9869edb60bdc832e87b9437f4962fe59a19df78ecd53681981e68bb6efc98e05f7ef50883a59983ddbb66"; + sha512 = "a03098ad7d83b86cd316c56b69589370fb8bad041b93f90f61514b04e3d0e78385f779ed715c6e22e45597d1bf03676046cbc1eae7896bb2a309af3683c8bd1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/et/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/et/thunderbird-68.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "766656029454d89be4fa8ac8ebfc61f25d86c6f8974abe1426cd96dd5b7492bbdf4f8568ac18a69fa4ac3acf4a28486f1184c0852d4ee29416d6dbf3ddee097f"; + sha512 = "44efeaf030580dd7b55770627678808e34d689e85191852c2e5fcb223a0fdd0e5386f21f03524d0983aeded7f8ed99382ff2c372c8c5a1fdfe218bd5b10ccd80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/eu/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/eu/thunderbird-68.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "db312b24b48677e47fa9ade4f04e219ec6a1aefb03239b60ba63c46659e86eadbec32513c494d48c90e303a87bcdd7280d7c4ae5be4df1a2c30159516bca5abd"; + sha512 = "c670be5932d7e8bea28cffda7c119cfdfd5823f76b2c97251ec23ec16e420a8b7feb5f2251d89750b956d3bf3baff5d17393c05d8c265d0a98cc3faea8f85735"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fi/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fi/thunderbird-68.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "003a0ca468ed7a7ab19065ef4a45504c9e95724112c6bb277c6e1964f8f642d5d1a7a4b135e412c81db5896eb00a831b089104563a9237c0594c2ad5c31c4814"; + sha512 = "36aa0b47e9b5d91fbc812a3d63503924a8ca227d7b7084c1159419092b17da9c1b6e89fa046c636dbcff7776f9a1d8465e660b47f1753505f0d2eb85da9c3a7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fr/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fr/thunderbird-68.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "5097831b1d77046583bd86dd124c48f2389a676a902cbdd4e408508452400f9d981c14475e43276ba31efa70bd3fe1bce5193bc9624de40e34a57319d6ede80f"; + sha512 = "b1e7d345d3dd38725227b5e09c4f3cfcf29ed3a98b0580fbf6ae1ecab4414d09e307423495b75769a8d2ee3ab4700cd6eba3d95ce05612e1d8290d3f5a3ba988"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fy-NL/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fy-NL/thunderbird-68.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "bb1170342797ccb3cada48fe654cbba2c02391f30666f3c14891d813692c21400c24f0f1e02d6cf975b88b8e92943feff8da5daf05b9535ae4730272b104d43e"; + sha512 = "4065a083f49006dacf64f084c1bf26c4c1b8d53bca7eba7a56d66bb035eaae2c4528687c5c1e2213f92adbba17ff92eb54f897d3b0ef6d27b8effbee66ca555b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ga-IE/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ga-IE/thunderbird-68.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a65089b76bb09f78bdd7c8c63e0fe4e68468a210a18069621d4b9fb3ef7cd54abe849fae983dd3e8f05bc5f7dfc3a03a64051587a9e65439fc5cb2c15836f13b"; + sha512 = "2ae9a0860513e90d1742e5c17220b2367e61273eba04738cd29e9ab497b86f9a1d78b38b21da84b1f214f3368ee114d376b05eabe0aac9a1ec07ca6a4b399070"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gd/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gd/thunderbird-68.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "bca1e964554eccf2c69968380954dedd9e76fe2952becd06b0cd56ddf0e3936d6c40f7cfa5d9c8719cdb4b5181d47048d10a47e6c549e74b2ab72a0d7b89d1ad"; + sha512 = "d2315aca9d8e5bb35b21cab46a48e51f09200b056da2682201c32eb4fd3d0379a24a6926ebcf11e9c70d70fd20152fc24d5197a78cdb3c8ea3cc2399d784b463"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gl/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gl/thunderbird-68.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "d8ec696e056b44059ce713dfb86980da72441d9c53e17f30d0ce43408a16d3e4b2c8700e595639f7bbe3b59082fbdca49a1ecc47bdfa7704ba189198efeb1909"; + sha512 = "52d9210e857c1b6cb665a2ffa71cfa5e67c3718b210e2b4b42839d8f25987170f1603fa55d324003a4be821ba74093ff92d632e688e44b87ebf51dafd02f69a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/he/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/he/thunderbird-68.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "bf9d9db17930dae863bc8803d7f8e39fad79c74712d16d3912968b8605372521cd1ec23f2cb4c8d05e67341176749c97e85072cef40a899570811b594a5d994c"; + sha512 = "e7b5a16950be233fe8a49152184270a901bdb4bcc14769401d4b5a21fd2a3ab9d395ed8f6b61081330386723725252fceff09bf9fdde3a71135a98d8ae45089b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hr/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hr/thunderbird-68.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "62c626a6dbc65e69443e0e33bbcca131f2b0c3ab521ad74c9de355328fef0e26689e99f7e41111cee688400ffeb2f749f1fc73cf35dff8908f3661218e5df29c"; + sha512 = "1ed224dc0864009edc6389f9b3b063f56b15be982c2e2915f1a2f773bfc78e6b81ec0ab02e03f7ade08f47260be597003f8119116576f4fe5dd490e85cd3d4ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hsb/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hsb/thunderbird-68.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "72a7c2356748b59103457fdb22ebe471b68bbdb4c8e61b53c83e14a64f25bfc781070242f2bb04dccbacb52387ee3b7a2b5a66c2bb01d653b4d78ee5a4d3aa86"; + sha512 = "f4bcd8a199bafd544687b1e890694dac2b598d4fd79818ab19441ae9be579a9928fd8c7fbae43e322fced15ff39314fbc88be94ce2fe12b5d2ec2ba003a219a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hu/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hu/thunderbird-68.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b6e9b086b065555b2fdf3c243e72a37c1f7d1708b130ca060fc72cc4715514aed5a40ac19b497fdfc7b6d067d8a065ad16e077e8f1b6aa4f2f7204b47699c2a8"; + sha512 = "28223aec237fce2f07b0c3b454a8339bbd2f195d6e263c5a5723e04bd5df1128d58a6bc6c7275cdbeefd5161a405a2d6340303faa79d9330abd0e70de9facbfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hy-AM/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hy-AM/thunderbird-68.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "7b4690527883906a6a6e2d2b6347b8d2bc1b6a16576b6970c2b7dd0a04b6f046337e191aeaae4b07e37b29a9e24db3848a2683c6f0d10923c1c7ccf4bc8a38f6"; + sha512 = "d7dea23905f8bc8dfde92082f90278b76477eb3036c7fc4abe656e37af9d389d37f3b166492df210eeab03750d85cbcaf1340aaa26ab723ca1b70299b4a64ab6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/id/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/id/thunderbird-68.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "d6446e829d5126386535463e4b44551529108c22c1f5ea054cbced5d6ecae56c31d8a6af99620edfad62acf54844a3a0484b8892ee85fe7cf8676aa2010bc0f1"; + sha512 = "f55ad81a1dc80838a9ab045899e0f16bb077d05d73119705f820f6fe8c8c7a550e05cc68cb7ca0aa8861cbd70bc9f061ba51a4749db6c37d90e7e7bda5dcccdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/is/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/is/thunderbird-68.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "8527f8adbce559195b3487ac11b9ff7a716d4efbe4139289093b49e07b0767b99d90560695773433ccd838affe2e34f488e1051059213d79ef2c604aa5c239e5"; + sha512 = "503c236102a15428e41a21b458ecc29986abff4e434f4e26ec9741b2facf39a8fc2ae9dff5aeb32fe3c9ca0dcb6e914a2acf229ae9caecdc4f064380f126ecf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/it/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/it/thunderbird-68.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3d376e4f8efeffae16c2a39fba40cf29433af35ffbcfc5d0a7491355a211ca25fd5157f64a4d9f4611ac0cfc7659cb7118f0e4db15f594767d0e8a7fca9bfa03"; + sha512 = "51a736932baa5c810a29de46eba64b0fcd2703da38ba9449b6b06a9412562e80853367416c5b4d6c6834eb7a2186f434e426099ede56d9342860e4f3561455eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ja/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ja/thunderbird-68.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b9623d6902ad5f5d77b67b490d8df6f312c895257965580cf1108a4d9c3da78f3d021551f9e48ab56b92eb691c3c4007a7584b4681683b261bab7b6b7139ead3"; + sha512 = "7a00080835155d301f65a35684d81f8e3a3be23d927d939da84a2a887057bca0b75d5b580a004b4f797af504a6812f71951bc3c75ccb24dad60b6cca770cc7a1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ka/thunderbird-68.0.tar.bz2"; + locale = "ka"; + arch = "linux-x86_64"; + sha512 = "eaf67c64275495fcb08aca63953406cd7815ec356ee0a1edca8a5e8dacd924a9c11e35dbe4ad17a1617199a5f66489bb553a7a5177eb629223b49a9adccff803"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kab/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kab/thunderbird-68.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "33417e6604f706ff3bfab521c5bd890fcffd0f524e11d29fedafaf89ad5a7f6284598ef994059c00aed70ef921a08dfa763f57694976b365d3317aeab8209c6e"; + sha512 = "9432bbba0965b6da04495b79ef4db3bdbe69476b20650b4d6407d921cf07d09950368f0c13211ea6743b621d486bf71dce0e60d8ceefd82b48a8f2581a3fd7ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kk/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kk/thunderbird-68.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "05910b83e3c65b2be6c6382bb27f819f9d02e3a1f89c00afa22eb1e68ff04d6f39edf31468be245be1756f20e09cf9982ff0175017e91ff1fe08b62b2edea4f0"; + sha512 = "9bfb99694bcf1227162607e2b674abb00343e4da3876999430d6014cbd4f4aa6c6e9ddca7c7f3b144d101c1a5a6d38772e3750f5feb41d1f304b89a8c1e6ec15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ko/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ko/thunderbird-68.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f12a92b58c02dba4cb2fc8e8a9f90025d23c3849590bb149a50416aac3e3c15e0c2817e7a4bc518f24e796ea851bb5746b7611e2faeea2767e0f63dc67f2cb37"; + sha512 = "fd260740ccd74afae7af664775954acfd176b47176f48b5300f11bd77bc31205d0bbc2d06a701486e9742ffb38ad4aa2b253041b9d9518a4b9c7dbbe41aca264"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/lt/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/lt/thunderbird-68.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "06d12d4dffaaf863d77ab1fcc59517bec26732db4b81f6114602b9ad06a77d86d52a0b21066d93854459fc3087dce8d8087df635151f672194edf55d7903bacd"; + sha512 = "fb7a7b6d0c7d58d13b3ec20c8176ee793cac5c53bf849e3b3c4aaeff0f3e897cc35e61a9dfa4055c691fd56f280f7b31e04999922c29ecc89294ea6eeac16cd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ms/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ms/thunderbird-68.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "021f1843a788cd6285e4d56559b7042e161f0279b9b64234bb7cc39847f7f2011265e86a738b5926413f2e98e293fbb478d36322c9071b0f7346dbd07eb05a7b"; + sha512 = "7490a8169079569143c63f85e7da299d28ea423fb95265e2e86ec724ff0da641e24a2e9ea612d180d523973522f40c250bfd56e66ee39b28cb9acf57f6be6831"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nb-NO/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nb-NO/thunderbird-68.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "9913898a8b6ae8745f76aae51f82aa1fc9f71e410f458c3deaef5879521bbf1e25067709999a4c7722b42ae152eeed7016e5aa0437b8b3fc81d246b297f92f22"; + sha512 = "7256820ea97851319e51616f6eb45617983e76e74b46ae62a02e22d13e2dd6abd590fd265aa6c88ac14b2f0276219580b6b9fbd956f1eaa38e6a93329b9c9621"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nl/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nl/thunderbird-68.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "006e2332079d8a837c42b44df7b7af01bf9363109a47158357438140a068a9a17b2eb1ecba351b49b3300dae5a8e3abb0938fa1222012a886e6a123f7612dfa7"; + sha512 = "00f32145c861abd8f151d7840d0f01eb9d4190df65e5a179f999f3149477f2de7f796782eb7ef912fcbec005d65c76974185d1c0105dea862cbc22c821bc906d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nn-NO/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nn-NO/thunderbird-68.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "022fb45fd0305cad23853277f2b18d22879a4d0523cbbb73a65209ac3d2a87782667e71c6903a6b944aa824ebe8d30421d511f346df7a511ae1f7c325d53de41"; + sha512 = "3ac255b5bb4b352833fd56d5aceaba6d0ada571630a993729970ae99d5067f05ba22e6ef50fa7dd099c0eb5874f11aeed32718c56a80538e28b401ee6b7900a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pl/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pl/thunderbird-68.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ecbad62e54f5b49fa89d0f8d00ccc3315cae71e0a46b25e3bb72b117ef4a8271d9374d82352a7ed75bb93fed9504ac883165911cb6423c5c993d75ee620e27c2"; + sha512 = "19ab4bde9314dbed1bca7565698a7b1231767ef9cc792a49e7e9d679453ae8209e6f68c63ea0a24bd9e3a97328dceeedd109bfe28038108b52b9dad366f28787"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-BR/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-BR/thunderbird-68.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e9f2180eef290f0d0fb3b91eafafa7ea0a8cbbb7acc01758fafb56d6c56caa0ac5455b728013ac88d50757830a7f65a3e77423417abd3ee77238657c94461381"; + sha512 = "68e28b657b885e7823dca0d091f2609556d560a50b5e6c285cdf467ae2b09743406baa2e544f17997519c219e0d4e8911115d30e7b0c35f09b956e28b311f8d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-PT/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-PT/thunderbird-68.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "20e448cdc26b9a27b2c42b7baa09d299ea9ea834bb3bfba284d5f907bdfe0170ba7ef611e0e7ddc1ccdf296781401fe32b80f5e909b68c12a23652c06b3c93c1"; + sha512 = "41623568d2e78b821a89480836f8d8c739f6983b80ce26017d12fd9363016158fa6c629e030f63aba6e730e554b7717fd2ee58e0246aa82b46fe55d5d6be9933"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/rm/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/rm/thunderbird-68.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "62d71bc39dc895514eb2cb957205ad7379ce95bacf6d75e193e0d9eca34df300dbbbb9df3e4cf200a5c1266b1747949df54a969edae62b720b10d0d756ff4c08"; + sha512 = "a2cabac0ff5e3bb4a8dde4e884ba4647792e0935ef0a61b56470c67d3ba9c2310a07c2d2da51f7b4cb5fc3e841dd385a2c64ff29d263333a91e2044a4ad3190e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ro/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ro/thunderbird-68.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2a506e9c7d1f752452201ff78c0a2d678115404294200ad07317672220674eb32227dd7b1f8af65ee91ffb4051beadbdbf2da2dbc243d14d22ecb81dd004549e"; + sha512 = "2e9da10d1f88352687175fa48fb70f8a73cf3ab1d84958a79c4a46526b3640e264d98611806bb234f579d616fe7d1dbb2d4c6ba55a389363034f85a97283bb64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ru/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ru/thunderbird-68.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "c76e85ae89f1d6f878f5ff745f76860a18d053d13c4deb6774de9e653e841273c09fd7297ade76ea390a30ab0d2af280a0e6b2d929a50ada2ea37c32c2d68d7d"; + sha512 = "5f4bd3d3657479446ff070cfdb33e16a527c6f1615f37fb4c4e32c12b89c62d5649fa5c3d826723be47fa9795575bd33ccf37c2aebb555c218aba8f9d68ec3a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/si/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/si/thunderbird-68.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "92617456dd89e933130992a15247bffc9c8ebabbec41b061320ae6be8d86ef1af38c1469e633ef9dd312da8f8bcac99545077fb23665add9c82c0a38f538e56d"; + sha512 = "b47d2aea81327089445c9f57a1508406c534907c7b574006886828846e6deaab04e35de2781d55d882f05c0a89f65fa7c386547d6581064af4fc3bf4e879e379"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sk/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sk/thunderbird-68.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "8ab573b0cf04ae24f0ce5f1b8e79024fac5e33da2e80ef28837b7bb941512d01396759b34ba4fe87bef74a9385d5b7fb8d656429c110a38e0ec30ba21c01dd48"; + sha512 = "4295204bb89789704da6830d33e92a77df165737c291c74a94fa532309c89505fb796151e0855b4e0bad8658fecaadc9978580ac72e2a2f24a4022909bb64aa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sl/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sl/thunderbird-68.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4ca6019ec3420487ac141bed30efe310d4c01aa2d7adf16fd97ad543cc90d14611d270074c5ab1c52b90c6ac9cfde5f5957c323189965ea60c2f1110abf4bca8"; + sha512 = "598fe5bd04e04a73db04eb630e02dd7cc7af34d0381e6877626c8885bc4b879e1f35362afb8cfeb1bbafffc5b7ea14c8efe9b35b5e30056d04fa0126b8663679"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sq/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sq/thunderbird-68.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1a47ea68a8435099883a502e65e31aa0e7c14564f86e6b4e4937362fbad3b9771efc74df4ef92994c1ac77130fef228a1c131d0eb4508a5c655e2a4b3800d1ec"; + sha512 = "0b657daedc98db51179cebf547d5f278d2d632bdb552878b4af29427ab8fad62f8d6c1ab2c3a38cbd8e67b670d6d613bdb1d4f535a0c69d0d1ca607d0b10bd43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sr/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sr/thunderbird-68.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "dbcf13d0333d1ea714b85e542f5bdcbc83bdb2b3f8c3dca829d4b224a0741fee36ac9d2df9bd12cd5505fc972454b990ccf830d71926f65a4f460be2fb7ca937"; + sha512 = "10efa11b9c9ba56142c8a321a25a7e875f3d02fd17f73bd3061ffc71823aeb1269f9a864aae88a4fc434d1c4a01d227c0be605ffa7f4ef6421db98c0141c839e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sv-SE/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sv-SE/thunderbird-68.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7602c9dab1202e84822d537c0aec36d1705c259e3d5f34ce6212363450e1e0dda508ed36ea999467be2f39b991cd21a6f8a153b0aca87aa70ba62f01f078bbb8"; + sha512 = "c77d10b35edef7e59f4e6c48cd4352c4fb7d05b0140aba12be42b3e3a3df609ebc86f2f5a3993fa172ec0ac118726314bc9042335101241637481a2e1a4d1c00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/tr/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/tr/thunderbird-68.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "0fbec00596ccd59e54aaf23058e96abc6ae672ab55d2a7ebd0bb20c37c03f47daa70acfb981d9edf48c45a75d0b0a02328025e100dc4b344c03e3540089b1cbb"; + sha512 = "3d52693efb05379802d62fb9e40c4b1856b45ee948032634d4c4bde7bbae67327f963e0f1096fd5d7a15d4341af1ecf3d9ee96eed45146859d8e8e5d403d660a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/uk/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uk/thunderbird-68.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4f1b0608f55f945552bfb3ff28fb93b52ba8a180426e6a101c7c849a48a65c13c78cdd707c8bcd6bc02f55942750c3d34151a4f674bbf53d5e1aeb4fa5d8b974"; + sha512 = "c09734ab8e6428c6ed270887a0add934a7058d5e9c895864b1128e0fd39d57e13789bab38cafaf7cdbac1a71c8884407698c4bdfcf48aeec6604a457ed57c48d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uz/thunderbird-68.0.tar.bz2"; + locale = "uz"; + arch = "linux-x86_64"; + sha512 = "083a83ae3c6083934fbe49f1e65ceadc5b5459f0f29ae0df9901b6d9b29d0a105cbde94357c1ee0a9677ec923fd1d419c618db0e843cdf320c087108990b89ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/vi/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/vi/thunderbird-68.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e3fbe83460505e135427c773650151e8d7d4d14df5a432392625871c561f6cb0c4eacbeb73d1078f4e3b195014373735a1383a472f6a85d9adf76d4b98929689"; + sha512 = "6ba1573c9a170d1d827b6d17941c25e3852f7b66be2eaf7a3e9ab02278f19a38b801d7b9b0c266dc4f38f1190f9c83990eaa51f4734ddb38f43ea3e1bd23b72b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-CN/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-CN/thunderbird-68.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "050cf6cddd3a4f7f56af9f271114d6aa10e032644a958e62f3957d0df61e6f6d92e2a21fcd203a1f45dab7127a652a0dc192993477570ed82726fc9765372dce"; + sha512 = "74ee429901cb520d07361a4b621c9be06253cf93300f0f91e3633d3b375e4e9a6a58823d4bbfed60519734ca5705f2cd0da4bdc7db0f578ec300f1d705e9b7b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-TW/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-TW/thunderbird-68.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "566a7288a7819ac3bf72ae97fc10470530656c2c4bd75f9b06b4e4c1c07e0e80534fd3dc14081c828a7aff3319d83ca482e4d8d15aa6e3dd02201ce0038a1de2"; + sha512 = "d720029e0720fa972d694712a85bdae94b1ff51213c4e56b84dff6d293a2a9831f5cd4efeb44070010eba1486b9358929f64546ce7ebb7cee29a7bcd4a1cd650"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ar/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ar/thunderbird-68.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "fa10e2e513050f8c62a0e53530a3ce99cc74aecb0b93090207531556a394d41308c599c469380b39daf178e775c61cf5c279b8fb26429652368ab0468dee4ad8"; + sha512 = "823b3cf50f8d23d1d0ba8583d2b10146e2eb0ff4a9401527557fae8e8db997ecc66d0bf5a091323bbd37dd6222bacb73fb9818de8740963b929a8893e4ec9391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ast/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ast/thunderbird-68.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a88c415580fe8b5a1f83468afdcc55714abc13eb53c6b4a8b6b4779837b0668934c58ce40928b8a215a099fa06cce957754ac714a941172ded5087f09b8b2abc"; + sha512 = "f0087ab3189e8fd194d2ef6d5d2f9c3e14d592d5217a8fea19ba5189e806f9d484332f9d342a15549651a75bcfa673f21cd7666265fc185ec58c814814902ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/be/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/be/thunderbird-68.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "d0c7edde8c6d2b2daa4d2389781962ebbb8b11e2b6ff4f0c79a15052cb65e869711cc18c5ed86310800dd5fdacb4d594347663a440ad7caf874599bf9aa696d1"; + sha512 = "edb358214e93142d73c92ab3dcf6240cd08614c2d0e9ea506492023be46d7b7f6273dc767ae034762c052db3b0a093dd027187afb272b2a55fc3126b06ffb78a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/bg/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/bg/thunderbird-68.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f5fa777606c529b5d5d85af9ea1bc9d7bae55571d11cb02fd46903643bd2fb9bde0dba0eb9e3b8a0276b004e40a12bcfc8b35f0a5d0445b1d6989caaffca2ed4"; + sha512 = "f3268fced7a81b5046332f975906ac79b8ab5ac888dc1c81085dd7cd1b1a414988208d426bd305f67cbd913c58de857c844809ae6e6ab5a2a520d7d6b149b731"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/br/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/br/thunderbird-68.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "673478f9995d4b43c3a67abfe876004e71871a45b9b13fa89b5266fca48d1edd69b601d34ce4d007080346f99d8a6ad61a47bc891b61364b239b24a1066da75e"; + sha512 = "c1be2ec4d4e64a2a9b32b974eecd182ad9d1fa23b775769e8535e742479ed6be2a222272d7c5b141393f0c752d4af704758912bbac1c17f445b3bf277c12eb9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ca/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ca/thunderbird-68.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "336e500bad4e173a675f24ea05a2507c8729a30c9bbea2659135808bc04fa31b0306ade3073c70de22c76827f0494d517d9ad95fbe03a5526d14bf3e492001ac"; + sha512 = "ac0c2508b89812ba63d0bb770adc2292127243fe31bf140a4ab88c953750fc2f699c5ed2afb9a400cec48dc14d927b08dc96d5b110e2f2d90e81d1532ba9d916"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cs/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cak/thunderbird-68.0.tar.bz2"; + locale = "cak"; + arch = "linux-i686"; + sha512 = "4d73beb37469131b7e7747c85a73027e1eaf008100eee21e27d36b4736ffdb4cc3ca3606726e36033de64504f058ec9d4193797a09c2a591675636a5c00fc890"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cs/thunderbird-68.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "abb309d772ba27eaea1cbf79436d21cb18eca0733f2ecbaab18778daa7ad55ead8471e76c46ef0e86cc0c95d4877fed61553a8d195c8ab835be24cd55af0e923"; + sha512 = "635ec13ec9fd688ccb9c690ccb4d64228f1f47755ce24c4806f5f47655af1279b9ee758fe15c0fcbd43c830edf66383bfa3d84d35137209a4af41aa59565f554"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cy/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cy/thunderbird-68.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "cd1ad0258585f14ee8c5243f18841f80b1cfab41934efdc92871ad4c3d71708f1397836bc2f3843f769f2232c05ea9e8f3cc25c1b76f86b7658934e4a331a6e4"; + sha512 = "afb546562f92c93639a407598d9c6654b64776cb68db7ddb07c0d17f83d122d9e7bb974238ee5cdb90876bca3ea30356cc5eef28b11ccf082ef72c0343dc42d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/da/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/da/thunderbird-68.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7d9fb57f9681934f8e564c92d80acf3ffc8df1341346adfb5c4fc13738a5068aba7cdf6ecaea2937bff076b66a6103cff95fea27e2a6a7b4b545b78b2c423a4e"; + sha512 = "f7b7d183312d11d02200890afe4e81c793b658729119d9f81ac2ca58714244ece9d64d1b9d9f34c79f1d00b574e24192ce066debf873c4b740c35208cfaec16e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/de/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/de/thunderbird-68.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "f5c1c01677f4605f9e4731681d1e9e1395d2fee6fc32f88ae8f207750859887e0a49b2d95bc27e4311b05c6af2a390866662f79094e9c3a55e4f2bcbb92f60cc"; + sha512 = "e6b3ba227c8e84273e6dadcb59d6691187512666efcb63244740a56273c5b765c65d21607e4f07a508e5e63ed0812162ad767fcb1140b89b2c155da945586179"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/dsb/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/dsb/thunderbird-68.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "92171f0c8140b360953c6b5310f260503d17d1da71e795c91a4ec80fc4cc15ac43405db8f345c0675233dde4d89f57a1db3177c3699f241fc2d4d6f43cde71eb"; + sha512 = "84d39965568de9c87c280beb43330aec4ba6cdebf59a9c4f566b6bc01fbe15cc3987e87d9c24a9e746283cc54ec1ebaaff99952de7ff0aa9b6f05f36b1295d09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/el/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/el/thunderbird-68.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "1062d28a437aa854dc213e632afc0e41edbe00d4398601db671d14e39fa2ee832c1fe6d263e7fab3d8347b4b2cacd541cb9f4b1fd640aa4bf97c3bd1fe23a2ff"; + sha512 = "0942b5c8c7ee792d264824c6837d5857679feae9073fd2451b92dc0f31290360a24f7cd708e550955e798d2decb9f0c3a21dc8ba7bb5f226ba8ba9f502ef870f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-GB/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-GB/thunderbird-68.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "61dd1c410b5c87ca41eaf303f85a5c90b5c65fcba5a75d93654b3a5ff898991fd59b89ae772876c707dd7d5a2767fa607b3ea0c2f2c57ccb73a7a75720157f43"; + sha512 = "12fb5086fd012d85f35a41125b7e5ebf37ec34e9215db9b2a4c67f924d3bfa738698ba15bfa2e51f8cbe0d81cdfe5de4bfecd54b0fe6cc7163c753444e56bb9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-US/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-US/thunderbird-68.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa"; + sha512 = "6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-AR/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-AR/thunderbird-68.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "45e0eb7e51110bc892cab458286e5c37f0aca4bfc88b01801c184521eb3bde33bdfc78758a67e7337be157b7507891874def8e7456fde8483054fd9671f068b5"; + sha512 = "6a547a1d0450de1089df18baae81100d3fb9934c963459ec83ae81504e7a1ec7abf595766c84fe8d321f901150a68b7e172888028f3b992b4b6b74ba98ca4efe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-ES/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-ES/thunderbird-68.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a8dca85c7ecc2678cf48de000fa4e46432a28a02ec200447789da0213d01841f142de45c0c93b52c8952248eed7e0afb12c1f84026dcbaa0b47ce8b907bee779"; + sha512 = "e1256da3c8938776b11444790f20a68f056f7407f444f0884dfa1c52260309d4adfc64fe95168dd8263e4aea650362ab9fa08930559c7f0e97b3489c172c81fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/et/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/et/thunderbird-68.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "d212bf0d4881094835f156c277015e37f1de4d1927d2f89bc993071f50eaeb604913022c3db948baabb1d76b17a982bfd1911050c46bab54fd3ffd4f374ce378"; + sha512 = "a5d7cd5e3171d44dbf91f067231301940e8a622a6729333512b49bc037022bc2058fa548c044a40b7ebea5d3199402276a34eeec5cb21b2070d7cfd96737def1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/eu/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/eu/thunderbird-68.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "14602ea4b22210049756484646fe538cece02d7a23e6079e7020ff30d08868d353f9d59fc831e1b600c061faf18f5af93a67ac95cc2f2f64a137c430d6ea6bd0"; + sha512 = "08047c83e28397d265712dbd5a533799b2bba97d90f83b93be8377a544226ea0dff22f5b5e2cd5314c24608825048f3e59c6fc348959d63e1acb81d10d687f46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fi/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fi/thunderbird-68.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "aaf723df2d042c7fca5457b0646998c7ed799d0d24021fb6de3b66d35519a7c189844bbd4a2840b884915995be4ec191455bbdbda7f5711831fc7702232a5d12"; + sha512 = "ae407ee0dde2be8a8f89979b5dcacebd13fcfa42fddce48773e8f26ffbb503acc6b17a90170a0d72d550400397c17a725f9bf6f65d842f0f281fc58eaf9dbc53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fr/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fr/thunderbird-68.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9dd7e8c61049f4de1d03c73e1b7a1b38e244ad67be84dc6e4a53b94dc810d98b35e49b199662672f0954cf87cba7e3df75ba11fada1b74e8096d866131b08550"; + sha512 = "a776215a9ba91de0500cc7fda245afa19a49b51b60089c55444aa452c5aca06cf3b95e66448147cdbc3df063348c28bbde3f3c2a6e19deed26e1b33dec565b25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fy-NL/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fy-NL/thunderbird-68.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "aba1031a349f835577a06cbb8452760c4ab65fb1c8a7183e92556b6d140814f16e794f4a5305e789aba3b0c10703006641546751460fa5fe2a822835881d8e6c"; + sha512 = "5302a5709fc4485eff607fd0b5e75f15bb600a14d20661cc4f7280b0bf5c156a40a51045182ff0d31c89d4009c5a516015843ec9fef1fb1134cfa80c511c05ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ga-IE/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ga-IE/thunderbird-68.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9172d99e57d02a676f9bfe3373fef7448a2d6f70f3de8139205c55a37c73c5b70133373763daf8c58adf2acf4916cfb34aee60a431d55aa94cbe95e8e58430f3"; + sha512 = "4b9cfa317f8ae5accb2c96731bd7fcbaf2eebaaee76bc7383d247cac9db6708b7c4c03d2faf3a6e7e6620b3eb696e9bb3fd18c3dfd1f3ce12e4bc65bb86955ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gd/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gd/thunderbird-68.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f8449e20680cf02220e009f19b2cb66d1354941c0deda60086ae80f1d3bdf2159a8b5bb45a45c480528437e78d8c71c00a8ee42827b3254e37c83cb8af1d3de1"; + sha512 = "8738b93fd18972456158c28d4146ec8548e97339d7b4ff044ace814213d27940b02f9b889b5809525d5bba46a5b3ff4a570c14b3b9a5fe276b4aec515b62055b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gl/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gl/thunderbird-68.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "04d8babded176785625add5bc9c457a0ff380c293579a18146924e57fb3782017c12d5569d10d2a3f1fa872fa8eaa87bbe5f1ac5f44f05cf5d5f3936fb12706e"; + sha512 = "c556343f99d39f6ff41f0b05af606ada89e6b95938886f8d0b1ccd7b77f336ae40a8debb003d2bfc865548c5e9e055859d6d353e169a4f2ee7ada7cb8687cc47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/he/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/he/thunderbird-68.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2b77c7c4044c73257f24f1961d431ae50cc9dd0b0f2a58464a745ed3888e957467e6f35dba904a47c3d8d84aba81827184070ac6c12ecccf02760202b831b578"; + sha512 = "b6eed03bdebfc334c8852a15989c024883b99f600b9aa58f8344976b63f1f9590aa9b78a2a27b081a1e5256443801f01c1f638f1e4f8c0c2a78e695a5e2f590a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hr/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hr/thunderbird-68.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "17d68b938531b89eb8972fa315fb6951821a1a55478a801b5697afe5b84450841ac66c8aef49a43c4aa6acec4f81652a1de32a3acbbb41ee6cf0a4ed9f03acd1"; + sha512 = "aa4527614db13978d03cf07444109dbc63b7788a2cff924b5566c98d9316031f1c0fb74839b5be78030959f85147c1c1e50edca5605b5cbe2ad3bbbb257c24ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hsb/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hsb/thunderbird-68.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "556b441cbd6e9a34e101385484fc292e3a2edefd39dc8286b5880c66ad558beecc9206084ed0ee35aced87ba0325fe737f6595cf3ddbe4d3842b10bfb535ed36"; + sha512 = "92b1e17c825a60da17bc9942b689337246f301843637fe420284fe89aad4ab2f30101201330d5319a7e6a2bd87567bf7aa7b35bfbc13b1399ed54973afacf4ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hu/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hu/thunderbird-68.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "7a355c9ab063d6b6d8c17d1df4e30a3c2511c4f9d78be578a1a0b73e4728bb08d917190249baff08e30fe76eda16bc889d64ddba673f51067dc3b1957f8ebba3"; + sha512 = "5e0c03de66a9098e290fb93545cb46be41d7e91c865cb3fcff9dee7d141fa113cf7bfc14cbbf1e8f9e3979e6602116081958c22a83ea043015cc5adfb738e5ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hy-AM/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hy-AM/thunderbird-68.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "b5a94db363d6a16507e71fa0d6d8928b4c8d14b7b6a35e287232fca511caaf9f7852db37502ed9ac0fcba65cfc9d3185db8f08d7dd3941df660e083f0bc6c6a6"; + sha512 = "3df1da5c3d18ee3705e5d5013a752920863fdcee8a1c021bfde28603862a7c56e60a65b46b98af5d66fc5066c1580ab5484d86dd278d64d5d800b3840361b812"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/id/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/id/thunderbird-68.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "6a94778d20665c901005150fab16c4fbcf86bba10b7a1833b7d89d3e76a7b90a0c1e755617ade294fb3c86611a0f2bb0e812d1b282e66d2a63e11a2f25b9da1a"; + sha512 = "786a5839f311df656fd4a0687819a47589f5a6ebac6f76e1f643136286d43b2f27744dfcc116341a8905b5e1da4ec0ad1f1eb4998e188d2e87ea487c6826fb32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/is/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/is/thunderbird-68.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "c6f89a98f956ab17bddc6250af88b1422a347733c15d12a720a8d84ffbd00142afd09b80bbac39dd14907558dc97f33890a091203c1f907dbe0df5f5f12a87f6"; + sha512 = "53e4f76d41e1f8af240ecec249bd3ef3c787c6ff69320694bc682a876a76be22ed59abf0bc83691c7ea96d1e16f5a4c859e2b62528c99261f562012dbd035a9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/it/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/it/thunderbird-68.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "38bcd03bf02276feef2321503bedbd7b8e8c609f48a038e660e522af5cad603ac642622f8b08b7aa870c1bf50b136d09034995941d14fa574ff9ca4f11d3cc66"; + sha512 = "8ecb5594e5252be84f97a55b37f5089220a3e5c1565686fe02f00d94a1418a9460e4c1f25724243c82b3c9442eb8cfbff3c3c9470971921469f2fd71aec66860"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ja/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ja/thunderbird-68.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e91f0e3ee53575d9e3fd02be22c46a8aebfe2e12998db77f3bf73c4756d4d615341c20fed031ee0b146aa1e9200bae3bb92c02da18bbca6e99574c46e2049f01"; + sha512 = "7f9ed4fbdc0549c6ab704f80676218980a4b2609086437f57e22e9750e5a34d7506c1ee43ec48031a28322cdf4dcde6bd14c05fd032244acf33310fb6aa8e9a2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ka/thunderbird-68.0.tar.bz2"; + locale = "ka"; + arch = "linux-i686"; + sha512 = "bab15aa28fc92850d374f76ae9898c9408176db9b9e19cbdb49f7b586172c20eed0cb358f3cd4b5fcc2a4740188c0f041cf617a63743a42648c7e33dd0fb79e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kab/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kab/thunderbird-68.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a858c81c5fc9110757328df3705cfd8ca1bc61ca173448f411a849bc3799b586e7119e6c4ecafd12d0522ba37463092271b76744bc0a7fe603702627f598ad36"; + sha512 = "26b1055333e508666dd24706da824c5cf9d5f87d1d1cb1c4d42894b836412205a7cc7ff73f764d8f2a1852138923bb02a6b2a2c3c92d1fe9307529533b6360e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kk/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kk/thunderbird-68.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1bf45fa38562308f4285c5bea746bafee65f498e5b4f4d1971e7ff68cbc5b8d3e6c7a32a4318100f1fa6bb203a12e3dde14df25a70aa1aad5d6279766b398c2b"; + sha512 = "d946c82a8c35d82147812ef16e4573ae559dbfe65f4a6e5fc7dd107fb57fc6ba2a47f8a3655344e9e6172628692ad7815045830ee27bb10aab0d71483936d6ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ko/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ko/thunderbird-68.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "56e59aeb1286ec53ee558ab029476b72ed4094504123bb93abb3e3425f60065d66c9de83190d6f00528045f934d4775dfa555243f13fcdd540ca522e9f825740"; + sha512 = "3b9d9e70c097a1b7958c6854bc2da121f44921962d873e7f90fee85ce2214725223482aebcd503205e32501648c774199eced7ff34effb428dbc738f1ba4b963"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/lt/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/lt/thunderbird-68.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4572fe9803b28c6f94ac4e1fc5283d2569723698c4295279099bd33358a33cf50c1a49bec70c001dad65d19d30bcb215d50f2084b458143d338b8ecbcea1ebe5"; + sha512 = "0cf99a6aec58d2f56f6a52fc5fee17b9e1d5abd0ece53073cc392c71452e1415c94ad0af003dd0a97fc5c6744a1a2243aef69dc44b831be51108b769e5bff87d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ms/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ms/thunderbird-68.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "fd1a58ebb66a39fc00ba20eaf555cfaa6124cc2e2fa7b44e1d4d7f1e914d86a0617f1be8d461f952196fa6dd8d29ae622769e5e6f8e4c0eb30b757da62d3864d"; + sha512 = "8b4697a312aafdd88a5ecdf898a796bddb91e80b4c8c9c342fce765ee0f4dd494114324a51d6379468756a44bc71cb6f46b8fabc7ca733d9d85d08069f18526d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nb-NO/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nb-NO/thunderbird-68.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "bf4663ffe717d07b37e4f6741c9d6a804420f0104ac9adf152f73900d89818dddd67b1d047bf3f095d1a6ca7ac9da8e2132567e11caf486588f262e84e87905b"; + sha512 = "ad6275f8343dd36ed039524875b41ab9c8bafd2a1e54291b98c16b0ab35f9bea1bfee3fce86070317fad2f25d46d0aa9ef0824e4ad88e0879a33ae753c61ab2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nl/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nl/thunderbird-68.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b7f7a989fe70860eec8349cbf85a943c0a5e7e4c9f7ae2010309adf96778797b036847e6860c0d89213c51c3c01ee1e9e4dfc6ba4a45d31c6ec4b6e9cc7e76bf"; + sha512 = "49f586a62969e6ea5638eb95f812e7d4a891ef55f381633792ed0820ad098cc527dc9490c3a1ce52246526f0a8cf00eb16666c6a7f932a68c6d440e151b452cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nn-NO/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nn-NO/thunderbird-68.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b2a8a72ce49d15c0629e038deaa8fef4b93893da9198e712daaddaadd2169c4781fe6c2544f33954d28e4be30048716a80c20063a13ea78f0ff3c466ee814cce"; + sha512 = "1f04f2bf7a60472eff1b546608cfb26e41f31a273d1037e0d73530029a757dfcd95e2c1b85a6990b6f7eec28138835fe096266a00dd094b4db74007cd59ef00d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pl/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pl/thunderbird-68.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "e6d0f12754182f5bcfaead0bce7183a7f6527983f8a4ece9b9f7968d87d9c55b06257c20e1dd4bcd82be56961a08f6e20d7140cd8239531e2f346bd4c6aaba1c"; + sha512 = "f232e4b6cfcea81ed70e56e9812b8e0783205f49b846d29338ad09457db9a18e4fbb35738bf5e9abce42855c13c1839605aa343cb7d33d0110b68d634183e697"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-BR/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-BR/thunderbird-68.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "bf1fa8c66264ef98b4d192e794cb789ea0f062f342bc3aa664fd8e228acae045dbff4673e31b5b65754eb80e6af2581b3b540b3fbd3e1042439caad9177f7499"; + sha512 = "2527ec08fc23d01712574e3c8419273ac82111c5f2b4b6040cd8f3292aeadb36021029b01bc319d8ca52177db39f1a446acd5537a6e8f42800eb22c3e2d7cb30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-PT/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-PT/thunderbird-68.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2b503e6b87230e4939c09774d9e7b70130e42ef4bdc0e3500563fc0848f138b7b569d37ba09eb676efa6e0d9b245d49acca8c740ec44abbe25b57a8546095871"; + sha512 = "c91d9d0becade1508a3212693f5fcdeb917fe5df5d63b54de125b76786dc3787a7f5f220eb48add1dd1eee95f7eb120b1c1dc85dc0bd91688c883be9219f3d7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/rm/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/rm/thunderbird-68.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fbb4192fa466549313d874d5b48258d3d133040449f96c55270a5ad25798067b921d0336e577081985e1e0cff28aa17d8b1890e77aa3cdc9c369e5e416ac20dc"; + sha512 = "45a4f608eb5e64f24ee385328a3a568aa2ad3284169019423c8b414790779cd079c2d73b290716f18227210ab5eff50625bd6688498bc027228b8fff51fda5b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ro/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ro/thunderbird-68.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5e6ca640f36f44b8d6594aa13847acf16b7f5d96d21761fc43b38b16d39deebf6dd30cc2eae778ec1f8f37408451acb19485f52ae3e701833103e59b6e0615e4"; + sha512 = "e344d838e2f79dd8ff79cf2e7ff2a1d8f6c7e64f29cf870d8a6fad9b3dee31de6c0a80d3007dd498dffb816c00dc8429150bc6b49a5b6eb10b633a4e942ca725"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ru/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ru/thunderbird-68.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4bdaf5e71f18d75554a4d954a802390ca6689d07b3ba16de8654b6557c874622ad2b2d587d8306edecfad47c1bf89550378d478377fe49b0e87b5d4417d05840"; + sha512 = "8dbfd4f8969703623388a55e790b722933f2c1faf702ff5c7fdfe3cdab8f62fc4ea69f9303edf94a41a71be1b8c5a2ddfa5509d4c8abe260c91b7075349afe64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/si/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/si/thunderbird-68.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "096ca4b2efe21c92d041b5fbcb5ac19351d39b339b0686fbefd1b127f7fe1da8b31dcd9135149006a71b664eb9f98d729a48da4f138af250330b60f80ea07f11"; + sha512 = "f1808e9648caa00afab0609dac1cb564dbf6e5bef75446071997cc9913da8470e54cb254282fc6e8b839e88b003ef18426609a97cd1affb93659fcb519913a5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sk/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sk/thunderbird-68.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "101363485e58e8a733523f103994c0abaa520ffe758a0ca39db9d5cebea273bde9a93be489d49db67a37130191a3e54ab9454e74cc392c5e0a163020a740149a"; + sha512 = "7d5b480a44dae0d2f5348261ecad04348ebb7943a757fe83c0fb154da251b423ba21840c5d1fbf8d7979dd30c2d5e7b18e90d0ad033a1e96d6f6587407a24cc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sl/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sl/thunderbird-68.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7060e6918d9818be407fe568caedf7e65738ce6335e287ca9ecee9d7f7be9d00599364b8d7b1033c7943d3a417fef32cd2e6912e832ce0e5eefe6e04db3a7dcf"; + sha512 = "f76e1f01b8da8a2ba344dd3bedfa4301df03fabf9848fa189d522995cd48d81f8d00f11e01722868acb1993d4e79977122e04e3d208629b2e398c715777194e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sq/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sq/thunderbird-68.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "56c297aa61bb50517a5cf126e506cd7fbedda6250434a21423581b2a2cd79352f21c51265f7e3fa9b60636c8e3bd6dfedbf81c058daa8545f5da0f02837e0719"; + sha512 = "cff32ee84324724dea5612e5b48b22adc63d8b9428c5937f84c94da83bcf5f2aadda6ab81c5f9bced6d693689bc38bf15c764d4ab4809cacec3bb54cd82745f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sr/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sr/thunderbird-68.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "95f8bb13b4ecc9774452b799a8ec06dc6abbb585471f5f2f9ce38e4af733fcc99132b66df73df96159872ca6e6285a62c86e61e4d389c2c96da547f875cb9841"; + sha512 = "96d25f7d952e204751cd601932713418cd495d11364430a37ecfa36333113a6132209b8e8f0ec337799ed02b71b388f43e22a53fa168f17e4d15e7594170299a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sv-SE/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sv-SE/thunderbird-68.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "fc48493a7873299d4c284c806fe2ba856ff197e5f50bb57d3fdbc95eda062b035f98318c0f5bb4d1bec63dedae486b9872e3f1718b922a1ec8da311796794121"; + sha512 = "8bc790d7951469e2dfa2499622464cf55427a6bc93dec50b18f014ac079ec0579b91a11680e4104f7d6a38f60d467e9fb3c9ee7ab83b64f8dae2c1e979150bd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/tr/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/tr/thunderbird-68.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "649527a4c603798b0f726eec995d721156c36279b1aa5afb956fe64ef40298956e1abf6eee2d15eb3f5e4c9c5d48ed804eb425483456adf068084114b6d5cae5"; + sha512 = "2c40fa3e6ecfb68507897e669bed229ed98e1b4a3998b55b59523d3cec1fc5553cfacbd9be3d55f7a32b612ee662dfda7c8a21a4c26c750d48b87d31368a9942"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/uk/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uk/thunderbird-68.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "2b4ae669b99ac9a7b20eef71b7dd6d5ad2b20ddb516ba1b3fce7dfbc783f0aa945e8f319b71e8912b2d72b78025fbdcb355ff96be43ffe828d2ba1ac4fa00d41"; + sha512 = "5eee26a500c1d4bf71222987523cc3e5f144aca02c17c88a01d4b68f9ac5e1298407460c69504d0a7b1e5727755cb32e2ae523cd97766419848c1b6dc0a30bf0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uz/thunderbird-68.0.tar.bz2"; + locale = "uz"; + arch = "linux-i686"; + sha512 = "51a0fc8dc30cc82f7d3b222167aaa8ea0225b4136ebacee38687cdc1235c0720da14cd2a3e1875a4c4bfa3bb8fd9045541ca6df736115312ac49a2db2ef83639"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/vi/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/vi/thunderbird-68.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5808e5e2a75cf63366b190dc67177c8f1b2998b2001972412a760eac3c6a370aaf7e60d3fc7978783469163c55f69756637b4436593530d518dab27dddb6c295"; + sha512 = "bb02dd69a8c8d514666fedb9d7de520f6ea89740956ddcd9d7f90175bca6f7bcf79b573c6e5ecd6fdfcdd15aa2a35881e8877074fbb795019eccff52cb943a91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-CN/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-CN/thunderbird-68.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "95cf6871aacf5d36ca04673fe23277dcc4674dd5b2d215c1f453fb6e5f82d64774efee4a0538e7c451b8807bf930912a31eaada65248416c24e8e1382923d09f"; + sha512 = "408599229da40b2ce1a23ec1e5b12c7f4a24fb63524d792d50764cdfbcc6774dd7f651ba2dce46bccd94937e24b4b08d8bf37b6fb839c61540dfbf36f6d3e6b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-TW/thunderbird-60.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-TW/thunderbird-68.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8429305258abecd306e01417bff356a536ad7f6982705a51b4c35b26a83c18f661ae743029597d69466e3618f99ed71070071743c5821264143f78cad2b7aeed"; + sha512 = "d75c9bfc6234fa0ddc56b7c1dace76b789e29c0cb03ff17395eeba020a82431e457271e95117731963f2666295b94746d0370bf0e85f9c3646836830684bca45"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index da817731e07e..f2b4cfb4befc 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip +{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python2, python3, nodejs , libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, libGLU_combined, sqlite, unzip -, hunspell, libevent, libstartup_notification +, yasm, libGLU_combined, sqlite, zip, unzip +, libevent, libstartup_notification , icu, libpng, jemalloc -, autoconf213, which, m4 -, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl, runtimeShell -, cargo, rustc, llvmPackages +, autoconf213, which, m4, fetchpatch +, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl +, runtimeShell +, cargo, rustc, rust-cbindgen, llvmPackages, nasm , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableCalendar ? true , debugBuild ? false @@ -24,11 +25,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { pname = "thunderbird"; - version = "60.8.0"; + version = "68.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "1cd1ps4r70bnxn9kydljsp776dazfzfsghc5zwp1xz6p3cwb9g0gybj677sac7y3ma2wsq1xbqk20q35n7gjz3k1zzhmpxyii558rdl"; + sha512 = "2cz583rwfpj4z5cwg2vfy4ha0pz4xs9g7li078rmk6x19haiv8s9fwijd82xgxax0afn8wk80bq5kd8yz38l9432f6bar8xnwb21y4i"; }; # from firefox, but without sound libraries @@ -39,26 +40,25 @@ in stdenv.mkDerivation rec { nspr nss libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.xorgproto xorg.libXext sqlite unzip - hunspell libevent libstartup_notification /* cairo */ - icu libpng jemalloc + libevent libstartup_notification /* cairo */ + icu libpng jemalloc nasm ] ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ]; # from firefox + m4 + wrapperTool - nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; + # llvm is for llvm-objdump + nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python2 python3 nodejs wrapperTool cargo rustc rust-cbindgen llvmPackages.llvm ]; patches = [ # Remove buildconfig.html to prevent a dependency on clang etc. ./no-buildconfig.patch - - # Needed on older branches since rustc: 1.32.0 -> 1.33.0 - (fetchurl { - name = "missing-documentation.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch" - + "?h=firefox-esr&id=03bdd01f9cf"; - sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb"; - }) - ]; + ] + ++ lib.optional (lib.versionOlder version "69") + (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29 + name = "write_error-parallel_make.diff"; + url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py"; + sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y"; + }); configureFlags = [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio) @@ -76,7 +76,6 @@ in stdenv.mkDerivation rec { "--with-system-icu" #"--enable-rust-simd" # not supported since rustc 1.32.0 -> 1.33.0; TODO: probably OK since 68.0.0 "--enable-system-ffi" - "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" #"--enable-system-cairo" @@ -114,6 +113,9 @@ in stdenv.mkDerivation rec { configureScript="$(realpath ./configure)" mkdir ../objdir cd ../objdir + + # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 + unset AS ''; dontWrapGApps = true; # we do it ourselves @@ -134,6 +136,8 @@ in stdenv.mkDerivation rec { gappsWrapperArgs+=( --argv0 "$target" --set MOZ_APP_LAUNCHER thunderbird + # https://github.com/NixOS/nixpkgs/pull/61980 + --set SNAP_NAME "thunderbird" ) ${ # We wrap manually because wrapGAppsHook does not detect the symlink diff --git a/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix b/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix index 6dcc35f44d33..bfd177cda7a1 100644 --- a/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app to send/receive SMS, make USSD requests, control mobile data usage and more"; longDescription = '' - A simple GTK+ based GUI compatible with Modem manager, Wader and oFono + A simple GTK based GUI compatible with Modem manager, Wader and oFono system services able to control EDGE/3G/4G broadband modem specific functions. You can check balance of your SIM card, send or receive SMS messages, control mobile traffic consumption and more. diff --git a/nixpkgs/pkgs/applications/networking/mumble/default.nix b/nixpkgs/pkgs/applications/networking/mumble/default.nix index 9f641061bd86..6439991920d9 100644 --- a/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -4,13 +4,13 @@ , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null -, iceSupport ? false, zeroc_ice ? null +, iceSupport ? false, zeroc-ice ? null, zeroc-ice-36 ? null }: assert jackSupport -> libjack2 != null; assert speechdSupport -> speechd != null; assert pulseSupport -> libpulseaudio != null; -assert iceSupport -> zeroc_ice != null; +assert iceSupport -> zeroc-ice != null && zeroc-ice-36 != null; with stdenv.lib; let @@ -41,7 +41,6 @@ let "CONFIG+=no-bundled-speex" ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" - ++ optional (!iceSupport) "CONFIG+=no-ice" ++ (overrides.configureFlags or [ ]); preConfigure = '' @@ -108,24 +107,24 @@ let ''; } source; - server = generic { + server = source: let ice = if source.qtVersion == 4 then zeroc-ice-36 else zeroc-ice; in generic { type = "murmur"; postPatch = optional iceSupport '' - grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' + grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${ice.dev}/share/ice/,g' ''; configureFlags = [ "CONFIG+=no-client" - ]; + ] ++ optional (!iceSupport) "CONFIG+=no-ice"; - buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice; + buildInputs = [ libcap ] ++ optional iceSupport ice; installPhase = '' # bin stuff install -Dm755 release/murmurd $out/bin/murmurd ''; - }; + } source; stableSource = rec { version = "1.2.19"; @@ -170,7 +169,5 @@ in { mumble = client stableSource; mumble_rc = client rcSource; murmur = server stableSource; - murmur_rc = (server rcSource).overrideAttrs (old: { - meta = old.meta // { broken = iceSupport; }; - }); + murmur_rc = server rcSource; } diff --git a/nixpkgs/pkgs/applications/networking/netperf/default.nix b/nixpkgs/pkgs/applications/networking/netperf/default.nix index b3001c960574..c2a84971bc29 100644 --- a/nixpkgs/pkgs/applications/networking/netperf/default.nix +++ b/nixpkgs/pkgs/applications/networking/netperf/default.nix @@ -1,6 +1,6 @@ { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "netperf"; version = "20180613"; diff --git a/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix b/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix index 34ebf4364ce7..3f90f65476e4 100644 --- a/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - description = "A GTK+-based Usenet newsreader good at both text and binaries"; + description = "A GTK-based Usenet newsreader good at both text and binaries"; homepage = http://pan.rebelbase.com/; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix b/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix index 58e1fffdbdad..96bdc0b1dfa4 100644 --- a/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix +++ b/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nntp-proxy"; version = "2014-01-06"; diff --git a/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix b/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix index 9428b2764585..c9e2f8f67140 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix @@ -7,7 +7,7 @@ let rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnunet-git-${rev}"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix b/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix index 629e748fcacf..0ead4b7e3ec4 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "mldonkey-3.1.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix b/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix index bcfe8f01e4a4..704c439bb27d 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -17,7 +17,7 @@ let mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit"); srcs = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz"; sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6"; }; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "soulseekqt"; inherit version; - src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); dontBuild = true; diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index b94864a0b40f..8af94b2609ff 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { on top of a cross-platform back-end. Feature spotlight: * Uses fewer resources than other clients - * Native Mac, GTK+ and Qt GUI clients + * Native Mac, GTK and Qt GUI clients * Daemon ideal for servers, embedded systems, and headless use * All these can be remote controlled by Web and Terminal clients * Bluetack (PeerGuardian) blocklists with automatic updates diff --git a/nixpkgs/pkgs/applications/networking/protocol/default.nix b/nixpkgs/pkgs/applications/networking/protocol/default.nix index 305aceec62b5..7fdb062ef805 100644 --- a/nixpkgs/pkgs/applications/networking/protocol/default.nix +++ b/nixpkgs/pkgs/applications/networking/protocol/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonApplication, fetchFromGitHub }: -buildPythonApplication rec { +buildPythonApplication { pname = "protocol"; version = "20171226"; diff --git a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index bf8e7a16a4f3..60ea01ae4512 100644 --- a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -21,7 +21,7 @@ let categories = "Utility;Security;Network;Email"; }; -in mkDerivation rec { +in mkDerivation { pname = "protonmail-bridge"; inherit version; diff --git a/nixpkgs/pkgs/applications/networking/ps2client/default.nix b/nixpkgs/pkgs/applications/networking/ps2client/default.nix index be4cc5830d54..d75f92cb25c7 100644 --- a/nixpkgs/pkgs/applications/networking/ps2client/default.nix +++ b/nixpkgs/pkgs/applications/networking/ps2client/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2018-10-18"; pname = "ps2client"; diff --git a/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix b/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix index 571df924e1f8..66470bf8f314 100644 --- a/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix +++ b/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix @@ -1,6 +1,6 @@ { pythonPackages, isPy3k, pkgs }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonPackage { name = "beautifulsoup-3.2.1"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index 5255b492ec66..30130f60028c 100644 --- a/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -4,18 +4,18 @@ let sha256 = { - "x86_64-linux" = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2"; - "i686-linux" = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2"; - }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported"); + x86_64-linux = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2"; + i686-linux = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2"; + }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); arch = { - "x86_64-linux" = "amd64"; - "i686-linux" = "i686"; - }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported"); + x86_64-linux = "amd64"; + i686-linux = "i686"; + }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); description = "Desktop sharing application, providing remote support and online meetings"; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "anydesk"; exec = "@out@/bin/anydesk"; icon = "anydesk"; diff --git a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index fb577f09120b..f60d43f36166 100644 --- a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { license = licenses.gpl2; homepage = https://gitlab.com/Remmina/Remmina; - description = "Remote desktop client written in GTK+"; + description = "Remote desktop client written in GTK"; maintainers = with maintainers; [ melsigl ryantm ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix index 2cfbfb1b201e..13bcbf9b57e1 100644 --- a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: -mkDerivation rec { +mkDerivation { pname = "x2goclient"; version = "unstable-2019-07-24"; diff --git a/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix index ecce7172defa..e9d0727d31cf 100644 --- a/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix +++ b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix @@ -2,8 +2,8 @@ let arch = { - "x86_64-linux" = "x64"; - "i686-linux" = "i386"; + x86_64-linux = "x64"; + i686-linux = "i386"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; - "i686-linux" = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; + x86_64-linux = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; + i686-linux = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; }.${stdenv.hostPlatform.system}; }; diff --git a/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index a38a9140b490..158e6c5dad15 100644 --- a/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -python27Packages.buildPythonApplication rec { +python27Packages.buildPythonApplication { pname = "nicotine-plus"; version = "1.4.1"; diff --git a/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix index c70723284fd8..74a02f47c3bf 100644 --- a/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ b/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix @@ -5,7 +5,7 @@ glibc, systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.12.0"; diff --git a/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix b/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix index fb47d9bc5101..b72ddc8bae63 100644 --- a/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix @@ -1,6 +1,6 @@ {stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (backintime-common) version src installFlags; pname = "backintime-qt4"; diff --git a/nixpkgs/pkgs/applications/networking/sync/casync/default.nix b/nixpkgs/pkgs/applications/networking/sync/casync/default.nix index 1eb5e44ba24f..cdec695d90f2 100644 --- a/nixpkgs/pkgs/applications/networking/sync/casync/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/casync/default.nix @@ -7,7 +7,7 @@ , glibcLocales, rsync }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "casync"; version = "2-152-ge4a3c5e"; diff --git a/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix b/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix index 12f992d44a5a..19e2eaa5fa23 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -3,7 +3,7 @@ let base = import ./base.nix { inherit stdenv fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rrsync-${base.version}"; src = base.src; diff --git a/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 5b847163a2a7..7bfe697105eb 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -3,19 +3,19 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.2.1"; + version = "1.2.2"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0q1x6kd5kaij8mvs6yll2vqfzrbb31y5hpg6g5kjc8gngwv4rl6v"; + sha256 = "0zkyjnjrla0vpvidwwr4z4kxc9cyjcfbjdzsr34xz7rw3jswswm9"; }; goPackagePath = "github.com/syncthing/syncthing"; - modSha256 = "1daixrpdj97ck02853hwp8l158sja5a7a37h0gdbwb1lgf5hsn05"; + modSha256 = "0pp2gjx227crggph924q7sg6ak8nyl8nlsffpmawq4zl1908lsrd"; patches = [ ./add-stcli-target.patch diff --git a/nixpkgs/pkgs/applications/networking/transporter/default.nix b/nixpkgs/pkgs/applications/networking/transporter/default.nix index 46649c069111..a3cde14f34c0 100644 --- a/nixpkgs/pkgs/applications/networking/transporter/default.nix +++ b/nixpkgs/pkgs/applications/networking/transporter/default.nix @@ -18,7 +18,7 @@ let pname = "Transporter"; version = "1.3.3"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/vnstat/default.nix b/nixpkgs/pkgs/applications/networking/vnstat/default.nix index 8a210c1af681..acda73b0f091 100644 --- a/nixpkgs/pkgs/applications/networking/vnstat/default.nix +++ b/nixpkgs/pkgs/applications/networking/vnstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.3"; + version = "2.4"; src = fetchurl { - sha256 = "138s79dqxrm59xc2s2xch16qkzzjks580sac4ppq8jy5lxrzj2i8"; + sha256 = "1amb8l97y6acp9j1xs2da3mdk6hykg6drzsps9im8vfmmfcmk5d0"; url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz"; }; diff --git a/nixpkgs/pkgs/applications/networking/znc/modules.nix b/nixpkgs/pkgs/applications/networking/znc/modules.nix index fce885a25941..54e148f0833e 100644 --- a/nixpkgs/pkgs/applications/networking/znc/modules.nix +++ b/nixpkgs/pkgs/applications/networking/znc/modules.nix @@ -15,7 +15,7 @@ let passthru.module_name = module_name; }); -in rec { +in { backlog = zncDerivation rec { name = "znc-backlog-${version}"; diff --git a/nixpkgs/pkgs/applications/office/beancount/bean-add.nix b/nixpkgs/pkgs/applications/office/beancount/bean-add.nix index 9eec315217cb..aefd696ae4e3 100644 --- a/nixpkgs/pkgs/applications/office/beancount/bean-add.nix +++ b/nixpkgs/pkgs/applications/office/beancount/bean-add.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bean-add-2018-01-08"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/office/docear/default.nix b/nixpkgs/pkgs/applications/office/docear/default.nix index 0d2341113b48..fb9578c909df 100644 --- a/nixpkgs/pkgs/applications/office/docear/default.nix +++ b/nixpkgs/pkgs/applications/office/docear/default.nix @@ -3,7 +3,7 @@ , antialiasFont ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "docear"; version = "1.2"; diff --git a/nixpkgs/pkgs/applications/office/fava/default.nix b/nixpkgs/pkgs/applications/office/fava/default.nix index e33a0b202da0..a5de74a6f165 100644 --- a/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/nixpkgs/pkgs/applications/office/fava/default.nix @@ -5,15 +5,14 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.10"; + version = "1.11"; src = fetchPypi { inherit pname version; - sha256 = "145995nzgr06qsn619zap0xqa8ckfrp5azga41smyszq97pd01sj"; + sha256 = "0gyrxqmfr8igfjnp9lcsl4km17yakj556xns3jp4m9l2407b5zhc"; }; - doCheck = false; - + checkInputs = [ python3.pkgs.pytest ]; propagatedBuildInputs = with python3.pkgs; [ Babel @@ -28,6 +27,11 @@ buildPythonApplication rec { simplejson ]; + # CLI test expects fava on $PATH. Not sure why static_url fails. + checkPhase = '' + py.test tests -k 'not cli and not static_url' + ''; + meta = { homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; diff --git a/nixpkgs/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch b/nixpkgs/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch new file mode 100644 index 000000000000..5e0ae68e17c6 --- /dev/null +++ b/nixpkgs/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch @@ -0,0 +1,12 @@ +Index: gnucash-3.6/gnucash/register/register-gnome/CMakeLists.txt +=================================================================== +--- gnucash-3.6.orig/gnucash/register/register-gnome/CMakeLists.txt ++++ gnucash-3.6/gnucash/register/register-gnome/CMakeLists.txt +@@ -1,6 +1,7 @@ + add_subdirectory(test) + + #GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK ++include(CheckSymbolExists) + check_symbol_exists(GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK gdk/gdktypes.h have_mod_mask) + if (NOT have_mod_mask) + if (MAC_INTEGRATION) diff --git a/nixpkgs/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix index d3ab02fabd3f..3abc447f6e9f 100644 --- a/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { # Should probably be removed next version bump CXXFLAGS = [ "-Wno-deprecated-declarations" ]; + patches = [ ./cmake_check_symbol_exists.patch ]; + postPatch = '' patchShebangs . ''; diff --git a/nixpkgs/pkgs/applications/office/ledger-web/default.nix b/nixpkgs/pkgs/applications/office/ledger-web/default.nix index df8298579e8f..0a8f68bc0961 100644 --- a/nixpkgs/pkgs/applications/office/ledger-web/default.nix +++ b/nixpkgs/pkgs/applications/office/ledger-web/default.nix @@ -3,7 +3,7 @@ , withSqlite ? false, sqlite }: -bundlerApp rec { +bundlerApp { pname = "ledger_web"; gemdir = ./.; exes = [ "ledger_web" ]; diff --git a/nixpkgs/pkgs/applications/office/moneyplex/default.nix b/nixpkgs/pkgs/applications/office/moneyplex/default.nix index 6b4a3869af9f..103288c03c62 100644 --- a/nixpkgs/pkgs/applications/office/moneyplex/default.nix +++ b/nixpkgs/pkgs/applications/office/moneyplex/default.nix @@ -18,7 +18,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "moneyplex"; version = "16.0.22424"; diff --git a/nixpkgs/pkgs/applications/office/mytetra/default.nix b/nixpkgs/pkgs/applications/office/mytetra/default.nix index dd7f0ace26c9..050222451cf6 100644 --- a/nixpkgs/pkgs/applications/office/mytetra/default.nix +++ b/nixpkgs/pkgs/applications/office/mytetra/default.nix @@ -2,7 +2,7 @@ let version = "1.44.55"; -in mkDerivation rec { +in mkDerivation { pname = "mytetra"; inherit version; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index d3668d057ee4..c1e0f7da30f6 100644 --- a/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub , pytest, pytest-django, django }: -buildPythonPackage rec { +buildPythonPackage { pname = "django-crispy-forms"; version = "2019.04.21"; diff --git a/nixpkgs/pkgs/applications/office/planner/default.nix b/nixpkgs/pkgs/applications/office/planner/default.nix index 41cc3d940164..687b83948cd1 100644 --- a/nixpkgs/pkgs/applications/office/planner/default.nix +++ b/nixpkgs/pkgs/applications/office/planner/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation { Its goal is to be an easy-to-use no-nonsense cross-platform project management application. - Planner is a GTK+ application written in C and licensed under the + Planner is a GTK application written in C and licensed under the GPLv2 or any later version. It can store its data in either xml files or in a postgresql database. Projects can also be printed to PDF or exported to HTML for easy viewing from any web browser. diff --git a/nixpkgs/pkgs/applications/office/zanshin/default.nix b/nixpkgs/pkgs/applications/office/zanshin/default.nix index 6f4f9c43b0ff..b76e09d4d1d6 100644 --- a/nixpkgs/pkgs/applications/office/zanshin/default.nix +++ b/nixpkgs/pkgs/applications/office/zanshin/default.nix @@ -7,15 +7,15 @@ krunner, kwallet }: -mkDerivation rec { +mkDerivation { pname = "zanshin"; - version = "2017-11-25"; + version = "2019-07-28"; src = fetchFromGitHub { owner = "KDE"; repo = "zanshin"; - rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89"; - sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m"; + rev = "a8c223e745ed7e6aa3dd3cb0786a625a5c54e378"; + sha256 = "0jglwh30x7qrl41n3dhawn4c25dmrzscpvcajhgb6fwcl4w8cgfm"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/zotero/default.nix b/nixpkgs/pkgs/applications/office/zotero/default.nix index 5221add8ff68..334a380d9147 100644 --- a/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js ''; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "zotero-${version}"; exec = "zotero -url %U"; icon = "zotero"; diff --git a/nixpkgs/pkgs/applications/radio/dabtools/default.nix b/nixpkgs/pkgs/applications/radio/dabtools/default.nix index c9dbc59323ef..401e207ba4f6 100644 --- a/nixpkgs/pkgs/applications/radio/dabtools/default.nix +++ b/nixpkgs/pkgs/applications/radio/dabtools/default.nix @@ -2,7 +2,7 @@ , libusb1, rtl-sdr, fftw } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dabtools"; version = "20180405"; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix index 6b23858aee48..c26d3e77c70d 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gr-ais"; version = "2015-12-20"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { owner = "bistromath"; repo = "gr-ais"; # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 - "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; - "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; + sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix index 80583c0ff3bb..27cdfc74aab3 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gr-gsm"; version = "2016-08-25"; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix index d56994e46ff5..ec1b802c659b 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix @@ -7,7 +7,7 @@ assert pythonSupport -> python != null && swig != null; let version = "2.0.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gr-limesdr"; inherit version; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix index d357db913447..3026c81e8eff 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gr-nacl"; version = "2017-04-10"; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix index b8cc60544c99..3bb632a819c5 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -12,7 +12,7 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gr-osmosdr"; version = "2018-08-15"; diff --git a/nixpkgs/pkgs/applications/radio/inspectrum/default.nix b/nixpkgs/pkgs/applications/radio/inspectrum/default.nix index e2232c4b2ec8..ef4bd6129a84 100644 --- a/nixpkgs/pkgs/applications/radio/inspectrum/default.nix +++ b/nixpkgs/pkgs/applications/radio/inspectrum/default.nix @@ -9,7 +9,7 @@ , liquid-dsp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "inspectrum-unstable-2017-05-31"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix b/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix index 0bd6f573ead0..3964a8c37370 100644 --- a/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kalibrate-hackrf-unstable-20160827"; # There are no tags/releases, so use the latest commit from git master. diff --git a/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix b/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix index 19ebd05e23c1..879cd6e3aac9 100644 --- a/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kalibrate-rtl-20131214"; # There are no tags/releases, so use the latest commit from git master. diff --git a/nixpkgs/pkgs/applications/radio/rtl_433/default.nix b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix index a06ac2d7a038..3d519255ab48 100644 --- a/nixpkgs/pkgs/applications/radio/rtl_433/default.nix +++ b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix @@ -2,7 +2,7 @@ , libusb1, rtl-sdr, soapysdr-with-plugins }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "18.12"; pname = "rtl_433"; diff --git a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index 968d8769caa3..a21c9f328f40 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif -, cfitsio , getopt , perl , groff , which +, cfitsio , getopt , perl , groff , which, darwin }: let @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "jul19a"; - version = "20190701_a"; + srcVersion = "sep19a"; + version = "20190901_a"; pname = "gildas"; src = fetchurl { @@ -16,19 +16,22 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "97eaa0d0a0f53f0616462642a9bfaddb0305a8a0948e60531d8a524a13a370b6"; + sha256 = "0l4jfzzxp1ab70a920qfbxiphgnc06m46wfwv0jlsq2mfk7cxac1"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; - buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; + buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ] + ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} diff --git a/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix index ff273ab8e95b..f36431beac13 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { description = "Real time satellite tracking and orbit prediction"; longDescription = '' Gpredict is a real time satellite tracking and orbit prediction program - written using the Gtk+ widgets. Gpredict is targetted mainly towards ham radio + written using the GTK widgets. Gpredict is targetted mainly towards ham radio operators but others interested in satellite tracking may find it useful as well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the NORAD Keplerian elements. diff --git a/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix b/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix index b5bc3b622b91..4e4c093ad7f7 100644 --- a/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bedtools"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "arq5x"; repo = "bedtools2"; rev = "v${version}"; - sha256 = "1266bcn5hgbvysfi6nr4cqxlbxcx7vn7ng8kb0v3gz37qh2zxxw9"; + sha256 = "0d6i985qqxp92ddq4n6558m70qi5rqhl724wrfys0hm0p6a9h56x"; }; buildInputs = [ zlib python bzip2 lzma ]; diff --git a/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix b/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix index 56de61da1c5a..1ebfa2fca57a 100644 --- a/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, cmake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cmtk-3.3.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/biology/diamond/default.nix b/nixpkgs/pkgs/applications/science/biology/diamond/default.nix index 854e91b2fcbb..c1d20a11ca96 100644 --- a/nixpkgs/pkgs/applications/science/biology/diamond/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/diamond/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "diamond-0.8.36"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/biology/platypus/default.nix b/nixpkgs/pkgs/applications/science/biology/platypus/default.nix index fc6cfbb158c3..6907c6e3ec82 100644 --- a/nixpkgs/pkgs/applications/science/biology/platypus/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/platypus/default.nix @@ -2,7 +2,7 @@ let python = python27.withPackages (ps: with ps; [ cython ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "platypus-unstable"; version = "2018-07-22"; diff --git a/nixpkgs/pkgs/applications/science/biology/xenomapper/default.nix b/nixpkgs/pkgs/applications/science/biology/xenomapper/default.nix new file mode 100644 index 000000000000..cc235c4ca996 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/xenomapper/default.nix @@ -0,0 +1,23 @@ +{buildPythonPackage, lib, fetchFromGitHub, statistics}: + +buildPythonPackage rec { + pname = "xenomapper"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "genomematt"; + repo = pname; + rev = "v${version}"; + sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr"; + }; + + propagatedBuildInputs = [ statistics ]; + + meta = with lib; { + homepage = "http://github.com/genomematt/xenomapper"; + description = "A utility for post processing mapped reads that have been aligned to a primary genome and a secondary genome and binning reads into species specific, multimapping in each species, unmapped and unassigned bins"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix index a27355afdc8e..9d7880f57df5 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix @@ -3,7 +3,7 @@ , mpi ? null, scalapack }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "4.1-b3"; pname = "siesta"; diff --git a/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix b/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix index b351c892c2cf..c863fe6aea85 100644 --- a/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--prefix=$(out)" - "--disable-static" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/science/electronics/bitscope/packages.nix b/nixpkgs/pkgs/applications/science/electronics/bitscope/packages.nix index 58e01f4f9f49..11e1ed524ed2 100644 --- a/nixpkgs/pkgs/applications/science/electronics/bitscope/packages.nix +++ b/nixpkgs/pkgs/applications/science/electronics/bitscope/packages.nix @@ -110,7 +110,7 @@ in { proto = let toolName = "bitscope-proto"; version = "0.9.FG13B"; - in mkBitscope rec { + in mkBitscope { inherit toolName version; # NOTE: this is meant as a demo by BitScope # NOTE: clicking on logo produces error diff --git a/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index 8aa8275510c9..c2cfc69c50c8 100644 --- a/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -3,7 +3,7 @@ glib, libzip, libserialport, check, libusb, libftdi, systemd, alsaLib, dsview }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (dsview) version src; pname = "libsigrok4dsl"; diff --git a/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index 12d375cf88aa..b7fe5140864c 100644 --- a/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -2,7 +2,7 @@ glib, check, python3, dsview }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (dsview) version src; pname = "libsigrokdecode4dsl"; diff --git a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index 3168fc19d055..2b28f2c06db5 100644 --- a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -36,9 +36,6 @@ let qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine ]; - doConfigure = false; - doBuild = false; - installPhase = '' # Extract eagle tarball mkdir "$out" diff --git a/nixpkgs/pkgs/applications/science/electronics/fped/default.nix b/nixpkgs/pkgs/applications/science/electronics/fped/default.nix index a3b2945ac3d9..4eb666ada7ce 100644 --- a/nixpkgs/pkgs/applications/science/electronics/fped/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/fped/default.nix @@ -4,7 +4,7 @@ }: with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fped"; version = "unstable-2017-05-11"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # This uses '/bin/bash', '/usr/local' and 'lex' by default makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "LEX=flex" "RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt" ]; diff --git a/nixpkgs/pkgs/applications/science/electronics/geda/default.nix b/nixpkgs/pkgs/applications/science/electronics/geda/default.nix index 71101d7cd74a..1aaa5496ff37 100644 --- a/nixpkgs/pkgs/applications/science/electronics/geda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/geda/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "geda"; version = "1.8.2-20130925"; diff --git a/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix b/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix index 3f61a13eab8c..fa5bdbbebdb6 100644 --- a/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gerbv"; version = "2015-10-08"; diff --git a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index 110552d1d645..fb931ec91622 100644 --- a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qttools, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "librepcb"; version = "0.1.0"; diff --git a/nixpkgs/pkgs/applications/science/logic/abc/default.nix b/nixpkgs/pkgs/applications/science/logic/abc/default.nix index fd50fc825a06..c832d12627a0 100644 --- a/nixpkgs/pkgs/applications/science/logic/abc/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/abc/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, readline, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "abc-verifier"; version = "2018-07-08"; diff --git a/nixpkgs/pkgs/applications/science/logic/aspino/default.nix b/nixpkgs/pkgs/applications/science/logic/aspino/default.nix index bf8d3cf03b83..d6190942efab 100644 --- a/nixpkgs/pkgs/applications/science/logic/aspino/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/aspino/default.nix @@ -7,7 +7,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "aspino-unstable-2017-03-09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/avy/default.nix b/nixpkgs/pkgs/applications/science/logic/avy/default.nix index 668fd9fea72d..9b59828ddab7 100644 --- a/nixpkgs/pkgs/applications/science/logic/avy/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/avy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, zlib, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "avy"; version = "2017.10.16"; diff --git a/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix b/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix index 9d6c866faea3..2d00e9f30464 100644 --- a/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "btor2tools"; version = "pre55_8c150b39"; diff --git a/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix b/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix index e2f48b340292..0319069660ed 100644 --- a/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix +++ b/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "clprover"; version = "1.0.3"; diff --git a/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/nixpkgs/pkgs/applications/science/logic/coq/default.nix index dfe1277d5ac9..a04ec0bb16ce 100644 --- a/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -29,7 +29,7 @@ let "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal"; - }."${version}"; + }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10") diff --git a/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix b/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix index 50454847baf1..4c4ea0f14ce1 100644 --- a/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "drat-trim-2017-08-31"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/nixpkgs/pkgs/applications/science/logic/elan/default.nix index bc4f526bb3a4..f9a911d82108 100644 --- a/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "elan-${version}"; + pname = "elan"; version = "0.7.5"; cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd"; diff --git a/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix b/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix index 21ce6be3e6c1..ed757e444b7c 100644 --- a/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fast-downward-2019-05-13"; src = fetchhg { diff --git a/nixpkgs/pkgs/applications/science/logic/lean2/default.nix b/nixpkgs/pkgs/applications/science/logic/lean2/default.nix index 22177798647b..8cc50bb5e295 100644 --- a/nixpkgs/pkgs/applications/science/logic/lean2/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lean2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gmp, mpfr, python , gperftools, ninja, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lean2"; version = "2017-07-22"; diff --git a/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix b/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix index dbd34f1da6e6..287dbd36eabf 100644 --- a/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix @@ -2,7 +2,7 @@ , aiger }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lingeling"; # This is the version used in satcomp2018, which was # relicensed, and also known as version 'bcj' diff --git a/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix b/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix index 7e46dbeb0743..ed1218c401b3 100644 --- a/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, perl, mlton }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "metis-prover"; version = "2.3.20160713"; diff --git a/nixpkgs/pkgs/applications/science/logic/minisat/unstable.nix b/nixpkgs/pkgs/applications/science/logic/minisat/unstable.nix index f1a42f8215e3..ef46c694acb7 100644 --- a/nixpkgs/pkgs/applications/science/logic/minisat/unstable.nix +++ b/nixpkgs/pkgs/applications/science/logic/minisat/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, zlib, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "minisat-unstable-2013-09-25"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/monosat/default.nix b/nixpkgs/pkgs/applications/science/logic/monosat/default.nix index 54bedc7c5e97..30d47687a3eb 100644 --- a/nixpkgs/pkgs/applications/science/logic/monosat/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/monosat/default.nix @@ -20,7 +20,7 @@ let inherit rev sha256; }; - core = stdenv.mkDerivation rec { + core = stdenv.mkDerivation { name = "${pname}-${version}"; inherit src; buildInputs = [ cmake zlib gmp jdk8 ]; diff --git a/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix b/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix index 48546a86112b..32ce9fde0c31 100644 --- a/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, zlib, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "open-wbo-2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix index cb35b9f27d52..d277e0e1521a 100644 --- a/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,6 +1,12 @@ -{ mkDerivation, async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, sbv, stdenv, stm, transformers +{ mkDerivation, callPackage, buildPackages +, async, base, bytestring, containers, fetchFromGitLab, mtl +, parallel-io, parsec, stdenv, stm, transformers }: +let + z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; +in let + sbv = callPackage ./sbv-7.13.nix { inherit z3; }; +in mkDerivation rec { pname = "petrinizer"; version = "0.9.1.1"; diff --git a/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix new file mode 100644 index 000000000000..ed10e9f3db19 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix @@ -0,0 +1,26 @@ +{ mkDerivation, array, async, base, bytestring, containers +, crackNum, deepseq, directory, doctest, filepath, generic-deriving +, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random +, stdenv, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, template-haskell, time, z3 +}: +mkDerivation { + pname = "sbv"; + version = "7.13"; + sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix new file mode 100644 index 000000000000..4d868054c09b --- /dev/null +++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix @@ -0,0 +1,24 @@ +{ mkDerivation, fetchpatch +, base, containers, gomp, hspec, QuickCheck, stdenv +, transformers, z3 +}: +mkDerivation { + pname = "z3"; + version = "408.0"; + sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers transformers ]; + librarySystemDepends = [ gomp z3 ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/IagoAbal/haskell-z3"; + description = "Bindings for the Z3 Theorem Prover"; + license = stdenv.lib.licenses.bsd3; + doCheck = false; + patches = [ + (fetchpatch { + url = "https://github.com/IagoAbal/haskell-z3/commit/b10e09b8a809fb5bbbb1ef86aeb62109ece99cae.patch"; + sha256 = "13fnrs27mg3985r3lwks8fxfxr5inrayy2cyx2867d92pnl3yry4"; + }) + ]; +} diff --git a/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix b/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix index 3f8305ff4030..d357bef2c7a0 100644 --- a/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix @@ -22,7 +22,7 @@ let sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "saw-tools"; version = "0.1.1-20150731"; diff --git a/nixpkgs/pkgs/applications/science/logic/spass/default.nix b/nixpkgs/pkgs/applications/science/logic/spass/default.nix index 2645aa102d92..ece6f0b9f6a8 100644 --- a/nixpkgs/pkgs/applications/science/logic/spass/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/spass/default.nix @@ -8,7 +8,7 @@ let + " dfg2ascii dfg2dfg tptp2dfg dimacs2dfg pgen rescmp"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spass"; version = "${baseVersion}.${minorVersion}"; diff --git a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index 29eb8026366b..ed66c77dcabf 100644 --- a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, yosys, bash, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "symbiyosys"; version = "2019.08.13"; diff --git a/nixpkgs/pkgs/applications/science/logic/verit/default.nix b/nixpkgs/pkgs/applications/science/logic/verit/default.nix index a04ab46c669b..2c68191b800e 100644 --- a/nixpkgs/pkgs/applications/science/logic/verit/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/verit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, gmp, flex, bison }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "veriT"; version = "2016"; diff --git a/nixpkgs/pkgs/applications/science/logic/why3/default.nix b/nixpkgs/pkgs/applications/science/logic/why3/default.nix index 3cb14d7da21e..6f338f214783 100644 --- a/nixpkgs/pkgs/applications/science/logic/why3/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/why3/default.nix @@ -1,7 +1,7 @@ { callPackage, fetchurl, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "why3"; version = "1.2.0"; diff --git a/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix index 340073b016e3..4469e7f06e03 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,6 +1,6 @@ { stdenv, python2Packages, fetchurl }: python2Packages.buildPythonApplication rec { - name = "labelImg-${version}"; + pname = "labelImg"; version = "1.6.0"; src = fetchurl { url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/nixpkgs/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 9c4f24021430..73272df99221 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -94,7 +94,7 @@ let # rockspec = "lua-cjson-2.1devel-1.rockspec"; # }; - lua-cjson = stdenv.mkDerivation rec { + lua-cjson = stdenv.mkDerivation { name = "lua-cjson"; src = "${distro_src}/extra/lua-cjson"; @@ -179,7 +179,7 @@ let rockspec = "rocks/${name}-scm-1.rockspec"; }; - sys = buildLuaRocks rec { + sys = buildLuaRocks { name = "sys"; luadeps = [torch]; buildInputs = [readline cmake]; @@ -190,14 +190,14 @@ let ''; }; - xlua = buildLuaRocks rec { + xlua = buildLuaRocks { name = "xlua"; luadeps = [torch sys]; src = "${distro_src}/pkg/xlua"; rockspec = "xlua-1.0-0.rockspec"; }; - nn = buildLuaRocks rec { + nn = buildLuaRocks { name = "nn"; luadeps = [torch luaffifb]; buildInputs = [cmake]; @@ -208,7 +208,7 @@ let ''; }; - graph = buildLuaRocks rec { + graph = buildLuaRocks { name = "graph"; luadeps = [ torch ]; buildInputs = [cmake]; @@ -219,7 +219,7 @@ let ''; }; - nngraph = buildLuaRocks rec { + nngraph = buildLuaRocks { name = "nngraph"; luadeps = [ torch nn graph ]; buildInputs = [cmake]; @@ -229,7 +229,7 @@ let ''; }; - image = buildLuaRocks rec { + image = buildLuaRocks { name = "image"; luadeps = [ torch dok sys xlua ]; buildInputs = [cmake libjpeg libpng]; @@ -240,7 +240,7 @@ let ''; }; - optim = buildLuaRocks rec { + optim = buildLuaRocks { name = "optim"; luadeps = [ torch ]; buildInputs = [cmake]; @@ -251,7 +251,7 @@ let ''; }; - gnuplot = buildLuaRocks rec { + gnuplot = buildLuaRocks { name = "gnuplot"; luadeps = [ torch paths ]; runtimeDeps = [ pkgs_gnuplot less ]; @@ -259,7 +259,7 @@ let rockspec = "rocks/gnuplot-scm-1.rockspec"; }; - unsup = buildLuaRocks rec { + unsup = buildLuaRocks { name = "unsup"; luadeps = [ torch xlua optim ]; buildInputs = [ cmake ]; @@ -275,7 +275,7 @@ let meta.broken = true; }; - trepl = buildLuaRocks rec { + trepl = buildLuaRocks { name = "trepl"; luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok unsup]; runtimeDeps = [ ncurses readline ]; @@ -285,7 +285,7 @@ let }; }; - lbase64 = buildLuaRocks rec { + lbase64 = buildLuaRocks { name = "lbase64"; src = fetchgit { url = "https://github.com/LuaDist2/lbase64"; @@ -295,7 +295,7 @@ let meta.broken = true; # 2018-04-11 }; - luuid = stdenv.mkDerivation rec { + luuid = stdenv.mkDerivation { name = "luuid"; src = fetchgit { url = "https://github.com/LuaDist/luuid"; @@ -314,7 +314,7 @@ let }; # Doesn't work due to missing deps (according to luarocs). - itorch = buildLuaRocks rec { + itorch = buildLuaRocks { name = "itorch"; luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok lbase64 lua-cjson luuid]; diff --git a/nixpkgs/pkgs/applications/science/math/LiE/default.nix b/nixpkgs/pkgs/applications/science/math/LiE/default.nix index 6909cfd8ef65..d59ec57c1a85 100644 --- a/nixpkgs/pkgs/applications/science/math/LiE/default.nix +++ b/nixpkgs/pkgs/applications/science/math/LiE/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , bison, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.2.2"; # The current version of LiE is 2.2.2, which is more or less unchanged # since about the year 2000. Minor bugfixes do get applied now and then. diff --git a/nixpkgs/pkgs/applications/science/math/form/default.nix b/nixpkgs/pkgs/applications/science/math/form/default.nix index eb42315f015b..0dbafebf2c06 100644 --- a/nixpkgs/pkgs/applications/science/math/form/default.nix +++ b/nixpkgs/pkgs/applications/science/math/form/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "4.2.1"; pname = "form"; diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/9.nix b/nixpkgs/pkgs/applications/science/math/mathematica/9.nix index 1023e7ca3d5c..aaa1c02ec0a0 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/9.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/9.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { name = "mathematica-9.0.0"; - src = requireFile rec { + src = requireFile { name = "Mathematica_9.0.0_LINUX.sh"; message = '' This nix expression requires that Mathematica_9.0.0_LINUX.sh is diff --git a/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/nixpkgs/pkgs/applications/science/math/nauty/default.nix index c86354234e3f..bd116b02e29e 100644 --- a/nixpkgs/pkgs/applications/science/math/nauty/default.nix +++ b/nixpkgs/pkgs/applications/science/math/nauty/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA - "default" = [ "--disable-clz" "--disable-popcnt" ]; - "westmere" = [ "--disable-clz" ]; - "sandybridge" = [ "--disable-clz" ]; - "ivybridge" = [ "--disable-clz" ]; + default = [ "--disable-clz" "--disable-popcnt" ]; + westmere = [ "--disable-clz" ]; + sandybridge = [ "--disable-clz" ]; + ivybridge = [ "--disable-clz" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; buildInputs = []; installPhase = '' diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix index 856d604d7518..93ec1e33cf69 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix @@ -23,7 +23,7 @@ let relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute testFileList = lib.concatStringsSep " " (map relpathToArg files); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = src.version; pname = "sage-tests"; inherit src; diff --git a/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix b/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix index 21ce53e70c51..8e85cece9b28 100644 --- a/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix +++ b/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix @@ -15,7 +15,7 @@ let else badArch; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/misc/gephi/default.nix b/nixpkgs/pkgs/applications/science/misc/gephi/default.nix index 17b2fe27f297..577c8ecfa058 100644 --- a/nixpkgs/pkgs/applications/science/misc/gephi/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/gephi/default.nix @@ -27,7 +27,7 @@ let outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gephi"; inherit version; diff --git a/nixpkgs/pkgs/applications/science/misc/megam/default.nix b/nixpkgs/pkgs/applications/science/misc/megam/default.nix index 59f5afb2f437..f86bed854a2b 100644 --- a/nixpkgs/pkgs/applications/science/misc/megam/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/megam/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, ocaml, makeWrapper, ncurses }: let version = "0.92"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "megam"; inherit version; diff --git a/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix b/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix index 43d57feab71b..bb067fbca7a9 100644 --- a/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix @@ -2,7 +2,7 @@ , eigen, opencv, ceres-solver, cgal, boost, vcg , gmp, mpfr, glog, gflags, libjpeg_turbo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "openmvs-unstable-2018-05-26"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/nixpkgs/pkgs/applications/science/misc/rink/default.nix index daa8b4943227..0dfcbfda0024 100644 --- a/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { version = "0.4.4"; - name = "rink-${version}"; + pname = "rink"; src = fetchFromGitHub { owner = "tiffany352"; diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index c7692dde13aa..b0ed5e946379 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -2,7 +2,7 @@ , gfortran, mpi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.10"; pname = "DL_POLY_Classic"; diff --git a/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix b/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix index dd092a2ce9a9..80417f0fcc18 100644 --- a/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sacrifice"; version = "1.0.0"; diff --git a/nixpkgs/pkgs/applications/science/robotics/gazebo/6.nix b/nixpkgs/pkgs/applications/science/robotics/gazebo/6.nix index 0d1aa4a9085f..80c52b49e47f 100644 --- a/nixpkgs/pkgs/applications/science/robotics/gazebo/6.nix +++ b/nixpkgs/pkgs/applications/science/robotics/gazebo/6.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, callPackage, ignition, gazeboSimulator, ... } @ args: -callPackage ./default.nix (args // rec { +callPackage ./default.nix (args // { version = "6.5.1"; src-sha256 = "96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908"; sdformat = gazeboSimulator.sdformat3; diff --git a/nixpkgs/pkgs/applications/search/catfish/default.nix b/nixpkgs/pkgs/applications/search/catfish/default.nix index a0917d03ce11..983a5153ee2f 100644 --- a/nixpkgs/pkgs/applications/search/catfish/default.nix +++ b/nixpkgs/pkgs/applications/search/catfish/default.nix @@ -56,7 +56,7 @@ pythonPackages.buildPythonApplication rec { description = "A handy file search tool"; longDescription = '' Catfish is a handy file searching tool. The interface is - intentionally lightweight and simple, using only GTK+3. + intentionally lightweight and simple, using only GTK 3. You can configure it to your needs by using several command line options. ''; diff --git a/nixpkgs/pkgs/applications/search/grepm/default.nix b/nixpkgs/pkgs/applications/search/grepm/default.nix index f3fc1e24401d..bad8d35623c0 100644 --- a/nixpkgs/pkgs/applications/search/grepm/default.nix +++ b/nixpkgs/pkgs/applications/search/grepm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perlPackages, mutt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "grepm"; version = "0.6"; diff --git a/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix b/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix index d16ea2710503..0dfa19882028 100644 --- a/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix +++ b/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "bzr-tools-${version}"; + pname = "bzr-tools"; version = "2.6.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix b/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix index a2ebb8195db4..4c818060d220 100644 --- a/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix @@ -4,11 +4,11 @@ }: python2Packages.buildPythonApplication rec { - name = "cvs2svn-${version}"; + pname = "cvs2svn"; version = "2.5.0"; src = fetchurl { - url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${name}.tar.gz"; + url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz"; sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; diff --git a/nixpkgs/pkgs/applications/version-management/gerrit/default.nix b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix index 350eea240ec8..fe0c1a508d0a 100644 --- a/nixpkgs/pkgs/applications/version-management/gerrit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix @@ -2,24 +2,20 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "2.14.6"; + version = "3.0.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "0fsqwfsnyb4nbxgb1i1mp0vshl0mk8bwqlddzqr9x2v99mbca28q"; + sha256 = "16zh2dczjnzwzrzg0xkqs7bfd6bzk7s42gyb59z3206zpvh5kq9k"; }; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1qrmvqqnlbabqz4yx06vi030ci12v0063iq2palxmbj3whrzv9la"; - buildCommand = '' mkdir -p "$out"/webapps/ ln -s ${src} "$out"/webapps/gerrit-${version}.war ''; meta = with stdenv.lib; { - homepage = https://www.gerritcodereview.com/index.md; + homepage = "https://www.gerritcodereview.com/index.md"; license = licenses.asl20; description = "A web based code review and repository management for the git version control system"; maintainers = with maintainers; [ jammerful ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 0e28258915f2..454458cdec66 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "darcs-to-git"; version = "2015-06-04"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 2d171df8bf24..32b9c8a980dc 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -4,8 +4,6 @@ python2Packages.buildPythonApplication rec { pname = "git-big-picture"; version = "0.10.1"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "esc"; repo = pname; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index e502c73adfd4..5edf9a7b5a53 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -2,7 +2,7 @@ , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto , pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "git-bz"; version = "3.2015-09-08"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix index fbbb2d952422..418cf2e5866f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "git-codeowners-${version}"; + pname = "git-codeowners"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index abb09ff9a45e..df0b1e78d274 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "ENABLE_MAN=yes" "DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl" ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 90b8b54434bd..77fc04281153 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -16,7 +16,7 @@ with rustPlatform; buildRustPackage rec { - name = "git-dit-${version}"; + pname = "git-dit"; version = "0.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 2d6de24167bd..f4aa4878f62f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,6 +1,6 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { inherit ruby; pname = "git_fame"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index e8eaf885c71f..ae40e011f858 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "git-stree"; version = "0.4.5"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix index 24a1e1ac937e..b196d39b46f6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" - "INSTALL_LIB=${placeholder ''out''}/bin" - "INSTALL_MAN=${placeholder ''out''}/share/man/man1" + "PREFIX=${placeholder "out"}" + "INSTALL_LIB=${placeholder "out"}/bin" + "INSTALL_MAN=${placeholder "out"}/share/man/man1" ]; patches = [ diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 3a4fcc099340..47da7f7a1d7f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.22.1"; + version = "2.23.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac"; + sha256 = "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 1de631e8b6ad..8cf9662d8f94 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,6 +1,6 @@ {callPackage, stdenv, fetchFromGitHub, ...}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gitstatus"; version = "unstable-2019-05-06"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 22f35e22fb54..0ff7fae2878f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -1,6 +1,6 @@ {fetchFromGitHub, libgit2, ...}: -libgit2.overrideAttrs (oldAttrs: rec { +libgit2.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_ICONV=OFF" diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index f1950923415f..cd38be2b977a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.12.3"; + version = "2.12.4"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "13l4nc3k6vl9x1x0153mwi351j3z266wx0fp7xw2851avrgkk9zg"; + sha256 = "1d4cn4pgx520psrfac92h3m7azxnpj1plrrqmxryar85f3y363bq"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-review/default.nix b/nixpkgs/pkgs/applications/version-management/git-review/default.nix index ecc054df47e7..3a7f8632d2cc 100644 --- a/nixpkgs/pkgs/applications/version-management/git-review/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-review/default.nix @@ -8,7 +8,7 @@ pythonPackages.buildPythonApplication rec { # upstream repository (and we are installing from tarball instead) PBR_VERSION = "${version}"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "openstack-infra"; repo = pname; rev = version; diff --git a/nixpkgs/pkgs/applications/version-management/git-up/default.nix b/nixpkgs/pkgs/applications/version-management/git-up/default.nix index 45c97868c4bf..ba0625c433de 100644 --- a/nixpkgs/pkgs/applications/version-management/git-up/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-up/default.nix @@ -2,10 +2,10 @@ python2Packages.buildPythonApplication rec { version = "1.4.2"; - name = "git-up-${version}"; + pname = "git-up"; src = fetchurl { - url = "mirror://pypi/g/git-up/${name}.zip"; + url = "mirror://pypi/g/git-up/${pname}-${version}.zip"; sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q"; }; diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 00f344597bb4..9c7d83a05fd9 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1i7h6scycwzil87fcx1a19w5pl0986g5ax7y030w0wgmrq3zj53a"; + sha256 = "0g6ch85dq4vazxnr6g78wgqrnfa955395y1zws0a50h0wfxpdjis"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' @@ -62,7 +62,7 @@ buildGoPackage rec { meta = { description = "Git with a cup of tea"; - homepage = https://gitea.io; + homepage = "https://gitea.io"; license = licenses.mit; maintainers = with maintainers; [ disassembler kolaente ]; }; diff --git a/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix b/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix index 2428c6cebddd..4467e9746ce9 100644 --- a/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, python2Packages}: python2Packages.buildPythonApplication rec { - name = "gitinspector-${version}"; + pname = "gitinspector"; version = "0.4.4"; namePrefix = ""; src = fetchzip { url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz"; sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m"; - name = name + "-src"; + name = "${pname}-${version}" + "-src"; }; checkInputs = with python2Packages; [ diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index 20f0937274ed..35ac8a18c451 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -44,7 +44,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}"; src = sources.gitlab; diff --git a/nixpkgs/pkgs/applications/version-management/guitone/default.nix b/nixpkgs/pkgs/applications/version-management/guitone/default.nix index 0aa8afa93619..92bc9f51cac7 100644 --- a/nixpkgs/pkgs/applications/version-management/guitone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/guitone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: let version = "1.0-mtn-head"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "guitone"; inherit version; diff --git a/nixpkgs/pkgs/applications/version-management/mr/default.nix b/nixpkgs/pkgs/applications/version-management/mr/default.nix index 23278e9e748c..a4632399df04 100644 --- a/nixpkgs/pkgs/applications/version-management/mr/default.nix +++ b/nixpkgs/pkgs/applications/version-management/mr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mr"; version = "1.20180726"; diff --git a/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix b/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix index 8b2b15a00780..b0a7108ac07f 100644 --- a/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix +++ b/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix @@ -1,8 +1,8 @@ -{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}: +{lib, python2Packages, git, mercurial, coreutils}: with python2Packages; buildPythonApplication rec { - version = "0.3.1"; + version = "0.3.6"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -12,30 +12,11 @@ buildPythonApplication rec { nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; - # PyPI source is currently missing tests. Thus, use GitHub instead. - # See: https://github.com/kynan/nbstripout/issues/73 - # Use PyPI again after it has been fixed in a release. - src = fetchFromGitHub { - owner = "kynan"; - repo = pname; - rev = version; - sha256 = "1jifqmszjzyaqzaw2ir83k5fdb04iyxdad4lclawpb42hbink9ws"; + src = fetchPypi { + inherit pname version; + sha256 = "1x6010akw7iqxn7ba5m6malfr2fvaf0bjp3cdh983qn1s7vwlq0r"; }; - patches = [ - ( - # Fix git diff tests by using --no-index. - # See: https://github.com/kynan/nbstripout/issues/74 - # - # Remove this patch once the pull request has been merged and a new - # release made. - fetchurl { - url = "https://github.com/jluttine/nbstripout/commit/03e28424fb788dd09a95e99814977b0d0846c0b4.patch"; - sha256 = "09myfb77a2wh8lqqs9fcpam97vmaw8b7zbq8n5gwn6d80zbl7dn0"; - } - ) - ]; - # for some reason, darwin uses /bin/sh echo native instead of echo binary, so # force using the echo binary postPatch = '' diff --git a/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 180664d33863..6d0e39d47bf4 100644 --- a/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "pijul-${version}"; + pname = "pijul"; version = "0.12.0"; src = fetchurl { - url = "https://pijul.org/releases/${name}.tar.gz"; + url = "https://pijul.org/releases/${pname}-${version}.tar.gz"; sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; diff --git a/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix b/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix index d3b027fada68..e9950c32549a 100644 --- a/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: python2Packages.buildPythonApplication rec { - name = "rabbitvcs-${version}"; + pname = "rabbitvcs"; version = "0.17.1"; namePrefix = ""; diff --git a/nixpkgs/pkgs/applications/version-management/sit/default.nix b/nixpkgs/pkgs/applications/version-management/sit/default.nix index 7d655bfc5d3b..a225c23ceebc 100644 --- a/nixpkgs/pkgs/applications/version-management/sit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/sit/default.nix @@ -3,7 +3,7 @@ libiconv, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { - name = "sit-${version}"; + pname = "sit"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/tailor/default.nix b/nixpkgs/pkgs/applications/version-management/tailor/default.nix index c68cc928848d..c769ec0a66d6 100644 --- a/nixpkgs/pkgs/applications/version-management/tailor/default.nix +++ b/nixpkgs/pkgs/applications/version-management/tailor/default.nix @@ -1,7 +1,7 @@ { fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "tailor-${version}"; + pname = "tailor"; version = "0.9.35"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix b/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix index a6cdf2e4373e..779c33627e8f 100644 --- a/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix @@ -21,7 +21,7 @@ let }; }; -in python2Packages.buildPythonApplication rec { +in python2Packages.buildPythonApplication { inherit (tortoisehgSrc.meta) name version; src = tortoisehgSrc; diff --git a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix index 577f2f014168..8a014a633930 100644 --- a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, which, git, ronn, perlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.20170915"; # date of commit we're pulling pname = "vcsh"; diff --git a/nixpkgs/pkgs/applications/video/avxsynth/default.nix b/nixpkgs/pkgs/applications/video/avxsynth/default.nix index 3d5980863296..f16f655b95db 100644 --- a/nixpkgs/pkgs/applications/video/avxsynth/default.nix +++ b/nixpkgs/pkgs/applications/video/avxsynth/default.nix @@ -7,7 +7,7 @@ let inherit (stdenv.lib) enableFeature optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "avxsynth"; version = "2015-04-07"; diff --git a/nixpkgs/pkgs/applications/video/byzanz/default.nix b/nixpkgs/pkgs/applications/video/byzanz/default.nix index 0f1b185ed220..10685a72f109 100644 --- a/nixpkgs/pkgs/applications/video/byzanz/default.nix +++ b/nixpkgs/pkgs/applications/video/byzanz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2.3.alpha"; pname = "byzanz"; diff --git a/nixpkgs/pkgs/applications/video/celluloid/default.nix b/nixpkgs/pkgs/applications/video/celluloid/default.nix index d1a9b64d711b..47a82470137e 100644 --- a/nixpkgs/pkgs/applications/video/celluloid/default.nix +++ b/nixpkgs/pkgs/applications/video/celluloid/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "Simple GTK+ frontend for the mpv video player"; + description = "Simple GTK frontend for the mpv video player"; longDescription = '' GNOME MPV interacts with mpv via the client API exported by libmpv, allowing access to mpv's powerful playback capabilities through an diff --git a/nixpkgs/pkgs/applications/video/coriander/default.nix b/nixpkgs/pkgs/applications/video/coriander/default.nix index 10a8f4019fca..a2de52468f29 100644 --- a/nixpkgs/pkgs/applications/video/coriander/default.nix +++ b/nixpkgs/pkgs/applications/video/coriander/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coriander-2.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/video/devede/default.nix b/nixpkgs/pkgs/applications/video/devede/default.nix index d614523f5345..388476cbf8e7 100644 --- a/nixpkgs/pkgs/applications/video/devede/default.nix +++ b/nixpkgs/pkgs/applications/video/devede/default.nix @@ -4,7 +4,7 @@ let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3; -in buildPythonApplication rec { +in buildPythonApplication { name = "devede-4.8.8"; namePrefix = ""; diff --git a/nixpkgs/pkgs/applications/video/handbrake/default.nix b/nixpkgs/pkgs/applications/video/handbrake/default.nix index aa2407134f38..a15a4cd5999a 100644 --- a/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { and containers. Very versatile and customizable. Package provides: CLI - `HandbrakeCLI` - GTK+ GUI - `ghb` + GTK GUI - `ghb` ''; license = licenses.gpl2; maintainers = with maintainers; [ Anton-Latukha wmertens ]; diff --git a/nixpkgs/pkgs/applications/video/kodi/default.nix b/nixpkgs/pkgs/applications/video/kodi/default.nix index 73bcdadbc594..773c63b0036d 100644 --- a/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -43,15 +43,15 @@ assert vdpauSupport -> libvdpau != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; let - kodiReleaseDate = "20190627"; - kodiVersion = "18.3"; + kodiReleaseDate = "20190901"; + kodiVersion = "18.4"; rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld"; + sha256 = "1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7"; }; cmakeProto = fetchurl { @@ -143,7 +143,7 @@ let postPatch = cmakeProtoPatch; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}"; src = kodi_src; diff --git a/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/nixpkgs/pkgs/applications/video/kodi/plugins.nix index 1cb510780691..dad52ccb9a7c 100644 --- a/nixpkgs/pkgs/applications/video/kodi/plugins.nix +++ b/nixpkgs/pkgs/applications/video/kodi/plugins.nix @@ -51,7 +51,7 @@ let self = rec { }; mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: - toKodiPlugin (stdenv.mkDerivation (rec { + toKodiPlugin (stdenv.mkDerivation ({ name = "kodi-plugin-${plugin}-${version}"; dontStrip = true; @@ -70,7 +70,7 @@ let self = rec { mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args: - toKodiPlugin (stdenv.mkDerivation (rec { + toKodiPlugin (stdenv.mkDerivation ({ name = "kodi-plugin-${plugin}-${version}"; dontStrip = true; @@ -172,7 +172,7 @@ let self = rec { }; mkController = controller: { - "${controller}" = mkKodiPlugin rec { + ${controller} = mkKodiPlugin rec { plugin = pname + "-" + controller; namespace = "game.controller." + controller; sourceDir = "addons/" + namespace; @@ -310,7 +310,7 @@ let self = rec { }; - steam-launcher = mkKodiPlugin rec { + steam-launcher = mkKodiPlugin { plugin = "steam-launcher"; namespace = "script.steam.launcher"; diff --git a/nixpkgs/pkgs/applications/video/lightworks/default.nix b/nixpkgs/pkgs/applications/video/lightworks/default.nix index 0dc97410f547..1ab7e2c991b9 100644 --- a/nixpkgs/pkgs/applications/video/lightworks/default.nix +++ b/nixpkgs/pkgs/applications/video/lightworks/default.nix @@ -76,7 +76,7 @@ let }; # Lightworks expects some files in /usr/share/lightworks -in buildFHSUserEnv rec { +in buildFHSUserEnv { name = lightworks.name; targetPkgs = pkgs: [ diff --git a/nixpkgs/pkgs/applications/video/makemkv/default.nix b/nixpkgs/pkgs/applications/video/makemkv/default.nix index f3d8b4ae569b..77aa2779b5d9 100644 --- a/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -3,21 +3,21 @@ }: let - version = "1.14.4"; + version = "1.14.5"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "0vmmvldmwmq9g202abblj6l15kb8z3b0c6mcc03f30s2yci6ij33"; + sha256 = "1rnkx0h149n3pawmk8d234x5w1xw4kady9pgrcc5aw6krbx38nis"; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "0n1nlq17dxcbgk9xqf7nv6zykvh91yhsjqdhq55947wc11fxjqa0"; + sha256 = "1jg10mslcl0sfwdd9p7hy9zfvk0xc7qhdakiv1kbilsl42bgaxyi"; }; in mkDerivation { pname = "makemkv"; diff --git a/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix b/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix index 14db747d2ce7..d1efae4a9244 100644 --- a/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix +++ b/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, libjpeg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mjpg-streamer"; version = "unstable-2019-05-24"; diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 42b40ade271f..04ddbbb8c06a 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "36.0.0"; + version = "37.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "114j9n2m6dkh7vqzyhcsjzzffadr0lzyjmh31cbl4mvvkg9j5z6r"; + sha256 = "0r1qzvqc6xx7rmv4v4fjc70cqy832h8v0fjf6c5ljbg1c6pgkl0l"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/mplayer/default.nix b/nixpkgs/pkgs/applications/video/mplayer/default.nix index c77486a30cf1..2afb7d1c68a5 100644 --- a/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -59,20 +59,21 @@ let codecs_src = let dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; + version = "20071007"; in if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "${dir}/essential-20071007.tar.bz2"; + url = "${dir}/essential-${version}.tar.bz2"; sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "${dir}/essential-amd64-20071007.tar.bz2"; + url = "${dir}/essential-amd64-${version}.tar.bz2"; sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x"; } else if stdenv.hostPlatform.system == "powerpc-linux" then fetchurl { - url = "${dir}/essential-ppc-20071007.tar.bz2"; + url = "${dir}/essential-ppc-${version}.tar.bz2"; sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z"; } else null; codecs = if codecs_src != null then stdenv.mkDerivation { - name = "MPlayer-codecs-essential-20071007"; + pname = "MPlayer-codecs-essential"; src = codecs_src; @@ -89,11 +90,12 @@ let in stdenv.mkDerivation rec { - name = "mplayer-1.3.0"; + pname = "mplayer"; + version = "1.4"; src = fetchurl { - url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz"; - sha256 = "0hwqn04bdknb2ic88xd75smffxx63scvz0zvwvjb56nqj9n89l1s"; + url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz"; + sha256 = "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2"; }; prePatch = '' @@ -218,6 +220,6 @@ stdenv.mkDerivation rec { homepage = http://mplayerhq.hu; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index 0b1d9e951150..1c5359e5f0c6 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -1,7 +1,14 @@ -{ stdenv, mkDerivationWith, fetchFromGitHub +{ stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch , doxygen, python3Packages, libopenshot , wrapGAppsHook, gtk3 }: +let + fixPermissions = fetchpatch rec { + url = https://github.com/OpenShot/openshot-qt/pull/2973.patch; + sha256 = "037rh0p3k4sdzprlpyb73byjq3qhqk5zd0d4iin6bq602r8bbp0n"; + }; +in + mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; version = "2.4.4"; @@ -13,6 +20,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba"; }; + patches = [ fixPermissions ]; + nativeBuildInputs = [ doxygen wrapGAppsHook ]; buildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix b/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix index d59b02d4b0ae..cf02825501f5 100644 --- a/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix +++ b/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix @@ -4,7 +4,7 @@ let binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gtk-recordmydesktop"; version = "0.3.8-svn${recordmydesktop.rev}"; diff --git a/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix b/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix index 0864edfcf38e..573a18f62ce9 100644 --- a/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix +++ b/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix @@ -4,7 +4,7 @@ let binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "qt-recordmydesktop"; version = "0.3.8-svn${recordmydesktop.rev}"; diff --git a/nixpkgs/pkgs/applications/video/subdl/default.nix b/nixpkgs/pkgs/applications/video/subdl/default.nix index 32bd731f16e9..36a92f0f1afb 100644 --- a/nixpkgs/pkgs/applications/video/subdl/default.nix +++ b/nixpkgs/pkgs/applications/video/subdl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "subdl-0.0pre.2017.11.06"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix index 03fc1f5399af..f628c3b214e4 100644 --- a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix +++ b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix @@ -7,7 +7,7 @@ let version = "0.54.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "subtitleeditor"; inherit version; @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-debug" ]; meta = { - description = "GTK+3 application to edit video subtitles"; + description = "GTK 3 application to edit video subtitles"; longDescription = '' - Subtitle Editor is a GTK+3 tool to edit subtitles for GNU/Linux/*BSD. It + Subtitle Editor is a GTK 3 tool to edit subtitles for GNU/Linux/*BSD. It can be used for new subtitles or as a tool to transform, edit, correct and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices. diff --git a/nixpkgs/pkgs/applications/video/uvccapture/default.nix b/nixpkgs/pkgs/applications/video/uvccapture/default.nix index dd595baa52e8..f52ffa923d28 100644 --- a/nixpkgs/pkgs/applications/video/uvccapture/default.nix +++ b/nixpkgs/pkgs/applications/video/uvccapture/default.nix @@ -8,7 +8,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "uvccapture-0.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/video/vdr/plugins.nix b/nixpkgs/pkgs/applications/video/vdr/plugins.nix index 022f4382a492..2ee196baccc7 100644 --- a/nixpkgs/pkgs/applications/video/vdr/plugins.nix +++ b/nixpkgs/pkgs/applications/video/vdr/plugins.nix @@ -201,7 +201,7 @@ in { }; - text2skin = stdenv.mkDerivation rec { + text2skin = stdenv.mkDerivation { name = "vdr-text2skin-1.3.4-20170702"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/video/xscast/default.nix b/nixpkgs/pkgs/applications/video/xscast/default.nix index ba72763cdaf2..3c4c59a0ee8f 100644 --- a/nixpkgs/pkgs/applications/video/xscast/default.nix +++ b/nixpkgs/pkgs/applications/video/xscast/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xscast-unstable"; version = "2016-07-26"; diff --git a/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix b/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix index 6e61ef098f35..e16fcb84b055 100644 --- a/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix @@ -4,7 +4,7 @@ assert sdlSupport -> (SDL != null); -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "8086tiny"; version = "1.25"; diff --git a/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix b/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix deleted file mode 100644 index 9cdaec1c698a..000000000000 --- a/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, iasl, flex, bison }: - -stdenv.mkDerivation rec { - pname = "cbfstool"; - version = "4.9"; - - src = fetchurl { - url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; - }; - - nativeBuildInputs = [ flex bison ]; - buildInputs = [ iasl ]; - - buildPhase = '' - export LEX=${flex}/bin/flex - make -C util/cbfstool - ''; - - installPhase = '' - mkdir -p $out/bin - cp util/cbfstool/cbfstool $out/bin - cp util/cbfstool/fmaptool $out/bin - cp util/cbfstool/rmodtool $out/bin - ''; - - meta = with stdenv.lib; { - description = "Management utility for CBFS formatted ROM images"; - homepage = https://www.coreboot.org; - license = licenses.gpl2; - maintainers = [ maintainers.tstrobel ]; - platforms = platforms.linux; - }; -} - diff --git a/nixpkgs/pkgs/applications/virtualization/cntr/default.nix b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix index 23084c6286a4..13afe0a42619 100644 --- a/nixpkgs/pkgs/applications/virtualization/cntr/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "cntr-${version}"; + pname = "cntr"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 8070e1423fe8..0d2d0278cc3b 100644 --- a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.15.0"; + version = "1.15.1"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "08m84rlar25w6dwv76rab4vdlavacn7kb5ravzqnb8ngx68csbp3"; + sha256 = "0yjj03qwwb6g05pzavimgj14p6805m3w8qqpl4fp4fpmbrsx4sb0"; }; outputs = [ "bin" "out" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index 2d983d009f1d..b1c42b099b67 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -5,6 +5,7 @@ , six, texttable, websocket_client, cached-property , enum34, functools32, paramiko }: + buildPythonApplication rec { version = "1.24.1"; pname = "docker-compose"; @@ -32,15 +33,17 @@ buildPythonApplication rec { ''; postInstall = '' - mkdir -p $out/share/bash-completion/completions/ - cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose + install -D -m 0444 contrib/completion/bash/docker-compose \ + $out/share/bash-completion/completions/docker-compose + + install -D -m 0444 contrib/completion/zsh/_docker-compose \ + $out/share/zsh-completion/zsh/site-functions/_docker-compose ''; meta = with stdenv.lib; { homepage = https://docs.docker.com/compose/; description = "Multi-container orchestration for Docker"; license = licenses.asl20; - maintainers = with maintainers; [ - ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/nixpkgs/pkgs/applications/virtualization/docker/default.nix index a1125f25e816..72b885b79e7d 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -15,7 +15,7 @@ rec { , tiniRev, tiniSha256 } : let - docker-runc = runc.overrideAttrs (oldAttrs: rec { + docker-runc = runc.overrideAttrs (oldAttrs: { name = "docker-runc-${version}"; inherit version; src = fetchFromGitHub { @@ -28,7 +28,7 @@ rec { patches = []; }); - docker-containerd = containerd.overrideAttrs (oldAttrs: rec { + docker-containerd = containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -41,7 +41,7 @@ rec { hardeningDisable = [ "fortify" ]; }); - docker-tini = tini.overrideAttrs (oldAttrs: rec { + docker-tini = tini.overrideAttrs (oldAttrs: { name = "docker-init-${version}"; inherit version; src = fetchFromGitHub { @@ -60,7 +60,7 @@ rec { ]; }); in - stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) rec { + stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) { inherit docker-runc docker-containerd docker-proxy docker-tini; @@ -70,7 +70,7 @@ rec { ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; - }) // rec { + }) // { inherit version rev; name = "docker-${version}"; diff --git a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix index b58a5108ebad..e11ca04f6b36 100644 --- a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -24,7 +24,7 @@ with lib; let sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a"; }; - nvidia-container-runtime-hook = buildGoPackage rec { + nvidia-container-runtime-hook = buildGoPackage { pname = "nvidia-container-runtime-hook"; version = "1.4.0"; diff --git a/nixpkgs/pkgs/applications/virtualization/railcar/default.nix b/nixpkgs/pkgs/applications/virtualization/railcar/default.nix index 0a139448cb3a..bce254061421 100644 --- a/nixpkgs/pkgs/applications/virtualization/railcar/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/railcar/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, rustPlatform, libseccomp }: rustPlatform.buildRustPackage rec { - name = "railcar-${version}"; + pname = "railcar"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix index 382ebba3c57e..9fc167f5e9de 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, ocamlPackages, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "virt-top"; version = "2017-11-18-unstable"; diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 20930b865370..ac52b83e43d2 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,8 +1,8 @@ { config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras -, qttools, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 -, alsaLib, curl, libvpx, nettools, dbus +, qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 +, alsaLib, curl, libvpx, nettools, dbus, substituteAll , makeself, perl , javaBindings ? true, jdk ? null # Almost doesn't affect closure size , pythonBindings ? false, python3 ? null @@ -21,8 +21,8 @@ let buildType = "release"; # Remember to change the extpackRev and version in extpack.nix and # guest-additions/default.nix as well. - main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv"; - version = "6.0.8"; + main = "1y6j73axjns8ng3m8zs31zwx71wmm91n6vrhdpxphx16jf518djj"; + version = "6.0.10"; in stdenv.mkDerivation { pname = "virtualbox"; inherit version; @@ -37,7 +37,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ] ++ optional (!headless) wrapQtAppsHook; - # Wrap manually because we just need to wrap one executable + # Wrap manually because we wrap just a small number of executables. dontWrapQtApps = true; buildInputs = @@ -79,6 +79,17 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch + # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees + # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. + # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run, + # and also because it would unset QT_PLUGIN_PATH for security reasons. We work around + # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, + # after the code that unsets it. Note that qtsvg is included so that SVG icons from + # the user's icon theme can be loaded. + ++ optional (!headless && enableHardening) (substituteAll { + src = ./qt-env-vars.patch; + qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; + }) ++ [ ./qtx11extras.patch ]; @@ -184,6 +195,11 @@ in stdenv.mkDerivation { preFixup = optionalString (!headless) '' wrapQtApp $out/bin/VirtualBox + '' + # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching + # the source code (see postPatch). + + optionalString (!headless && !enableHardening) '' + wrapQtApp $out/libexec/virtualbox/VirtualBoxVM ''; passthru = { diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index 78c2538bbb0e..8c9f1aea7baa 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,7 +2,7 @@ with lib; -let version = "6.0.8"; +let version = "6.0.10"; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -10,7 +10,8 @@ fetchurl rec { sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. - let value = "6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954"; + # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS + let value = "e5a9eb240379a57c9bf03954a594a03431698e67aef551e27f62170bed9b16ea"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 5ff8a1650bab..e7f6fad79f90 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1njgxb18r8a1m8fk2b32mmnbwciip3wcxwyhza5k73bx4q2sifac"; + sha256 = "098kibz8dkiqd8shm44n4h6iyszcbj0ikav1b4vsi75dqzw8d9n8"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -56,8 +56,6 @@ stdenv.mkDerivation { } ''; - doConfigure = false; - buildPhase = '' # Build kernel modules. cd src diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch b/nixpkgs/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch new file mode 100644 index 000000000000..ad1d1fd11f87 --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch @@ -0,0 +1,14 @@ +--- a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp ++++ b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp +@@ -2131,6 +2131,11 @@ static void supR3HardenedMainPurgeEnvironment(char **envp) + /** @todo Call NT API to do the same. */ + #endif + } ++ ++ /* ++ * NixOS hack: Set QT_PLUGIN_PATH to make Qt find plugins. ++ */ ++ setenv("QT_PLUGIN_PATH", "@qtPluginPath@", /*overwrite=*/ 1); + } + + diff --git a/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix index f3055fc79c35..042b01e86780 100644 --- a/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix +++ b/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix @@ -47,7 +47,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; # rev = "refs/tags/qemu-xen-${version}"; @@ -67,7 +67,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; # rev = "refs/tags/xen-${version}"; @@ -114,7 +114,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/michalpalka/xen-libhvm; diff --git a/nixpkgs/pkgs/applications/virtualization/xen/4.5.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.5.nix index 64704f73e7b1..af4721516eca 100644 --- a/nixpkgs/pkgs/applications/virtualization/xen/4.5.nix +++ b/nixpkgs/pkgs/applications/virtualization/xen/4.5.nix @@ -50,7 +50,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "refs/tags/qemu-xen-${version}"; @@ -86,7 +86,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; rev = "refs/tags/xen-${version}"; @@ -152,7 +152,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/ts468/xen-libhvm; diff --git a/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix index 8ad8edde8cc8..1608fabf4b29 100644 --- a/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix +++ b/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix @@ -64,7 +64,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "refs/tags/qemu-xen-${version}"; @@ -78,7 +78,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; rev = "refs/tags/xen-${version}"; @@ -123,7 +123,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/michalpalka/xen-libhvm; diff --git a/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix b/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix index 727546b69fb0..de692820d8f7 100644 --- a/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -5,7 +5,7 @@ let url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; inherit sha256; }); -in rec { +in { # 4.5 XSA_190 = (xsaPatch { name = "190-4.5"; diff --git a/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix b/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix index 09c7c8e0e088..eeadfa248d75 100644 --- a/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix +++ b/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bspwm-unstable-2016-09-30"; diff --git a/nixpkgs/pkgs/applications/window-managers/clfswm/default.nix b/nixpkgs/pkgs/applications/window-managers/clfswm/default.nix index cc00f1e4b6e9..e2c39887a321 100644 --- a/nixpkgs/pkgs/applications/window-managers/clfswm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/clfswm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 , makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "clfswm"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/window-managers/cwm/default.nix b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix index 0b611906a466..1354171dcfac 100644 --- a/nixpkgs/pkgs/applications/window-managers/cwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cwm-5.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix b/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix index eac15ca71418..1787e40eb96c 100644 --- a/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -8,7 +8,7 @@ let in rustPlatform.buildRustPackage rec { - name = "dwm-status-${version}"; + pname = "dwm-status"; version = "1.6.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/dzen2/default.nix b/nixpkgs/pkgs/applications/window-managers/dzen2/default.nix index 7bc76d5c2bfb..96dcfb938004 100644 --- a/nixpkgs/pkgs/applications/window-managers/dzen2/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/dzen2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dzen2-0.9.5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix b/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix index 2246d77173a0..ef03216d499b 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "i3blocks"; version = "unstable-2019-02-07"; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/nixpkgs/pkgs/applications/window-managers/i3/default.nix index 31a96ba1788b..403d9939e134 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.17"; + version = "4.17.1"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf"; + sha256 = "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33qy"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix index f6d797c98e1e..4ca69ce31b44 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy - sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" i3lock-fancy + sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" i3lock-fancy rm Makefile ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/window-managers/i3/status.nix b/nixpkgs/pkgs/applications/window-managers/i3/status.nix index 17b147da1b2f..e963259b6247 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/status.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/status.nix @@ -1,21 +1,25 @@ -{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig - }: +{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { - name = "i3status-2.12"; + name = "i3status-2.13"; src = fetchurl { url = "https://i3wm.org/i3status/${name}.tar.bz2"; - sha256 = "06krpbijv4yi33nypg6qcn4hilcrdyarsdpd9fmr2cq46qaqiikg"; + sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; + # This hack is needed because for unknown reasons configure generates a broken makefile on the 2.13 release under nixos + preBuild = '' + sed -i -e 's/\$(TEST_LOGS) \$(TEST_LOGS/\$(TEST_LOGS)/g' Makefile + ''; + meta = { - description = "A tiling window manager"; + description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar"; homepage = https://i3wm.org; maintainers = [ ]; license = stdenv.lib.licenses.bsd3; diff --git a/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 71a4ec3549a7..f388c2d99db2 100644 --- a/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -1,36 +1,40 @@ -{ stdenv, fetchurl, cmake, gettext +{ stdenv, fetchFromGitHub, cmake, gettext, perl, asciidoc , libjpeg, libtiff, libungif, libpng, imlib, expat , freetype, fontconfig, pkgconfig, gdk-pixbuf , mkfontdir, libX11, libXft, libXext, libXinerama , libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb -, libpthreadstubs, pcre }: +, libpthreadstubs, pcre, libXdamage, libXcomposite, libXfixes +, libsndfile, fribidi }: -with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.4.2"; + version = "1.6.0"; - buildInputs = - [ cmake gettext libjpeg libtiff libungif libpng imlib expat - freetype fontconfig pkgconfig gdk-pixbuf mkfontdir libX11 - libXft libXext libXinerama libXrandr libICE libSM libXpm - libXdmcp libxcb libpthreadstubs pcre ]; - - src = fetchurl { - url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz"; - sha256 = "05chzjjnb4n4j05ld2gmhhr07c887qb4j9inwg9izhvml51af1bw"; + src = fetchFromGitHub { + owner = "bbidulock"; + repo = "icewm"; + rev = version; + sha256 = "1l8hjmb19d7ds7z21cx207h86wkjcmmmamcnalgkwh4alvbawc2p"; }; - preConfigure = '' - export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm" - ''; + nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; - patches = [ ./fix-strlcat_strlcpy.patch ] ++ - stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch; + buildInputs = [ + gettext libjpeg libtiff libungif libpng imlib expat + freetype fontconfig gdk-pixbuf mkfontdir libX11 + libXft libXext libXinerama libXrandr libICE libSM libXpm + libXdmcp libxcb libpthreadstubs pcre libsndfile fribidi + libXdamage libXcomposite libXfixes + ]; + + cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ]; - patchFlags = [ "-p0" ]; + # install legacy themes + postInstall = '' + cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/ + ''; - meta = { + meta = with stdenv.lib; { description = "A simple, lightweight X window manager"; longDescription = '' IceWM is a window manager for the X Window System. The goal of diff --git a/nixpkgs/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch b/nixpkgs/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch deleted file mode 100644 index 9721e125b051..000000000000 --- a/nixpkgs/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch +++ /dev/null @@ -1,236 +0,0 @@ ---- src/apppstatus.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/apppstatus.cc 2017-08-09 09:12:54.332052762 +0200 -@@ -366,7 +366,7 @@ - sscanf(p, "%s %s %s %s %s", val[0], val[1], val[2], val[3], val[4]); - for (i = 0; i < 4; i++) { - if (strncmp(val[i+1], "?", 1) != 0) -- strlcpy(phoneNumber, val[i+1], sizeof phoneNumber); -+ my_strlcpy(phoneNumber, val[i+1], sizeof phoneNumber); - } - } - ---- src/base.h 2017-07-30 10:59:06.000000000 +0200 -+++ src/base.h 2017-08-09 09:11:13.082025484 +0200 -@@ -44,9 +44,9 @@ - /*** String Functions *********************************************************/ - - /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ --size_t strlcpy(char *dest, const char *from, size_t dest_size); -+size_t my_strlcpy(char *dest, const char *from, size_t dest_size); - /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ --size_t strlcat(char *dest, const char *from, size_t dest_size); -+size_t my_strlcat(char *dest, const char *from, size_t dest_size); - - char *newstr(char const *str); - char *newstr(char const *str, int len); ---- src/gnome2.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/gnome2.cc 2017-08-09 09:11:21.819027846 +0200 -@@ -158,8 +158,8 @@ - const int plen = strlen(fPath); - - char tmp[256]; -- strlcpy(tmp, fPath, sizeof tmp); -- strlcat(tmp, "/.directory", sizeof tmp); -+ my_strlcpy(tmp, fPath, sizeof tmp); -+ my_strlcat(tmp, "/.directory", sizeof tmp); - - if (isDir && !stat(tmp, &sb)) { // looks like kde/gnome1 style - -@@ -279,8 +279,8 @@ - - while ((file = readdir(dir)) != NULL) { - char fullpath[256]; -- strlcpy(fullpath, dirname, sizeof fullpath); -- strlcat(fullpath, file->d_name, sizeof fullpath); -+ my_strlcpy(fullpath, dirname, sizeof fullpath); -+ my_strlcat(fullpath, file->d_name, sizeof fullpath); - GnomeDesktopItem *ditem = - gnome_desktop_item_new_from_file(fullpath, - (GnomeDesktopItemLoadFlags)0, ---- src/icehelp.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/icehelp.cc 2017-08-09 09:11:31.490030459 +0200 -@@ -1790,8 +1790,8 @@ - const size_t size = 9 + strlen(cfmt) + strlen(cstr) + strlen(crea); - char *cbuf = (char *)malloc(size); - snprintf(cbuf, size, cfmt, cstr); -- strlcat(cbuf, ":\n ", size); -- strlcat(cbuf, crea, size); -+ my_strlcat(cbuf, ":\n ", size); -+ my_strlcat(cbuf, crea, size); - - node *root = new node(node::div); - flist<node> nodes(root); ---- src/icesm.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/icesm.cc 2017-08-09 09:13:12.946057758 +0200 -@@ -28,10 +28,10 @@ - wordexp_t w; - if (wordexp(trim(buf), &w, 0) != 0 || w.we_wordc == 0) - return false; -- size_t len = strlcpy(buf, trim(w.we_wordv[0]), bufsiz); -+ size_t len = my_strlcpy(buf, trim(w.we_wordv[0]), bufsiz); - for (size_t k = 1; k < w.we_wordc && len < bufsiz; ++k) { -- strlcat(buf, " ", bufsiz); -- len = strlcat(buf, trim(w.we_wordv[k]), bufsiz); -+ my_strlcat(buf, " ", bufsiz); -+ len = my_strlcat(buf, trim(w.we_wordv[k]), bufsiz); - } - wordfree(&w); - if (len >= bufsiz) -@@ -39,7 +39,7 @@ - #else - char *str = trim(buf); - if (str > buf) -- strlcpy(buf, str, bufsiz); -+ my_strlcpy(buf, str, bufsiz); - #endif - if (buf[0] == '#' || buf[0] == '=') - buf[0] = 0; ---- src/icesound.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/icesound.cc 2017-08-09 09:11:26.686029161 +0200 -@@ -145,8 +145,8 @@ - char * findSample(int sid) { - char basefname[1024]; - -- strlcpy(basefname, gui_events[sid].name, sizeof basefname); -- strlcat(basefname, ".wav", sizeof basefname); -+ my_strlcpy(basefname, gui_events[sid].name, sizeof basefname); -+ my_strlcat(basefname, ".wav", sizeof basefname); - - return findSample(basefname); - } ---- src/misc.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/misc.cc 2017-08-09 09:13:39.372064834 +0200 -@@ -448,7 +448,7 @@ - #endif - - /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ --size_t strlcpy(char *dest, const char *from, size_t dest_size) -+size_t my_strlcpy(char *dest, const char *from, size_t dest_size) - { - const char *in = from; - if (dest_size > 0) { -@@ -463,12 +463,12 @@ - } - - /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ --size_t strlcat(char *dest, const char *from, size_t dest_size) -+size_t my_strlcat(char *dest, const char *from, size_t dest_size) - { - char *to = dest; - char *const stop = to + dest_size - 1; - while (to < stop && *to) ++to; -- return to - dest + strlcpy(to, from, dest_size - (to - dest)); -+ return to - dest + my_strlcpy(to, from, dest_size - (to - dest)); - } - - char *newstr(char const *str) { ---- src/strtest.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/strtest.cc 2017-08-09 09:13:24.395060823 +0200 -@@ -286,63 +286,63 @@ - strtest tester("strlc"); - char d[10] = "@"; - size_t n; -- n = strlcpy(d, "", 0); -+ n = my_strlcpy(d, "", 0); - sequal(d, "@"); - assert(d, n == 0); - -- n = strlcpy(d, "a", 0); -+ n = my_strlcpy(d, "a", 0); - sequal(d, "@"); - assert(d, n == 1); - -- n = strlcpy(d, "", 1); -+ n = my_strlcpy(d, "", 1); - sequal(d, ""); - assert(d, n == 0); - -- n = strlcpy(d, "a", 1); -+ n = my_strlcpy(d, "a", 1); - sequal(d, ""); - assert(d, n == 1); - -- n = strlcpy(d, "a", 2); -+ n = my_strlcpy(d, "a", 2); - sequal(d, "a"); - assert(d, n == 1); - -- n = strlcpy(d, "ab", 2); -+ n = my_strlcpy(d, "ab", 2); - sequal(d, "a"); - assert(d, n == 2); - -- n = strlcpy(d, "ab", 3); -+ n = my_strlcpy(d, "ab", 3); - sequal(d, "ab"); - assert(d, n == 2); - -- n = strlcpy(d, "abc", sizeof d); -+ n = my_strlcpy(d, "abc", sizeof d); - sequal(d, "abc"); - assert(d, n == 3); - -- n = strlcat(d, "def", 4); -+ n = my_strlcat(d, "def", 4); - sequal(d, "abc"); - assert(d, n == 6); - -- n = strlcat(d, "def", sizeof d); -+ n = my_strlcat(d, "def", sizeof d); - sequal(d, "abcdef"); - assert(d, n == 6); - -- n = strlcat(d, "ghijkl", sizeof d); -+ n = my_strlcat(d, "ghijkl", sizeof d); - sequal(d, "abcdefghi"); - assert(d, n == 12); - -- n = strlcpy(d, "123", sizeof d); -+ n = my_strlcpy(d, "123", sizeof d); - sequal(d, "123"); - assert(d, n == 3); - -- n = strlcpy(d, d + 1, sizeof d); -+ n = my_strlcpy(d, d + 1, sizeof d); - sequal(d, "23"); - assert(d, n == 2); - -- n = strlcpy(d, d + 1, sizeof d); -+ n = my_strlcpy(d, d + 1, sizeof d); - sequal(d, "3"); - assert(d, n == 1); - -- n = strlcpy(d, d + 1, sizeof d); -+ n = my_strlcpy(d, d + 1, sizeof d); - sequal(d, ""); - assert(d, n == 0); - } -@@ -418,7 +418,7 @@ - while (a.next()) { - const char *e = a.entry(); - assert(e, strcoll(buf, e) < 0); -- strlcpy(buf, e, sizeof buf); -+ my_strlcpy(buf, e, sizeof buf); - } - assert(buf, strcoll(buf, "~~~~~~~~~") < 0); - } -@@ -437,7 +437,7 @@ - cstring c(s.entry()); - const char *e = c.c_str(); - assert(e, strcoll(buf, e) < 0); -- strlcpy(buf, e, sizeof buf); -+ my_strlcpy(buf, e, sizeof buf); - } - assert(buf, strcoll(buf, "~~~~~~~~~") < 0); - } ---- src/udir.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/udir.cc 2017-08-09 09:13:28.346061883 +0200 -@@ -66,7 +66,7 @@ - if (impl) { - DirPtr dirp(impl); - if (dirp.next()) { -- strlcpy(fEntry, dirp.name(), sizeof fEntry); -+ my_strlcpy(fEntry, dirp.name(), sizeof fEntry); - return true; - } - } diff --git a/nixpkgs/pkgs/applications/window-managers/icewm/musl.patch b/nixpkgs/pkgs/applications/window-managers/icewm/musl.patch deleted file mode 100644 index e7d18e312874..000000000000 --- a/nixpkgs/pkgs/applications/window-managers/icewm/musl.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/ylocale.cc 2017-07-30 10:59:06.000000000 +0200 -+++ src/ylocale.cc 2017-08-09 08:15:50.938841549 +0200 -@@ -55,6 +55,8 @@ - int const codesetItems[] = { - #ifdef CONFIG_NL_CODESETS - CONFIG_NL_CODESETS -+#elif !defined(__GLIBC__) -+ CODESET, 0 - #else - CODESET, _NL_CTYPE_CODESET_NAME, 0 - #endif ---- src/globit.c 2017-07-30 10:59:06.000000000 +0200 -+++ src/globit.c 2017-08-09 08:17:18.691824584 +0200 -@@ -143,7 +143,9 @@ - } else if (*pattern == '~') { - /* yes, tilde */ - is_absolute = 2; -+#if defined(__GLIBC__) - glob_flags |= GLOB_TILDE; -+#endif - /* any slash in the pattern? */ - while (*cp && *cp != '/') - ++cp; diff --git a/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 7df2847669f5..db33b27ddd81 100644 --- a/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jwm-settings-manager"; version = "2018-10-19"; diff --git a/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix b/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix index 08b79927d21e..bcfcbe3c5f52 100644 --- a/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kbdd"; version = "unstable-2017-01-29"; diff --git a/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix b/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix index ed34e75f35db..9d6e0f27f934 100644 --- a/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, libxcb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "lemonbar-1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/window-managers/lemonbar/xft.nix b/nixpkgs/pkgs/applications/window-managers/lemonbar/xft.nix index a1334112cf98..ff34f1dfee78 100644 --- a/nixpkgs/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/nixpkgs/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, perl, libxcb, libXft }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "lemonbar-xft-unstable-2016-02-17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix b/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix index 7233ff2410bd..ba43403d9bbb 100644 --- a/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix @@ -12,7 +12,7 @@ , stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spectrwm"; version = "2.7.2"; diff --git a/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix b/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix index a6f2961ed3fc..00f4b95b3f27 100644 --- a/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix @@ -1,6 +1,6 @@ { stdenv, substituteAll, fetchFromGitHub, gnused, ncurses, xorg, rlwrap }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stumpish"; version = "0.0.1"; diff --git a/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix b/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix index 3ed7f4325f24..b39585092edd 100644 --- a/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix @@ -10,7 +10,7 @@ let sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc"; }); versionSpec = { - "latest" = { + latest = { name = "1.0.0"; rev = "refs/tags/1.0.0"; sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb"; @@ -22,7 +22,7 @@ let sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; patches = [ ./fix-module-path.patch ]; }; - "git" = { + git = { name = "git-20170203"; rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97"; sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70"; @@ -30,7 +30,7 @@ let }; }.${version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "stumpwm-${versionSpec.name}"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix b/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix index 0943881da28f..c391532376e3 100644 --- a/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tabbed-20180310"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/window-managers/way-cooler/crates-io.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/crates-io.nix index 955dfe9b44a1..01638c6332c8 100644 --- a/nixpkgs/pkgs/applications/window-managers/way-cooler/crates-io.nix +++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/crates-io.nix @@ -20,7 +20,7 @@ rec { (crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps) ]); }; - features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec { + features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({ aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true); memchr."${deps.aho_corasick."0.5.3".memchr}".default = true; }) [ @@ -39,7 +39,7 @@ rec { sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c"; features = mkFeatures (features."bitflags"."0.4.0" or {}); }; - features_.bitflags."0.4.0" = deps: f: updateFeatures f (rec { + features_.bitflags."0.4.0" = deps: f: updateFeatures f ({ bitflags."0.4.0".default = (f.bitflags."0.4.0".default or true); }) []; @@ -54,7 +54,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6"; }; - features_.bitflags."0.6.0" = deps: f: updateFeatures f (rec { + features_.bitflags."0.6.0" = deps: f: updateFeatures f ({ bitflags."0.6.0".default = (f.bitflags."0.6.0".default or true); }) []; @@ -69,7 +69,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; }; - features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec { + features_.bitflags."0.7.0" = deps: f: updateFeatures f ({ bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true); }) []; @@ -107,7 +107,7 @@ rec { sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; features = mkFeatures (features."bitflags"."1.0.4" or {}); }; - features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + features_.bitflags."1.0.4" = deps: f: updateFeatures f ({ bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); }) []; @@ -122,7 +122,7 @@ rec { authors = [ "Guillaume Gomez <guillaume1.gomez@gmail.com>" ]; sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd"; }; - features_.c_vec."1.2.1" = deps: f: updateFeatures f (rec { + features_.c_vec."1.2.1" = deps: f: updateFeatures f ({ c_vec."1.2.1".default = (f.c_vec."1.2.1".default or true); }) []; @@ -284,7 +284,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n"; }; - features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec { + features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({ cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true); }) []; @@ -336,7 +336,7 @@ rec { (crates."pkg_config"."${deps."dbus"."0.4.1"."pkg_config"}" deps) ]); }; - features_.dbus."0.4.1" = deps: f: updateFeatures f (rec { + features_.dbus."0.4.1" = deps: f: updateFeatures f ({ dbus."0.4.1".default = (f.dbus."0.4.1".default or true); libc."${deps.dbus."0.4.1".libc}".default = true; pkg_config."${deps.dbus."0.4.1".pkg_config}".default = true; @@ -359,7 +359,7 @@ rec { (crates."dbus"."${deps."dbus_macros"."0.0.6"."dbus"}" deps) ]); }; - features_.dbus_macros."0.0.6" = deps: f: updateFeatures f (rec { + features_.dbus_macros."0.0.6" = deps: f: updateFeatures f ({ dbus."${deps.dbus_macros."0.0.6".dbus}".default = true; dbus_macros."0.0.6".default = (f.dbus_macros."0.0.6".default or true); }) [ @@ -381,7 +381,7 @@ rec { ]); features = mkFeatures (features."dlib"."0.3.1" or {}); }; - features_.dlib."0.3.1" = deps: f: updateFeatures f (rec { + features_.dlib."0.3.1" = deps: f: updateFeatures f ({ dlib."0.3.1".default = (f.dlib."0.3.1".default or true); libloading."${deps.dlib."0.3.1".libloading}".default = true; }) [ @@ -403,7 +403,7 @@ rec { ]); features = mkFeatures (features."dlib"."0.4.1" or {}); }; - features_.dlib."0.4.1" = deps: f: updateFeatures f (rec { + features_.dlib."0.4.1" = deps: f: updateFeatures f ({ dlib."0.4.1".default = (f.dlib."0.4.1".default or true); libloading."${deps.dlib."0.4.1".libloading}".default = true; }) [ @@ -421,7 +421,7 @@ rec { authors = [ "David Tolnay <dtolnay@gmail.com>" ]; sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8"; }; - features_.dtoa."0.4.3" = deps: f: updateFeatures f (rec { + features_.dtoa."0.4.3" = deps: f: updateFeatures f ({ dtoa."0.4.3".default = (f.dtoa."0.4.3".default or true); }) []; @@ -441,7 +441,7 @@ rec { (crates."wayland_sys"."${deps."dummy_rustwlc"."0.7.1"."wayland_sys"}" deps) ]); }; - features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f (rec { + features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f ({ bitflags."${deps.dummy_rustwlc."0.7.1".bitflags}".default = true; dummy_rustwlc."0.7.1".default = (f.dummy_rustwlc."0.7.1".default or true); libc."${deps.dummy_rustwlc."0.7.1".libc}".default = true; @@ -498,7 +498,7 @@ rec { authors = [ "bluss" ]; sha256 = "1bkb5aq7h9p4rzlgxagnda1f0dd11q0qz41bmdy11z18q1p8igy1"; }; - features_.fixedbitset."0.1.9" = deps: f: updateFeatures f (rec { + features_.fixedbitset."0.1.9" = deps: f: updateFeatures f ({ fixedbitset."0.1.9".default = (f.fixedbitset."0.1.9".default or true); }) []; @@ -517,7 +517,7 @@ rec { (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) ]); }; - features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({ bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; @@ -537,7 +537,7 @@ rec { authors = [ "Raph Levien <raph@google.com>" ]; sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; }; - features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({ fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); }) []; @@ -712,7 +712,7 @@ rec { (crates."unicode_width"."${deps."getopts"."0.2.18"."unicode_width"}" deps) ]); }; - features_.getopts."0.2.18" = deps: f: updateFeatures f (rec { + features_.getopts."0.2.18" = deps: f: updateFeatures f ({ getopts."0.2.18".default = (f.getopts."0.2.18".default or true); unicode_width."${deps.getopts."0.2.18".unicode_width}".default = true; }) [ @@ -1033,7 +1033,7 @@ rec { sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; features = mkFeatures (features."itoa"."0.3.4" or {}); }; - features_.itoa."0.3.4" = deps: f: updateFeatures f (rec { + features_.itoa."0.3.4" = deps: f: updateFeatures f ({ itoa."0.3.4".default = (f.itoa."0.3.4".default or true); }) []; @@ -1051,7 +1051,7 @@ rec { (crates."rustc_serialize"."${deps."json_macro"."0.1.1"."rustc_serialize"}" deps) ]); }; - features_.json_macro."0.1.1" = deps: f: updateFeatures f (rec { + features_.json_macro."0.1.1" = deps: f: updateFeatures f ({ json_macro."0.1.1".default = (f.json_macro."0.1.1".default or true); rustc_serialize."${deps.json_macro."0.1.1".rustc_serialize}".default = true; }) [ @@ -1078,7 +1078,7 @@ rec { (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) ]); }; - features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({ kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; @@ -1199,7 +1199,7 @@ rec { (crates."target_build_utils"."${deps."libloading"."0.3.4"."target_build_utils"}" deps) ]); }; - features_.libloading."0.3.4" = deps: f: updateFeatures f (rec { + features_.libloading."0.3.4" = deps: f: updateFeatures f ({ kernel32_sys."${deps.libloading."0.3.4".kernel32_sys}".default = true; lazy_static."${deps.libloading."0.3.4".lazy_static}".default = true; libloading."0.3.4".default = (f.libloading."0.3.4".default or true); @@ -1231,7 +1231,7 @@ rec { (crates."cc"."${deps."libloading"."0.5.0"."cc"}" deps) ]); }; - features_.libloading."0.5.0" = deps: f: updateFeatures f (rec { + features_.libloading."0.5.0" = deps: f: updateFeatures f ({ cc."${deps.libloading."0.5.0".cc}".default = true; libloading."0.5.0".default = (f.libloading."0.5.0".default or true); winapi = fold recursiveUpdate {} [ @@ -1340,7 +1340,7 @@ rec { ]); features = mkFeatures (features."log"."0.4.6" or {}); }; - features_.log."0.4.6" = deps: f: updateFeatures f (rec { + features_.log."0.4.6" = deps: f: updateFeatures f ({ cfg_if."${deps.log."0.4.6".cfg_if}".default = true; log."0.4.6".default = (f.log."0.4.6".default or true); }) [ @@ -1361,7 +1361,7 @@ rec { (crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps) ]); }; - features_.memchr."0.1.11" = deps: f: updateFeatures f (rec { + features_.memchr."0.1.11" = deps: f: updateFeatures f ({ libc."${deps.memchr."0.1.11".libc}".default = true; memchr."0.1.11".default = (f.memchr."0.1.11".default or true); }) [ @@ -1392,7 +1392,7 @@ rec { ]); features = mkFeatures (features."nix"."0.6.0" or {}); }; - features_.nix."0.6.0" = deps: f: updateFeatures f (rec { + features_.nix."0.6.0" = deps: f: updateFeatures f ({ bitflags."${deps.nix."0.6.0".bitflags}".default = true; cfg_if."${deps.nix."0.6.0".cfg_if}".default = true; libc."${deps.nix."0.6.0".libc}".default = true; @@ -1426,7 +1426,7 @@ rec { (crates."void"."${deps."nix"."0.9.0"."void"}" deps) ]); }; - features_.nix."0.9.0" = deps: f: updateFeatures f (rec { + features_.nix."0.9.0" = deps: f: updateFeatures f ({ bitflags."${deps.nix."0.9.0".bitflags}".default = true; cfg_if."${deps.nix."0.9.0".cfg_if}".default = true; libc."${deps.nix."0.9.0".libc}".default = true; @@ -1453,7 +1453,7 @@ rec { (crates."num_traits"."${deps."num_traits"."0.1.43"."num_traits"}" deps) ]); }; - features_.num_traits."0.1.43" = deps: f: updateFeatures f (rec { + features_.num_traits."0.1.43" = deps: f: updateFeatures f ({ num_traits = fold recursiveUpdate {} [ { "${deps.num_traits."0.1.43".num_traits}".default = true; } { "0.1.43".default = (f.num_traits."0.1.43".default or true); } @@ -1620,7 +1620,7 @@ rec { (crates."phf_shared"."${deps."phf_codegen"."0.7.23"."phf_shared"}" deps) ]); }; - features_.phf_codegen."0.7.23" = deps: f: updateFeatures f (rec { + features_.phf_codegen."0.7.23" = deps: f: updateFeatures f ({ phf_codegen."0.7.23".default = (f.phf_codegen."0.7.23".default or true); phf_generator."${deps.phf_codegen."0.7.23".phf_generator}".default = true; phf_shared."${deps.phf_codegen."0.7.23".phf_shared}".default = true; @@ -1644,7 +1644,7 @@ rec { (crates."rand"."${deps."phf_generator"."0.7.23"."rand"}" deps) ]); }; - features_.phf_generator."0.7.23" = deps: f: updateFeatures f (rec { + features_.phf_generator."0.7.23" = deps: f: updateFeatures f ({ phf_generator."0.7.23".default = (f.phf_generator."0.7.23".default or true); phf_shared."${deps.phf_generator."0.7.23".phf_shared}".default = true; rand."${deps.phf_generator."0.7.23".rand}".default = true; @@ -1669,7 +1669,7 @@ rec { ]); features = mkFeatures (features."phf_shared"."0.7.23" or {}); }; - features_.phf_shared."0.7.23" = deps: f: updateFeatures f (rec { + features_.phf_shared."0.7.23" = deps: f: updateFeatures f ({ phf_shared."0.7.23".default = (f.phf_shared."0.7.23".default or true); siphasher."${deps.phf_shared."0.7.23".siphasher}".default = true; }) [ @@ -1687,7 +1687,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6"; }; - features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec { + features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({ pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true); }) []; @@ -2004,7 +2004,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; }; - features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({ regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true); }) []; @@ -2057,7 +2057,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; }; - features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f (rec { + features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f ({ rustc_serialize."0.3.24".default = (f.rustc_serialize."0.3.24".default or true); }) []; @@ -2075,7 +2075,7 @@ rec { (crates."semver"."${deps."rustc_version"."0.1.7"."semver"}" deps) ]); }; - features_.rustc_version."0.1.7" = deps: f: updateFeatures f (rec { + features_.rustc_version."0.1.7" = deps: f: updateFeatures f ({ rustc_version."0.1.7".default = (f.rustc_version."0.1.7".default or true); semver."${deps.rustc_version."0.1.7".semver}".default = true; }) [ @@ -2131,7 +2131,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; }; - features_.semver."0.1.20" = deps: f: updateFeatures f (rec { + features_.semver."0.1.20" = deps: f: updateFeatures f ({ semver."0.1.20".default = (f.semver."0.1.20".default or true); }) []; @@ -2225,7 +2225,7 @@ rec { authors = [ "Frank Denis <github@pureftpd.org>" ]; sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw"; }; - features_.siphasher."0.2.3" = deps: f: updateFeatures f (rec { + features_.siphasher."0.2.3" = deps: f: updateFeatures f ({ siphasher."0.2.3".default = (f.siphasher."0.2.3".default or true); }) []; @@ -2282,7 +2282,7 @@ rec { (crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps) ]); }; - features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec { + features_.thread_id."2.0.0" = deps: f: updateFeatures f ({ kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true; libc."${deps.thread_id."2.0.0".libc}".default = true; thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true); @@ -2305,7 +2305,7 @@ rec { (crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps) ]); }; - features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec { + features_.thread_local."0.2.7" = deps: f: updateFeatures f ({ thread_id."${deps.thread_local."0.2.7".thread_id}".default = true; thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true); }) [ @@ -2323,7 +2323,7 @@ rec { authors = [ "Victor Berger <victor.berger@m4x.org>" ]; sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq"; }; - features_.token_store."0.1.2" = deps: f: updateFeatures f (rec { + features_.token_store."0.1.2" = deps: f: updateFeatures f ({ token_store."0.1.2".default = (f.token_store."0.1.2".default or true); }) []; @@ -2339,7 +2339,7 @@ rec { sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; features = mkFeatures (features."unicode_width"."0.1.5" or {}); }; - features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec { + features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({ unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true); }) []; @@ -2354,7 +2354,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; }; - features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec { + features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({ utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true); }) []; @@ -2542,7 +2542,7 @@ rec { (crates."xml_rs"."${deps."wayland_scanner"."0.12.5"."xml_rs"}" deps) ]); }; - features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f (rec { + features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f ({ wayland_scanner."0.12.5".default = (f.wayland_scanner."0.12.5".default or true); xml_rs."${deps.wayland_scanner."0.12.5".xml_rs}".default = true; }) [ @@ -2737,7 +2737,7 @@ rec { authors = [ "Peter Atashian <retep998@gmail.com>" ]; sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; }; - features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + features_.winapi."0.2.8" = deps: f: updateFeatures f ({ winapi."0.2.8".default = (f.winapi."0.2.8".default or true); }) []; @@ -2760,7 +2760,7 @@ rec { ]) else []); features = mkFeatures (features."winapi"."0.3.6" or {}); }; - features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + features_.winapi."0.3.6" = deps: f: updateFeatures f ({ winapi."0.3.6".default = (f.winapi."0.3.6".default or true); winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; @@ -2781,7 +2781,7 @@ rec { sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; libName = "build"; }; - features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({ winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); }) []; @@ -2797,7 +2797,7 @@ rec { sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; build = "build.rs"; }; - features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); }) []; @@ -2813,7 +2813,7 @@ rec { sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; build = "build.rs"; }; - features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); }) []; @@ -2992,7 +2992,7 @@ rec { (crates."bitflags"."${deps."xml_rs"."0.7.0"."bitflags"}" deps) ]); }; - features_.xml_rs."0.7.0" = deps: f: updateFeatures f (rec { + features_.xml_rs."0.7.0" = deps: f: updateFeatures f ({ bitflags."${deps.xml_rs."0.7.0".bitflags}".default = true; xml_rs."0.7.0".default = (f.xml_rs."0.7.0".default or true); }) [ diff --git a/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix index 9ebb0b5ffcfb..7bc6ac700204 100644 --- a/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix @@ -16,23 +16,23 @@ let # https://nest.pijul.com/pmeunier/carnix/discussions/22 version = "0.8.1"; deps = (callPackage ./way-cooler.nix {}).deps; - way_cooler_ = f: cratesIO.crates.way_cooler."${version}" deps { - features = cratesIO.features_.way_cooler."${version}" deps { - "way_cooler"."${version}" = f; + way_cooler_ = f: cratesIO.crates.way_cooler.${version} deps { + features = cratesIO.features_.way_cooler.${version} deps { + way_cooler.${version} = f; }; }; way-cooler = ((way_cooler_ { builtin-lua = true; }).override { crateOverrides = defaultCrateOverrides // { way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; }; - };}).overrideAttrs (oldAttrs: rec { + };}).overrideAttrs (oldAttrs: { postBuild = '' mkdir -p $out/etc cp -r config $out/etc/way-cooler ''; }); - wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec { + wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: { nativeBuildInputs = [ makeWrapper ]; postFixup = '' @@ -47,7 +47,7 @@ let crateOverrides = defaultCrateOverrides // { wc-lock = attrs: { buildInputs = [ pam ]; }; - };}).overrideAttrs (oldAttrs: rec { + };}).overrideAttrs (oldAttrs: { nativeBuildInputs = [ makeWrapper ]; postFixup = '' @@ -87,7 +87,7 @@ let sleep 5 ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d ''; -in symlinkJoin rec { +in symlinkJoin { inherit version; name = "way-cooler-with-extensions-${version}"; paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ]; diff --git a/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-bg.nix index 4d527715c5f2..a797e7aacdef 100644 --- a/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-bg.nix +++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-bg.nix @@ -508,7 +508,7 @@ rec { inherit dependencies buildDependencies features; }; ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; - ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0_features = f: updateFeatures f ({ ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); }) []; atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ { @@ -516,7 +516,7 @@ rec { ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - atty_0_2_3_features = f: updateFeatures f (rec { + atty_0_2_3_features = f: updateFeatures f ({ atty_0_2_3.default = (f.atty_0_2_3.default or true); kernel32_sys_0_2_2.default = true; libc_0_2_32.default = (f.libc_0_2_32.default or false); @@ -524,7 +524,7 @@ rec { winapi_0_2_8.default = true; }) [ termion_1_5_1_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; - bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); }) []; bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { @@ -631,25 +631,25 @@ rec { dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]); features = mkFeatures (features.coco_0_1_1 or {}); }; - coco_0_1_1_features = f: updateFeatures f (rec { + coco_0_1_1_features = f: updateFeatures f ({ coco_0_1_1.default = (f.coco_0_1_1.default or true); either_1_2_0.default = true; scopeguard_0_3_2.default = true; }) [ either_1_2_0_features scopeguard_0_3_2_features ]; color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; - color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0_features = f: updateFeatures f ({ color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); }) []; dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ { dependencies = mapFeatures features ([ libloading_0_3_4 ]); features = mkFeatures (features.dlib_0_3_1 or {}); }; - dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1_features = f: updateFeatures f ({ dlib_0_3_1.default = (f.dlib_0_3_1.default or true); libloading_0_3_4.default = true; }) [ libloading_0_3_4_features ]; dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; - dtoa_0_4_2_features = f: updateFeatures f (rec { + dtoa_0_4_2_features = f: updateFeatures f ({ dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); }) []; either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ { @@ -665,7 +665,7 @@ rec { enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { dependencies = mapFeatures features ([ num_traits_0_1_40 ]); }; - enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1_features = f: updateFeatures f ({ enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); num_traits_0_1_40.default = (f.num_traits_0_1_40.default or false); }) [ num_traits_0_1_40_features ]; @@ -698,14 +698,14 @@ rec { fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ { dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]); }; - fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec { + fuchsia_zircon_0_2_1_features = f: updateFeatures f ({ fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true); fuchsia_zircon_sys_0_2_0.default = true; }) [ fuchsia_zircon_sys_0_2_0_features ]; fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ { dependencies = mapFeatures features ([ bitflags_0_7_0 ]); }; - fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = true; fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true); }) [ bitflags_0_7_0_features ]; @@ -741,7 +741,7 @@ rec { lzw_0_10_0.default = true; }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; - glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11_features = f: updateFeatures f ({ glob_0_2_11.default = (f.glob_0_2_11.default or true); }) []; image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ { @@ -828,13 +828,13 @@ rec { inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { features = mkFeatures (features.inflate_0_1_1 or {}); }; - inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1_features = f: updateFeatures f ({ inflate_0_1_1.default = (f.inflate_0_1_1.default or true); }) []; itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { features = mkFeatures (features.itoa_0_3_4 or {}); }; - itoa_0_3_4_features = f: updateFeatures f (rec { + itoa_0_3_4_features = f: updateFeatures f ({ itoa_0_3_4.default = (f.itoa_0_3_4.default or true); }) []; jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ { @@ -855,7 +855,7 @@ rec { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -890,7 +890,7 @@ rec { ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); }; - libloading_0_3_4_features = f: updateFeatures f (rec { + libloading_0_3_4_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = true; lazy_static_0_2_9.default = true; libloading_0_3_4.default = (f.libloading_0_3_4.default or true); @@ -911,7 +911,7 @@ rec { dependencies = mapFeatures features ([ libc_0_2_32 ]); buildDependencies = mapFeatures features ([ cc_1_0_0 ]); }; - miniz_sys_0_1_10_features = f: updateFeatures f (rec { + miniz_sys_0_1_10_features = f: updateFeatures f ({ cc_1_0_0.default = true; libc_0_2_32.default = true; miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); @@ -940,14 +940,14 @@ rec { num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { dependencies = mapFeatures features ([ num_traits_0_1_40 ]); }; - num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35_features = f: updateFeatures f ({ num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); num_traits_0_1_40.default = true; }) [ num_traits_0_1_40_features ]; num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]); }; - num_iter_0_1_34_features = f: updateFeatures f (rec { + num_iter_0_1_34_features = f: updateFeatures f ({ num_integer_0_1_35.default = true; num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); num_traits_0_1_40.default = true; @@ -978,13 +978,13 @@ rec { rustc_serialize_0_3_24.default = true; }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_40_features rustc_serialize_0_3_24_features ]; num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; - num_traits_0_1_40_features = f: updateFeatures f (rec { + num_traits_0_1_40_features = f: updateFeatures f ({ num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); }) []; num_cpus_1_7_0 = { features?(num_cpus_1_7_0_features {}) }: num_cpus_1_7_0_ { dependencies = mapFeatures features ([ libc_0_2_32 ]); }; - num_cpus_1_7_0_features = f: updateFeatures f (rec { + num_cpus_1_7_0_features = f: updateFeatures f ({ libc_0_2_32.default = true; num_cpus_1_7_0.default = (f.num_cpus_1_7_0.default or true); }) [ libc_0_2_32_features ]; @@ -1007,7 +1007,7 @@ rec { phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); }; - phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21_features = f: updateFeatures f ({ phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); phf_generator_0_7_21.default = true; phf_shared_0_7_21.default = true; @@ -1015,7 +1015,7 @@ rec { phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_17 ]); }; - phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21_features = f: updateFeatures f ({ phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); phf_shared_0_7_21.default = true; rand_0_3_17.default = true; @@ -1024,7 +1024,7 @@ rec { dependencies = mapFeatures features ([ siphasher_0_2_2 ]); features = mkFeatures (features.phf_shared_0_7_21 or {}); }; - phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21_features = f: updateFeatures f ({ phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); siphasher_0_2_2.default = true; }) [ siphasher_0_2_2_features ]; @@ -1065,14 +1065,14 @@ rec { rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ { dependencies = mapFeatures features ([ rayon_core_1_2_1 ]); }; - rayon_0_8_2_features = f: updateFeatures f (rec { + rayon_0_8_2_features = f: updateFeatures f ({ rayon_0_8_2.default = (f.rayon_0_8_2.default or true); rayon_core_1_2_1.default = true; }) [ rayon_core_1_2_1_features ]; rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ { dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_9 libc_0_2_32 num_cpus_1_7_0 rand_0_3_17 ]); }; - rayon_core_1_2_1_features = f: updateFeatures f (rec { + rayon_core_1_2_1_features = f: updateFeatures f ({ coco_0_1_1.default = true; futures_0_1_16.default = true; lazy_static_0_2_9.default = true; @@ -1082,24 +1082,24 @@ rec { rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true); }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_9_features libc_0_2_32_features num_cpus_1_7_0_features rand_0_3_17_features ]; redox_syscall_0_1_31 = { features?(redox_syscall_0_1_31_features {}) }: redox_syscall_0_1_31_ {}; - redox_syscall_0_1_31_features = f: updateFeatures f (rec { + redox_syscall_0_1_31_features = f: updateFeatures f ({ redox_syscall_0_1_31.default = (f.redox_syscall_0_1_31.default or true); }) []; redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { dependencies = mapFeatures features ([ redox_syscall_0_1_31 ]); }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_termios_0_1_1_features = f: updateFeatures f ({ redox_syscall_0_1_31.default = true; redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); }) [ redox_syscall_0_1_31_features ]; rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; - rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24_features = f: updateFeatures f ({ rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); }) []; scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ { features = mkFeatures (features.scoped_threadpool_0_1_8 or {}); }; - scoped_threadpool_0_1_8_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_8_features = f: updateFeatures f ({ scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true); }) []; scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ { @@ -1159,11 +1159,11 @@ rec { siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { dependencies = mapFeatures features ([]); }; - siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2_features = f: updateFeatures f ({ siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); }) []; strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0_features = f: updateFeatures f ({ strsim_0_6_0.default = (f.strsim_0_6_0.default or true); }) []; target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { @@ -1188,7 +1188,7 @@ rec { ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - tempfile_2_2_0_features = f: updateFeatures f (rec { + tempfile_2_2_0_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = true; libc_0_2_32.default = true; rand_0_3_17.default = true; @@ -1226,7 +1226,7 @@ rec { dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_32 ]) else []) ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 redox_termios_0_1_1 ]) else []); }; - termion_1_5_1_features = f: updateFeatures f (rec { + termion_1_5_1_features = f: updateFeatures f ({ libc_0_2_32.default = true; redox_syscall_0_1_31.default = true; redox_termios_0_1_1.default = true; @@ -1235,7 +1235,7 @@ rec { textwrap_0_8_0 = { features?(textwrap_0_8_0_features {}) }: textwrap_0_8_0_ { dependencies = mapFeatures features ([ term_size_0_3_0 unicode_width_0_1_4 ]); }; - textwrap_0_8_0_features = f: updateFeatures f (rec { + textwrap_0_8_0_features = f: updateFeatures f ({ term_size_0_3_0.default = true; textwrap_0_8_0.default = (f.textwrap_0_8_0.default or true); unicode_width_0_1_4.default = true; @@ -1243,7 +1243,7 @@ rec { unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4_features = f: updateFeatures f ({ unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { @@ -1264,7 +1264,7 @@ rec { way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ { dependencies = mapFeatures features ([ wayland_client_0_9_10 wayland_sys_0_9_10 ]); }; - way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec { + way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({ way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true); wayland_client_0_9_10.cursor = true; wayland_client_0_9_10.default = true; @@ -1309,7 +1309,7 @@ rec { wayland_scanner_0_9_10 = { features?(wayland_scanner_0_9_10_features {}) }: wayland_scanner_0_9_10_ { dependencies = mapFeatures features ([ xml_rs_0_6_1 ]); }; - wayland_scanner_0_9_10_features = f: updateFeatures f (rec { + wayland_scanner_0_9_10_features = f: updateFeatures f ({ wayland_scanner_0_9_10.default = (f.wayland_scanner_0_9_10.default or true); xml_rs_0_6_1.default = true; }) [ xml_rs_0_6_1_features ]; @@ -1339,7 +1339,7 @@ rec { dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_26_2 image_0_10_4 tempfile_2_2_0 way_cooler_client_helpers_0_1_0 wayland_client_0_9_10 wayland_sys_0_9_10 ]); buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]); }; - wc_bg_0_3_0_features = f: updateFeatures f (rec { + wc_bg_0_3_0_features = f: updateFeatures f ({ byteorder_0_5_3.default = true; clap_2_26_2.default = true; image_0_10_4.default = true; @@ -1355,17 +1355,17 @@ rec { wc_bg_0_3_0.default = (f.wc_bg_0_3_0.default or true); }) [ byteorder_0_5_3_features clap_2_26_2_features image_0_10_4_features tempfile_2_2_0_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_10_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ]; winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8_features = f: updateFeatures f ({ winapi_0_2_8.default = (f.winapi_0_2_8.default or true); }) []; winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1_features = f: updateFeatures f ({ winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); }) []; xml_rs_0_6_1 = { features?(xml_rs_0_6_1_features {}) }: xml_rs_0_6_1_ { dependencies = mapFeatures features ([ bitflags_0_9_1 ]); }; - xml_rs_0_6_1_features = f: updateFeatures f (rec { + xml_rs_0_6_1_features = f: updateFeatures f ({ bitflags_0_9_1.default = true; xml_rs_0_6_1.default = (f.xml_rs_0_6_1.default or true); }) [ bitflags_0_9_1_features ]; diff --git a/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-grab.nix index 6f936eb2e432..3264357b2fdb 100644 --- a/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-grab.nix +++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-grab.nix @@ -305,25 +305,25 @@ rec { inherit dependencies buildDependencies features; }; adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {}; - adler32_1_0_0_features = f: updateFeatures f (rec { + adler32_1_0_0_features = f: updateFeatures f ({ adler32_1_0_0.default = (f.adler32_1_0_0.default or true); }) []; ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; - ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0_features = f: updateFeatures f ({ ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); }) []; atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ { dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - atty_0_2_2_features = f: updateFeatures f (rec { + atty_0_2_2_features = f: updateFeatures f ({ atty_0_2_2.default = (f.atty_0_2_2.default or true); kernel32_sys_0_2_2.default = true; libc_0_2_21.default = true; winapi_0_2_8.default = true; }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; - bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); }) []; bitflags_0_8_0 = { features?(bitflags_0_8_0_features {}) }: bitflags_0_8_0_ { @@ -402,7 +402,7 @@ rec { vec_map_0_7_0.default = true; }) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_0_features strsim_0_6_0_features term_size_0_2_3_features unicode_segmentation_1_1_0_features unicode_width_0_1_4_features vec_map_0_7_0_features ]; color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; - color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0_features = f: updateFeatures f ({ color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); }) []; dbus_0_5_2 = { features?(dbus_0_5_2_features {}) }: dbus_0_5_2_ { @@ -410,7 +410,7 @@ rec { buildDependencies = mapFeatures features ([ metadeps_1_1_1 ]); features = mkFeatures (features.dbus_0_5_2 or {}); }; - dbus_0_5_2_features = f: updateFeatures f (rec { + dbus_0_5_2_features = f: updateFeatures f ({ dbus_0_5_2.default = (f.dbus_0_5_2.default or true); libc_0_2_21.default = true; metadeps_1_1_1.default = true; @@ -418,7 +418,7 @@ rec { deflate_0_7_5 = { features?(deflate_0_7_5_features {}) }: deflate_0_7_5_ { dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_0_0 ]); }; - deflate_0_7_5_features = f: updateFeatures f (rec { + deflate_0_7_5_features = f: updateFeatures f ({ adler32_1_0_0.default = true; byteorder_1_0_0.default = true; deflate_0_7_5.default = (f.deflate_0_7_5.default or true); @@ -426,14 +426,14 @@ rec { deque_0_3_1 = { features?(deque_0_3_1_features {}) }: deque_0_3_1_ { dependencies = mapFeatures features ([ rand_0_3_15 ]); }; - deque_0_3_1_features = f: updateFeatures f (rec { + deque_0_3_1_features = f: updateFeatures f ({ deque_0_3_1.default = (f.deque_0_3_1.default or true); rand_0_3_15.default = true; }) [ rand_0_3_15_features ]; enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { dependencies = mapFeatures features ([ num_traits_0_1_37 ]); }; - enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1_features = f: updateFeatures f ({ enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false); }) [ num_traits_0_1_37_features ]; @@ -470,7 +470,7 @@ rec { lzw_0_10_0.default = true; }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; - glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11_features = f: updateFeatures f ({ glob_0_2_11.default = (f.glob_0_2_11.default or true); }) []; image_0_12_3 = { features?(image_0_12_3_features {}) }: image_0_12_3_ { @@ -557,7 +557,7 @@ rec { inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { features = mkFeatures (features.inflate_0_1_1 or {}); }; - inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1_features = f: updateFeatures f ({ inflate_0_1_1.default = (f.inflate_0_1_1.default or true); }) []; jpeg_decoder_0_1_11 = { features?(jpeg_decoder_0_1_11_features {}) }: jpeg_decoder_0_1_11_ { @@ -578,7 +578,7 @@ rec { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -606,7 +606,7 @@ rec { metadeps_1_1_1 = { features?(metadeps_1_1_1_features {}) }: metadeps_1_1_1_ { dependencies = mapFeatures features ([ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]); }; - metadeps_1_1_1_features = f: updateFeatures f (rec { + metadeps_1_1_1_features = f: updateFeatures f ({ error_chain_0_7_2.default = (f.error_chain_0_7_2.default or false); metadeps_1_1_1.default = (f.metadeps_1_1_1.default or true); pkg_config_0_3_9.default = true; @@ -615,14 +615,14 @@ rec { num_integer_0_1_33 = { features?(num_integer_0_1_33_features {}) }: num_integer_0_1_33_ { dependencies = mapFeatures features ([ num_traits_0_1_37 ]); }; - num_integer_0_1_33_features = f: updateFeatures f (rec { + num_integer_0_1_33_features = f: updateFeatures f ({ num_integer_0_1_33.default = (f.num_integer_0_1_33.default or true); num_traits_0_1_37.default = true; }) [ num_traits_0_1_37_features ]; num_iter_0_1_33 = { features?(num_iter_0_1_33_features {}) }: num_iter_0_1_33_ { dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]); }; - num_iter_0_1_33_features = f: updateFeatures f (rec { + num_iter_0_1_33_features = f: updateFeatures f ({ num_integer_0_1_33.default = true; num_iter_0_1_33.default = (f.num_iter_0_1_33.default or true); num_traits_0_1_37.default = true; @@ -649,18 +649,18 @@ rec { num_traits_0_1_37.default = true; }) [ num_integer_0_1_33_features num_traits_0_1_37_features ]; num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {}; - num_traits_0_1_37_features = f: updateFeatures f (rec { + num_traits_0_1_37_features = f: updateFeatures f ({ num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true); }) []; num_cpus_1_3_0 = { features?(num_cpus_1_3_0_features {}) }: num_cpus_1_3_0_ { dependencies = mapFeatures features ([ libc_0_2_21 ]); }; - num_cpus_1_3_0_features = f: updateFeatures f (rec { + num_cpus_1_3_0_features = f: updateFeatures f ({ libc_0_2_21.default = true; num_cpus_1_3_0.default = (f.num_cpus_1_3_0.default or true); }) [ libc_0_2_21_features ]; pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; - pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9_features = f: updateFeatures f ({ pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); }) []; png_0_6_2 = { features?(png_0_6_2_features {}) }: png_0_6_2_ { @@ -686,7 +686,7 @@ rec { rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { dependencies = mapFeatures features ([ libc_0_2_21 ]); }; - rand_0_3_15_features = f: updateFeatures f (rec { + rand_0_3_15_features = f: updateFeatures f ({ libc_0_2_21.default = true; rand_0_3_15.default = (f.rand_0_3_15.default or true); }) [ libc_0_2_21_features ]; @@ -694,7 +694,7 @@ rec { dependencies = mapFeatures features ([ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]); features = mkFeatures (features.rayon_0_6_0 or {}); }; - rayon_0_6_0_features = f: updateFeatures f (rec { + rayon_0_6_0_features = f: updateFeatures f ({ deque_0_3_1.default = true; libc_0_2_21.default = true; num_cpus_1_3_0.default = true; @@ -704,11 +704,11 @@ rec { scoped_threadpool_0_1_7 = { features?(scoped_threadpool_0_1_7_features {}) }: scoped_threadpool_0_1_7_ { features = mkFeatures (features.scoped_threadpool_0_1_7 or {}); }; - scoped_threadpool_0_1_7_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_7_features = f: updateFeatures f ({ scoped_threadpool_0_1_7.default = (f.scoped_threadpool_0_1_7.default or true); }) []; strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0_features = f: updateFeatures f ({ strsim_0_6_0.default = (f.strsim_0_6_0.default or true); }) []; term_size_0_2_3 = { features?(term_size_0_2_3_features {}) }: term_size_0_2_3_ { @@ -750,13 +750,13 @@ rec { unicode_segmentation_1_1_0 = { features?(unicode_segmentation_1_1_0_features {}) }: unicode_segmentation_1_1_0_ { features = mkFeatures (features.unicode_segmentation_1_1_0 or {}); }; - unicode_segmentation_1_1_0_features = f: updateFeatures f (rec { + unicode_segmentation_1_1_0_features = f: updateFeatures f ({ unicode_segmentation_1_1_0.default = (f.unicode_segmentation_1_1_0.default or true); }) []; unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4_features = f: updateFeatures f ({ unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; vec_map_0_7_0 = { features?(vec_map_0_7_0_features {}) }: vec_map_0_7_0_ { @@ -777,18 +777,18 @@ rec { wc_grab_0_3_0 = { features?(wc_grab_0_3_0_features {}) }: wc_grab_0_3_0_ { dependencies = mapFeatures features ([ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]); }; - wc_grab_0_3_0_features = f: updateFeatures f (rec { + wc_grab_0_3_0_features = f: updateFeatures f ({ clap_2_22_0.default = true; dbus_0_5_2.default = true; image_0_12_3.default = true; wc_grab_0_3_0.default = (f.wc_grab_0_3_0.default or true); }) [ clap_2_22_0_features dbus_0_5_2_features image_0_12_3_features ]; winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8_features = f: updateFeatures f ({ winapi_0_2_8.default = (f.winapi_0_2_8.default or true); }) []; winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1_features = f: updateFeatures f ({ winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); }) []; } diff --git a/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-lock.nix index 1b9e3df3508e..6ffc5779a0b6 100644 --- a/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-lock.nix +++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-lock.nix @@ -557,21 +557,21 @@ rec { inherit dependencies buildDependencies features; }; ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; - ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0_features = f: updateFeatures f ({ ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); }) []; atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ { dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - atty_0_2_2_features = f: updateFeatures f (rec { + atty_0_2_2_features = f: updateFeatures f ({ atty_0_2_2.default = (f.atty_0_2_2.default or true); kernel32_sys_0_2_2.default = true; libc_0_2_23.default = true; winapi_0_2_8.default = true; }) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; - bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); }) []; bitflags_0_8_2 = { features?(bitflags_0_8_2_features {}) }: bitflags_0_8_2_ { @@ -674,20 +674,20 @@ rec { dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]); features = mkFeatures (features.coco_0_1_1 or {}); }; - coco_0_1_1_features = f: updateFeatures f (rec { + coco_0_1_1_features = f: updateFeatures f ({ coco_0_1_1.default = (f.coco_0_1_1.default or true); either_1_2_0.default = true; scopeguard_0_3_2.default = true; }) [ either_1_2_0_features scopeguard_0_3_2_features ]; color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; - color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0_features = f: updateFeatures f ({ color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); }) []; dbus_0_5_4 = { features?(dbus_0_5_4_features {}) }: dbus_0_5_4_ { dependencies = mapFeatures features ([ libc_0_2_23 libdbus_sys_0_1_1 ]); features = mkFeatures (features.dbus_0_5_4 or {}); }; - dbus_0_5_4_features = f: updateFeatures f (rec { + dbus_0_5_4_features = f: updateFeatures f ({ dbus_0_5_4.default = (f.dbus_0_5_4.default or true); libc_0_2_23.default = true; libdbus_sys_0_1_1.default = true; @@ -696,12 +696,12 @@ rec { dependencies = mapFeatures features ([ libloading_0_3_4 ]); features = mkFeatures (features.dlib_0_3_1 or {}); }; - dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1_features = f: updateFeatures f ({ dlib_0_3_1.default = (f.dlib_0_3_1.default or true); libloading_0_3_4.default = true; }) [ libloading_0_3_4_features ]; dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {}; - dtoa_0_4_1_features = f: updateFeatures f (rec { + dtoa_0_4_1_features = f: updateFeatures f ({ dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true); }) []; either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ { @@ -717,7 +717,7 @@ rec { enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { dependencies = mapFeatures features ([ num_traits_0_1_37 ]); }; - enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1_features = f: updateFeatures f ({ enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false); }) [ num_traits_0_1_37_features ]; @@ -765,7 +765,7 @@ rec { fs2_0_2_5 = { features?(fs2_0_2_5_features {}) }: fs2_0_2_5_ { dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]); }; - fs2_0_2_5_features = f: updateFeatures f (rec { + fs2_0_2_5_features = f: updateFeatures f ({ fs2_0_2_5.default = (f.fs2_0_2_5.default or true); kernel32_sys_0_2_2.default = true; libc_0_2_23.default = true; @@ -814,7 +814,7 @@ rec { lzw_0_10_0.default = true; }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; - glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11_features = f: updateFeatures f ({ glob_0_2_11.default = (f.glob_0_2_11.default or true); }) []; image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ { @@ -901,11 +901,11 @@ rec { inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { features = mkFeatures (features.inflate_0_1_1 or {}); }; - inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1_features = f: updateFeatures f ({ inflate_0_1_1.default = (f.inflate_0_1_1.default or true); }) []; itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {}; - itoa_0_3_1_features = f: updateFeatures f (rec { + itoa_0_3_1_features = f: updateFeatures f ({ itoa_0_3_1.default = (f.itoa_0_3_1.default or true); }) []; jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ { @@ -926,7 +926,7 @@ rec { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -958,7 +958,7 @@ rec { }) []; libdbus_sys_0_1_1 = { features?(libdbus_sys_0_1_1_features {}) }: libdbus_sys_0_1_1_ { buildDependencies = mapFeatures features ([ metadeps_1_1_2 ]);}; - libdbus_sys_0_1_1_features = f: updateFeatures f (rec { + libdbus_sys_0_1_1_features = f: updateFeatures f ({ libdbus_sys_0_1_1.default = (f.libdbus_sys_0_1_1.default or true); metadeps_1_1_2.default = true; }) [ metadeps_1_1_2_features ]; @@ -967,7 +967,7 @@ rec { ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); }; - libloading_0_3_4_features = f: updateFeatures f (rec { + libloading_0_3_4_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = true; lazy_static_0_2_8.default = true; libloading_0_3_4.default = (f.libloading_0_3_4.default or true); @@ -987,7 +987,7 @@ rec { memmap_0_4_0 = { features?(memmap_0_4_0_features {}) }: memmap_0_4_0_ { dependencies = mapFeatures features ([ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]); }; - memmap_0_4_0_features = f: updateFeatures f (rec { + memmap_0_4_0_features = f: updateFeatures f ({ fs2_0_2_5.default = true; kernel32_sys_0_2_2.default = true; libc_0_2_23.default = true; @@ -997,7 +997,7 @@ rec { metadeps_1_1_2 = { features?(metadeps_1_1_2_features {}) }: metadeps_1_1_2_ { dependencies = mapFeatures features ([ error_chain_0_10_0 pkg_config_0_3_9 toml_0_2_1 ]); }; - metadeps_1_1_2_features = f: updateFeatures f (rec { + metadeps_1_1_2_features = f: updateFeatures f ({ error_chain_0_10_0.default = (f.error_chain_0_10_0.default or false); metadeps_1_1_2.default = (f.metadeps_1_1_2.default or true); pkg_config_0_3_9.default = true; @@ -1007,7 +1007,7 @@ rec { dependencies = mapFeatures features ([ libc_0_2_23 ]); buildDependencies = mapFeatures features ([ cc_1_0_0 ]); }; - miniz_sys_0_1_10_features = f: updateFeatures f (rec { + miniz_sys_0_1_10_features = f: updateFeatures f ({ cc_1_0_0.default = true; libc_0_2_23.default = true; miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); @@ -1036,14 +1036,14 @@ rec { num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { dependencies = mapFeatures features ([ num_traits_0_1_37 ]); }; - num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35_features = f: updateFeatures f ({ num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); num_traits_0_1_37.default = true; }) [ num_traits_0_1_37_features ]; num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]); }; - num_iter_0_1_34_features = f: updateFeatures f (rec { + num_iter_0_1_34_features = f: updateFeatures f ({ num_integer_0_1_35.default = true; num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); num_traits_0_1_37.default = true; @@ -1074,13 +1074,13 @@ rec { rustc_serialize_0_3_24.default = true; }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_37_features rustc_serialize_0_3_24_features ]; num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {}; - num_traits_0_1_37_features = f: updateFeatures f (rec { + num_traits_0_1_37_features = f: updateFeatures f ({ num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true); }) []; num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ { dependencies = mapFeatures features ([ libc_0_2_23 ]); }; - num_cpus_1_6_2_features = f: updateFeatures f (rec { + num_cpus_1_6_2_features = f: updateFeatures f ({ libc_0_2_23.default = true; num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true); }) [ libc_0_2_23_features ]; @@ -1103,7 +1103,7 @@ rec { phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); }; - phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21_features = f: updateFeatures f ({ phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); phf_generator_0_7_21.default = true; phf_shared_0_7_21.default = true; @@ -1111,7 +1111,7 @@ rec { phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_15 ]); }; - phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21_features = f: updateFeatures f ({ phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); phf_shared_0_7_21.default = true; rand_0_3_15.default = true; @@ -1120,12 +1120,12 @@ rec { dependencies = mapFeatures features ([ siphasher_0_2_2 ]); features = mkFeatures (features.phf_shared_0_7_21 or {}); }; - phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21_features = f: updateFeatures f ({ phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); siphasher_0_2_2.default = true; }) [ siphasher_0_2_2_features ]; pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; - pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9_features = f: updateFeatures f ({ pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); }) []; png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ { @@ -1151,21 +1151,21 @@ rec { rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { dependencies = mapFeatures features ([ libc_0_2_23 ]); }; - rand_0_3_15_features = f: updateFeatures f (rec { + rand_0_3_15_features = f: updateFeatures f ({ libc_0_2_23.default = true; rand_0_3_15.default = (f.rand_0_3_15.default or true); }) [ libc_0_2_23_features ]; rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ { dependencies = mapFeatures features ([ rayon_core_1_2_1 ]); }; - rayon_0_8_2_features = f: updateFeatures f (rec { + rayon_0_8_2_features = f: updateFeatures f ({ rayon_0_8_2.default = (f.rayon_0_8_2.default or true); rayon_core_1_2_1.default = true; }) [ rayon_core_1_2_1_features ]; rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ { dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_8 libc_0_2_23 num_cpus_1_6_2 rand_0_3_15 ]); }; - rayon_core_1_2_1_features = f: updateFeatures f (rec { + rayon_core_1_2_1_features = f: updateFeatures f ({ coco_0_1_1.default = true; futures_0_1_16.default = true; lazy_static_0_2_8.default = true; @@ -1175,20 +1175,20 @@ rec { rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true); }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_8_features libc_0_2_23_features num_cpus_1_6_2_features rand_0_3_15_features ]; rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; - rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24_features = f: updateFeatures f ({ rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); }) []; rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ { dependencies = mapFeatures features ([ semver_0_1_20 ]); }; - rustc_version_0_1_7_features = f: updateFeatures f (rec { + rustc_version_0_1_7_features = f: updateFeatures f ({ rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true); semver_0_1_20.default = true; }) [ semver_0_1_20_features ]; scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ { features = mkFeatures (features.scoped_threadpool_0_1_8 or {}); }; - scoped_threadpool_0_1_8_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_8_features = f: updateFeatures f ({ scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true); }) []; scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ { @@ -1202,7 +1202,7 @@ rec { (scopeguard_0_3_2.default or false); }) []; semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {}; - semver_0_1_20_features = f: updateFeatures f (rec { + semver_0_1_20_features = f: updateFeatures f ({ semver_0_1_20.default = (f.semver_0_1_20.default or true); }) []; serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ { @@ -1252,11 +1252,11 @@ rec { siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { dependencies = mapFeatures features ([]); }; - siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2_features = f: updateFeatures f ({ siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); }) []; strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0_features = f: updateFeatures f ({ strsim_0_6_0.default = (f.strsim_0_6_0.default or true); }) []; target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { @@ -1281,7 +1281,7 @@ rec { ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]); }; - tempfile_2_1_5_features = f: updateFeatures f (rec { + tempfile_2_1_5_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = true; libc_0_2_23.default = true; rand_0_3_15.default = true; @@ -1328,13 +1328,13 @@ rec { unicode_segmentation_1_2_0 = { features?(unicode_segmentation_1_2_0_features {}) }: unicode_segmentation_1_2_0_ { features = mkFeatures (features.unicode_segmentation_1_2_0 or {}); }; - unicode_segmentation_1_2_0_features = f: updateFeatures f (rec { + unicode_segmentation_1_2_0_features = f: updateFeatures f ({ unicode_segmentation_1_2_0.default = (f.unicode_segmentation_1_2_0.default or true); }) []; unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4_features = f: updateFeatures f ({ unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { @@ -1355,7 +1355,7 @@ rec { way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ { dependencies = mapFeatures features ([ wayland_client_0_9_6 wayland_sys_0_9_6 ]); }; - way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec { + way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({ way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true); wayland_client_0_9_6.cursor = true; wayland_client_0_9_6.default = true; @@ -1400,7 +1400,7 @@ rec { wayland_kbd_0_9_0 = { features?(wayland_kbd_0_9_0_features {}) }: wayland_kbd_0_9_0_ { dependencies = mapFeatures features ([ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]); }; - wayland_kbd_0_9_0_features = f: updateFeatures f (rec { + wayland_kbd_0_9_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = true; dlib_0_3_1.default = true; lazy_static_0_2_8.default = true; @@ -1411,7 +1411,7 @@ rec { wayland_scanner_0_9_6 = { features?(wayland_scanner_0_9_6_features {}) }: wayland_scanner_0_9_6_ { dependencies = mapFeatures features ([ xml_rs_0_3_6 ]); }; - wayland_scanner_0_9_6_features = f: updateFeatures f (rec { + wayland_scanner_0_9_6_features = f: updateFeatures f ({ wayland_scanner_0_9_6.default = (f.wayland_scanner_0_9_6.default or true); xml_rs_0_3_6.default = true; }) [ xml_rs_0_3_6_features ]; @@ -1441,7 +1441,7 @@ rec { dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_24_2 dbus_0_5_4 image_0_10_4 libc_0_2_23 rand_0_3_15 tempfile_2_1_5 way_cooler_client_helpers_0_1_0 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_9_6 ]); buildDependencies = mapFeatures features ([ gcc_0_3_50 wayland_scanner_0_9_6 ]); }; - wc_lock_0_2_1_features = f: updateFeatures f (rec { + wc_lock_0_2_1_features = f: updateFeatures f ({ byteorder_0_5_3.default = true; clap_2_24_2.default = true; dbus_0_5_4.default = true; @@ -1462,17 +1462,17 @@ rec { wc_lock_0_2_1.default = (f.wc_lock_0_2_1.default or true); }) [ byteorder_0_5_3_features clap_2_24_2_features dbus_0_5_4_features image_0_10_4_features libc_0_2_23_features rand_0_3_15_features tempfile_2_1_5_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_6_features wayland_kbd_0_9_0_features wayland_sys_0_9_6_features gcc_0_3_50_features wayland_scanner_0_9_6_features ]; winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8_features = f: updateFeatures f ({ winapi_0_2_8.default = (f.winapi_0_2_8.default or true); }) []; winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1_features = f: updateFeatures f ({ winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); }) []; xml_rs_0_3_6 = { features?(xml_rs_0_3_6_features {}) }: xml_rs_0_3_6_ { dependencies = mapFeatures features ([ bitflags_0_7_0 ]); }; - xml_rs_0_3_6_features = f: updateFeatures f (rec { + xml_rs_0_3_6_features = f: updateFeatures f ({ bitflags_0_7_0.default = true; xml_rs_0_3_6.default = (f.xml_rs_0_3_6.default or true); }) [ bitflags_0_7_0_features ]; diff --git a/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/nixpkgs/pkgs/applications/window-managers/weston/default.nix index 99416fcf778a..34ad2bcc732f 100644 --- a/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, pkgconfig , wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev -, colord, lcms2 +, colord, lcms2, pipewire ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols # beware of null defaults, as the parameters *are* supplied by callPackage by default @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "weston"; - version = "6.0.1"; + version = "7.0.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"; + sha256 = "0r4sj11hq4brv3ryrgp2wmkkfz1h59vh9ih18igzjibagch6s2m0"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva libwebp wayland-protocols - colord lcms2 + colord lcms2 pipewire ]; mesonFlags= [ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "-Dbackend-rdp=${boolToString (freerdp != null)}" "-Dxwayland=${boolToString (xwayland != null)}" # Default is true! "-Dremoting=false" # TODO + "-Dpipewire=${boolToString (pipewire != null)}" "-Dimage-webp=${boolToString (libwebp != null)}" "-Dsimple-dmabuf-drm=" # Disables all drivers "-Ddemo-clients=false" diff --git a/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix index ad611f8dabe1..2013096d6fea 100644 --- a/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gnumake, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wmfs"; version = "201902"; diff --git a/nixpkgs/pkgs/applications/window-managers/wtftw/default.nix b/nixpkgs/pkgs/applications/window-managers/wtftw/default.nix index 60d3e61fdf96..36ca00b776bb 100644 --- a/nixpkgs/pkgs/applications/window-managers/wtftw/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wtftw/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { name = "wtftw-0.0pre20170921"; src = fetchFromGitHub { owner = "kintaro"; diff --git a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index e1ec09bc95a1..e02e77de45e4 100644 --- a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -180,10 +180,10 @@ stdenv.mkDerivation { else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isx86_32 then "i386" else if targetPlatform.isMips then { - "mips" = "btsmipn32"; # n32 variant - "mipsel" = "ltsmipn32"; # n32 variant - "mips64" = "btsmip"; - "mips64el" = "ltsmip"; + mips = "btsmipn32"; # n32 variant + mipsel = "ltsmipn32"; # n32 variant + mips64 = "btsmip"; + mips64el = "ltsmip"; }.${targetPlatform.parsed.cpu.name} else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" diff --git a/nixpkgs/pkgs/build-support/fetchdocker/default.nix b/nixpkgs/pkgs/build-support/fetchdocker/default.nix index bbd2bae46df5..57d2e4ad82d2 100644 --- a/nixpkgs/pkgs/build-support/fetchdocker/default.nix +++ b/nixpkgs/pkgs/build-support/fetchdocker/default.nix @@ -37,8 +37,8 @@ let repositories = writeText "repositories" (builtins.toJSON { - "${repoTag1}" = { - "${tag}" = lib.last layers; + ${repoTag1} = { + ${tag} = lib.last layers; }; }); diff --git a/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git b/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git index b447911ab8d3..931be1a37007 100755 --- a/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git @@ -265,7 +265,9 @@ make_deterministic_repo(){ rm -f .git/config # Garbage collect unreferenced objects. - git gc --prune=all + # Note: --keep-largest-pack prevents non-deterministic ordering of packs + # listed in .git/objects/info/packs by only using a single pack + git gc --prune=all --keep-largest-pack ) } diff --git a/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix b/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix index 1ca1e45f2fbb..ec7d289996b3 100644 --- a/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix +++ b/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix @@ -1,4 +1,4 @@ -rec { +{ # Content-addressable Nix mirrors. hashedMirrors = [ diff --git a/nixpkgs/pkgs/build-support/install-shell-files/default.nix b/nixpkgs/pkgs/build-support/install-shell-files/default.nix new file mode 100644 index 000000000000..e1f2e24dd875 --- /dev/null +++ b/nixpkgs/pkgs/build-support/install-shell-files/default.nix @@ -0,0 +1,4 @@ +{ makeSetupHook }: + +# See the header comment in ../setup-hooks/install-shell-files.sh for example usage. +makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh diff --git a/nixpkgs/pkgs/build-support/nix-prefetch-github/default.nix b/nixpkgs/pkgs/build-support/nix-prefetch-github/default.nix index 3c5cbe2b4928..10a6daaf53f7 100644 --- a/nixpkgs/pkgs/build-support/nix-prefetch-github/default.nix +++ b/nixpkgs/pkgs/build-support/nix-prefetch-github/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-prefetch-github"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "0b2hgfyxhlqq6lyi5cr98dz6if5kl6b3kq67f2lzfkalydywl1dh"; + sha256 = "13wvq13iiva97a16kahfpxar5ppb015nnbn7d4v9s9jyxdickc2c"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/build-support/oci-tools/default.nix b/nixpkgs/pkgs/build-support/oci-tools/default.nix new file mode 100644 index 000000000000..18b238033ffd --- /dev/null +++ b/nixpkgs/pkgs/build-support/oci-tools/default.nix @@ -0,0 +1,78 @@ +{ lib, writeText, runCommand, writeReferencesToFile }: + +{ + buildContainer = + { args + , mounts ? {} + , os ? "linux" + , arch ? "x86_64" + , readonly ? false + }: + let + sysMounts = { + "/proc" = { + type = "proc"; + source = "proc"; + }; + "/dev" = { + type = "tmpfs"; + source = "tmpfs"; + options = [ "nosuid" "strictatime" "mode=755" "size=65536k" ]; + }; + "/dev/pts" = { + type = "devpts"; + source = "devpts"; + options = [ "nosuid" "noexec" "newinstance" "ptmxmode=0666" "mode=755" "gid=5" ]; + }; + "/dev/shm" = { + type = "tmpfs"; + source = "shm"; + options = [ "nosuid" "noexec" "nodev" "mode=1777" "size=65536k" ]; + }; + "/dev/mqueue" = { + type = "mqueue"; + source = "mqueue"; + options = [ "nosuid" "noexec" "nodev" ]; + }; + "/sys" = { + type = "sysfs"; + source = "sysfs"; + options = [ "nosuid" "noexec" "nodev" "ro" ]; + }; + "/sys/fs/cgroup" = { + type = "cgroup"; + source = "cgroup"; + options = [ "nosuid" "noexec" "nodev" "realatime" "ro" ]; + }; + }; + config = writeText "config.json" (builtins.toJSON { + ociVersion = "1.0.0"; + platform = { + inherit os arch; + }; + + linux = { + namespaces = map (type: { inherit type; }) [ "pid" "network" "mount" "ipc" "uts" ]; + }; + + root = { path = "rootfs"; inherit readonly; }; + + process = { + inherit args; + user = { uid = 0; gid = 0; }; + cwd = "/"; + }; + + mounts = lib.mapAttrsToList (destination: { type, source, options ? null }: { + inherit destination type source options; + }) sysMounts; + }); + in + runCommand "join" {} '' + set -o pipefail + mkdir -p $out/rootfs/{dev,proc,sys} + cp ${config} $out/config.json + xargs tar c < ${writeReferencesToFile args} | tar -xC $out/rootfs/ + ''; +} + diff --git a/nixpkgs/pkgs/build-support/release/maven-build.nix b/nixpkgs/pkgs/build-support/release/maven-build.nix index f7ea07baccbe..71eb63b850d5 100644 --- a/nixpkgs/pkgs/build-support/release/maven-build.nix +++ b/nixpkgs/pkgs/build-support/release/maven-build.nix @@ -15,7 +15,7 @@ let mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}"; in -stdenv.mkDerivation ( rec { +stdenv.mkDerivation ( { inherit name src; phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix index 068cc5a98843..ab9b0a13ae77 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix @@ -44,7 +44,7 @@ rec { alloc_no_stdlib_1_3_0 = { features?(alloc_no_stdlib_1_3_0_features {}) }: alloc_no_stdlib_1_3_0_ { features = mkFeatures (features.alloc_no_stdlib_1_3_0 or {}); }; - alloc_no_stdlib_1_3_0_features = f: updateFeatures f (rec { + alloc_no_stdlib_1_3_0_features = f: updateFeatures f ({ alloc_no_stdlib_1_3_0.default = (f.alloc_no_stdlib_1_3_0.default or true); }) []; brotli_2_5_0 = { features?(brotli_2_5_0_features {}) }: brotli_2_5_0_ { @@ -52,20 +52,20 @@ rec { features = mkFeatures (features.brotli_2_5_0 or {}); }; brotli_2_5_0_features = f: updateFeatures f (rec { - alloc_no_stdlib_1_3_0."no-stdlib" = - (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) || - (brotli_2_5_0."no-stdlib" or false) || - (f.brotli_2_5_0."no-stdlib" or false); + alloc_no_stdlib_1_3_0.no-stdlib = + (f.alloc_no_stdlib_1_3_0.no-stdlib or false) || + (brotli_2_5_0.no-stdlib or false) || + (f.brotli_2_5_0.no-stdlib or false); alloc_no_stdlib_1_3_0.default = true; brotli_2_5_0.default = (f.brotli_2_5_0.default or true); - brotli_decompressor_1_3_1."disable-timer" = - (f.brotli_decompressor_1_3_1."disable-timer" or false) || - (brotli_2_5_0."disable-timer" or false) || - (f.brotli_2_5_0."disable-timer" or false); - brotli_decompressor_1_3_1."no-stdlib" = - (f.brotli_decompressor_1_3_1."no-stdlib" or false) || - (brotli_2_5_0."no-stdlib" or false) || - (f.brotli_2_5_0."no-stdlib" or false); + brotli_decompressor_1_3_1.disable-timer = + (f.brotli_decompressor_1_3_1.disable-timer or false) || + (brotli_2_5_0.disable-timer or false) || + (f.brotli_2_5_0.disable-timer or false); + brotli_decompressor_1_3_1.no-stdlib = + (f.brotli_decompressor_1_3_1.no-stdlib or false) || + (brotli_2_5_0.no-stdlib or false) || + (f.brotli_2_5_0.no-stdlib or false); brotli_decompressor_1_3_1.benchmark = (f.brotli_decompressor_1_3_1.benchmark or false) || (brotli_2_5_0.benchmark or false) || @@ -81,10 +81,10 @@ rec { features = mkFeatures (features.brotli_decompressor_1_3_1 or {}); }; brotli_decompressor_1_3_1_features = f: updateFeatures f (rec { - alloc_no_stdlib_1_3_0."no-stdlib" = - (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) || - (brotli_decompressor_1_3_1."no-stdlib" or false) || - (f.brotli_decompressor_1_3_1."no-stdlib" or false); + alloc_no_stdlib_1_3_0.no-stdlib = + (f.alloc_no_stdlib_1_3_0.no-stdlib or false) || + (brotli_decompressor_1_3_1.no-stdlib or false) || + (f.brotli_decompressor_1_3_1.no-stdlib or false); alloc_no_stdlib_1_3_0.default = true; alloc_no_stdlib_1_3_0.unsafe = (f.alloc_no_stdlib_1_3_0.unsafe or false) || diff --git a/nixpkgs/pkgs/build-support/rust/crates-io.nix b/nixpkgs/pkgs/build-support/rust/crates-io.nix index 9dd2da28ad5b..66f98cd99121 100644 --- a/nixpkgs/pkgs/build-support/rust/crates-io.nix +++ b/nixpkgs/pkgs/build-support/rust/crates-io.nix @@ -19,7 +19,7 @@ rec { (crates."memchr"."${deps."aho_corasick"."0.6.10"."memchr"}" deps) ]); }; - features_.aho_corasick."0.6.10" = deps: f: updateFeatures f (rec { + features_.aho_corasick."0.6.10" = deps: f: updateFeatures f ({ aho_corasick."0.6.10".default = (f.aho_corasick."0.6.10".default or true); memchr."${deps.aho_corasick."0.6.10".memchr}".default = true; }) [ @@ -42,7 +42,7 @@ rec { (crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps) ]); }; - features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec { + features_.aho_corasick."0.6.8" = deps: f: updateFeatures f ({ aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true); memchr."${deps.aho_corasick."0.6.8".memchr}".default = true; }) [ @@ -62,7 +62,7 @@ rec { (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps) ]) else []); }; - features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec { + features_.ansi_term."0.11.0" = deps: f: updateFeatures f ({ ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true); winapi = fold recursiveUpdate {} [ { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; } @@ -186,7 +186,7 @@ rec { (crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps) ]) else []); }; - features_.atty."0.2.11" = deps: f: updateFeatures f (rec { + features_.atty."0.2.11" = deps: f: updateFeatures f ({ atty."0.2.11".default = (f.atty."0.2.11".default or true); libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false); termion."${deps.atty."0.2.11".termion}".default = true; @@ -215,7 +215,7 @@ rec { authors = [ "Josh Stone <cuviper@gmail.com>" ]; sha256 = "0dv81dwnp1al3j4ffz007yrjv4w1c7hw09gnf0xs3icxiw6qqfs3"; }; - features_.autocfg."0.1.2" = deps: f: updateFeatures f (rec { + features_.autocfg."0.1.2" = deps: f: updateFeatures f ({ autocfg."0.1.2".default = (f.autocfg."0.1.2".default or true); }) []; @@ -461,7 +461,7 @@ rec { (crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps) ]); }; - features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec { + features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f ({ backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true); cc."${deps.backtrace_sys."0.1.24".cc}".default = true; libc."${deps.backtrace_sys."0.1.24".libc}".default = true; @@ -489,7 +489,7 @@ rec { (crates."cc"."${deps."backtrace_sys"."0.1.28"."cc"}" deps) ]); }; - features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f (rec { + features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f ({ backtrace_sys."0.1.28".default = (f.backtrace_sys."0.1.28".default or true); cc."${deps.backtrace_sys."0.1.28".cc}".default = true; libc."${deps.backtrace_sys."0.1.28".libc}".default = (f.libc."${deps.backtrace_sys."0.1.28".libc}".default or false); @@ -509,7 +509,7 @@ rec { sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; features = mkFeatures (features."bitflags"."1.0.4" or {}); }; - features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + features_.bitflags."1.0.4" = deps: f: updateFeatures f ({ bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); }) []; @@ -582,7 +582,7 @@ rec { (crates."url"."${deps."carnix"."0.10.0"."url"}" deps) ]); }; - features_.carnix."0.10.0" = deps: f: updateFeatures f (rec { + features_.carnix."0.10.0" = deps: f: updateFeatures f ({ carnix."0.10.0".default = (f.carnix."0.10.0".default or true); clap."${deps.carnix."0.10.0".clap}".default = true; dirs."${deps.carnix."0.10.0".dirs}".default = true; @@ -645,7 +645,7 @@ rec { (crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps) ]); }; - features_.carnix."0.9.1" = deps: f: updateFeatures f (rec { + features_.carnix."0.9.1" = deps: f: updateFeatures f ({ carnix."0.9.1".default = (f.carnix."0.9.1".default or true); clap."${deps.carnix."0.9.1".clap}".default = true; dirs."${deps.carnix."0.9.1".dirs}".default = true; @@ -704,7 +704,7 @@ rec { (crates."toml"."${deps."carnix"."0.9.2"."toml"}" deps) ]); }; - features_.carnix."0.9.2" = deps: f: updateFeatures f (rec { + features_.carnix."0.9.2" = deps: f: updateFeatures f ({ carnix."0.9.2".default = (f.carnix."0.9.2".default or true); clap."${deps.carnix."0.9.2".clap}".default = true; dirs."${deps.carnix."0.9.2".dirs}".default = true; @@ -764,7 +764,7 @@ rec { (crates."url"."${deps."carnix"."0.9.8"."url"}" deps) ]); }; - features_.carnix."0.9.8" = deps: f: updateFeatures f (rec { + features_.carnix."0.9.8" = deps: f: updateFeatures f ({ carnix."0.9.8".default = (f.carnix."0.9.8".default or true); clap."${deps.carnix."0.9.8".clap}".default = true; dirs."${deps.carnix."0.9.8".dirs}".default = true; @@ -854,7 +854,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n"; }; - features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec { + features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({ cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true); }) []; @@ -869,7 +869,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "13gvcx1dxjq4mpmpj26hpg3yc97qffkx2zi58ykr1dwr8q2biiig"; }; - features_.cfg_if."0.1.7" = deps: f: updateFeatures f (rec { + features_.cfg_if."0.1.7" = deps: f: updateFeatures f ({ cfg_if."0.1.7".default = (f.cfg_if."0.1.7".default or true); }) []; @@ -1001,7 +1001,7 @@ rec { authors = [ "Cesar Eduardo Barros <cesarb@cesarb.eti.br>" ]; sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd"; }; - features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec { + features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f ({ constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true); }) []; @@ -1024,7 +1024,7 @@ rec { (crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps) ]) else []); }; - features_.dirs."1.0.4" = deps: f: updateFeatures f (rec { + features_.dirs."1.0.4" = deps: f: updateFeatures f ({ dirs."1.0.4".default = (f.dirs."1.0.4".default or true); libc."${deps.dirs."1.0.4".libc}".default = true; redox_users."${deps.dirs."1.0.4".redox_users}".default = true; @@ -1062,7 +1062,7 @@ rec { (crates."winapi"."${deps."dirs"."1.0.5"."winapi"}" deps) ]) else []); }; - features_.dirs."1.0.5" = deps: f: updateFeatures f (rec { + features_.dirs."1.0.5" = deps: f: updateFeatures f ({ dirs."1.0.5".default = (f.dirs."1.0.5".default or true); libc."${deps.dirs."1.0.5".libc}".default = true; redox_users."${deps.dirs."1.0.5".redox_users}".default = true; @@ -1359,7 +1359,7 @@ rec { ]); features = mkFeatures (features."failure_derive"."0.1.3" or {}); }; - features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec { + features_.failure_derive."0.1.3" = deps: f: updateFeatures f ({ failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true); proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true; quote."${deps.failure_derive."0.1.3".quote}".default = true; @@ -1392,7 +1392,7 @@ rec { ]); features = mkFeatures (features."failure_derive"."0.1.5" or {}); }; - features_.failure_derive."0.1.5" = deps: f: updateFeatures f (rec { + features_.failure_derive."0.1.5" = deps: f: updateFeatures f ({ failure_derive."0.1.5".default = (f.failure_derive."0.1.5".default or true); proc_macro2."${deps.failure_derive."0.1.5".proc_macro2}".default = true; quote."${deps.failure_derive."0.1.5".quote}".default = true; @@ -1417,7 +1417,7 @@ rec { edition = "2018"; sha256 = "07apwv9dj716yjlcj29p94vkqn5zmfh7hlrqvrjx3wzshphc95h9"; }; - features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f (rec { + features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f ({ fuchsia_cprng."0.1.1".default = (f.fuchsia_cprng."0.1.1".default or true); }) []; @@ -1435,7 +1435,7 @@ rec { (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) ]); }; - features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({ bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; @@ -1454,7 +1454,7 @@ rec { authors = [ "Raph Levien <raph@google.com>" ]; sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; }; - features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({ fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); }) []; @@ -1472,7 +1472,7 @@ rec { (crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps) ]); }; - features_.humantime."1.1.1" = deps: f: updateFeatures f (rec { + features_.humantime."1.1.1" = deps: f: updateFeatures f ({ humantime."1.1.1".default = (f.humantime."1.1.1".default or true); quick_error."${deps.humantime."1.1.1".quick_error}".default = true; }) [ @@ -1494,7 +1494,7 @@ rec { (crates."quick_error"."${deps."humantime"."1.2.0"."quick_error"}" deps) ]); }; - features_.humantime."1.2.0" = deps: f: updateFeatures f (rec { + features_.humantime."1.2.0" = deps: f: updateFeatures f ({ humantime."1.2.0".default = (f.humantime."1.2.0".default or true); quick_error."${deps.humantime."1.2.0".quick_error}".default = true; }) [ @@ -1516,7 +1516,7 @@ rec { (crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps) ]); }; - features_.idna."0.1.5" = deps: f: updateFeatures f (rec { + features_.idna."0.1.5" = deps: f: updateFeatures f ({ idna."0.1.5".default = (f.idna."0.1.5".default or true); matches."${deps.idna."0.1.5".matches}".default = true; unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true; @@ -1730,7 +1730,7 @@ rec { ]); features = mkFeatures (features."log"."0.4.5" or {}); }; - features_.log."0.4.5" = deps: f: updateFeatures f (rec { + features_.log."0.4.5" = deps: f: updateFeatures f ({ cfg_if."${deps.log."0.4.5".cfg_if}".default = true; log."0.4.5".default = (f.log."0.4.5".default or true); }) [ @@ -1752,7 +1752,7 @@ rec { ]); features = mkFeatures (features."log"."0.4.6" or {}); }; - features_.log."0.4.6" = deps: f: updateFeatures f (rec { + features_.log."0.4.6" = deps: f: updateFeatures f ({ cfg_if."${deps.log."0.4.6".cfg_if}".default = true; log."0.4.6".default = (f.log."0.4.6".default or true); }) [ @@ -1770,7 +1770,7 @@ rec { sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv"; libPath = "lib.rs"; }; - features_.matches."0.1.8" = deps: f: updateFeatures f (rec { + features_.matches."0.1.8" = deps: f: updateFeatures f ({ matches."0.1.8".default = (f.matches."0.1.8".default or true); }) []; @@ -2004,7 +2004,7 @@ rec { sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; libPath = "lib.rs"; }; - features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({ percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); }) []; @@ -2077,7 +2077,7 @@ rec { authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ]; sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5"; }; - features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec { + features_.quick_error."1.2.2" = deps: f: updateFeatures f ({ quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true); }) []; @@ -2362,7 +2362,7 @@ rec { ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ ]) else []); }; - features_.rand_os."0.1.3" = deps: f: updateFeatures f (rec { + features_.rand_os."0.1.3" = deps: f: updateFeatures f ({ cloudabi."${deps.rand_os."0.1.3".cloudabi}".default = true; fuchsia_cprng."${deps.rand_os."0.1.3".fuchsia_cprng}".default = true; libc."${deps.rand_os."0.1.3".libc}".default = true; @@ -2426,7 +2426,7 @@ rec { sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; libName = "syscall"; }; - features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec { + features_.redox_syscall."0.1.40" = deps: f: updateFeatures f ({ redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true); }) []; @@ -2442,7 +2442,7 @@ rec { sha256 = "1a61cv7yydx64vpyvzr0z0hwzdvy4gcvcnfc6k70zpkngj5sz3ip"; libName = "syscall"; }; - features_.redox_syscall."0.1.51" = deps: f: updateFeatures f (rec { + features_.redox_syscall."0.1.51" = deps: f: updateFeatures f ({ redox_syscall."0.1.51".default = (f.redox_syscall."0.1.51".default or true); }) []; @@ -2460,7 +2460,7 @@ rec { (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) ]); }; - features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({ redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); }) [ @@ -2483,7 +2483,7 @@ rec { (crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) ]); }; - features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec { + features_.redox_users."0.2.0" = deps: f: updateFeatures f ({ argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false); failure."${deps.redox_users."0.2.0".failure}".default = true; rand."${deps.redox_users."0.2.0".rand}".default = true; @@ -2513,7 +2513,7 @@ rec { (crates."redox_syscall"."${deps."redox_users"."0.3.0"."redox_syscall"}" deps) ]); }; - features_.redox_users."0.3.0" = deps: f: updateFeatures f (rec { + features_.redox_users."0.3.0" = deps: f: updateFeatures f ({ argon2rs."${deps.redox_users."0.3.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.3.0".argon2rs}".default or false); failure."${deps.redox_users."0.3.0".failure}".default = true; rand_os."${deps.redox_users."0.3.0".rand_os}".default = true; @@ -2626,7 +2626,7 @@ rec { (crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) ]); }; - features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.6.2" = deps: f: updateFeatures f ({ regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true); ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true; }) [ @@ -2647,7 +2647,7 @@ rec { (crates."ucd_util"."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps) ]); }; - features_.regex_syntax."0.6.5" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.6.5" = deps: f: updateFeatures f ({ regex_syntax."0.6.5".default = (f.regex_syntax."0.6.5".default or true); ucd_util."${deps.regex_syntax."0.6.5".ucd_util}".default = true; }) [ @@ -2667,7 +2667,7 @@ rec { (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) ]) else []); }; - features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec { + features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({ remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); winapi = fold recursiveUpdate {} [ { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } @@ -2692,7 +2692,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0sr6cr02araqnlqwc5ghvnafjmkw11vzjswqaz757lvyrcl8xcy6"; }; - features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f (rec { + features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f ({ rustc_demangle."0.1.13".default = (f.rustc_demangle."0.1.13".default or true); }) []; @@ -2706,7 +2706,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax"; }; - features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec { + features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f ({ rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true); }) []; @@ -2724,7 +2724,7 @@ rec { ]); features = mkFeatures (features."ryu"."0.2.6" or {}); }; - features_.ryu."0.2.6" = deps: f: updateFeatures f (rec { + features_.ryu."0.2.6" = deps: f: updateFeatures f ({ ryu."0.2.6".default = (f.ryu."0.2.6".default or true); }) []; @@ -2743,7 +2743,7 @@ rec { ]); features = mkFeatures (features."ryu"."0.2.7" or {}); }; - features_.ryu."0.2.7" = deps: f: updateFeatures f (rec { + features_.ryu."0.2.7" = deps: f: updateFeatures f ({ ryu."0.2.7".default = (f.ryu."0.2.7".default or true); }) []; @@ -2758,7 +2758,7 @@ rec { sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v"; features = mkFeatures (features."scoped_threadpool"."0.1.9" or {}); }; - features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec { + features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f ({ scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true); }) []; @@ -2876,7 +2876,7 @@ rec { ]); features = mkFeatures (features."serde_derive"."1.0.80" or {}); }; - features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec { + features_.serde_derive."1.0.80" = deps: f: updateFeatures f ({ proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true; quote."${deps.serde_derive."1.0.80".quote}".default = true; serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true); @@ -2908,7 +2908,7 @@ rec { ]); features = mkFeatures (features."serde_derive"."1.0.89" or {}); }; - features_.serde_derive."1.0.89" = deps: f: updateFeatures f (rec { + features_.serde_derive."1.0.89" = deps: f: updateFeatures f ({ proc_macro2."${deps.serde_derive."1.0.89".proc_macro2}".default = true; quote."${deps.serde_derive."1.0.89".quote}".default = true; serde_derive."1.0.89".default = (f.serde_derive."1.0.89".default or true); @@ -3024,7 +3024,7 @@ rec { authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; }; - features_.strsim."0.7.0" = deps: f: updateFeatures f (rec { + features_.strsim."0.7.0" = deps: f: updateFeatures f ({ strsim."0.7.0".default = (f.strsim."0.7.0".default or true); }) []; @@ -3176,7 +3176,7 @@ rec { ]); features = mkFeatures (features."synstructure"."0.10.0" or {}); }; - features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec { + features_.synstructure."0.10.0" = deps: f: updateFeatures f ({ proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true; quote."${deps.synstructure."0.10.0".quote}".default = true; syn = fold recursiveUpdate {} [ @@ -3211,7 +3211,7 @@ rec { ]); features = mkFeatures (features."synstructure"."0.10.1" or {}); }; - features_.synstructure."0.10.1" = deps: f: updateFeatures f (rec { + features_.synstructure."0.10.1" = deps: f: updateFeatures f ({ proc_macro2."${deps.synstructure."0.10.1".proc_macro2}".default = true; quote."${deps.synstructure."0.10.1".quote}".default = true; syn = fold recursiveUpdate {} [ @@ -3242,7 +3242,7 @@ rec { (crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) ]); }; - features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec { + features_.tempdir."0.3.7" = deps: f: updateFeatures f ({ rand."${deps.tempdir."0.3.7".rand}".default = true; remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true; tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true); @@ -3264,7 +3264,7 @@ rec { (crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps) ]) else []); }; - features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec { + features_.termcolor."1.0.4" = deps: f: updateFeatures f ({ termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true); wincolor."${deps.termcolor."1.0.4".wincolor}".default = true; }) [ @@ -3288,7 +3288,7 @@ rec { (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) ]) else []); }; - features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + features_.termion."1.5.1" = deps: f: updateFeatures f ({ libc."${deps.termion."1.5.1".libc}".default = true; redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; @@ -3312,7 +3312,7 @@ rec { (crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps) ]); }; - features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec { + features_.textwrap."0.10.0" = deps: f: updateFeatures f ({ textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true); unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true; }) [ @@ -3332,7 +3332,7 @@ rec { (crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps) ]); }; - features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec { + features_.thread_local."0.3.6" = deps: f: updateFeatures f ({ lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true; thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true); }) [ @@ -3352,7 +3352,7 @@ rec { (crates."serde"."${deps."toml"."0.4.10"."serde"}" deps) ]); }; - features_.toml."0.4.10" = deps: f: updateFeatures f (rec { + features_.toml."0.4.10" = deps: f: updateFeatures f ({ serde."${deps.toml."0.4.10".serde}".default = true; toml."0.4.10".default = (f.toml."0.4.10".default or true); }) [ @@ -3372,7 +3372,7 @@ rec { (crates."serde"."${deps."toml"."0.4.8"."serde"}" deps) ]); }; - features_.toml."0.4.8" = deps: f: updateFeatures f (rec { + features_.toml."0.4.8" = deps: f: updateFeatures f ({ serde."${deps.toml."0.4.8".serde}".default = true; toml."0.4.8".default = (f.toml."0.4.8".default or true); }) [ @@ -3420,7 +3420,7 @@ rec { (crates."toml"."${deps."toml2nix"."0.1.1"."toml"}" deps) ]); }; - features_.toml2nix."0.1.1" = deps: f: updateFeatures f (rec { + features_.toml2nix."0.1.1" = deps: f: updateFeatures f ({ toml."${deps.toml2nix."0.1.1".toml}".default = true; toml2nix."0.1.1".default = (f.toml2nix."0.1.1".default or true); }) [ @@ -3437,7 +3437,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; }; - features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec { + features_.ucd_util."0.1.1" = deps: f: updateFeatures f ({ ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true); }) []; @@ -3452,7 +3452,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1n1qi3jywq5syq90z9qd8qzbn58pcjgv1sx4sdmipm4jf9zanz15"; }; - features_.ucd_util."0.1.3" = deps: f: updateFeatures f (rec { + features_.ucd_util."0.1.3" = deps: f: updateFeatures f ({ ucd_util."0.1.3".default = (f.ucd_util."0.1.3".default or true); }) []; @@ -3502,7 +3502,7 @@ rec { authors = [ "kwantam <kwantam@gmail.com>" ]; sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; }; - features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec { + features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f ({ unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true); }) []; @@ -3520,7 +3520,7 @@ rec { (crates."smallvec"."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps) ]); }; - features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f (rec { + features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f ({ smallvec."${deps.unicode_normalization."0.1.8".smallvec}".default = true; unicode_normalization."0.1.8".default = (f.unicode_normalization."0.1.8".default or true); }) [ @@ -3538,7 +3538,7 @@ rec { sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; features = mkFeatures (features."unicode_width"."0.1.5" or {}); }; - features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec { + features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({ unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true); }) []; @@ -3553,7 +3553,7 @@ rec { sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; features = mkFeatures (features."unicode_xid"."0.1.0" or {}); }; - features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec { + features_.unicode_xid."0.1.0" = deps: f: updateFeatures f ({ unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true); }) []; @@ -3604,7 +3604,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp"; }; - features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec { + features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f ({ utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true); }) []; @@ -3619,7 +3619,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1my02laqsgnd8ib4dvjgd4rilprqjad6pb9jj9vi67csi5qs2281"; }; - features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f (rec { + features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f ({ utf8_ranges."1.0.2".default = (f.utf8_ranges."1.0.2".default or true); }) []; @@ -3656,7 +3656,7 @@ rec { authors = [ "Sergio Benitez <sb@sergio.bz>" ]; sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd"; }; - features_.version_check."0.1.5" = deps: f: updateFeatures f (rec { + features_.version_check."0.1.5" = deps: f: updateFeatures f ({ version_check."0.1.5".default = (f.version_check."0.1.5".default or true); }) []; @@ -3678,7 +3678,7 @@ rec { ]) else []); features = mkFeatures (features."winapi"."0.3.6" or {}); }; - features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + features_.winapi."0.3.6" = deps: f: updateFeatures f ({ winapi."0.3.6".default = (f.winapi."0.3.6".default or true); winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; @@ -3698,7 +3698,7 @@ rec { sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; build = "build.rs"; }; - features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); }) []; @@ -3715,7 +3715,7 @@ rec { (crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps) ]) else []); }; - features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec { + features_.winapi_util."0.1.1" = deps: f: updateFeatures f ({ winapi = fold recursiveUpdate {} [ { "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; } { "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; } @@ -3747,7 +3747,7 @@ rec { (crates."winapi"."${deps."winapi_util"."0.1.2"."winapi"}" deps) ]) else []); }; - features_.winapi_util."0.1.2" = deps: f: updateFeatures f (rec { + features_.winapi_util."0.1.2" = deps: f: updateFeatures f ({ winapi = fold recursiveUpdate {} [ { "${deps.winapi_util."0.1.2".winapi}"."consoleapi" = true; } { "${deps.winapi_util."0.1.2".winapi}"."errhandlingapi" = true; } @@ -3777,7 +3777,7 @@ rec { sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; build = "build.rs"; }; - features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); }) []; @@ -3795,7 +3795,7 @@ rec { (crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps) ]); }; - features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec { + features_.wincolor."1.0.1" = deps: f: updateFeatures f ({ winapi = fold recursiveUpdate {} [ { "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; } { "${deps.wincolor."1.0.1".winapi}"."wincon" = true; } @@ -4104,7 +4104,7 @@ rec { dependencies = mapFeatures features ([ ]); }; - features_.bytesize."1.0.0" = deps: f: updateFeatures f (rec { + features_.bytesize."1.0.0" = deps: f: updateFeatures f ({ bytesize."1.0.0".default = (f.bytesize."1.0.0".default or true); }) []; @@ -4549,7 +4549,7 @@ rec { build = "build.rs"; features = mkFeatures (features."core_foundation_sys"."0.6.2" or {}); }; - features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f (rec { + features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f ({ core_foundation_sys."0.6.2".default = (f.core_foundation_sys."0.6.2".default or true); }) []; @@ -4576,7 +4576,7 @@ rec { (crates."url"."${deps."crates_io"."0.23.0"."url"}" deps) ]); }; - features_.crates_io."0.23.0" = deps: f: updateFeatures f (rec { + features_.crates_io."0.23.0" = deps: f: updateFeatures f ({ crates_io."0.23.0".default = (f.crates_io."0.23.0".default or true); curl."${deps.crates_io."0.23.0".curl}".default = true; failure."${deps.crates_io."0.23.0".failure}".default = true; @@ -4670,7 +4670,7 @@ rec { (crates."smallvec"."${deps."crossbeam_channel"."0.3.8"."smallvec"}" deps) ]); }; - features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f (rec { + features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f ({ crossbeam_channel."0.3.8".default = (f.crossbeam_channel."0.3.8".default or true); crossbeam_utils."${deps.crossbeam_channel."0.3.8".crossbeam_utils}".default = true; smallvec."${deps.crossbeam_channel."0.3.8".smallvec}".default = true; @@ -4737,7 +4737,7 @@ rec { (crates."winapi"."${deps."crypto_hash"."0.3.3"."winapi"}" deps) ]) else []); }; - features_.crypto_hash."0.3.3" = deps: f: updateFeatures f (rec { + features_.crypto_hash."0.3.3" = deps: f: updateFeatures f ({ commoncrypto."${deps.crypto_hash."0.3.3".commoncrypto}".default = true; crypto_hash."0.3.3".default = (f.crypto_hash."0.3.3".default or true); hex."${deps.crypto_hash."0.3.3".hex}".default = true; @@ -4929,7 +4929,7 @@ rec { (crates."strsim"."${deps."docopt"."1.1.0"."strsim"}" deps) ]); }; - features_.docopt."1.1.0" = deps: f: updateFeatures f (rec { + features_.docopt."1.1.0" = deps: f: updateFeatures f ({ docopt."1.1.0".default = (f.docopt."1.1.0".default or true); lazy_static."${deps.docopt."1.1.0".lazy_static}".default = true; regex."${deps.docopt."1.1.0".regex}".default = true; @@ -4989,7 +4989,7 @@ rec { (crates."libc"."${deps."filetime"."0.2.4"."libc"}" deps) ]) else []); }; - features_.filetime."0.2.4" = deps: f: updateFeatures f (rec { + features_.filetime."0.2.4" = deps: f: updateFeatures f ({ cfg_if."${deps.filetime."0.2.4".cfg_if}".default = true; filetime."0.2.4".default = (f.filetime."0.2.4".default or true); libc."${deps.filetime."0.2.4".libc}".default = true; @@ -5078,7 +5078,7 @@ rec { sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip"; libPath = "lib.rs"; }; - features_.fnv."1.0.6" = deps: f: updateFeatures f (rec { + features_.fnv."1.0.6" = deps: f: updateFeatures f ({ fnv."1.0.6".default = (f.fnv."1.0.6".default or true); }) []; @@ -5096,7 +5096,7 @@ rec { (crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) ]); }; - features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec { + features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({ foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true); foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true; }) [ @@ -5114,7 +5114,7 @@ rec { authors = [ "Steven Fackler <sfackler@gmail.com>" ]; sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; }; - features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec { + features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({ foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true); }) []; @@ -5135,7 +5135,7 @@ rec { (crates."winapi"."${deps."fs2"."0.4.3"."winapi"}" deps) ]) else []); }; - features_.fs2."0.4.3" = deps: f: updateFeatures f (rec { + features_.fs2."0.4.3" = deps: f: updateFeatures f ({ fs2."0.4.3".default = (f.fs2."0.4.3".default or true); libc."${deps.fs2."0.4.3".libc}".default = true; winapi = fold recursiveUpdate {} [ @@ -5167,7 +5167,7 @@ rec { (crates."termcolor"."${deps."fwdansi"."1.0.1"."termcolor"}" deps) ]); }; - features_.fwdansi."1.0.1" = deps: f: updateFeatures f (rec { + features_.fwdansi."1.0.1" = deps: f: updateFeatures f ({ fwdansi."1.0.1".default = (f.fwdansi."1.0.1".default or true); memchr."${deps.fwdansi."1.0.1".memchr}".default = true; termcolor."${deps.fwdansi."1.0.1".termcolor}".default = true; @@ -5279,7 +5279,7 @@ rec { (crates."url"."${deps."git2_curl"."0.9.0"."url"}" deps) ]); }; - features_.git2_curl."0.9.0" = deps: f: updateFeatures f (rec { + features_.git2_curl."0.9.0" = deps: f: updateFeatures f ({ curl."${deps.git2_curl."0.9.0".curl}".default = true; git2."${deps.git2_curl."0.9.0".git2}".default = (f.git2."${deps.git2_curl."0.9.0".git2}".default or false); git2_curl."0.9.0".default = (f.git2_curl."0.9.0".default or true); @@ -5303,7 +5303,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; }; - features_.glob."0.2.11" = deps: f: updateFeatures f (rec { + features_.glob."0.2.11" = deps: f: updateFeatures f ({ glob."0.2.11".default = (f.glob."0.2.11".default or true); }) []; @@ -5326,7 +5326,7 @@ rec { ]); features = mkFeatures (features."globset"."0.4.3" or {}); }; - features_.globset."0.4.3" = deps: f: updateFeatures f (rec { + features_.globset."0.4.3" = deps: f: updateFeatures f ({ aho_corasick."${deps.globset."0.4.3".aho_corasick}".default = true; bstr = fold recursiveUpdate {} [ { "${deps.globset."0.4.3".bstr}"."std" = true; } @@ -5360,7 +5360,7 @@ rec { ]); features = mkFeatures (features."hashbrown"."0.1.8" or {}); }; - features_.hashbrown."0.1.8" = deps: f: updateFeatures f (rec { + features_.hashbrown."0.1.8" = deps: f: updateFeatures f ({ byteorder."${deps.hashbrown."0.1.8".byteorder}".default = (f.byteorder."${deps.hashbrown."0.1.8".byteorder}".default or false); hashbrown."0.1.8".default = (f.hashbrown."0.1.8".default or true); scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default = (f.scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default or false); @@ -5381,7 +5381,7 @@ rec { sha256 = "0hs0xfb4x67y4ss9mmbjmibkwakbn3xf23i21m409bw2zqk9b6kz"; features = mkFeatures (features."hex"."0.3.2" or {}); }; - features_.hex."0.3.2" = deps: f: updateFeatures f (rec { + features_.hex."0.3.2" = deps: f: updateFeatures f ({ hex."0.3.2".default = (f.hex."0.3.2".default or true); }) []; @@ -5400,7 +5400,7 @@ rec { (crates."winapi"."${deps."home"."0.3.4"."winapi"}" deps) ]) else []); }; - features_.home."0.3.4" = deps: f: updateFeatures f (rec { + features_.home."0.3.4" = deps: f: updateFeatures f ({ home."0.3.4".default = (f.home."0.3.4".default or true); scopeguard."${deps.home."0.3.4".scopeguard}".default = true; winapi = fold recursiveUpdate {} [ @@ -5434,7 +5434,7 @@ rec { (crates."itoa"."${deps."http"."0.1.17"."itoa"}" deps) ]); }; - features_.http."0.1.17" = deps: f: updateFeatures f (rec { + features_.http."0.1.17" = deps: f: updateFeatures f ({ bytes."${deps.http."0.1.17".bytes}".default = true; fnv."${deps.http."0.1.17".fnv}".default = true; http."0.1.17".default = (f.http."0.1.17".default or true); @@ -5524,7 +5524,7 @@ rec { (crates."rustc_version"."${deps."im_rc"."12.3.4"."rustc_version"}" deps) ]); }; - features_.im_rc."12.3.4" = deps: f: updateFeatures f (rec { + features_.im_rc."12.3.4" = deps: f: updateFeatures f ({ im_rc."12.3.4".default = (f.im_rc."12.3.4".default or true); rustc_version."${deps.im_rc."12.3.4".rustc_version}".default = true; sized_chunks."${deps.im_rc."12.3.4".sized_chunks}".default = true; @@ -5552,7 +5552,7 @@ rec { (crates."winapi"."${deps."iovec"."0.1.2"."winapi"}" deps) ]) else []); }; - features_.iovec."0.1.2" = deps: f: updateFeatures f (rec { + features_.iovec."0.1.2" = deps: f: updateFeatures f ({ iovec."0.1.2".default = (f.iovec."0.1.2".default or true); libc."${deps.iovec."0.1.2".libc}".default = true; winapi."${deps.iovec."0.1.2".winapi}".default = true; @@ -5609,7 +5609,7 @@ rec { (crates."rand"."${deps."jobserver"."0.1.13"."rand"}" deps) ]) else []); }; - features_.jobserver."0.1.13" = deps: f: updateFeatures f (rec { + features_.jobserver."0.1.13" = deps: f: updateFeatures f ({ jobserver."0.1.13".default = (f.jobserver."0.1.13".default or true); libc."${deps.jobserver."0.1.13".libc}".default = true; log."${deps.jobserver."0.1.13".log}".default = true; @@ -5640,7 +5640,7 @@ rec { (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) ]); }; - features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({ kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; @@ -5790,7 +5790,7 @@ rec { (crates."cc"."${deps."libnghttp2_sys"."0.1.1"."cc"}" deps) ]); }; - features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f (rec { + features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f ({ cc."${deps.libnghttp2_sys."0.1.1".cc}".default = true; libc."${deps.libnghttp2_sys."0.1.1".libc}".default = true; libnghttp2_sys."0.1.1".default = (f.libnghttp2_sys."0.1.1".default or true); @@ -5827,7 +5827,7 @@ rec { (crates."pkg_config"."${deps."libssh2_sys"."0.2.11"."pkg_config"}" deps) ]); }; - features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f (rec { + features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f ({ cc."${deps.libssh2_sys."0.2.11".cc}".default = true; libc."${deps.libssh2_sys."0.2.11".libc}".default = true; libssh2_sys."0.2.11".default = (f.libssh2_sys."0.2.11".default or true); @@ -5865,7 +5865,7 @@ rec { ]); features = mkFeatures (features."libz_sys"."1.0.25" or {}); }; - features_.libz_sys."1.0.25" = deps: f: updateFeatures f (rec { + features_.libz_sys."1.0.25" = deps: f: updateFeatures f ({ cc."${deps.libz_sys."1.0.25".cc}".default = true; libc."${deps.libz_sys."1.0.25".libc}".default = true; libz_sys."1.0.25".default = (f.libz_sys."1.0.25".default or true); @@ -5891,7 +5891,7 @@ rec { ]); features = mkFeatures (features."lock_api"."0.1.5" or {}); }; - features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec { + features_.lock_api."0.1.5" = deps: f: updateFeatures f ({ lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true); scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false); }) [ @@ -5913,7 +5913,7 @@ rec { (crates."rawpointer"."${deps."matrixmultiply"."0.1.15"."rawpointer"}" deps) ]); }; - features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f (rec { + features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f ({ matrixmultiply."0.1.15".default = (f.matrixmultiply."0.1.15".default or true); rawpointer."${deps.matrixmultiply."0.1.15".rawpointer}".default = true; }) [ @@ -5941,7 +5941,7 @@ rec { (crates."cc"."${deps."miniz_sys"."0.1.11"."cc"}" deps) ]); }; - features_.miniz_sys."0.1.11" = deps: f: updateFeatures f (rec { + features_.miniz_sys."0.1.11" = deps: f: updateFeatures f ({ cc."${deps.miniz_sys."0.1.11".cc}".default = true; libc."${deps.miniz_sys."0.1.11".libc}".default = true; miniz_sys."0.1.11".default = (f.miniz_sys."0.1.11".default or true); @@ -5964,7 +5964,7 @@ rec { (crates."adler32"."${deps."miniz_oxide"."0.2.1"."adler32"}" deps) ]); }; - features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f (rec { + features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f ({ adler32."${deps.miniz_oxide."0.2.1".adler32}".default = true; miniz_oxide."0.2.1".default = (f.miniz_oxide."0.2.1".default or true); }) [ @@ -6039,7 +6039,7 @@ rec { (crates."winapi"."${deps."miow"."0.3.3"."winapi"}" deps) ]); }; - features_.miow."0.3.3" = deps: f: updateFeatures f (rec { + features_.miow."0.3.3" = deps: f: updateFeatures f ({ miow."0.3.3".default = (f.miow."0.3.3".default or true); socket2."${deps.miow."0.3.3".socket2}".default = true; winapi = fold recursiveUpdate {} [ @@ -6200,7 +6200,7 @@ rec { (crates."libc"."${deps."num_cpus"."1.10.0"."libc"}" deps) ]); }; - features_.num_cpus."1.10.0" = deps: f: updateFeatures f (rec { + features_.num_cpus."1.10.0" = deps: f: updateFeatures f ({ libc."${deps.num_cpus."1.10.0".libc}".default = true; num_cpus."1.10.0".default = (f.num_cpus."1.10.0".default or true); }) [ @@ -6253,7 +6253,7 @@ rec { (crates."winapi"."${deps."opener"."0.3.2"."winapi"}" deps) ]) else []); }; - features_.opener."0.3.2" = deps: f: updateFeatures f (rec { + features_.opener."0.3.2" = deps: f: updateFeatures f ({ failure."${deps.opener."0.3.2".failure}".default = true; failure_derive."${deps.opener."0.3.2".failure_derive}".default = true; opener."0.3.2".default = (f.opener."0.3.2".default or true); @@ -6321,7 +6321,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; }; - features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec { + features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({ openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true); }) []; @@ -6339,7 +6339,7 @@ rec { (crates."cc"."${deps."openssl_src"."111.2.1+1.1.1b"."cc"}" deps) ]); }; - features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f (rec { + features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f ({ cc."${deps.openssl_src."111.2.1+1.1.1b".cc}".default = true; openssl_src."111.2.1+1.1.1b".default = (f.openssl_src."111.2.1+1.1.1b".default or true); }) [ @@ -6518,7 +6518,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6"; }; - features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec { + features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({ pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true); }) []; @@ -6705,7 +6705,7 @@ rec { (crates."autocfg"."${deps."rand_chacha"."0.1.1"."autocfg"}" deps) ]); }; - features_.rand_chacha."0.1.1" = deps: f: updateFeatures f (rec { + features_.rand_chacha."0.1.1" = deps: f: updateFeatures f ({ autocfg."${deps.rand_chacha."0.1.1".autocfg}".default = true; rand_chacha."0.1.1".default = (f.rand_chacha."0.1.1".default or true); rand_core."${deps.rand_chacha."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.1".rand_core}".default or false); @@ -6728,7 +6728,7 @@ rec { (crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps) ]); }; - features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec { + features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({ rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false); rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true); }) [ @@ -6896,7 +6896,7 @@ rec { authors = [ "bluss" ]; sha256 = "0hblv2cv310ixf5f1jw4nk9w5pb95wh4dwqyjv07g2xrshbw6j04"; }; - features_.rawpointer."0.1.0" = deps: f: updateFeatures f (rec { + features_.rawpointer."0.1.0" = deps: f: updateFeatures f ({ rawpointer."0.1.0".default = (f.rawpointer."0.1.0".default or true); }) []; @@ -6912,7 +6912,7 @@ rec { sha256 = "1ndcp7brnvii87ndcd34fk846498r07iznphkslcy0shic9cp4rr"; libName = "syscall"; }; - features_.redox_syscall."0.1.54" = deps: f: updateFeatures f (rec { + features_.redox_syscall."0.1.54" = deps: f: updateFeatures f ({ redox_syscall."0.1.54".default = (f.redox_syscall."0.1.54".default or true); }) []; @@ -6974,7 +6974,7 @@ rec { (crates."ucd_util"."${deps."regex_syntax"."0.6.6"."ucd_util"}" deps) ]); }; - features_.regex_syntax."0.6.6" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.6.6" = deps: f: updateFeatures f ({ regex_syntax."0.6.6".default = (f.regex_syntax."0.6.6".default or true); ucd_util."${deps.regex_syntax."0.6.6".ucd_util}".default = true; }) [ @@ -7020,7 +7020,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0arpdp472j4lrwxbmf4z21d8kh95rbbphnzccf605pqq2rvczv3p"; }; - features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f (rec { + features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f ({ rustc_workspace_hack."1.0.0".default = (f.rustc_workspace_hack."1.0.0".default or true); }) []; @@ -7038,7 +7038,7 @@ rec { (crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps) ]); }; - features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec { + features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({ rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true); semver."${deps.rustc_version."0.2.3".semver}".default = true; }) [ @@ -7063,7 +7063,7 @@ rec { (crates."serde_json"."${deps."rustfix"."0.4.5"."serde_json"}" deps) ]); }; - features_.rustfix."0.4.5" = deps: f: updateFeatures f (rec { + features_.rustfix."0.4.5" = deps: f: updateFeatures f ({ failure."${deps.rustfix."0.4.5".failure}".default = true; log."${deps.rustfix."0.4.5".log}".default = true; rustfix."0.4.5".default = (f.rustfix."0.4.5".default or true); @@ -7092,7 +7092,7 @@ rec { (crates."winapi_util"."${deps."same_file"."1.0.4"."winapi_util"}" deps) ]) else []); }; - features_.same_file."1.0.4" = deps: f: updateFeatures f (rec { + features_.same_file."1.0.4" = deps: f: updateFeatures f ({ same_file."1.0.4".default = (f.same_file."1.0.4".default or true); winapi_util."${deps.same_file."1.0.4".winapi_util}".default = true; }) [ @@ -7114,7 +7114,7 @@ rec { (crates."winapi"."${deps."schannel"."0.1.15"."winapi"}" deps) ]); }; - features_.schannel."0.1.15" = deps: f: updateFeatures f (rec { + features_.schannel."0.1.15" = deps: f: updateFeatures f ({ lazy_static."${deps.schannel."0.1.15".lazy_static}".default = true; schannel."0.1.15".default = (f.schannel."0.1.15".default or true); winapi = fold recursiveUpdate {} [ @@ -7199,7 +7199,7 @@ rec { authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; }; - features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec { + features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({ semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true); }) []; @@ -7258,7 +7258,7 @@ rec { ]); features = mkFeatures (features."serde_derive"."1.0.90" or {}); }; - features_.serde_derive."1.0.90" = deps: f: updateFeatures f (rec { + features_.serde_derive."1.0.90" = deps: f: updateFeatures f ({ proc_macro2."${deps.serde_derive."1.0.90".proc_macro2}".default = true; quote."${deps.serde_derive."1.0.90".quote}".default = true; serde_derive."1.0.90".default = (f.serde_derive."1.0.90".default or true); @@ -7286,7 +7286,7 @@ rec { (crates."serde"."${deps."serde_ignored"."0.0.4"."serde"}" deps) ]); }; - features_.serde_ignored."0.0.4" = deps: f: updateFeatures f (rec { + features_.serde_ignored."0.0.4" = deps: f: updateFeatures f ({ serde."${deps.serde_ignored."0.0.4".serde}".default = true; serde_ignored."0.0.4".default = (f.serde_ignored."0.0.4".default or true); }) [ @@ -7304,7 +7304,7 @@ rec { authors = [ "Steven Fackler <sfackler@gmail.com>" ]; sha256 = "02ik28la039b8anx0sx8mbdp2yx66m64mjrjyy6x0dgpbmfxmc24"; }; - features_.shell_escape."0.1.4" = deps: f: updateFeatures f (rec { + features_.shell_escape."0.1.4" = deps: f: updateFeatures f ({ shell_escape."0.1.4".default = (f.shell_escape."0.1.4".default or true); }) []; @@ -7323,7 +7323,7 @@ rec { (crates."typenum"."${deps."sized_chunks"."0.1.3"."typenum"}" deps) ]); }; - features_.sized_chunks."0.1.3" = deps: f: updateFeatures f (rec { + features_.sized_chunks."0.1.3" = deps: f: updateFeatures f ({ sized_chunks."0.1.3".default = (f.sized_chunks."0.1.3".default or true); typenum."${deps.sized_chunks."0.1.3".typenum}".default = true; }) [ @@ -7352,7 +7352,7 @@ rec { ]) else []); features = mkFeatures (features."socket2"."0.3.8" or {}); }; - features_.socket2."0.3.8" = deps: f: updateFeatures f (rec { + features_.socket2."0.3.8" = deps: f: updateFeatures f ({ cfg_if."${deps.socket2."0.3.8".cfg_if}".default = true; libc."${deps.socket2."0.3.8".libc}".default = true; redox_syscall."${deps.socket2."0.3.8".redox_syscall}".default = true; @@ -7383,7 +7383,7 @@ rec { authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; sha256 = "0d3jsdz22wgjyxdakqnvdgmwjdvkximz50d9zfk4qlalw635qcvy"; }; - features_.strsim."0.8.0" = deps: f: updateFeatures f (rec { + features_.strsim."0.8.0" = deps: f: updateFeatures f ({ strsim."0.8.0".default = (f.strsim."0.8.0".default or true); }) []; @@ -7402,7 +7402,7 @@ rec { (crates."ndarray"."${deps."strsim"."0.9.1"."ndarray"}" deps) ]); }; - features_.strsim."0.9.1" = deps: f: updateFeatures f (rec { + features_.strsim."0.9.1" = deps: f: updateFeatures f ({ hashbrown."${deps.strsim."0.9.1".hashbrown}".default = true; ndarray."${deps.strsim."0.9.1".ndarray}".default = true; strsim."0.9.1".default = (f.strsim."0.9.1".default or true); @@ -7539,7 +7539,7 @@ rec { (crates."winapi"."${deps."tempfile"."3.0.7"."winapi"}" deps) ]) else []); }; - features_.tempfile."3.0.7" = deps: f: updateFeatures f (rec { + features_.tempfile."3.0.7" = deps: f: updateFeatures f ({ cfg_if."${deps.tempfile."3.0.7".cfg_if}".default = true; libc."${deps.tempfile."3.0.7".libc}".default = true; rand."${deps.tempfile."3.0.7".rand}".default = true; @@ -7575,7 +7575,7 @@ rec { (crates."unicode_width"."${deps."textwrap"."0.11.0"."unicode_width"}" deps) ]); }; - features_.textwrap."0.11.0" = deps: f: updateFeatures f (rec { + features_.textwrap."0.11.0" = deps: f: updateFeatures f ({ textwrap."0.11.0".default = (f.textwrap."0.11.0".default or true); unicode_width."${deps.textwrap."0.11.0".unicode_width}".default = true; }) [ @@ -7595,7 +7595,7 @@ rec { build = "build/main.rs"; features = mkFeatures (features."typenum"."1.10.0" or {}); }; - features_.typenum."1.10.0" = deps: f: updateFeatures f (rec { + features_.typenum."1.10.0" = deps: f: updateFeatures f ({ typenum."1.10.0".default = (f.typenum."1.10.0".default or true); }) []; @@ -7614,7 +7614,7 @@ rec { (crates."url"."${deps."url_serde"."0.2.0"."url"}" deps) ]); }; - features_.url_serde."0.2.0" = deps: f: updateFeatures f (rec { + features_.url_serde."0.2.0" = deps: f: updateFeatures f ({ serde."${deps.url_serde."0.2.0".serde}".default = true; url."${deps.url_serde."0.2.0".url}".default = true; url_serde."0.2.0".default = (f.url_serde."0.2.0".default or true); @@ -7634,7 +7634,7 @@ rec { authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x"; }; - features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec { + features_.vcpkg."0.2.6" = deps: f: updateFeatures f ({ vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true); }) []; @@ -7656,7 +7656,7 @@ rec { (crates."winapi_util"."${deps."walkdir"."2.2.7"."winapi_util"}" deps) ]) else []); }; - features_.walkdir."2.2.7" = deps: f: updateFeatures f (rec { + features_.walkdir."2.2.7" = deps: f: updateFeatures f ({ same_file."${deps.walkdir."2.2.7".same_file}".default = true; walkdir."2.2.7".default = (f.walkdir."2.2.7".default or true); winapi = fold recursiveUpdate {} [ @@ -7682,7 +7682,7 @@ rec { authors = [ "Peter Atashian <retep998@gmail.com>" ]; sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; }; - features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + features_.winapi."0.2.8" = deps: f: updateFeatures f ({ winapi."0.2.8".default = (f.winapi."0.2.8".default or true); }) []; @@ -7732,7 +7732,7 @@ rec { sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; libName = "build"; }; - features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({ winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); }) []; @@ -7747,7 +7747,7 @@ rec { authors = [ "Remi Rampin <remirampin@gmail.com>" ]; sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb"; }; - features_.adler32."1.0.3" = deps: f: updateFeatures f (rec { + features_.adler32."1.0.3" = deps: f: updateFeatures f ({ adler32."1.0.3".default = (f.adler32."1.0.3".default or true); }) []; diff --git a/nixpkgs/pkgs/build-support/rust/default.nix b/nixpkgs/pkgs/build-support/rust/default.nix index cf8042ba255d..580675628d33 100644 --- a/nixpkgs/pkgs/build-support/rust/default.nix +++ b/nixpkgs/pkgs/build-support/rust/default.nix @@ -46,8 +46,8 @@ let hostConfig = stdenv.hostPlatform.config; rustHostConfig = { - "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu"; - }."${hostConfig}" or hostConfig; + x86_64-pc-mingw32 = "x86_64-pc-windows-gnu"; + }.${hostConfig} or hostConfig; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; diff --git a/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh b/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh new file mode 100644 index 000000000000..e0ea1f7f30a7 --- /dev/null +++ b/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh @@ -0,0 +1,165 @@ +#!/bin/bash +# Setup hook for the `installShellFiles` package. +# +# Example usage in a derivation: +# +# { …, installShellFiles, … }: +# stdenv.mkDerivation { +# … +# nativeBuildInputs = [ installShellFiles ]; +# postInstall = '' +# installManPage share/doc/foobar.1 +# installShellCompletion share/completions/foobar.{bash,fish,zsh} +# ''; +# … +# } +# +# See comments on each function for more details. + +# installManPage <path> [...<path>] +# +# Each argument is checked for its man section suffix and installed into the appropriate +# share/man<n>/ directory. The function returns an error if any paths don't have the man section +# suffix (with optional .gz compression). +installManPage() { + local path + for path in "$@"; do + if (( "${NIX_DEBUG:-0}" >= 1 )); then + echo "installManPage: installing $path" + fi + if test -z "$path"; then + echo "installManPage: error: path cannot be empty" >&2 + return 1 + fi + local basename + basename=$(stripHash "$path") # use stripHash in case it's a nix store path + local trimmed=${basename%.gz} # don't get fooled by compressed manpages + local suffix=${trimmed##*.} + if test -z "$suffix" -o "$suffix" = "$trimmed"; then + echo "installManPage: error: path missing manpage section suffix: $path" >&2 + return 1 + fi + local outRoot + if test "$suffix" = 3; then + outRoot=${!outputDevman:?} + else + outRoot=${!outputMan:?} + fi + install -Dm644 -T "$path" "${outRoot}/share/man/man$suffix/$basename" || return + done +} + +# installShellCompletion [--bash|--fish|--zsh] ([--name <name>] <path>)... +# +# Each path is installed into the appropriate directory for shell completions for the given shell. +# If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell. +# Otherwise the file extension will be examined to pick a shell. If the shell is unknown a warning +# will be logged and the command will return a non-zero status code after processing any remaining +# paths. Any of the shell flags will affect all subsequent paths (unless another shell flag is +# given). +# +# If the shell completion needs to be renamed before installing the optional `--name <name>` flag +# may be given. Any name provided with this flag only applies to the next path. +# +# For zsh completions, if the `--name` flag is not given, the path will be automatically renamed +# such that `foobar.zsh` becomes `_foobar`. +# +# This command accepts multiple shell flags in conjunction with multiple paths if you wish to +# install them all in one command: +# +# installShellCompletion share/completions/foobar.{bash,fish} --zsh share/completions/_foobar +# +# However it may be easier to read if each shell is split into its own invocation, especially when +# renaming is involved: +# +# installShellCompletion --bash --name foobar.bash share/completions.bash +# installShellCompletion --fish --name foobar.fish share/completions.fish +# installShellCompletion --zsh --name _foobar share/completions.zsh +# +# If any argument is `--` the remaining arguments will be treated as paths. +installShellCompletion() { + local shell='' name='' retval=0 parseArgs=1 arg + while { arg=$1; shift; }; do + # Parse arguments + if (( parseArgs )); then + case "$arg" in + --bash|--fish|--zsh) + shell=${arg#--} + continue;; + --name) + name=$1 + shift || { + echo 'installShellCompletion: error: --name flag expected an argument' >&2 + return 1 + } + continue;; + --name=*) + # treat `--name=foo` the same as `--name foo` + name=${arg#--name=} + continue;; + --?*) + echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2 + retval=2 + continue;; + --) + # treat remaining args as paths + parseArgs=0 + continue;; + esac + fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then + echo "installShellCompletion: installing $arg${name:+ as $name}" + fi + # if we get here, this is a path + # Identify shell + local basename + basename=$(stripHash "$arg") + local curShell=$shell + if [[ -z "$curShell" ]]; then + # auto-detect the shell + case "$basename" in + ?*.bash) curShell=bash;; + ?*.fish) curShell=fish;; + ?*.zsh) curShell=zsh;; + *) + if [[ "$basename" = _* && "$basename" != *.* ]]; then + # probably zsh + echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 + curShell=zsh + else + echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 + retval=2 + continue + fi;; + esac + fi + # Identify output path + local outName sharePath + outName=${name:-$basename} + case "$curShell" in + bash) sharePath=bash-completion/completions;; + fish) sharePath=fish/vendor_completions.d;; + zsh) + sharePath=zsh/site-functions + # only apply automatic renaming if we didn't have a manual rename + if test -z "$name"; then + # convert a name like `foo.zsh` into `_foo` + outName=${outName%.zsh} + outName=_${outName#_} + fi;; + *) + # Our list of shells is out of sync with the flags we accept or extensions we detect. + echo 'installShellCompletion: internal error' >&2 + return 1;; + esac + # Install file + install -Dm644 -T "$arg" "${!outputBin:?}/share/$sharePath/$outName" || return + # Clear the name, it only applies to one path + name= + done + if [[ -n "$name" ]]; then + echo 'installShellCompletion: error: --name flag given with no path' >&2 + return 1 + fi + return $retval +} diff --git a/nixpkgs/pkgs/build-support/templaterpm/default.nix b/nixpkgs/pkgs/build-support/templaterpm/default.nix index d93001884982..30465c740e53 100644 --- a/nixpkgs/pkgs/build-support/templaterpm/default.nix +++ b/nixpkgs/pkgs/build-support/templaterpm/default.nix @@ -1,6 +1,6 @@ {stdenv, makeWrapper, python, toposort, rpm}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nix-template-rpm"; version = "0.1"; diff --git a/nixpkgs/pkgs/build-support/trivial-builders.nix b/nixpkgs/pkgs/build-support/trivial-builders.nix index 0bfe14a85393..55df09121b42 100644 --- a/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -381,4 +381,37 @@ rec { # Copy a list of paths to the Nix store. copyPathsToStore = builtins.map copyPathToStore; + /* Applies a list of patches to a source directory. + * + * Examples: + * + * # Patching nixpkgs: + * applyPatches { + * src = pkgs.path; + * patches = [ + * (pkgs.fetchpatch { + * url = "https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch"; + * sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr"; + * }) + * ]; + * } + */ + applyPatches = + { src + , name ? (if builtins.typeOf src == "path" + then builtins.baseNameOf src + else + if builtins.isAttrs src && builtins.hasAttr "name" src + then src.name + else throw "applyPatches: please supply a `name` argument because a default name can only be computed when the `src` is a path or is an attribute set with a `name` attribute." + ) + "-patched" + , patches ? [] + , postPatch ? "" + }: stdenvNoCC.mkDerivation { + inherit name src patches postPatch; + preferLocalBuild = true; + allowSubstitutes = false; + phases = "unpackPhase patchPhase installPhase"; + installPhase = "cp -R ./ $out"; + }; } diff --git a/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix index bdf44b7a5bf3..24f7b735c2e2 100644 --- a/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix +++ b/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix @@ -1,5 +1,5 @@ a : -a.stdenv.mkDerivation rec { +a.stdenv.mkDerivation { buildCommand = '' mkdir -p "$out/attributes" diff --git a/nixpkgs/pkgs/build-support/vm/default.nix b/nixpkgs/pkgs/build-support/vm/default.nix index a59da3a8745b..371ab13c5281 100644 --- a/nixpkgs/pkgs/build-support/vm/default.nix +++ b/nixpkgs/pkgs/build-support/vm/default.nix @@ -741,7 +741,7 @@ rec { # Note: no i386 release for Fedora >= 26 fedora26x86_64 = let version = "26"; - in rec { + in { name = "fedora-${version}-x86_64"; fullName = "Fedora ${version} (x86_64)"; packagesList = fetchurl rec { @@ -756,7 +756,7 @@ rec { fedora27x86_64 = let version = "27"; - in rec { + in { name = "fedora-${version}-x86_64"; fullName = "Fedora ${version} (x86_64)"; packagesList = fetchurl rec { @@ -816,7 +816,7 @@ rec { /* The set of supported Dpkg-based distributions. */ - debDistros = rec { + debDistros = { # Interestingly, the SHA-256 hashes provided by Ubuntu in # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are diff --git a/nixpkgs/pkgs/build-support/vm/test.nix b/nixpkgs/pkgs/build-support/vm/test.nix index d0d85fce3662..698503032671 100644 --- a/nixpkgs/pkgs/build-support/vm/test.nix +++ b/nixpkgs/pkgs/build-support/vm/test.nix @@ -1,7 +1,7 @@ with import ../../.. {}; with vmTools; -rec { +{ # Run the PatchELF derivation in a VM. diff --git a/nixpkgs/pkgs/data/documentation/bgnet/default.nix b/nixpkgs/pkgs/data/documentation/bgnet/default.nix index a53ead29c1e8..7297d18df277 100644 --- a/nixpkgs/pkgs/data/documentation/bgnet/default.nix +++ b/nixpkgs/pkgs/data/documentation/bgnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, python, zip, fop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bgnet"; version = "3.0.21"; diff --git a/nixpkgs/pkgs/data/documentation/std-man-pages/default.nix b/nixpkgs/pkgs/data/documentation/std-man-pages/default.nix index d90fa99dd702..b3b2b956de87 100644 --- a/nixpkgs/pkgs/data/documentation/std-man-pages/default.nix +++ b/nixpkgs/pkgs/data/documentation/std-man-pages/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "std-man-pages-4.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/data/fonts/aileron/default.nix b/nixpkgs/pkgs/data/fonts/aileron/default.nix index ee85ee598827..4961a5e7449d 100644 --- a/nixpkgs/pkgs/data/fonts/aileron/default.nix +++ b/nixpkgs/pkgs/data/fonts/aileron/default.nix @@ -6,7 +6,7 @@ let pname = "aileron"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix b/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix index 53f4d94b38fe..0b6340d1ba94 100644 --- a/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix +++ b/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let version = "1.100"; in -fetchzip rec { +fetchzip { name = "ankacoder-condensed-${version}"; url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/ankacoder/default.nix b/nixpkgs/pkgs/data/fonts/ankacoder/default.nix index 52e2d4a42330..3a57d08dbc28 100644 --- a/nixpkgs/pkgs/data/fonts/ankacoder/default.nix +++ b/nixpkgs/pkgs/data/fonts/ankacoder/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let version = "1.100"; in -fetchzip rec { +fetchzip { name = "ankacoder-${version}"; url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix b/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix index 8b4228ec4235..a0fcd5f7bbf5 100644 --- a/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "behdad-fonts"; version = "0.0.3"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "font-store"; repo = "BehdadFont"; diff --git a/nixpkgs/pkgs/data/fonts/caladea/default.nix b/nixpkgs/pkgs/data/fonts/caladea/default.nix index 29bd001f8089..b1f9312a7e9c 100644 --- a/nixpkgs/pkgs/data/fonts/caladea/default.nix +++ b/nixpkgs/pkgs/data/fonts/caladea/default.nix @@ -2,7 +2,7 @@ let version = "20130214"; -in fetchzip rec { +in fetchzip { name = "caladea-${version}"; url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/data/fonts/carlito/default.nix b/nixpkgs/pkgs/data/fonts/carlito/default.nix index 3c0e314579de..79913bb83980 100644 --- a/nixpkgs/pkgs/data/fonts/carlito/default.nix +++ b/nixpkgs/pkgs/data/fonts/carlito/default.nix @@ -2,7 +2,7 @@ let version = "20130920"; -in fetchzip rec { +in fetchzip { name = "carlito-${version}"; url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix b/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix index 061bbb445fb2..eff0c579a707 100644 --- a/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix +++ b/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.92"; pname = "dina-font-pcf"; diff --git a/nixpkgs/pkgs/data/fonts/dina/default.nix b/nixpkgs/pkgs/data/fonts/dina/default.nix index 8638ec74f77a..0d4cd286219e 100644 --- a/nixpkgs/pkgs/data/fonts/dina/default.nix +++ b/nixpkgs/pkgs/data/fonts/dina/default.nix @@ -2,7 +2,7 @@ let version = "2.92"; -in fetchzip rec { +in fetchzip { name = "dina-font-${version}"; # `meta.homepage` has no direct download link diff --git a/nixpkgs/pkgs/data/fonts/envypn-font/default.nix b/nixpkgs/pkgs/data/fonts/envypn-font/default.nix index 0e31231d05fc..351a0617ddc8 100644 --- a/nixpkgs/pkgs/data/fonts/envypn-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/envypn-font/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "envypn-font-1.7.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/data/fonts/eunomia/default.nix b/nixpkgs/pkgs/data/fonts/eunomia/default.nix index 55250156fcd0..de68b17d6ebb 100644 --- a/nixpkgs/pkgs/data/fonts/eunomia/default.nix +++ b/nixpkgs/pkgs/data/fonts/eunomia/default.nix @@ -6,7 +6,7 @@ let pname = "eunomia"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/f5_6/default.nix b/nixpkgs/pkgs/data/fonts/f5_6/default.nix index 28969f02364a..175648198cee 100644 --- a/nixpkgs/pkgs/data/fonts/f5_6/default.nix +++ b/nixpkgs/pkgs/data/fonts/f5_6/default.nix @@ -6,7 +6,7 @@ let pname = "f5_6"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/ferrum/default.nix b/nixpkgs/pkgs/data/fonts/ferrum/default.nix index ec3f3218ea56..fe40252ab23d 100644 --- a/nixpkgs/pkgs/data/fonts/ferrum/default.nix +++ b/nixpkgs/pkgs/data/fonts/ferrum/default.nix @@ -6,7 +6,7 @@ let pname = "ferrum"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix b/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix index 422258f84d11..bcf02f1328e6 100644 --- a/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix +++ b/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: let - font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec { + font-awesome = { version, sha256, rev ? version}: fetchFromGitHub { name = "font-awesome-${version}"; diff --git a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix index 707beb41231d..7c1af485a989 100644 --- a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "google-fonts"; version = "2019-07-14"; diff --git a/nixpkgs/pkgs/data/fonts/hack/default.nix b/nixpkgs/pkgs/data/fonts/hack/default.nix index ef0df1ba67f6..3c49bf7f5656 100644 --- a/nixpkgs/pkgs/data/fonts/hack/default.nix +++ b/nixpkgs/pkgs/data/fonts/hack/default.nix @@ -2,7 +2,7 @@ let version = "3.003"; -in fetchzip rec { +in fetchzip { name = "hack-font-${version}"; url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; diff --git a/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 759d2c2db1d2..23f6fb29be07 100644 --- a/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -2,7 +2,7 @@ let version = "2013.06.07"; # date of most recent file in distribution -in fetchzip rec { +in fetchzip { name = "helvetica-neue-lt-std-${version}"; url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; diff --git a/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix b/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix index 362781c05bb5..726fbab95bd8 100644 --- a/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix +++ b/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix @@ -5,7 +5,7 @@ let pname = "HyperScrypt"; in -fetchzip rec { +fetchzip { name = "${lib.toLower pname}-font-${version}"; url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m"; diff --git a/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix b/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix index a042a31f1d02..1d910ed54a4b 100644 --- a/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -2,7 +2,7 @@ let version = "20180721"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "ia-writer-duospace-${version}"; owner = "iaolo"; diff --git a/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix b/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix index 7e1014da2102..7401c5694624 100644 --- a/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix +++ b/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix @@ -2,7 +2,7 @@ let version = "2.0.0"; -in fetchzip rec { +in fetchzip { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; postFetch = '' diff --git a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix index 94c43b11285e..a170a0780a48 100644 --- a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix +++ b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix @@ -1,6 +1,6 @@ { stdenv, google-fonts }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "inconsolata"; inherit (google-fonts) src version; diff --git a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix index d079ae59b0d6..3bc836fa4e48 100644 --- a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix @@ -1,6 +1,6 @@ { stdenv, requireFile, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "input-fonts"; version = "2017-08-10"; # date of the download and checksum diff --git a/nixpkgs/pkgs/data/fonts/inriafonts/default.nix b/nixpkgs/pkgs/data/fonts/inriafonts/default.nix index 52c28db639ef..5a8e3476bf80 100644 --- a/nixpkgs/pkgs/data/fonts/inriafonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/inriafonts/default.nix @@ -3,7 +3,7 @@ let pname = "inriafonts"; version = "1.200"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "BlackFoundry"; repo = "InriaFonts"; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 0676d3c0e1f6..962769b81445 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -1,8 +1,8 @@ { stdenv, fetchzip }: let - version = "2.2.1"; -in fetchzip rec { + version = "2.3.0"; +in fetchzip { name = "iosevka-bin-${version}"; url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; - sha256 = "0d5ys9k8adj9v1hpwbmjqshzpjlnyj81xwp0328vc5q8pvjcfly6"; + sha256 = "0nry6zsmvcj44rijhbvrry84rh5hrixzb4n1mx9c27vvpy33a56w"; meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; diff --git a/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix b/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix index 1501e0fb7fa2..eef3883506ef 100644 --- a/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "ir-standard-fonts"; version = "unstable-2017-01-21"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "morealaz"; repo = pname; diff --git a/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/nixpkgs/pkgs/data/fonts/joypixels/default.nix index f54838d5a646..fc6481e9a89e 100644 --- a/nixpkgs/pkgs/data/fonts/joypixels/default.nix +++ b/nixpkgs/pkgs/data/fonts/joypixels/default.nix @@ -1,13 +1,7 @@ { stdenv, fetchurl }: -let - fontconfig = fetchurl { - name = "75-joypixels.conf"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/75-joypixels.conf?h=packages/ttf-joypixels&id=b2b38f8393ec56ed7338c256f5b85f3439a2dfc3"; - sha256 = "065y2fmf86zzvna1hrvcg46cnr7a76xd2mwa26nss861dsx6pnd6"; - }; -in stdenv.mkDerivation rec { - pname = "emojione"; +stdenv.mkDerivation rec { + pname = "joypixels"; version = "5.0.2"; src = fetchurl { @@ -19,7 +13,6 @@ in stdenv.mkDerivation rec { installPhase = '' install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf - install -Dm644 ${fontconfig} $out/etc/fonts/conf.d/75-joypixels.conf ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix b/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix index c1de2806ef18..f6a031c7faf0 100644 --- a/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "kawkab-mono-20151015"; url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; diff --git a/nixpkgs/pkgs/data/fonts/libertine/default.nix b/nixpkgs/pkgs/data/fonts/libertine/default.nix index 2152b960cdc2..eb0a47e13d96 100644 --- a/nixpkgs/pkgs/data/fonts/libertine/default.nix +++ b/nixpkgs/pkgs/data/fonts/libertine/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fontforge }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "linux-libertine-5.3.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/data/fonts/luculent/default.nix b/nixpkgs/pkgs/data/fonts/luculent/default.nix index fe733359f3a8..7e5a69a2c1f7 100644 --- a/nixpkgs/pkgs/data/fonts/luculent/default.nix +++ b/nixpkgs/pkgs/data/fonts/luculent/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let version = "2.0.0"; in -fetchzip rec { +fetchzip { name = "luculent-${version}"; url = http://www.eastfarthing.com/luculent/luculent.tar.xz; diff --git a/nixpkgs/pkgs/data/fonts/medio/default.nix b/nixpkgs/pkgs/data/fonts/medio/default.nix index 024e6049a386..c94046f085f9 100644 --- a/nixpkgs/pkgs/data/fonts/medio/default.nix +++ b/nixpkgs/pkgs/data/fonts/medio/default.nix @@ -6,7 +6,7 @@ let pname = "medio"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/monoid/default.nix b/nixpkgs/pkgs/data/fonts/monoid/default.nix index c4cf4f142516..06fb7499b81b 100644 --- a/nixpkgs/pkgs/data/fonts/monoid/default.nix +++ b/nixpkgs/pkgs/data/fonts/monoid/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, fontforge }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "monoid"; version = "2016-07-21"; diff --git a/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix b/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix index 03bc8a0db4da..75e8899e664a 100644 --- a/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -2,7 +2,7 @@ let version = "063a"; -in fetchzip rec { +in fetchzip { name = "mplus-${version}"; url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/data/fonts/myrica/default.nix b/nixpkgs/pkgs/data/fonts/myrica/default.nix index f3be8857284c..444d526f5ae1 100644 --- a/nixpkgs/pkgs/data/fonts/myrica/default.nix +++ b/nixpkgs/pkgs/data/fonts/myrica/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: -fetchFromGitHub rec { +fetchFromGitHub { name = "myrica-2.011.20160403"; owner = "tomokuni"; diff --git a/nixpkgs/pkgs/data/fonts/nafees/default.nix b/nixpkgs/pkgs/data/fonts/nafees/default.nix index b39a59d1ba7a..d2aaadc42794 100644 --- a/nixpkgs/pkgs/data/fonts/nafees/default.nix +++ b/nixpkgs/pkgs/data/fonts/nafees/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nafees"; srcs = [(fetchurl { diff --git a/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix b/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix index f6b8210290e7..7d908b62cc6d 100644 --- a/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -4,7 +4,7 @@ let version = "VER2.5"; fullName = "NanumGothicCoding-2.5"; -in fetchzip rec { +in fetchzip { name = "nanum-gothic-coding"; url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix b/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix index c6bdbd40248a..3f58bc5f9336 100644 --- a/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "nika-fonts"; version = "1.0.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "font-store"; repo = "NikaFont"; diff --git a/nixpkgs/pkgs/data/fonts/norwester/default.nix b/nixpkgs/pkgs/data/fonts/norwester/default.nix index 0de5aa8fdf3e..ae70c74c3e49 100644 --- a/nixpkgs/pkgs/data/fonts/norwester/default.nix +++ b/nixpkgs/pkgs/data/fonts/norwester/default.nix @@ -3,7 +3,7 @@ let version = "1.2"; pname = "norwester"; -in fetchzip rec { +in fetchzip { name = "${pname}-${version}"; url = "http://jamiewilson.io/norwester/assets/norwester.zip"; diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index fdc6061a5cf9..1acc2abfcc88 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -46,7 +46,7 @@ let }; in -rec { +{ noto-fonts = mkNoto { name = "noto-fonts"; weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}"; diff --git a/nixpkgs/pkgs/data/fonts/open-sans/default.nix b/nixpkgs/pkgs/data/fonts/open-sans/default.nix index dfe1426d697a..0c1293ebda3f 100644 --- a/nixpkgs/pkgs/data/fonts/open-sans/default.nix +++ b/nixpkgs/pkgs/data/fonts/open-sans/default.nix @@ -3,7 +3,7 @@ let pname = "open-sans"; version = "1.11"; -in fetchFromGitLab rec { +in fetchFromGitLab { name = "${pname}-${version}"; domain = "salsa.debian.org"; diff --git a/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix b/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix index d02925e3a375..d297baddc4d7 100644 --- a/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "parastoo-fonts"; version = "1.0.0-alpha5"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix index e6f0776daea0..6b619d232016 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-mono"; url = [ diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix index 1e6610e8e44d..a36928090264 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-sans"; url = [ diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix index f4da6508f083..d74295571e00 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-serif"; url = [ diff --git a/nixpkgs/pkgs/data/fonts/pecita/default.nix b/nixpkgs/pkgs/data/fonts/pecita/default.nix index 144ec3bab850..1fc252421de6 100644 --- a/nixpkgs/pkgs/data/fonts/pecita/default.nix +++ b/nixpkgs/pkgs/data/fonts/pecita/default.nix @@ -4,7 +4,7 @@ let version = "5.4"; in -fetchurl rec { +fetchurl { name = "pecita-${version}"; url = "http://pecita.eu/b/Pecita.otf"; diff --git a/nixpkgs/pkgs/data/fonts/penna/default.nix b/nixpkgs/pkgs/data/fonts/penna/default.nix index 57395c507fe0..784f9d2573ef 100644 --- a/nixpkgs/pkgs/data/fonts/penna/default.nix +++ b/nixpkgs/pkgs/data/fonts/penna/default.nix @@ -6,7 +6,7 @@ let pname = "penna"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/profont/default.nix b/nixpkgs/pkgs/data/fonts/profont/default.nix index c28c9283a9bc..89565910f7a5 100644 --- a/nixpkgs/pkgs/data/fonts/profont/default.nix +++ b/nixpkgs/pkgs/data/fonts/profont/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "profont"; url = "http://web.archive.org/web/20160707013914/http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; diff --git a/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix b/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix index b2207e01df1a..580ea61a2df5 100644 --- a/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix @@ -2,7 +2,7 @@ # adapted from https://aur.archlinux.org/packages/proggyfonts/ -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "proggyfonts-0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/data/fonts/public-sans/default.nix b/nixpkgs/pkgs/data/fonts/public-sans/default.nix index 14c66fb39b22..46ebe4dd4b27 100644 --- a/nixpkgs/pkgs/data/fonts/public-sans/default.nix +++ b/nixpkgs/pkgs/data/fonts/public-sans/default.nix @@ -2,7 +2,7 @@ let version = "1.005"; -in fetchzip rec { +in fetchzip { name = "public-sans-${version}"; url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/nixpkgs/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 61206ca5d14b..6d075424bc52 100644 --- a/nixpkgs/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -50,13 +50,13 @@ let }; in { - liberation_ttf_v1 = common rec { + liberation_ttf_v1 = common { repo = "liberation-1.7-fonts"; version = "1.07.5"; nativeBuildInputs = [ fontforge ]; sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; }; - liberation_ttf_v2 = common rec { + liberation_ttf_v2 = common { repo = "liberation-fonts"; version = "2.00.4"; nativeBuildInputs = [ fontforge fonttools ]; diff --git a/nixpkgs/pkgs/data/fonts/redhat-official/default.nix b/nixpkgs/pkgs/data/fonts/redhat-official/default.nix index c05b9c69aef5..33321a2c7fe1 100644 --- a/nixpkgs/pkgs/data/fonts/redhat-official/default.nix +++ b/nixpkgs/pkgs/data/fonts/redhat-official/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let version = "2.2.0"; in -fetchzip rec { +fetchzip { name = "redhat-official-${version}"; url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix index d55e3b753dd7..cfd4e3808aa3 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix @@ -4,7 +4,7 @@ let # last commit on the directory containing the fonts in the upstream repository commit = "883939708704a19a295e0652036369d22469e8dc"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "roboto-mono"; version = "2016-01-11"; diff --git a/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix index 548414152ddb..f9f6ec342e91 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix +++ b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix @@ -4,7 +4,7 @@ let # last commit on the directory containing the fonts in the upstream repository commit = "883939708704a19a295e0652036369d22469e8dc"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "roboto-slab"; version = "2016-01-11"; diff --git a/nixpkgs/pkgs/data/fonts/roboto/default.nix b/nixpkgs/pkgs/data/fonts/roboto/default.nix index 707d31ac531a..50629c5f9773 100644 --- a/nixpkgs/pkgs/data/fonts/roboto/default.nix +++ b/nixpkgs/pkgs/data/fonts/roboto/default.nix @@ -2,7 +2,7 @@ let version = "2.138"; -in fetchzip rec { +in fetchzip { name = "roboto-${version}"; url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; diff --git a/nixpkgs/pkgs/data/fonts/route159/default.nix b/nixpkgs/pkgs/data/fonts/route159/default.nix index 1b8d4e60653c..cbc89c550b3c 100644 --- a/nixpkgs/pkgs/data/fonts/route159/default.nix +++ b/nixpkgs/pkgs/data/fonts/route159/default.nix @@ -6,7 +6,7 @@ let pname = "route159"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix b/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix index 0b90a43ca3e2..029ed33611f4 100644 --- a/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "sahel-fonts"; version = "1.0.0-alpha22"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix b/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix index dd4a01c782ee..d8d3d0d3b5ae 100644 --- a/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "samim-fonts"; version = "3.1.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix b/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix index f46fda0dd310..2d9fbfdae050 100644 --- a/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,7 +2,7 @@ let version = "0.8.0"; -in fetchurl rec { +in fetchurl { name = "sarasa-gothic-${version}"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; diff --git a/nixpkgs/pkgs/data/fonts/seshat/default.nix b/nixpkgs/pkgs/data/fonts/seshat/default.nix index af3c5dd25ee0..71483a04cbb7 100644 --- a/nixpkgs/pkgs/data/fonts/seshat/default.nix +++ b/nixpkgs/pkgs/data/fonts/seshat/default.nix @@ -6,7 +6,7 @@ let pname = "seshat"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix b/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix index 89bca56a53ef..5834b797eeab 100644 --- a/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "shabnam-fonts"; version = "4.0.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix b/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix index 87484a99b110..eb776a3df26f 100644 --- a/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix +++ b/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,20 +1,20 @@ { lib, fetchzip }: let - version = "2.010"; + version = "3.000"; in fetchzip { name = "source-serif-pro-${version}"; - url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R-ro%2F1.010R-it/source-serif-pro-${version}R-ro-1.010R-it.zip"; + url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R/source-serif-pro-${version}R.zip"; postFetch = '' mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable + unzip -j $downloadedFile "OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "VAR/*.otf" -d $out/share/fonts/variable ''; - sha256 = "1a3lmqk7hyxpfkb30s9z73lhs823dmq6xr5llp9w23g6bh332x2h"; + sha256 = "06yp8y79mqk02qzp81h8zkmzqqlhicgrkwmzkd0bm338xh8grsiz"; meta = with lib; { homepage = https://adobe-fonts.github.io/source-serif-pro/; diff --git a/nixpkgs/pkgs/data/fonts/spleen/default.nix b/nixpkgs/pkgs/data/fonts/spleen/default.nix index 873528b8bde1..2964b8692dcc 100644 --- a/nixpkgs/pkgs/data/fonts/spleen/default.nix +++ b/nixpkgs/pkgs/data/fonts/spleen/default.nix @@ -3,7 +3,7 @@ let pname = "spleen"; version = "1.0.5"; -in fetchurl rec { +in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/data/fonts/stix-otf/default.nix b/nixpkgs/pkgs/data/fonts/stix-otf/default.nix index f5d15439079d..f3ff9600f5de 100644 --- a/nixpkgs/pkgs/data/fonts/stix-otf/default.nix +++ b/nixpkgs/pkgs/data/fonts/stix-otf/default.nix @@ -2,7 +2,7 @@ let version = "1.1.1"; -in fetchzip rec { +in fetchzip { name = "stix-otf-${version}"; url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip"; diff --git a/nixpkgs/pkgs/data/fonts/sudo/default.nix b/nixpkgs/pkgs/data/fonts/sudo/default.nix index bfc66a77207f..359139ec9c67 100644 --- a/nixpkgs/pkgs/data/fonts/sudo/default.nix +++ b/nixpkgs/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.37"; -in fetchzip rec { + version = "0.40"; +in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "16x6vs016wz6rmd4p248ri9fn35xq7r3dc8hv4w2c4rz1xl8c099"; + sha256 = "1nf025sjps4yysf6zkns5fzjgls6xdpifh7bz4ray9x8h5pz0z64"; postFetch = '' mkdir -p $out/share/fonts/truetype/ diff --git a/nixpkgs/pkgs/data/fonts/tenderness/default.nix b/nixpkgs/pkgs/data/fonts/tenderness/default.nix index 958af414ff09..09ea566e7382 100644 --- a/nixpkgs/pkgs/data/fonts/tenderness/default.nix +++ b/nixpkgs/pkgs/data/fonts/tenderness/default.nix @@ -6,7 +6,7 @@ let pname = "tenderness"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix b/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix index 211cc73cc9de..bdd0fd7762b6 100644 --- a/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -2,7 +2,7 @@ let version = "4.47.0"; -in fetchzip rec { +in fetchzip { name = "terminus-font-ttf-${version}"; url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix b/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix index 5f072f90f055..7c90c16d4d1e 100644 --- a/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "ubuntu-font-family-0.83"; url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip"; diff --git a/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix b/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix index f1545e3d5b45..0ea0363763dc 100644 --- a/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ucs-fonts"; version = "20090406"; diff --git a/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index 35551e929e64..f9045794fe15 100644 --- a/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -3,7 +3,7 @@ let version = "1.0"; in -fetchzip rec { +fetchzip { name = "ultimate-oldschool-pc-font-pack-${version}"; url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y"; diff --git a/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix index d004e75571b7..f39867538099 100755 --- a/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "vazir-fonts"; version = "19.2.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix b/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix index 01a4072099ad..fd74897077f3 100644 --- a/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix +++ b/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "vdrsymbols-20100612"; url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz; diff --git a/nixpkgs/pkgs/data/fonts/victor-mono/default.nix b/nixpkgs/pkgs/data/fonts/victor-mono/default.nix index e1ef611d686f..e886ad7578e3 100644 --- a/nixpkgs/pkgs/data/fonts/victor-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/victor-mono/default.nix @@ -2,7 +2,7 @@ let pname = "victor-mono"; - version = "1.2.1"; + version = "1.2.5"; in fetchFromGitHub rec { name = "${pname}-${version}"; @@ -26,7 +26,7 @@ in fetchFromGitHub rec { unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname} ''; - sha256 = "0347n3kdyrbg42rxcgnyghi21qz5iz6w30v7ms2vjal7pfm6h2vn"; + sha256 = "0dj5h45qk6abggj6mgm19sb0a7q0v4x41f2zds1ab79yd22gbjns"; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; diff --git a/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix b/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix index 0e996da2fc7c..e5dd11db72a7 100644 --- a/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix @@ -3,7 +3,7 @@ let pname = "xkcd-font"; version = "unstable-2017-08-24"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "ipython"; diff --git a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index f276b573019f..5a566bef6ef9 100644 --- a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Elementary icons for Xfce and other GTK+ desktops like GNOME"; + description = "Elementary icons for Xfce and other GTK desktops like GNOME"; homepage = https://github.com/shimmerproject/elementary-xfce; license = licenses.gpl2; # darwin cannot deal with file names differing only in case diff --git a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index 49d289cac391..a623af206048 100644 --- a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "maia-icon-theme"; version = "2018-02-24"; diff --git a/nixpkgs/pkgs/data/machine-learning/mnist/default.nix b/nixpkgs/pkgs/data/machine-learning/mnist/default.nix index 26b06b4e652e..fe9e83492e42 100644 --- a/nixpkgs/pkgs/data/machine-learning/mnist/default.nix +++ b/nixpkgs/pkgs/data/machine-learning/mnist/default.nix @@ -20,7 +20,7 @@ let }; in stdenvNoCC.mkDerivation rec { - name = "mnist-${version}"; + pname = "mnist"; version = "2018-11-16"; installPhase = '' mkdir -p $out diff --git a/nixpkgs/pkgs/data/misc/brise/default.nix b/nixpkgs/pkgs/data/misc/brise/default.nix index 54b54d278ffb..f1e0604acf86 100644 --- a/nixpkgs/pkgs/data/misc/brise/default.nix +++ b/nixpkgs/pkgs/data/misc/brise/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, librime }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "brise-unstable-2017-09-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/misc/cacert/default.nix b/nixpkgs/pkgs/data/misc/cacert/default.nix index a99df2e7bd65..99739646a8ba 100644 --- a/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -15,7 +15,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nss-cacert-${nss.version}"; src = nss.src; diff --git a/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix b/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix index 38662bef0af3..8cbd526f3d3b 100644 --- a/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix +++ b/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix @@ -6,7 +6,7 @@ let url = "https://geolite.maxmind.com/download/geoip/database/${src}"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "geolite-legacy"; version = "2017-12-02"; diff --git a/nixpkgs/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix index 87c4afb986be..3500eaa63265 100644 --- a/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/2b4df08d487f0821b932f92392b67fe12dc1d42c.tar.gz"; - sha256 = "02d06fr2jr69za5751z25c3x3zspiwdmlhmdmxaj1g48v00gbfag"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/93bcfb09798da885d29304fa4dab1e234e3b728e.tar.gz"; + sha256 = "1mv5kxqldakapzbmch2b88mynng268njq3dxbkmyzli8fwnllra2"; } diff --git a/nixpkgs/pkgs/data/misc/nixos-artwork/default.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/default.nix index 71fe32c10665..4814232fbfe7 100644 --- a/nixpkgs/pkgs/data/misc/nixos-artwork/default.nix +++ b/nixpkgs/pkgs/data/misc/nixos-artwork/default.nix @@ -1,5 +1,5 @@ { callPackage }: -rec { +{ wallpapers = callPackage ./wallpapers.nix { }; } diff --git a/nixpkgs/pkgs/data/misc/pari-galdata/default.nix b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix index 1b6b60f104e0..2535e8cfc250 100644 --- a/nixpkgs/pkgs/data/misc/pari-galdata/default.nix +++ b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "20080411"; pname = "pari-galdata"; diff --git a/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix index 2d3d52f697ed..3470a0804f74 100644 --- a/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix +++ b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "20090618"; pname = "pari-seadata-small"; diff --git a/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix b/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix index b5414ab18b4d..ca79e251f28a 100644 --- a/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix +++ b/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix @@ -3,7 +3,7 @@ let pname = "publicsuffix-list"; version = "2019-05-24"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "publicsuffix"; repo = "list"; diff --git a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix index 79924c4832f6..6952d2da6bad 100644 --- a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix +++ b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix @@ -2,7 +2,7 @@ , libxml2, glib}: let version = "1.12"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shared-mime-info"; inherit version; diff --git a/nixpkgs/pkgs/data/misc/tzdata/default.nix b/nixpkgs/pkgs/data/misc/tzdata/default.nix index c1f9153c5854..b2363b4b549e 100644 --- a/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2019a"; + version = "2019b"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh"; + sha256 = "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7"; + sha256 = "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf"; }) ]; diff --git a/nixpkgs/pkgs/data/themes/adementary/default.nix b/nixpkgs/pkgs/data/themes/adementary/default.nix index 40190d65d5ed..1cb7ac53432f 100644 --- a/nixpkgs/pkgs/data/themes/adementary/default.nix +++ b/nixpkgs/pkgs/data/themes/adementary/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; + description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme"; homepage = https://github.com/hrdwrrsk/adementary-theme; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; diff --git a/nixpkgs/pkgs/data/themes/greybird/default.nix b/nixpkgs/pkgs/data/themes/greybird/default.nix index d573603ce903..1c5a631a48c0 100644 --- a/nixpkgs/pkgs/data/themes/greybird/default.nix +++ b/nixpkgs/pkgs/data/themes/greybird/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Grey and blue theme from the Shimmer Project for GTK+-based environments"; + description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = https://github.com/shimmerproject/Greybird; license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 platforms = platforms.linux; diff --git a/nixpkgs/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix index 09ca8897a216..db0b4ec66104 100644 --- a/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "matcha"; version = "2019-06-22"; diff --git a/nixpkgs/pkgs/data/themes/materia-theme/default.nix b/nixpkgs/pkgs/data/themes/materia-theme/default.nix index ccdd1067302e..02c1b91a3ebd 100644 --- a/nixpkgs/pkgs/data/themes/materia-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/materia-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "materia-theme"; - version = "20190315"; + version = "20190831"; src = fetchFromGitHub { owner = "nana-4"; repo = pname; rev = "v${version}"; - sha256 = "1fpipwvwxjiriqhysqgx51rnax73hyd5jkyxhc2g3y73s5r2xq82"; + sha256 = "19b2wyq38wj3id0an47jln1y3zp5ih3kbrgmfpjp6bbdrmfcyccf"; }; nativeBuildInputs = [ glib libxml2 bc ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Material Design theme for GNOME/GTK+ based desktop environments"; + description = "Material Design theme for GNOME/GTK based desktop environments"; homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/themes/plata/default.nix b/nixpkgs/pkgs/data/themes/plata/default.nix index cf2eb5447f74..d026e06e39d3 100644 --- a/nixpkgs/pkgs/data/themes/plata/default.nix +++ b/nixpkgs/pkgs/data/themes/plata/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Gtk+ theme based on Material Design Refresh"; + description = "A GTK theme based on Material Design Refresh"; homepage = https://gitlab.com/tista500/plata-theme; license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix index 3a0695f3fb84..2511f05c4ea3 100644 --- a/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ]; + makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix index 619c66d9f5f8..7c88102c5f3a 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { makeFlags = [ "DEB_HOST_MULTIARCH=" - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index b6c20ef71297..4f2427e8237a 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # fix default background url sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ overrides/common/com.deepin.wrap.gnome.desktop.override - + fixPath ${deepin-wallpapers} /usr/share/backgrounds \ overrides/common/com.deepin.wrap.gnome.desktop.override @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # /usr/share/desktop-directories ''; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; doCheck = true; checkTarget = "test"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index f4f4ae2971a4..67fcc36bcefc 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; postPatch = '' sed -e 's/sudo cp/cp/' -i src/generate_mo.py diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 4c0643a7ce5c..8e2469a2c788 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix index 8ecb25f5a2e7..e63a228d0cbe 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildTargets = "all hicolor-links"; installTargets = "install-icons install-cursors"; - installFlags = [ "PREFIX=${placeholder ''out''}" ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix index 398be55398bf..e61e91fc87c7 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; }; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; diff --git a/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix index 1d97991dffd0..d302cc3417f2 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; }; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix index 2c63fd5ebe62..125629764902 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "GOCACHE=$(TMPDIR)/go-cache" ]; diff --git a/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix index 68504d756b17..2f431bd941b8 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "GOCACHE=$(TMPDIR)/go-cache" ]; diff --git a/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index d76bed1b9b7b..4d0240c426ba 100644 --- a/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { ]; qmakeFlags = [ - "INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms" + "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/desktops/enlightenment/default.nix b/nixpkgs/pkgs/desktops/enlightenment/default.nix index 8d0fed6b3d85..2739b9a2517f 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/default.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/default.nix @@ -1,5 +1,5 @@ { callPackage, pkgs }: -rec { +{ #### CORE EFL efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; diff --git a/nixpkgs/pkgs/desktops/gnome-2/default.nix b/nixpkgs/pkgs/desktops/gnome-2/default.nix index 16828f08bc27..6cc6848b316f 100644 --- a/nixpkgs/pkgs/desktops/gnome-2/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-2/default.nix @@ -57,8 +57,6 @@ lib.makeScope pkgs.newScope (self: with self; { #### DESKTOP - gvfs = pkgs.gvfs.override { gnome = self; }; - # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; @@ -78,7 +76,10 @@ lib.makeScope pkgs.newScope (self: with self; { glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 # Included for backwards compatibility - libsoup libwnck gtk-doc gnome-doc-utils rarian; + libsoup libwnck gtk-doc gnome-doc-utils rarian + + gvfs # added 2019-09-03 + ; gtk = pkgs.gtk2; gtkmm = pkgs.gtkmm2; diff --git a/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix b/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix index c774468852ee..606ba93d3fcd 100644 --- a/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -45,10 +45,10 @@ in stdenv.mkDerivation rec { meta = { homepage = https://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; + description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is + GTK, and a minimal sample application (vte) using that. Vte is mainly used in gnome-terminal, but can also be used to embed a console/terminal in games, editors, IDEs, etc. VTE supports Unicode and character set conversion, as well as emulating any terminal known to diff --git a/nixpkgs/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 369880c4fc1a..27caaa70634f 100644 --- a/nixpkgs/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://projects.gnome.org/gtkglext/; - description = "GtkGLExt, an OpenGL extension to GTK+"; - longDescription = - '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK - objects which support OpenGL rendering in GTK+ and GtkWidget API - add-ons to make GTK+ widgets OpenGL-capable. In contrast to Janne - Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables - OpenGL drawing for standard and custom GTK+ widgets. - ''; + description = "GtkGLExt, an OpenGL extension to GTK"; + longDescription = '' + GtkGLExt is an OpenGL extension to GTK. It provides additional GDK + objects which support OpenGL rendering in GTK and GtkWidget API + add-ons to make GTK widgets OpenGL-capable. In contrast to Janne + Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables + OpenGL drawing for standard and custom GTK widgets. + ''; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix index 92b38ed5eee4..84d1a8a76ba3 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Glade; - description = "User interface designer for GTK+ applications"; + description = "User interface designer for GTK applications"; maintainers = gnome3.maintainers; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 5978fb217e87..920343a60241 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -6,7 +6,7 @@ let version = "3.32.2"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gnome-notes"; inherit version; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index dda45a71fe20..0048b02581a7 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ]; prePatch = '' - substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas \ - --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas" + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ + --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} patches="$patches $PWD/hardcode-gsettings.patch" ''; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 4148843d4ab7..7817936bfda6 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-pkcs11-config=${placeholder ''out''}/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=${placeholder ''out''}/lib/pkcs11/" + "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories + "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 761216600120..3d37040828c5 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/ + schemadir=${glib.makeSchemaPath "$out" "${pname}-${version}"} glib-compile-schemas $schemadir diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 65f9fb0db806..2a425acb067d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" - "--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0" + "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" + "--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 7e1f696c58d1..41527298ffbe 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = version; - sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i"; + rev = "74e3126b77eb5f27c0ae3f53b0aff2d2eebc15af"; # patches of tip from gnome-3-28 branch + sha256 = "0gw1n1w3i040w5mv30kkg7g8a59ymjlc5yaklip0ngg8xv76g0zi"; }; patches = [ @@ -58,7 +58,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-x" - "--disable-static" "--enable-shape" "--enable-sm" "--enable-startup-notification" diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix index 61219ca4488e..eab0b131ea93 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo +{ fetchurl, fetchpatch, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , gsettings-desktop-schemas, glib, gtk3, gnome-desktop @@ -55,6 +55,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit zenity; }) + # Fix a segmentation fault in dri_flush_front_buffer() upon + # suspend/resume. This change should be removed when Mutter + # is updated to 3.34. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff"; + sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n"; + }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/vino/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/vino/default.nix index 444c144cfab8..e18f4de68d6c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/vino/default.nix @@ -28,7 +28,7 @@ , telepathy-glib ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vino"; version = "unstable-2019-07-08"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/default.nix b/nixpkgs/pkgs/desktops/gnome-3/default.nix index 1f16ff9d0b52..21ecc7e64ee4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/default.nix @@ -53,10 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; { gjs = callPackage ./core/gjs { }; - glib-networking = pkgs.glib-networking.override { - inherit (pkgs) gsettings-desktop-schemas; - }; - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; @@ -111,7 +107,7 @@ lib.makeScope pkgs.newScope (self: with self; { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; + gvfs = pkgs.gvfs.override { gnomeSupport = true; }; eog = callPackage ./core/eog { }; @@ -348,6 +344,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 inherit (pkgs) gnome-video-effects; # added 2019-08-19 inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 + inherit (pkgs) glib-networking; # added 2019-09-02 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix new file mode 100644 index 000000000000..b38f0aeba919 --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-arc-menu"; + version = "31"; + + src = fetchFromGitLab { + owner = "LinxGem33"; + repo = "Arc-Menu"; + rev = "v${version}-stable"; + sha256 = "124jgdy6mw76nrkq3f0y7qkhdm39wg273zifdvwbgpvirwzxbia1"; + }; + + patches = [ + (substituteAll { + src = ./fix_gmenu.patch; + gmenu_path = "${gnome-menus}/lib/girepository-1.0"; + }) + ]; + + buildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALL_BASE=$(out)/share/gnome-shell/extensions" ]; + + meta = with stdenv.lib; { + description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dkabot ]; + homepage = https://gitlab.com/LinxGem33/Arc-Menu; + }; +} diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch new file mode 100644 index 000000000000..7f6b8489ea8b --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch @@ -0,0 +1,12 @@ +--- a/extension.js ++++ b/extension.js +@@ -29,6 +29,8 @@ + * https://github.com/The-Panacea-Projects/Gnomenu + */ + ++ ++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); + + // Import Libraries + const Main = imports.ui.main; + diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index b4b184d4fa03..f04999a449c2 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { description = "GNOME Shell integration for Chrome"; homepage = https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome; longDescription = '' - To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>. For Firefox based browsers, you will also need to build the wrappers with <option>nixpkgs.config.firefox.enableGnomeExtensions</option> set to <literal>true</literal>. + To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>. ''; license = licenses.gpl3; maintainers = gnome3.maintainers; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 30f9ad7d2ab1..f7f189e23bdc 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; - version = "19"; + version = "23"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "0r26ph6zq87kvglydv00rf24mshz7l4r38zf9niyp3mxyzz6rwys"; + sha256 = "12smkz3clcvgicr0pdc0fk6igf82nw4hzih1ywv9q43xkqh9w1i6"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 0d9d54167ff2..cff0db665bba 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-paths.patch; gapplication = "${glib.bin}/bin/gapplication"; - mutter_gsettings_path = "${gnome3.mutter}/share/gsettings-schemas/${gnome3.mutter.name}/glib-2.0/schemas"; + mutter_gsettings_path = glib.getSchemaPath gnome3.mutter; }) ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" - "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" + "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" "-Dopenssl_path=${openssl}/bin/openssl" diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix index f09822415a6e..10175719e46c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extensions-mediaplayer"; version = "unstable-2019-03-21"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 285733d5f7c9..13b2d6a1db4f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; - version = "36"; + version = "38"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; rev = "v${version}"; - sha256 = "0x3r189h5264kjxsm18d34gzb5ih8l4pz7i9qks9slcnzaiw4y0z"; + sha256 = "1sdj2kxb418mgq44a6lf6jic33wlfbnn3ja61igmx0jj1530iknv"; }; buildInputs = [ @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; - broken = true; # GNOME 3.32 support WIP: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/510 maintainers = with maintainers; [ aneeshusa tiramiseb ]; homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index 745541b7cf43..d5bc0bbc83d2 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { uuid = "taskwhisperer-extension@infinicode.de"; makeFlags = [ - "INSTALLBASE=${placeholder ''out''}/share/gnome-shell/extensions" + "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix index 657bf4a76391..8e53a937a5e9 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Hitori; - description = "GTK+ application to generate and let you play games of Hitori"; + description = "GTK application to generate and let you play games of Hitori"; maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix index 94703f375b21..94418849b987 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -30,21 +30,13 @@ stdenv.mkDerivation rec { pname = "gitg"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81"; + sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; }; - patches = [ - # https://gitlab.gnome.org/GNOME/gitg/issues/213 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch"; - sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 7bb162b7b8b4..25e1347f1c92 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { doCheck = true; configureFlags = [ - "--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets" + "--with-libpanel-applet-dir=${placeholder "out"}/share/gnome-panel/applets" ]; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix index d8a78686e491..46ca01c1a1a1 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace src/gnome-shell/prefs.js \ --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/libgpaste/settings/gpaste-settings.c \ - --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" + --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"} ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnustep/make/default.nix b/nixpkgs/pkgs/desktops/gnustep/make/default.nix index 5e7db35a7276..64e9332a3066 100644 --- a/nixpkgs/pkgs/desktops/gnustep/make/default.nix +++ b/nixpkgs/pkgs/desktops/gnustep/make/default.nix @@ -4,7 +4,7 @@ let version = "2.7.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnustep-make"; inherit version; diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix index 104ab20835fa..0646078d8257 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { with all xfce4 dependencies removed, some bugs fixed, and some improvement of UI. Although being part of LXDE, the Lightweight X11 Desktop Environment, it's totally desktop independent and only - requires pure gtk+. + requires pure GTK. ''; homepage = https://wiki.lxde.org/en/LXTask; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix index 675648363f52..0278fd7fec83 100644 --- a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix +++ b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06z38vfs15f5crrrgvcsqfb557fhpq1mqkj5fd9wb0hvi77hasrk"; + sha256 = "0ph7ngk32nnzc3psqjs5zy52zbjilk30spr2r4sixqxvmz7d28gd"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index ae6583c46720..0decbbc6c7a6 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -10,6 +10,7 @@ , desktop-file-utils , libcanberra , gtk3 +, glib , libgee , granite , libnotify @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py substituteInPlace filechooser-module/FileChooserDialog.vala \ - --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 3b85b123fd03..7a79f72f1a2e 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Universal Access Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index bd6df460c04b..3247aed4993e 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ./remove-update-button.patch ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard About Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index dca9cc662a2b..ddb589c9e792 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Applications Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index d1663ad48cd3..9f1c75b7b438 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Bluetooth Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index fb7ea18e88be..c0c7bbdec2e5 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ./clock-format.patch ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Date & Time Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index c15abfd8cb81..76cfe61fc777 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Displays Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index ba753af7e202..8b82543a0e5f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }) ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Keyboard Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 00579c545254..a8556bd54014 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -10,6 +10,7 @@ , gtk3 , switchboard , elementary-settings-daemon +, glib }: stdenv.mkDerivation rec { @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Views/General.vala \ - --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + --subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon} ''; passthru = { @@ -46,13 +47,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glib granite gtk3 libgee switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Mouse & Touchpad Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 09d6da4f2460..b3e4879fdae4 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Networking Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index e547f22fec16..a61124954698 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Notifications Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index b9fad17c2f75..35dd958483d6 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, glib , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop , gala, wingpanel, plank, switchboard, gettext, bamf, fetchpatch }: @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { buildInputs = [ bamf + elementary-settings-daemon gexiv2 + glib gnome-desktop - elementary-settings-daemon granite gtk3 libgee @@ -51,13 +52,13 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Views/Appearance.vala \ - --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas + --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala} substituteInPlace src/Views/Appearance.vala \ - --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas + --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel} ''; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Desktop Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 461ddcd3764a..1c90cc0e6627 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -11,6 +11,7 @@ , elementary-settings-daemon , granite , gtk3 +, glib , dbus , polkit , switchboard @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus + glib granite gtk3 libgee @@ -59,15 +61,15 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/MainView.vala \ - --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas + --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${glib.getSchemaPath elementary-dpms-helper} substituteInPlace src/MainView.vala \ - --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + --subst-var-by GSD_GSETTINGS_PATH ${glib.getSchemaPath elementary-settings-daemon} ''; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; - PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/system-services"; - PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder ''out''}/etc"; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder ''out''}/share/polkit-1/actions"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; + PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services"; + PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; meta = with stdenv.lib; { description = "Switchboard Power Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 5c303e04982b..d1feaaf0ea4f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Printers Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 19967c3bce05..fd67440a43c2 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -9,6 +9,7 @@ , libgee , granite , gtk3 +, glib , polkit , zeitgeist , switchboard @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glib granite gtk3 libgee @@ -49,7 +51,7 @@ stdenv.mkDerivation rec { zeitgeist ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; patches = [ ./hardcode-gsettings.patch @@ -60,9 +62,9 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py substituteInPlace src/Views/LockPanel.vala \ - --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas + --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${glib.getSchemaPath lightlocker} substituteInPlace src/Views/FirewallPanel.vala \ - --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index b4aafb270062..87ae233916d8 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Sharing Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index ed3518c764f9..dee2f851e3fd 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Sound Plug"; diff --git a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 76bdcf643f8f..df2475ce82a3 100644 --- a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -3,7 +3,7 @@ , pantheon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elementary-redacted-script"; version = "unstable-2016-06-03"; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index b273bbece969..9fc4418e7ca1 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -33,16 +33,17 @@ with stdenv.lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this runCommand "elementary-gsettings-desktop-schemas" {} '' - mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages} + mkdir -p $schema_dir + cp -rf ${glib.getSchemaPath gsettings-desktop-schemas}/*.xml $schema_dir + + ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages} chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides - cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override \ - $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override $schema_dir - cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF + cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] picture-uri='file://${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' primary-color='#000000' @@ -50,5 +51,5 @@ runCommand "elementary-gsettings-desktop-schemas" {} ${extraGSettingsOverrides} EOF - ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ + ${glib.dev}/bin/glib-compile-schemas $schema_dir '' diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 9f40c0f9e582..ae138c9215c1 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "--sysconfdir=${placeholder ''out''}/etc" + "--sysconfdir=${placeholder "out"}/etc" ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; patches = [ (substituteAll { diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 7e73adcd7e91..36d1cf0e77a3 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; postPatch = '' chmod +x meson/post_install.py diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 1ab3c579e145..74408a4ed6d4 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }) ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; postPatch = '' chmod +x meson/post_install.py diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 00a57cb99433..5431b982f540 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }) ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; meta = with stdenv.lib; { description = "Keyboard Indicator for Wingpanel"; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index d5ce97df509d..6ba19ebf77ee 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; meta = with stdenv.lib; { description = "Network Indicator for Wingpanel"; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 0eab02bf8c80..0327d5e78e2c 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; meta = with stdenv.lib; { description = "Night Light Indicator for Wingpanel"; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 78c901a23063..a4266a6f4595 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; meta = with stdenv.lib; { description = "Notifications Indicator for Wingpanel"; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index f63cca74a4dc..9f9d47030600 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; postPatch = '' chmod +x meson/post_install.py diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index b363cb5485a5..f48638ff2b16 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; meta = with stdenv.lib; { description = "Session Indicator for Wingpanel"; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 6d0e791d1e41..038ab75094cd 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; postPatch = '' chmod +x meson/post_install.py diff --git a/nixpkgs/pkgs/desktops/pantheon/granite/default.nix b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix index 7fba9610db0b..521d22d23353 100644 --- a/nixpkgs/pkgs/desktops/pantheon/granite/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix @@ -66,9 +66,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "An extension to GTK+ used by elementary OS"; + description = "An extension to GTK used by elementary OS"; longDescription = '' - Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions + Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions designed for use in apps built for elementary OS. ''; homepage = https://github.com/elementary/granite; diff --git a/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix index 6401b96a2eab..b10e97f77d73 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libgee ]; - PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/services"; + PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; meta = with stdenv.lib; { description = "A desktop-wide extension service used by elementary OS"; diff --git a/nixpkgs/pkgs/desktops/pantheon/update.nix b/nixpkgs/pkgs/desktops/pantheon/update.nix index 7e9aacc0c2b2..3bc432c5d325 100644 --- a/nixpkgs/pkgs/desktops/pantheon/update.nix +++ b/nixpkgs/pkgs/desktops/pantheon/update.nix @@ -31,6 +31,6 @@ let throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release)."; - versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy} or throwFlag; + versionFlag = { release = "-r"; master = "-m"; }.${versionPolicy} or throwFlag; in [ updateScript versionFlag repoName attrPath ] diff --git a/nixpkgs/pkgs/desktops/plasma-5/default.nix b/nixpkgs/pkgs/desktops/plasma-5/default.nix index 07c6805c689a..e188e4e3fcdd 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -72,7 +72,7 @@ let let inherit (args) name; sname = args.sname or name; - inherit (srcs."${sname}") src version; + inherit (srcs.${sname}) src version; outputs = args.outputs or [ "out" ]; hasBin = lib.elem "bin" outputs; diff --git a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index 4efd493a3dd7..e2e6da6f07c2 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.4/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.5/ ) diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 32bd5f3a9f28..4183b38ba493 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -15,7 +15,7 @@ plasma-workspace, xf86inputlibinput }: -mkDerivation rec { +mkDerivation { name = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index 21dd5c36d78f..f299ed953de2 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/bluedevil-5.16.4.tar.xz"; - sha256 = "36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521"; - name = "bluedevil-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/bluedevil-5.16.5.tar.xz"; + sha256 = "60ac3471d30cb113b1959eacdaa1f4898f04f779f94a35dbca00993cda4ea464"; + name = "bluedevil-5.16.5.tar.xz"; }; }; breeze = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/breeze-5.16.4.tar.xz"; - sha256 = "84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395"; - name = "breeze-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/breeze-5.16.5.tar.xz"; + sha256 = "09225021a2cf396e74cabe692b0a5dcf9a12f0b47f02fb14df6ccc9db01f2e6b"; + name = "breeze-5.16.5.tar.xz"; }; }; breeze-grub = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/breeze-grub-5.16.4.tar.xz"; - sha256 = "c36b2183fff7d559ae944881443e0caa03c63bcc81af9f6b21b722109d2e34db"; - name = "breeze-grub-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/breeze-grub-5.16.5.tar.xz"; + sha256 = "ce73297350e7b79b04aa8ba44594e8eca2d37c0342eb331bd5d31679f3887878"; + name = "breeze-grub-5.16.5.tar.xz"; }; }; breeze-gtk = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/breeze-gtk-5.16.4.tar.xz"; - sha256 = "8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb"; - name = "breeze-gtk-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/breeze-gtk-5.16.5.tar.xz"; + sha256 = "d9849ecf6c2fc85fde76912410ab36c46ca65b96d80b4e51819ca35015a88098"; + name = "breeze-gtk-5.16.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/breeze-plymouth-5.16.4.tar.xz"; - sha256 = "7556c8f6bff771f3439036f843309b45594c5e903fc11a3275cc2c38346dec9f"; - name = "breeze-plymouth-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/breeze-plymouth-5.16.5.tar.xz"; + sha256 = "bb10d2f0185181e6f2fe8e3b85415dfcce6069595e0074b182688c6f567dd0b0"; + name = "breeze-plymouth-5.16.5.tar.xz"; }; }; discover = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/discover-5.16.4.tar.xz"; - sha256 = "0e07a49d3ee93434452d69330b11653546a2104601ec08518be111ba7967f1b0"; - name = "discover-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/discover-5.16.5.tar.xz"; + sha256 = "26c47a5c0f59a31f37da85e894a926c76805b66f91dde8ba6d2de8015842d5c1"; + name = "discover-5.16.5.tar.xz"; }; }; drkonqi = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/drkonqi-5.16.4.tar.xz"; - sha256 = "9d030a59a6d1d732241f8c54a54291ac60584d542ea0b891ca4b2bcb958bd51f"; - name = "drkonqi-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/drkonqi-5.16.5.tar.xz"; + sha256 = "b4ae1518108c2d3ccbc533708801b52b83b7e9efd6eed9f1ee9d67936b9e78ff"; + name = "drkonqi-5.16.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kactivitymanagerd-5.16.4.tar.xz"; - sha256 = "a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770"; - name = "kactivitymanagerd-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kactivitymanagerd-5.16.5.tar.xz"; + sha256 = "e35dbf7aae8a7b7f21b2304935cad96881af558a7c9d947f0114093038b1c4bc"; + name = "kactivitymanagerd-5.16.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kde-cli-tools-5.16.4.tar.xz"; - sha256 = "56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d"; - name = "kde-cli-tools-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kde-cli-tools-5.16.5.tar.xz"; + sha256 = "bc82b159d3c9a23f0ecb47a8314b645041b01692887a3be0ef0582d54f926de2"; + name = "kde-cli-tools-5.16.5.tar.xz"; }; }; kdecoration = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kdecoration-5.16.4.tar.xz"; - sha256 = "aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4"; - name = "kdecoration-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kdecoration-5.16.5.tar.xz"; + sha256 = "2b8c7b7cf114d0eff4ec842009cda264d8cf1254ec4bf65868b6d26f263829bb"; + name = "kdecoration-5.16.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kde-gtk-config-5.16.4.tar.xz"; - sha256 = "c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c"; - name = "kde-gtk-config-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kde-gtk-config-5.16.5.tar.xz"; + sha256 = "f78abf129aaa7afac2c7a71105b36b9553a975bbcb89ec65a0166099d1cca8c1"; + name = "kde-gtk-config-5.16.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kdeplasma-addons-5.16.4.tar.xz"; - sha256 = "4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1"; - name = "kdeplasma-addons-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kdeplasma-addons-5.16.5.tar.xz"; + sha256 = "a4737a54b75143053a9f8a5bc28c608f843c524872c665d4e5a65bd2853e1e00"; + name = "kdeplasma-addons-5.16.5.tar.xz"; }; }; kgamma5 = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kgamma5-5.16.4.tar.xz"; - sha256 = "18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46"; - name = "kgamma5-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kgamma5-5.16.5.tar.xz"; + sha256 = "838fabf4312f022ee3df5bba940c0c73e26260cfee39235c1ba8da8a2e61bfa0"; + name = "kgamma5-5.16.5.tar.xz"; }; }; khotkeys = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/khotkeys-5.16.4.tar.xz"; - sha256 = "a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d"; - name = "khotkeys-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/khotkeys-5.16.5.tar.xz"; + sha256 = "e7b866b5249ff7c5860a5a222dca79691ca1f09af176f786021fbbadbd718c8c"; + name = "khotkeys-5.16.5.tar.xz"; }; }; kinfocenter = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kinfocenter-5.16.4.tar.xz"; - sha256 = "30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426"; - name = "kinfocenter-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kinfocenter-5.16.5.tar.xz"; + sha256 = "e3bbc5e2baedf35dc8750c99e18c115b651f2665218a105c08177bc5250eb9b1"; + name = "kinfocenter-5.16.5.tar.xz"; }; }; kmenuedit = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kmenuedit-5.16.4.tar.xz"; - sha256 = "f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2"; - name = "kmenuedit-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kmenuedit-5.16.5.tar.xz"; + sha256 = "8e95b81b910e5e78689fc7d4427c813ba7d39426df24cf8606adb850913a19a4"; + name = "kmenuedit-5.16.5.tar.xz"; }; }; kscreen = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kscreen-5.16.4.tar.xz"; - sha256 = "40c29ad2236459a267eed3cad4a6fc64b5e3f12df8567fcf8869ba770c2e2328"; - name = "kscreen-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kscreen-5.16.5.tar.xz"; + sha256 = "ce35f554014cee819767180f0c9381d539e497edfb9c290b279fa78e9dea4bb0"; + name = "kscreen-5.16.5.tar.xz"; }; }; kscreenlocker = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kscreenlocker-5.16.4.tar.xz"; - sha256 = "92a858f1f4bd6f209f328ca6456dfadc6b542e2a1e3d04ecdcc70f70c1cc2f6f"; - name = "kscreenlocker-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kscreenlocker-5.16.5.tar.xz"; + sha256 = "5ed6fdeac9aaba014edf67c5f782fc210d58310d083afaa589d0ff1bb3e8e02d"; + name = "kscreenlocker-5.16.5.tar.xz"; }; }; ksshaskpass = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/ksshaskpass-5.16.4.tar.xz"; - sha256 = "e3ff91e5c160b8e83b48215fca5d70f4baeef95b6c3b32e8cfc749183b0ec97c"; - name = "ksshaskpass-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/ksshaskpass-5.16.5.tar.xz"; + sha256 = "78eaa38ebbf888a8905e9385173e7161335041d6d07720283ce6f3fa06426a33"; + name = "ksshaskpass-5.16.5.tar.xz"; }; }; ksysguard = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/ksysguard-5.16.4.tar.xz"; - sha256 = "10abf3bfa676275b6fded5e49979466a011e0552b9357c1b8923f01184c029d5"; - name = "ksysguard-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/ksysguard-5.16.5.tar.xz"; + sha256 = "5558977389cb1fac4a5ce52c9430b27d9d1ee92705ae1995d92bed5340477282"; + name = "ksysguard-5.16.5.tar.xz"; }; }; kwallet-pam = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kwallet-pam-5.16.4.tar.xz"; - sha256 = "7332dd9729c55f4b24260b3ec1266f72284f834eed66ce76badd4ac5af3dd429"; - name = "kwallet-pam-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kwallet-pam-5.16.5.tar.xz"; + sha256 = "4a12a8ed51973f9ea318a39a699523bcc99ae4e1cac932fccd19dedd45e758a8"; + name = "kwallet-pam-5.16.5.tar.xz"; }; }; kwayland-integration = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kwayland-integration-5.16.4.tar.xz"; - sha256 = "f15ae33af1d9ff999ec45d00752f202242f71fc022ae72b9522e5bf3a20edace"; - name = "kwayland-integration-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kwayland-integration-5.16.5.tar.xz"; + sha256 = "63724ecfb6db053ee949273979b393192309dbeed45b59bc193a605f90232282"; + name = "kwayland-integration-5.16.5.tar.xz"; }; }; kwin = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kwin-5.16.4.tar.xz"; - sha256 = "71b96f1efef0b3f4974900373285a08d425a63628404fe9e89c27f61119383e6"; - name = "kwin-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kwin-5.16.5.tar.xz"; + sha256 = "7ff0e114e323ff7e10d78a157f8242b1d3cfa03967898d9e3fd3c039b7c9918b"; + name = "kwin-5.16.5.tar.xz"; }; }; kwrited = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/kwrited-5.16.4.tar.xz"; - sha256 = "c3011ee1c7a431b25797e12fa0b16e6d92277c8fe5dc1e656121a135ad156c0f"; - name = "kwrited-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/kwrited-5.16.5.tar.xz"; + sha256 = "4b122099b0a362fc409b50b7523689ba8a112508dad26f58753c6b648e7c5313"; + name = "kwrited-5.16.5.tar.xz"; }; }; libkscreen = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/libkscreen-5.16.4.tar.xz"; - sha256 = "f20f33a2f32b3db39e94ca9d10e240591650357d03c1a2f8eb6c5faa4d1bf723"; - name = "libkscreen-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/libkscreen-5.16.5.tar.xz"; + sha256 = "fd2d1e849315ac745ecfe757d6b2c5cc6486e0be5397f686dae3916c0252c938"; + name = "libkscreen-5.16.5.tar.xz"; }; }; libksysguard = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/libksysguard-5.16.4.tar.xz"; - sha256 = "b9a8166bf808a54dd80eb8f760047c63989f1f10a9a7f649c8298c9a5031368f"; - name = "libksysguard-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/libksysguard-5.16.5.tar.xz"; + sha256 = "f09b99737a937df890ecdd2a33720b6cba3c79fc8bc17ef1470572748a6e1976"; + name = "libksysguard-5.16.5.tar.xz"; }; }; milou = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/milou-5.16.4.tar.xz"; - sha256 = "de9addbc504135839b1735742938d340cb191827606aa390f4b6ce1625c1ed89"; - name = "milou-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/milou-5.16.5.tar.xz"; + sha256 = "bfcdba29262dda9f386ee99132053ad5751194b2df8219899fcbb0b3699afcd5"; + name = "milou-5.16.5.tar.xz"; }; }; oxygen = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/oxygen-5.16.4.tar.xz"; - sha256 = "7ba8a18a0b44d2bf48c96679328f698a9bfd4d041724b960095fed67f228f2e1"; - name = "oxygen-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/oxygen-5.16.5.tar.xz"; + sha256 = "0e85dcd874d2e69aaa2d4eefc379289c7dd572437f53e42f1d6d260d97c2f8a2"; + name = "oxygen-5.16.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-browser-integration-5.16.4.tar.xz"; - sha256 = "a097b90dd47cdd01f6b7207cb9439c7f6e0ce68555272172f8b3b8e2086199ef"; - name = "plasma-browser-integration-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-browser-integration-5.16.5.tar.xz"; + sha256 = "99269c7e27fddb0c075bff28a5afba41298dc8d28297d69f35f6bc30f3af1d35"; + name = "plasma-browser-integration-5.16.5.tar.xz"; }; }; plasma-desktop = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-desktop-5.16.4.tar.xz"; - sha256 = "990e93eed2753053ac732ce5d1d45e7c9a52daa660b41b0d48955428e4834344"; - name = "plasma-desktop-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-desktop-5.16.5.tar.xz"; + sha256 = "49dc4c9eff5742eb52fc0d12c139c194eda837945389cd09f498a0c4c352a20f"; + name = "plasma-desktop-5.16.5.tar.xz"; }; }; plasma-integration = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-integration-5.16.4.tar.xz"; - sha256 = "d4c5022ea91f9727cfebab821cb6b8e7b52671a6508cd7450e05bf51e248452d"; - name = "plasma-integration-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-integration-5.16.5.tar.xz"; + sha256 = "635f109e7b59bb440c6be0c7a4baae70d2f44e659ab0522e170693b664e6d709"; + name = "plasma-integration-5.16.5.tar.xz"; }; }; plasma-nm = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-nm-5.16.4.tar.xz"; - sha256 = "2da834873d4fa471ad87ee8ce18a871dfb2acdf0bdc0b764789e8e26ebc2ca09"; - name = "plasma-nm-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-nm-5.16.5.tar.xz"; + sha256 = "b519429bd784ff2ede0bf10e1e943822ef08ea5cf85e901363fda36d32907460"; + name = "plasma-nm-5.16.5.tar.xz"; }; }; plasma-pa = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-pa-5.16.4.tar.xz"; - sha256 = "9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4"; - name = "plasma-pa-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-pa-5.16.5.tar.xz"; + sha256 = "e029563d50cc6266a4a3e22574c33fef4670e1aaab18630eb30769e2167acc96"; + name = "plasma-pa-5.16.5.tar.xz"; }; }; plasma-sdk = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-sdk-5.16.4.tar.xz"; - sha256 = "ce8152ad6044e2cf430834bf97bb4542e69e168a4b7350e313d148a9bd3b9403"; - name = "plasma-sdk-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-sdk-5.16.5.tar.xz"; + sha256 = "1b05f0501309099f241ebae857c24b31bc4e61fde8bfc33e854d3a1dd3d37385"; + name = "plasma-sdk-5.16.5.tar.xz"; }; }; plasma-tests = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-tests-5.16.4.tar.xz"; - sha256 = "9e0f8fcef080fc1b0ffae01f6b3caa17eccac27445e312243221fcace56d1097"; - name = "plasma-tests-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-tests-5.16.5.tar.xz"; + sha256 = "236a83c2caa99801b6db1debce53a6c7390087115899410a8139ad3b7268b7f7"; + name = "plasma-tests-5.16.5.tar.xz"; }; }; plasma-vault = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-vault-5.16.4.tar.xz"; - sha256 = "8d01b80079477fd7ea48a4cc3ff59728ae7dac3a5f6e552092dd5e67d72148f6"; - name = "plasma-vault-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-vault-5.16.5.tar.xz"; + sha256 = "2bb40a80c35f3eaedc729013a8b6b76641cc74eca4fd171f1cda99237f83198c"; + name = "plasma-vault-5.16.5.tar.xz"; }; }; plasma-workspace = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz"; - sha256 = "5cd9366ef3d0b68159d9dee2f14886d1f81d1ccf7aedceed1ae5cf8e32d243f1"; - name = "plasma-workspace-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz"; + sha256 = "43364fe4e7ea10ad7b5b1d7af4f1baa1d8796b60692f2dfc0d58693f63e458ff"; + name = "plasma-workspace-5.16.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-wallpapers-5.16.4.tar.xz"; - sha256 = "052f6d978b1230706821f67574a7d053fadfb25de65227ffc8389a8570ac6003"; - name = "plasma-workspace-wallpapers-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plasma-workspace-wallpapers-5.16.5.tar.xz"; + sha256 = "ff6e0eac42c540c72556439e6477fb78be2dab456386218813cce021f82d42d9"; + name = "plasma-workspace-wallpapers-5.16.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/plymouth-kcm-5.16.4.tar.xz"; - sha256 = "cf9d3e6f14d012617cc8a5c3381295449e68b1b13209436b561417232d21863f"; - name = "plymouth-kcm-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/plymouth-kcm-5.16.5.tar.xz"; + sha256 = "db839c5fe9f6df882b95f436983c129cd553dd50e6cf1065c4410a91b20f1dcc"; + name = "plymouth-kcm-5.16.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.16.4"; + version = "1-5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/polkit-kde-agent-1-5.16.4.tar.xz"; - sha256 = "917b31f194fcf5d56d465bd4a3a1cc8d0a30e302be63b9048b1b85b6746b46a0"; - name = "polkit-kde-agent-1-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/polkit-kde-agent-1-5.16.5.tar.xz"; + sha256 = "6f7a17990d72bb25c93acae919b764f95ac226754209b2e177075fbe9251f95f"; + name = "polkit-kde-agent-1-5.16.5.tar.xz"; }; }; powerdevil = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/powerdevil-5.16.4.tar.xz"; - sha256 = "40885869890366f7ea92946ed0f8d251546fb14228eddd2ad128e3be8f88d2ed"; - name = "powerdevil-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/powerdevil-5.16.5.tar.xz"; + sha256 = "ac868f31df8c6bcc6b1c850efa0640695ba698caabefcb21fc0b0c3405712139"; + name = "powerdevil-5.16.5.tar.xz"; }; }; sddm-kcm = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/sddm-kcm-5.16.4.tar.xz"; - sha256 = "340034c5475d751c19c96a75445fa50877fad1c4de3422bc02f4b95e8f14bd68"; - name = "sddm-kcm-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/sddm-kcm-5.16.5.tar.xz"; + sha256 = "4220d18f1a04c767649bffee1aed6c2b2c12c60cd7d6ca6fabc3dbec1ec3f127"; + name = "sddm-kcm-5.16.5.tar.xz"; }; }; systemsettings = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/systemsettings-5.16.4.tar.xz"; - sha256 = "73b78c3c5177aa3ba0ffe970a83cb8bea1ba8ac54420a6c8379d6e86cabda31e"; - name = "systemsettings-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/systemsettings-5.16.5.tar.xz"; + sha256 = "57944cf3f566cf5e25d5859f5716b2ad5dbd87de259f8d77efdfdd50a16fe1ec"; + name = "systemsettings-5.16.5.tar.xz"; }; }; user-manager = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/user-manager-5.16.4.tar.xz"; - sha256 = "3dd29a6abf8c15014ed87a448b13190516e16d8dc3a67d56f05f62d1f2e1b745"; - name = "user-manager-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/user-manager-5.16.5.tar.xz"; + sha256 = "e9df3ec2718de68b0b46d0b86f993fe450b236e13dda6219f350121f08f4c468"; + name = "user-manager-5.16.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.4/xdg-desktop-portal-kde-5.16.4.tar.xz"; - sha256 = "3b8aa78451cfc97ef316f1632f6a255ccebbe383ec8389ffc74d44540fc05052"; - name = "xdg-desktop-portal-kde-5.16.4.tar.xz"; + url = "${mirror}/stable/plasma/5.16.5/xdg-desktop-portal-kde-5.16.5.tar.xz"; + sha256 = "4884652b642fb6e8db791a04e9d42b5fec53f28cc0f0d26f49eb2bdaaa1709df"; + name = "xdg-desktop-portal-kde-5.16.5.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/desktops/surf-display/default.nix b/nixpkgs/pkgs/desktops/surf-display/default.nix index f3554fe0b40a..47b7e1172068 100644 --- a/nixpkgs/pkgs/desktops/surf-display/default.nix +++ b/nixpkgs/pkgs/desktops/surf-display/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs} ''; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Kiosk browser session manager based on the surf browser"; diff --git a/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index bb319e6fc6c3..567d3b80387a 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://www.xfce.org/; - description = "GTK+ theme engine for Xfce"; + description = "GTK theme engine for Xfce"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/nixpkgs/pkgs/desktops/xfce/default.nix b/nixpkgs/pkgs/desktops/xfce/default.nix index e5182a12d434..20d5175fed6f 100644 --- a/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/default.nix @@ -20,7 +20,7 @@ lib.makeScope pkgs.newScope (self: with self; { garcon = callPackage ./core/garcon.nix { }; - # When built with GTK+3, it was breaking GTK+3 app layout + # When built with GTK 3, it was breaking GTK 3 app layout gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; }; libxfce4ui = callPackage ./core/libxfce4ui.nix { }; @@ -151,7 +151,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; - #### GTK+3 (deprecated, see NixOS/nixpkgs#32763) + #### GTK3 (deprecated, see NixOS/nixpkgs#32763) libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; }; diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index f67ba7af8aa9..39393dd39e9f 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Port of the Unity GTK+ Module"; + description = "Port of the Unity GTK Module"; license = licenses.lgpl3; maintainers = with maintainers; [ jD91mZM2 ]; }; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/exo/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/exo/default.nix index b0dcec78765d..59ab5823314e 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/exo/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/exo/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3 , libxfce4ui, libxfce4util }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "exo"; version = "0.12.8"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/garcon/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/garcon/default.nix index d4e7e2ffc809..0d6cb8c410e0 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/garcon/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/garcon/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "garcon"; version = "0.6.4"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/gigolo/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/gigolo/default.nix index 6939e8859ac9..5b25e474af27 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/gigolo/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/gigolo/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, gtk3, gvfs, glib }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "gigolo"; version = "0.5.0"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/libxfce4ui/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/libxfce4ui/default.nix index 2ea6d195d6fd..79c8ec74b626 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/libxfce4ui/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/libxfce4ui/default.nix @@ -1,7 +1,7 @@ { lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM , libstartup_notification, libxfce4util, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; version = "4.14.1"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/libxfce4util/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/libxfce4util/default.nix index 99fe59583aa4..4540d2352511 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/libxfce4util/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/libxfce4util/default.nix @@ -1,6 +1,6 @@ { lib, mkXfceDerivation, gobject-introspection }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "libxfce4util"; version = "4.14.0"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/nixpkgs/pkgs/desktops/xfce4-14/mkXfceDerivation.nix index cf4b5eb3cdc6..b7dc83225696 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/mkXfceDerivation.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/mkXfceDerivation.nix @@ -12,7 +12,7 @@ let concatAttrLists = attrsets: zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; - template = rec { + template = { name = "${pname}-${version}"; nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/mousepad/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/mousepad/default.nix index ca80fd8bf53e..77559aaf329f 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/mousepad/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/mousepad/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "mousepad"; version = "0.4.2"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/orage/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/orage/default.nix index 8c453aa96a25..7bb10c2fd94b 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/orage/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/orage/default.nix @@ -7,7 +7,7 @@ let inherit (lib) optionals; in -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "orage"; version = "4.12.1"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/parole/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/parole/default.nix index 578be8329b0c..ed3979072ed3 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/parole/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/parole/default.nix @@ -5,7 +5,7 @@ # Doesn't seem to find H.264 codec even though built with gst-plugins-bad. -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "parole"; version = "1.0.4"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/ristretto/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/ristretto/default.nix index 1c09d3a0c008..4a24bf905328 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/ristretto/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/ristretto/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, automakeAddFlags, exo, gtk3, glib, libexif , libxfce4ui, libxfce4util, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "ristretto"; version = "0.10.0"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/thunar-volman/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/thunar-volman/default.nix index 1fa714c7ff1b..11b29c64b33f 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/thunar-volman/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/thunar-volman/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "thunar-volman"; version = "0.9.5"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/thunar/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/thunar/default.nix index ed0be4420232..12a1a62991a7 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/thunar/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/thunar/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev , libnotify, libX11, libxfce4ui, libxfce4util, libxslt, xfconf, gobject-introspection, gvfs }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "thunar"; version = "1.8.9"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix index 81b008083366..ecbc62d8ffbf 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix @@ -11,7 +11,7 @@ # TODO: add libopenraw -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "tumbler"; version = "0.2.7"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix index 97d086366565..27fae12981ca 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libisofs, libxfce4ui, libxslt }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfburn"; version = "0.5.5"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix index 312e64cdbbe9..6c4af66c8666 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; version = "4.14.0"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix index 84cb74276997..22793963df3d 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; version = "1.2.1"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix index b18f3fd45d62..38fe82ffb011 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, autoreconfHook, autoconf, automake , glib, gtk-doc, intltool, libtool }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; version = "4.14.0"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-dict/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-dict/default.nix index 603863264efc..66ca7affa481 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-dict/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-dict/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-dict"; version = "0.8.2"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix index a99c3ecb9844..e468fea637e8 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util , xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; version = "0.4.4"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-panel/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-panel/default.nix index 27acb3bee587..c571666e5c4b 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-panel/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-panel/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; version = "4.14.0"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix index 115668334c3c..985146c82571 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify , libxfce4ui, libxfce4util, upower, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; version = "1.6.5"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix index 185494c25439..6fca6069d1e8 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, automakeAddFlags, dbus-glib, dbus, gtk3, libpulseaudio , libnotify, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; version = "0.4.1"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix index 0f74a78e8f2c..f13a8fba6d0a 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; version = "1.9.5"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-session/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-session/default.nix index 070f40b52d5c..d44cd8b0dd7c 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-session/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-session/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; version = "4.14.0"; @@ -9,7 +9,7 @@ mkXfceDerivation rec { buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; - configureFlags = [ "--with-xsession-prefix=${placeholder ''out''}" ]; + configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ]; # See https://github.com/NixOS/nixpkgs/issues/36468 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-settings/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-settings/default.nix index 21aaef5fd081..8cda66359e34 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-settings/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-settings/default.nix @@ -2,7 +2,7 @@ , libnotify, libxfce4ui, libxfce4util, libxklavier , upower, xfconf, xf86inputlibinput }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; version = "4.14.0"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix index e62332343ba7..78e98e9ea7de 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; version = "0.8.8"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix index b1405910021a..97a00e9b67fa 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix @@ -1,6 +1,6 @@ { lib, mkXfceDerivation, gtk3, libnotify, libpulseaudio, keybinder3, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-volumed-pulse"; version = "0.2.3"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfconf/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfconf/default.nix index 8e56e0f8b37d..a9d6ceaf4695 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfconf/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfconf/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, libxfce4util }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfconf"; version = "4.14.1"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfdesktop/default.nix index c4b7d738b329..afcd0d19dc33 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfdesktop/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfdesktop/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; version = "4.14.1"; diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfwm4/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfwm4/default.nix index b84487c09ae0..358e99c893f1 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfwm4/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfwm4/default.nix @@ -2,7 +2,7 @@ , libstartup_notification, libxfce4ui, libxfce4util, libwnck3 , libXpresent, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfwm4"; version = "4.14.0"; diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index fcdd2eb51811..02aa6567c1a9 100644 --- a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -12,31 +12,31 @@ let # than we do. We don't just use theirs because ours are less ambiguous and # some builds need that clarity. ndkInfoFun = { config, ... }: { - "x86_64-apple-darwin" = { + x86_64-apple-darwin = { double = "darwin-x86_64"; }; - "x86_64-unknown-linux-gnu" = { + x86_64-unknown-linux-gnu = { double = "linux-x86_64"; }; - "i686-unknown-linux-android" = { + i686-unknown-linux-android = { triple = "i686-linux-android"; arch = "x86"; toolchain = "x86"; gccVer = "4.9"; }; - "x86_64-unknown-linux-android" = { + x86_64-unknown-linux-android = { triple = "x86_64-linux-android"; arch = "x86_64"; toolchain = "x86_64"; gccVer = "4.9"; }; - "armv7a-unknown-linux-androideabi" = { + armv7a-unknown-linux-androideabi = { arch = "arm"; triple = "arm-linux-androideabi"; toolchain = "arm-linux-androideabi"; gccVer = "4.9"; }; - "aarch64-unknown-linux-android" = { + aarch64-unknown-linux-android = { arch = "arm64"; triple = "aarch64-linux-android"; toolchain = "aarch64-linux-android"; diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/default.nix b/nixpkgs/pkgs/development/androidndk-pkgs/default.nix index e35444ed516e..7bb779d1d138 100644 --- a/nixpkgs/pkgs/development/androidndk-pkgs/default.nix +++ b/nixpkgs/pkgs/development/androidndk-pkgs/default.nix @@ -1,7 +1,7 @@ { androidenv, buildPackages, pkgs, targetPackages }: -rec { +{ "18b" = let ndkVersion = "18.1.5063045"; diff --git a/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix index 5d151e5fa210..efc8446b1a10 100644 --- a/nixpkgs/pkgs/development/arduino/arduino-core/default.nix +++ b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix @@ -24,8 +24,8 @@ let }; # Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand patchelfInJars = - lib.optional (stdenv.hostPlatform.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} - ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} + lib.optional (stdenv.hostPlatform.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino3.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} + ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino3.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; @@ -58,37 +58,37 @@ let + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.8.5"; + version = "1.8.9"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = "${version}"; - sha256 = "0ww72qfk7fyvprz15lc80i1axfdacb5fij4h5j5pakrg76mng2c3"; + sha256 = "0kblq0bqap2zzkflrj6rmdi8dvqxa28fcwwrc3lfmbz2893ni3w4"; }; - teensyduino_version = "145"; + teensyduino_version = "147"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = lib.optionalString ("${teensy_architecture}" == "linux64") - "0n8812znwdyvy7d1321p4r6j5pixg1sr31z5pfr7i0ikw0jxfrxb" + "09ysanip5d2f5axzd81z2l74ayng60zqhjxmxs7xa5098fff46il" + lib.optionalString ("${teensy_architecture}" == "linux32") - "1p74rb8g4v6kd09a0af1yra8xjzy3iyv5w5b6h6ljfhb022v3l57" + "1zw3cfv2p62dwg8838vh0gd1934b18cyx7c13azvwmrpj601l0xx" + lib.optionalString ("${teensy_architecture}" == "linuxarm") - "0jd9dvr8zx9hlyn6j979d66qdvzgv3dmx5x9yviqvrn1f3w4hfbf"; + "12421z26ksx84aldw1pq0cakh8jhs33mwafgvfij0zfgn9x0i877"; }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = lib.optionalString ("${teensy_architecture}" == "linux64") - "1f8s3by5lc6fazyaa9zc9kz3ar8zj8jabab1fy5jzh49fbd8bydx" + "1lv4in9j0r8s0cis4zdvbk2637vlj12w69wdxgcxcrwvkcdahkpa" + lib.optionalString ("${teensy_architecture}" == "linux32") - "1r9ral9aq5vp02dwgagifk5h403l7knxdyi1w23rqpcbbpa423lw" + "0zla3a6gd9prclgrbbgsmhf8ds8zb221m65x21pvz0y1cwsdvjpm" + lib.optionalString ("${teensy_architecture}" == "linuxarm") - "0sz18wns00kysmb2zv7a67dy9wpxiawq3ykfr07wjyg8h1fy3p6h"; + "1w5m49wfd68zazli0lf3w4zykab8n7mzp3wnbjqfpx2vip80bqnz"; }; @@ -216,6 +216,6 @@ stdenv.mkDerivation rec { homepage = http://arduino.cc/; license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ antono auntie robberer bjornfor ]; + maintainers = with maintainers; [ antono auntie robberer bjornfor bergey ]; }; } diff --git a/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix b/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix index 12cc7a6e52ca..9c4f795d2936 100644 --- a/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix +++ b/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix @@ -16,13 +16,33 @@ url = "https://downloads.arduino.cc/Edison_help_files-1.6.2.zip"; sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan"; }; - "build/Firmata-2.5.6.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip"; - sha256 = "117dd4pdlgv60gdlgm2ckjfq89i0dg1q8vszg6hxywdf701c1fk4"; + "build/Ethernet-2.0.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Ethernet/archive/2.0.0.zip"; + sha256 = "0had46c1n1wx9fa7ki5dwidvchiy00pv7qj9msp6wgv199vm19m8"; }; - "build/Bridge-1.6.3.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip"; - sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj"; + "build/GSM-1.0.6.zip" = fetchurl { + url = "https://github.com/arduino-libraries/GSM/archive/1.0.6.zip"; + sha256 = "1kmikxr07cyzsnhhymvgj9m4dxi671ni120l33gfmmm6079qfwbk"; + }; + "build/Stepper-1.1.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Stepper/archive/1.1.3.zip"; + sha256 = "1kyv6bmhmbjh7z8x77v04aywd2s54nm80g0j07gay2sa3f6k1p4v"; + }; + "build/TFT-1.0.6.zip" = fetchurl { + url = "https://github.com/arduino-libraries/TFT/archive/1.0.6.zip"; + sha256 = "1d69xp3hrva58nrx0vy4skrr1h63649q1jnc2g55bpbaxjhf5j5w"; + }; + "build/WiFi-1.2.7.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi/archive/1.2.7.zip"; + sha256 = "1fmj2q2672hivp5jn05xhc875ii3w54nfja3b1yrp8s2fwinh7f6"; + }; + "build/Firmata-2.5.8.zip" = fetchurl { + url = "https://github.com/firmata/arduino/archive/2.5.8.zip"; + sha256 = "0jmlqrnw5fksyqkjhcsl6j1q7c0clnvfr8yknanqqssc19pxp722"; + }; + "build/Bridge-1.7.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Bridge/archive/1.7.0.zip"; + sha256 = "1qpnb2mj77jm4qczk1ndgjc9j2kqxnyahxdvlp0120x6w2jcq8s8"; }; "build/Robot_Control-1.0.4.zip" = fetchurl { url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip"; @@ -52,87 +72,91 @@ url = "https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip"; sha256 = "106jjqxzpf5lrs9akwvamqsblj5w2fb7vd0wafm9ihsikingiypr"; }; - "build/Keyboard-1.0.1.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip"; - sha256 = "1spv73zhjbrb0vgpzjnh6wr3bddlbyzv78d21dbn8z2l0aqv2sac"; + "build/Keyboard-1.0.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.2.zip"; + sha256 = "17yfj95r1i7fb87q4krmxmaq07b4x2xf8cjngrj5imj68wgjck53"; }; - "build/SD-1.1.1.zip" = fetchurl { - url = "https://github.com/arduino-libraries/SD/archive/1.1.1.zip"; - sha256 = "0nackcf7yx5np1s24wnsrcjl8j0nlmqqir6316vqqkfayvb1247n"; + "build/SD-1.2.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/SD/archive/1.2.3.zip"; + sha256 = "0i5hb5hmrsrhfgxx8w7zzrfrkc751vs63vhxrj6qvwazhfcdpjw2"; }; - "build/Servo-1.1.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Servo/archive/1.1.2.zip"; - sha256 = "14k1883qrx425wnm0r8kszzq32yvvs3jwxf3g7ybp7v0ga0q47l7"; + "build/Servo-1.1.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Servo/archive/1.1.3.zip"; + sha256 = "1m019a75cdn1fg0cwlzbahmaqvg8sgzr6v1812rd7rjh8ismiah6"; }; "build/LiquidCrystal-1.0.7.zip" = fetchurl { url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip"; sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n"; }; - "build/Adafruit_CircuitPlayground-1.6.8.zip" = fetchurl { - url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip"; - sha256 = "0zm667xiaygx8v1ygcls43s6qd5n7pf21n0998n1z7nf18s35j41"; + "build/Adafruit_Circuit_Playground-1.8.1.zip" = fetchurl { + url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.8.1.zip"; + sha256 = "1fl24px4c42f6shpb3livwsxgpj866yy285274qrj4m1zl07f18q"; }; - "build/libastylej-2.05.1-3.zip" = fetchurl { - url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip"; - sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6"; + "build/libastylej-2.05.1-4.zip" = fetchurl { + url = "https://downloads.arduino.cc/libastylej-2.05.1-4.zip"; + sha256 = "0q307b85xba7izjh344kqby3qahg3f5zy18gg52sjk1lbkl9i39s"; }; - "build/liblistSerials-1.4.0.zip" = fetchurl { - url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"; - sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv"; + "build/liblistSerials-1.4.2.zip" = fetchurl { + url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2.zip"; + sha256 = "1p58b421k92rbgwfgbihy0d04mby7kfssghpmjb4gk9yix09za3m"; }; - "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip" = fetchurl { - url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip"; - sha256 = "15przp8z1dp6lamcvqdx4daq6fqi3c1algc3sbinyh25pm69pq74"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.6/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip"; + sha256 = "1k23xyr5dmr60y8hb9x24wrgd4mfgvrzky621p6fvawn5xbdq8a3"; }; } // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.3.25.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.25.tar.bz2"; - sha256 = "15y80p255w2rg028vc8dq4hpqsmf770qigv3hgf78npb4qrjnqqf"; + "build/arduino-builder-linux64-1.4.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.4.4.tar.bz2"; + sha256 = "1m5b4rc9i235ra6isqdpjj9llddb5sldkhidb8c4i14mcqbdci1n"; + }; + "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "11ciwv9sw900wxb2fwm4i4ml4a85ylng0f595v0mf0xifc6jnhh5"; }; - "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "132qm8l6h50z4s9h0i5mfv6bp0iia0pp9kc3gd37hkajy4bh4j0r"; + "build/linux/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "1z4b6pvn1823h8mg0iph88igmcnrk2y7skr3z44dqlwk0pryi1kr"; }; - "build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "0shz5ymnlsrbnaqcb13fwbd73hz9k45adw14gf1ywjgywa2cpk68"; + "build/linux/arduinoOTA-1.2.1-linux_amd64.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_amd64.tar.bz2"; + sha256 = "1ya834p2cqjj8k1ad3yxcnzd4bcgrlqsqsli9brq1138ac6k30jv"; }; - "build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2"; - sha256 = "0xy25srvpz6d0yfnz8b17mkmary3k51lb1cvgw7n2zyxayjd0npb"; + "build/avr-1.6.23.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2"; + sha256 = "1al449r8hcdck7f4y295g7q388qvbn6qhk2zqdvws9kg4mzqsq8q"; }; } // optionalAttrs (system == "i686-linux") { - "build/arduino-builder-linux32-1.3.25.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.25.tar.bz2"; - sha256 = "0hjiqbf7xspdcr7lganqnl68qcmndc9pz06dghkrwzbzc5ki72qr"; + "build/arduino-builder-linux32-1.4.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.4.4.tar.bz2"; + sha256 = "0q3i1ba7vh14616d9ligizcz89yadr0skazxbrcq3mvvjqzbifw8"; }; - "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2"; - sha256 = "1d81z5m4cklv29hgb5ywrmyq64ymlwmjx2plm1gzs1mcpg7d9ab3"; + "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2"; + sha256 = "13skspybzq80ndsi93s7v15900lf26n5243mbib77andyc27xy2i"; }; - "build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2"; - sha256 = "12r1drjafxwzrvf1y1glxd46rv870mhz1ifn0g328ciwivas4da2"; + "build/linux/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2"; + sha256 = "1jklpk1sgrmbh1r25ynps4qcs5dbg6hd54fzjx4hcdf68cw0w42g"; }; - "build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2"; - sha256 = "1vvilbbbvv68svxzyhjspacbavcqakph5glhnz7c0mxkspqixjbs"; + "build/linux/arduinoOTA-1.2.1-linux_386.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_386.tar.bz2"; + sha256 = "1m56ps58h0fs8rr4ifc45slmrdvalc63vhldy85isv28g15zdz9g"; }; } // optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.3.25.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.25.tar.bz2"; - sha256 = "0inkxjzdplb8b17j7lyam6v9gca25rxmsinrkgqnx3xxgkaxz2k0"; + "build/arduino-builder-macosx-1.4.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.4.4.tar.bz2"; + sha256 = "1jp5kg32aiw062kcxlv660w38iaprifm8h3g2798izpwyfj0dmwg"; }; - "build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2"; - sha256 = "0c27i3y4f5biinxjdpp43wbj00lz7dvl08pnqr7hpkzaalsyvcv7"; + "build/macosx/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2"; + sha256 = "1y2972b08ac59xwjqkyjmi5lf2pmzw88a6sdgci3x9rvahvh3idb"; }; - "build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2"; - sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z"; + "build/macosx/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2"; + sha256 = "0qsa3sb3f480fm2z75fq14cqddw5hq8w8q0c2a9cw8i7aa8kkl27"; }; "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl { url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip"; @@ -140,20 +164,20 @@ }; } // optionalAttrs (system == "armv6l-linux") { - "build/arduino-builder-linuxarm-1.3.25.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.3.25.tar.bz2"; - sha256 = "1jvlihpcbdv1sgq1wjdwp7dhznk7nd88zin6yj40kr80gcd2ykry"; + "build/arduino-builder-linuxarm-1.4.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.4.4.tar.bz2"; + sha256 = "03bhlhdkg1jx0d3lh9194xgaqsbank9njhlnwy8braa7pw4p58gn"; }; - "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "033jb1vmspcxsv0w9pk73xv195xnbnmckjsiccgqs8xx36g00dpf"; + "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "17z9li387mx2acgad733h7l1jnnwv09ynw4nrwlqfahqqdfgjhb7"; }; - "build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "1kp1xry97385zbrs94j285h1gqlzyyhkchh26z7zq6c0wi5879i5"; + "build/linux/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "12amp8hqcj6gcdga7hfs22asgmgzafy8ny0rqhqs8n8d95sn586i"; }; - "build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2"; - sha256 = "0k1pib8lmvk6c0y3m038fj3mc18ax1hy3kbvgd5nygrxvy1hv274"; + "build/linux/arduinoOTA-1.2.1-linux_arm.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_arm.tar.bz2"; + sha256 = "1q79w1d0h2lp3jcg58qrlh3k5lak7dbsnawrzm0jj8c6spfb6m5d"; }; } diff --git a/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix b/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix index 182f8fbefab5..01a2fb873aa2 100644 --- a/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix +++ b/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix @@ -3,19 +3,8 @@ let pio-pkgs = pkgs: let - python = pkgs.python.override { + python = pkgs.python3.override { packageOverrides = self: super: { - - # https://github.com/platformio/platformio-core/issues/349 - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "5.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; - }; - postPatch = ""; - }); - platformio = self.callPackage ./core.nix { }; }; }; @@ -38,7 +27,7 @@ in buildFHSUserEnv { meta = with lib; { description = "An open source ecosystem for IoT development"; - homepage = http://platformio.org; + homepage = "https://platformio.org"; maintainers = with maintainers; [ mog ]; license = licenses.asl20; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/development/arduino/platformio/core.nix b/nixpkgs/pkgs/development/arduino/platformio/core.nix index 0866311ad894..bfe216c6ad39 100644 --- a/nixpkgs/pkgs/development/arduino/platformio/core.nix +++ b/nixpkgs/pkgs/development/arduino/platformio/core.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonApplication, fetchFromGitHub , bottle, click, colorama , lockfile, pyserial, requests -, pytest, semantic-version, tox +, pytest, semantic-version, tox, tabulate , git }: @@ -35,6 +35,7 @@ let "test_builder.py::test_build_unflags" "test_misc.py::test_api_cache" "test_misc.py::test_ping_internet_ips" + "test_misc.py::test_platformio_cli" "test_pkgmanifest.py::test_packages" ]) ++ (map (e: "--ignore=tests/${e}") [ "commands/test_boards.py" @@ -46,19 +47,20 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "3.6.6"; + version = "4.0.3"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1qwd6684y2xagl375sv8fm6a535hcdqx296hknjlbvsgc1jc514a"; + sha256 = "1naaa53cc7n7zyqggqjvvgkcq8cyzngdf904y9ag0x1vvb70f8j9"; }; propagatedBuildInputs = [ bottle click colorama git lockfile pyserial requests semantic-version + tabulate ]; HOME = "/tmp"; diff --git a/nixpkgs/pkgs/development/arduino/platformio/default.nix b/nixpkgs/pkgs/development/arduino/platformio/default.nix index 45186914604d..280fd496650c 100644 --- a/nixpkgs/pkgs/development/arduino/platformio/default.nix +++ b/nixpkgs/pkgs/development/arduino/platformio/default.nix @@ -4,7 +4,7 @@ let callPackage = newScope self; - self = rec { + self = { platformio-chrootenv = callPackage ./chrootenv.nix { }; }; diff --git a/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch b/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch index a215ffc7d614..1570cae1b193 100644 --- a/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch +++ b/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch @@ -1,6 +1,6 @@ ---- ./platformio/util.py-old 2017-09-29 01:20:08.174548250 +0200 -+++ ./platformio/util.py 2017-09-29 01:19:48.410485308 +0200 -@@ -395,7 +395,7 @@ +--- ./platformio/proc.py-old 2017-09-29 01:20:08.174548250 +0200 ++++ ./platformio/proc.py 2017-09-29 01:19:48.410485308 +0200 +@@ -164,7 +164,7 @@ isdir(join(p, "click")) or isdir(join(p, "platformio"))) if all(conditions): _PYTHONPATH.append(p) diff --git a/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix b/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix index 18abe1055b5b..6edee5d8bc65 100644 --- a/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix @@ -6,7 +6,7 @@ let buildInputs = [ drv ]; }; - pkg = self: buildRebar3 rec { + pkg = self: buildRebar3 { name = "pgsql"; version = "25+beta.2"; diff --git a/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix b/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix index 4de7e3cc01ea..b6695029f34c 100644 --- a/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix @@ -6,7 +6,7 @@ let buildInputs = [ drv ]; }; - pkg = self: stdenv.mkDerivation rec { + pkg = self: stdenv.mkDerivation { name = "webdriver"; version = "0.0.0+build.18.7ceaf1f"; diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 40b690048eba..22a3c9cf4686 100755 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,14 +6,15 @@ import re import requests import sys -releases = ["openjdk11"] -oses = ["mac", "linux"] -types = ["jre", "jdk"] -impls = ["hotspot", "openj9"] +releases = ("openjdk8", "openjdk11") +oses = ("mac", "linux") +types = ("jre", "jdk") +impls = ("hotspot", "openj9") arch_to_nixos = { - "x64": "x86_64", - "aarch64": "aarch64", + "x64": ("x86_64",), + "aarch64": ("aarch64",), + "arm": ("armv6l", "armv7l"), } def get_sha256(url): @@ -23,7 +24,6 @@ def get_sha256(url): sys.exit(1) return resp.text.strip().split(" ")[0] -RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13 def generate_sources(release, assets): out = {} for asset in assets: @@ -33,7 +33,8 @@ def generate_sources(release, assets): if asset["heap_size"] != "normal": continue if asset["architecture"] not in arch_to_nixos: continue - version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups() + # examples: 11.0.1+13, 8.0.222+10 + version, build = asset["version_data"]["semver"].split("+") type_map = out.setdefault(asset["os"], {}) impl_map = type_map.setdefault(asset["binary_type"], {}) @@ -42,12 +43,13 @@ def generate_sources(release, assets): "vmType": asset["openjdk_impl"], }) - arch_map[arch_to_nixos[asset["architecture"]]] = { - "url": asset["binary_link"], - "sha256": get_sha256(asset["checksum_link"]), - "version": version, - "build": build, - } + for nixos_arch in arch_to_nixos[asset["architecture"]]: + arch_map[nixos_arch] = { + "url": asset["binary_link"], + "sha256": get_sha256(asset["checksum_link"]), + "version": version, + "build": build, + } return out diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 7b16d6ad9dbc..03857627952d 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -6,7 +6,7 @@ sourcePerArch: }: let cpuName = stdenv.hostPlatform.parsed.cpu.name; - result = stdenv.mkDerivation rec { + result = stdenv.mkDerivation { name = if sourcePerArch.packageType == "jdk" then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; @@ -46,9 +46,6 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; passthru.home = result; - # for backward compatibility - passthru.architecture = ""; - meta = with stdenv.lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index a837c6f1e851..509050209fb2 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -1,48 +1,17 @@ sourcePerArch: -{ swingSupport ? true -, stdenv +{ stdenv +, lib , fetchurl -, file -, xorg ? null -, glib -, libxml2 -, ffmpeg_2 -, libxslt -, libGL +, autoPatchelfHook +, alsaLib , freetype , fontconfig -, gtk2 -, pango -, cairo -, alsaLib -, atk -, gdk-pixbuf , zlib -, elfutils +, xorg }: -assert swingSupport -> xorg != null; - let - rSubPaths = [ - "lib/jli" - "lib/server" - "lib/compressedrefs" # OpenJ9 - "lib/j9vm" # OpenJ9 - "lib" - ]; - - libraries = [ - stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL - xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf - atk zlib elfutils - ] ++ (stdenv.lib.optionals swingSupport [ - xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt - xorg.libXrender - stdenv.cc.cc - ]); - cpuName = stdenv.hostPlatform.parsed.cpu.name; in @@ -57,7 +26,12 @@ let result = stdenv.mkDerivation rec { inherit (sourcePerArch.${cpuName}) url sha256; }; - nativeBuildInputs = [ file ]; + buildInputs = [ + alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst + xorg.libXi xorg.libXrender + ]; + + nativeBuildInputs = [ autoPatchelfHook ]; # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = 1; @@ -74,45 +48,31 @@ let result = stdenv.mkDerivation rec { # Remove embedded freetype to avoid problems like # https://github.com/NixOS/nixpkgs/issues/57733 - rm $out/lib/libfreetype.so - - # for backward compatibility - ln -s $out $out/jre + find "$out" -name 'libfreetype.so*' -delete mkdir -p $out/nix-support # Set JAVA_HOME automatically. - cat <<EOF >> $out/nix-support/setup-hook + cat <<EOF >> "$out/nix-support/setup-hook" if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi EOF ''; - postFixup = '' - rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}" - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + preFixup = '' + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; ''; - rpath = stdenv.lib.strings.makeLibraryPath libraries; - # FIXME: use multiple outputs or return actual JRE package passthru.jre = result; passthru.home = result; - # for backward compatibility - passthru.architecture = ""; - meta = with stdenv.lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; - platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms + maintainers = with lib.maintainers; [ taku0 ]; }; }; in result diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix new file mode 100644 index 000000000000..a170e0141cf0 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.hotspot; + jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.hotspot; + jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.openj9; + jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.openj9; +} diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix new file mode 100644 index 000000000000..4937eace4903 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.hotspot; + jre-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.hotspot; + jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.openj9; + jre-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.openj9; +} diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 03febb6aa355..403bd96efb0e 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -4,56 +4,68 @@ "jdk": { "hotspot": { "aarch64": { + "build": "11", + "sha256": "10e33e1862638e11a9158947b3d7b461727d8e396e378b171be1eb4dfe12f1ed", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" + }, + "armv6l": { + "build": "7", + "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz", + "version": "11.0.3" + }, + "armv7l": { "build": "7", - "sha256": "894a846600ddb0df474350037a2fb43e3343dc3606809a20c65e750580d8f2b9", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz", + "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz", "version": "11.0.3" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "23cded2b43261016f0f246c85c8948d4a9b7f2d44988f75dad69723a7a526094", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "90c33cf3f2ed0bd773f648815de7347e69cfbb3416ef3bf41616ab1c4aa0f5a8", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "7", - "sha256": "7012edd56fc958070bc4747073de14ea08eb43081eb6ea19bdbf4763186e2d17", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "b1099cccc80a3f434728c9bc3b8a90395793b625f4680ca05267cf635143d64d", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz", + "version": "11.0.4" } } }, "jre": { "hotspot": { "aarch64": { - "build": "7", - "sha256": "de31fab70640c6d5099de5fc8fa8b4d6b484a7352fa48a9fafbdc088ca708564", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "5f7b5c110fc0f344a549cb11784a6d76838061a2b6f654f7841f60e0cd286c6a", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "d2df8bc799b09c8375f79bf646747afac3d933bb1f65de71d6c78e7466ff8fe4", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "70d2cc675155476f1d8516a7ae6729d44681e4fad5a6fc8dfa65cab36a67b7e0", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "7", - "sha256": "14c660294832c7b2deb2845d96dce83df677e204b4f0f1fee0052764c4a56720", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "c2601e7cb22af7a910e03883280cee805074656104d6d3dcaaf30e3bbb832690", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz", + "version": "11.0.4" } } } @@ -64,20 +76,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "5ca2a24f1827bd7c110db99854693bf418f51ee3093c31332db5cd605278faad", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "a50b211f475b9497311c9b65594764d7b852b1653f249582bb20fc3c302846a5", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "7", - "sha256": "01045a99ff23bda354f82c0fd3fa6e8222e4a5acce7494e82495f47b30bc5e18", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "7c09678d9c2d9dd0366693c6ab27bed39c76a23e7ac69b8a25c794e99dcf3ba7", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz", + "version": "11.0.4" } } }, @@ -86,20 +98,126 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "9523b97288ff5d50e404565d346ed8ea8f19dd155092951af88d4be6b8414776", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "1647fded28d25e562811f7bce2092eb9c21d30608843b04250c023b40604ff26", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_mac_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "7", - "sha256": "150c4065a57ec368b692276e8e3320b183ee17b402b7db07e676dff5837f0c52", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "1a8e84bae517a848aa5f25c7b04f26ab3a3bfffaa7fdf9be24e1f83325e46766", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz", + "version": "11.0.4" + } + } + } + } + }, + "openjdk8": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "10", + "sha256": "652776586ede124189dc218174b5922cc97feac81021ad81905900b349a352d2", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "37356281345b93feb4212e6267109b4409b55b06f107619dde4960e402bafa77", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "20cff719c6de43f8bb58c7f59e251da7c1fa2207897c9a4768c8c669716dc819", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz", + "version": "8.0.222" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "build": "10", + "sha256": "dfaf5a121f7606c54bd6232793677a4267eddf65d29cde352b84d84edbccbb51", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "a418ce895c8bf3ca2e7b2f423f038b8b093941684c9430f2e40da0982e12b52d", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "ae56994a7c8e8c19939c0c2ff8fe5a850eb2f23845c499aa5ede26deb3d5ad28", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz", + "version": "8.0.222" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "9605fd00d2960934422437f601c7a9a1c5537309b9199d5bc75f84f20cd29a76", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "df185e167756332163633a826b329db067f8a721f7d5d27f0b353a35fc415de0", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz", + "version": "8.0.222" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "b3ac2436534cea932ccf665b317dbf5ffc0ee065efca808b22b6c2d795ca1b90", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_mac_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "d5754413d7bc3a3233aaa7f8465451fbdabaf2a0c2a91743155bf135a3047ec8", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz", + "version": "8.0.222" } } } diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix index c0e6c4b50044..664335c3dade 100644 --- a/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -5,7 +5,7 @@ let # Map from git revs to SHA256 hashes sha256s = { - "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; + version_89 = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/nixpkgs/pkgs/development/compilers/carp/default.nix b/nixpkgs/pkgs/development/compilers/carp/default.nix index 65f0481a8010..235ec4090391 100644 --- a/nixpkgs/pkgs/development/compilers/carp/default.nix +++ b/nixpkgs/pkgs/development/compilers/carp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }: -haskellPackages.mkDerivation rec { +haskellPackages.mkDerivation { pname = "carp"; version = "unstable-2018-09-15"; diff --git a/nixpkgs/pkgs/development/compilers/ccl/default.nix b/nixpkgs/pkgs/development/compilers/ccl/default.nix index 6fac183125f5..ec166352267e 100644 --- a/nixpkgs/pkgs/development/compilers/ccl/default.nix +++ b/nixpkgs/pkgs/development/compilers/ccl/default.nix @@ -29,7 +29,7 @@ let }; armv6l-linux = armv7l-linux; }; - cfg = options."${stdenv.hostPlatform.system}" or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); + cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/compilers/clean/default.nix b/nixpkgs/pkgs/development/compilers/clean/default.nix index 91c163fd343a..03a5cec50041 100644 --- a/nixpkgs/pkgs/development/compilers/clean/default.nix +++ b/nixpkgs/pkgs/development/compilers/clean/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "clean-3.0"; src = diff --git a/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/nixpkgs/pkgs/development/compilers/cmdstan/default.nix index dab724ea607c..9a01519a8812 100644 --- a/nixpkgs/pkgs/development/compilers/cmdstan/default.nix +++ b/nixpkgs/pkgs/development/compilers/cmdstan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cmdstan-2.17.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/crystal/default.nix b/nixpkgs/pkgs/development/compilers/crystal/default.nix index 0c79b3d394ff..409ac03d92f7 100644 --- a/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -13,12 +13,12 @@ let archs = { - "x86_64-linux" = "linux-x86_64"; - "i686-linux" = "linux-i686"; - "x86_64-darwin" = "darwin-x86_64"; + x86_64-linux = "linux-x86_64"; + i686-linux = "linux-i686"; + x86_64-darwin = "darwin-x86_64"; }; - arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ]; @@ -29,7 +29,7 @@ let src = fetchurl { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; - sha256 = sha256s."${stdenv.system}"; + sha256 = sha256s.${stdenv.system}; }; buildCommand = '' @@ -153,27 +153,27 @@ in rec { binaryCrystal_0_26 = genericBinary { version = "0.26.1"; sha256s = { - "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; - "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; - "x86_64-darwin" = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; + x86_64-linux = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; + i686-linux = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; + x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; }; }; binaryCrystal_0_27 = genericBinary { version = "0.27.2"; sha256s = { - "x86_64-linux" = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; - "i686-linux" = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; - "x86_64-darwin" = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; + x86_64-linux = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; + i686-linux = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; + x86_64-darwin = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; }; }; binaryCrystal_0_29 = genericBinary { version = "0.29.0"; sha256s = { - "x86_64-linux" = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna"; - "i686-linux" = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2"; - "x86_64-darwin" = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd"; + x86_64-linux = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna"; + i686-linux = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2"; + x86_64-darwin = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd"; }; }; diff --git a/nixpkgs/pkgs/development/compilers/dmd/default.nix b/nixpkgs/pkgs/development/compilers/dmd/default.nix index 332ded31df6a..6cae1fa073b3 100644 --- a/nixpkgs/pkgs/development/compilers/dmd/default.nix +++ b/nixpkgs/pkgs/development/compilers/dmd/default.nix @@ -13,7 +13,7 @@ let dmdConfFile = writeTextFile { name = "dmd.conf"; text = (lib.generators.toINI {} { - "Environment" = { + Environment = { DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; }; }); diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix index 1ffd758ac82e..870ad900210a 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/development/compilers/fasm/bin.nix b/nixpkgs/pkgs/development/compilers/fasm/bin.nix index 44d784133f5f..5353862424a0 100644 --- a/nixpkgs/pkgs/development/compilers/fasm/bin.nix +++ b/nixpkgs/pkgs/development/compilers/fasm/bin.nix @@ -1,7 +1,7 @@ { stdenvNoCC, lib, fetchurl }: stdenvNoCC.mkDerivation rec { - name = "fasm-bin-${version}"; + pname = "fasm-bin"; version = "1.73.16"; diff --git a/nixpkgs/pkgs/development/compilers/fasm/default.nix b/nixpkgs/pkgs/development/compilers/fasm/default.nix index 4b20c4051a82..f17d18bf92a6 100644 --- a/nixpkgs/pkgs/development/compilers/fasm/default.nix +++ b/nixpkgs/pkgs/development/compilers/fasm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fasm-bin, isx86_64 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (fasm-bin) version src meta; pname = "fasm"; diff --git a/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix b/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix index eca2cba7775f..f00a8b6efc91 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoconf, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gambit-bootstrap"; version = "4.9.3"; diff --git a/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 8fba9be4901b..06c2aa838c5a 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -162,7 +162,7 @@ let version = "4.8.5"; in -# We need all these X libraries when building AWT with GTK+. +# We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ @@ -341,7 +341,7 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # Note: When building the Java AWT GTK peer, the build system doesn't honor # `--with-gmp' et al., e.g., when building # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add # them to $CPATH and $LIBRARY_PATH in this case. diff --git a/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index 3ce5ea1f64c2..ebcf20d4e099 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -170,7 +170,7 @@ let version = "4.9.4"; in -# We need all these X libraries when building AWT with GTK+. +# We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ @@ -354,7 +354,7 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # Note: When building the Java AWT GTK peer, the build system doesn't honor # `--with-gmp' et al., e.g., when building # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add # them to $CPATH and $LIBRARY_PATH in this case. diff --git a/nixpkgs/pkgs/development/compilers/gcc/5/default.nix b/nixpkgs/pkgs/development/compilers/gcc/5/default.nix index e6115b104817..0adedb6f8420 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/5/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/5/default.nix @@ -157,7 +157,7 @@ let version = "5.5.0"; in -# We need all these X libraries when building AWT with GTK+. +# We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ @@ -359,7 +359,7 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # Note: When building the Java AWT GTK peer, the build system doesn't honor # `--with-gmp' et al., e.g., when building # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add # them to $CPATH and $LIBRARY_PATH in this case. diff --git a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index 7644f4d3f623..959b5e62381e 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -156,7 +156,7 @@ let version = "6.5.0"; in -# We need all these X libraries when building AWT with GTK+. +# We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ @@ -366,7 +366,7 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # Note: When building the Java AWT GTK peer, the build system doesn't honor # `--with-gmp' et al., e.g., when building # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add # them to $CPATH and $LIBRARY_PATH in this case. diff --git a/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix b/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix index 1c3df80645a8..f4f63bc9b19f 100644 --- a/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -7,7 +7,7 @@ assert stdenv.cc.isGNU ; assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gcl"; version = "2.6.13pre50"; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix index 9fe3a7d9dba3..d68bf7e24b5e 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -29,23 +29,23 @@ stdenv.mkDerivation rec { name = "ghc-${version}-binary"; src = fetchurl ({ - "i686-linux" = { + i686-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy"; }; - "x86_64-linux" = { + x86_64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8"; }; - "armv7l-linux" = { + armv7l-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz"; sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46"; }; - "aarch64-linux" = { + aarch64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz"; sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr"; }; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.3-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.3-binary.nix index 7e845da5b648..152bd5e4874c 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.3-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.3-binary.nix @@ -29,15 +29,15 @@ stdenv.mkDerivation rec { name = "ghc-${version}-binary"; src = fetchurl ({ - "i686-linux" = { + i686-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m"; }; - "x86_64-linux" = { + x86_64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r"; }; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix index 1534e6d1d08e..18b2407a90ba 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation (rec { name = "D5123.diff"; sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; }) - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix index c859a34729d0..cdbcb8e1aedc 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation (rec { name = "D5123.diff"; sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; }) - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; @@ -225,6 +225,10 @@ stdenv.mkDerivation (rec { egrep --quiet '^#!' <(head -n 1 $i) || continue sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done + '' + # Temporary work-around for https://github.com/NixOS/nixpkgs/issues/66277 + + stdenv.lib.optionalString hostPlatform.isAarch64 '' + rm -rf "$doc/share/doc/ghc/html/libraries" ''; passthru = { diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix index 804edabba0c2..b78f5bc2204c 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/base.nix b/nixpkgs/pkgs/development/compilers/ghcjs/base.nix index e9c303b88b6e..ba0bbb1962b8 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs/base.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs/base.nix @@ -61,7 +61,7 @@ let inherit (bootPkgs) ghc; -in mkDerivation (rec { +in mkDerivation ({ pname = "ghcjs"; inherit version; src = ghcjsSrc; diff --git a/nixpkgs/pkgs/development/compilers/go/1.10.nix b/nixpkgs/pkgs/development/compilers/go/1.10.nix deleted file mode 100644 index 3b924f58bfe1..000000000000 --- a/nixpkgs/pkgs/development/compilers/go/1.10.nix +++ /dev/null @@ -1,187 +0,0 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation -, fetchpatch -}: - -let - - inherit (stdenv.lib) optionals optionalString; - - clangHack = writeScriptBin "clang" '' - #!${stdenv.shell} - exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - ''; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.10.8"; - - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "1yynv105wh8pwiq61v4yg5i50k13g3x634x60mhxhv4gj9cq06cx"; - }; - - GOCACHE = "off"; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/areturn' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isAarch32 '' - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.9.patch - ./ssl-cert-file-1.9.patch - ./remove-test-pie.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - (fetchpatch { - name = "missing_cpuHog_in_pprof_output.diff"; - url = "https://github.com/golang/go/commit/33110e2c.diff"; - sha256 = "04vh9lflbpz9xjvymyzhd91gkxiiwwz4lhglzl3r8z0lk45p96qn"; - }) - ]; - - GOOS = if stdenv.isDarwin then "darwin" else "linux"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.hostPlatform.system == "i686-linux" then "386" - else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" - else if stdenv.isAarch32 then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported system"; - GOARM = optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - configurePhase = '' - mkdir -p $out/share/go/bin - export GOROOT=$out/share/go - export GOBIN=$GOROOT/bin - export PATH=$GOBIN:$PATH - ulimit -a - ''; - - postConfigure = optionalString stdenv.isDarwin '' - export PATH=${clangHack}/bin:$PATH - ''; - - installPhase = '' - cp -r . $GOROOT - ( cd $GOROOT/src && ./all.bash ) - ''; - - preFixup = '' - rm -r $out/share/go/pkg/bootstrap - ln -s $out/share/go/bin $out/bin - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ go_bootstrap ]; - - meta = with stdenv.lib; { - branch = "1.10"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 ]; - platforms = platforms.linux ++ platforms.darwin; - badPlatforms = [ "x86_64-darwin" ]; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/go/1.11.nix b/nixpkgs/pkgs/development/compilers/go/1.11.nix index a87876390537..32847a2671c5 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.11.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.11.nix @@ -17,13 +17,13 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; + i686 = "386"; + x86_64 = "amd64"; + aarch64 = "arm64"; + arm = "arm"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); in diff --git a/nixpkgs/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix index dae4c173223c..817f3ab324d6 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.12.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.12.nix @@ -17,13 +17,13 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; + i686 = "386"; + x86_64 = "amd64"; + aarch64 = "arm64"; + arm = "arm"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); in diff --git a/nixpkgs/pkgs/development/compilers/go/1.4.nix b/nixpkgs/pkgs/development/compilers/go/1.4.nix index 97c243439e89..1052f1f1ae1e 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.4.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.4.nix @@ -4,7 +4,7 @@ , Security }: let - libc = if stdenv ? "cross" then libcCross else stdenv.cc.libc; + libc = if stdenv ? cross then libcCross else stdenv.cc.libc; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/compilers/haxe/default.nix b/nixpkgs/pkgs/development/compilers/haxe/default.nix index 7e11c75e07dc..0ae038d47138 100644 --- a/nixpkgs/pkgs/development/compilers/haxe/default.nix +++ b/nixpkgs/pkgs/development/compilers/haxe/default.nix @@ -2,7 +2,7 @@ let generic = { version, sha256, prePatch }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "haxe"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/julia/shared.nix b/nixpkgs/pkgs/development/compilers/julia/shared.nix index c0414c6259fd..c706f2facec7 100644 --- a/nixpkgs/pkgs/development/compilers/julia/shared.nix +++ b/nixpkgs/pkgs/development/compilers/julia/shared.nix @@ -129,10 +129,10 @@ stdenv.mkDerivation rec { makeFlags = let arch = head (splitString "-" stdenv.system); - march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}" + march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} or (throw "unsupported architecture: ${arch}"); in [ "ARCH=${arch}" diff --git a/nixpkgs/pkgs/development/compilers/jwasm/default.nix b/nixpkgs/pkgs/development/compilers/jwasm/default.nix index b2db09e1c182..a9613de91eb9 100644 --- a/nixpkgs/pkgs/development/compilers/jwasm/default.nix +++ b/nixpkgs/pkgs/development/compilers/jwasm/default.nix @@ -2,7 +2,7 @@ , cmake }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jwasm"; version = "git-2017-11-22"; diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 754ab020d51e..90dc20fcd3ea 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,7 +2,7 @@ let version = "1.3.41"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; pname = "kotlin"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 4f766e5f9a5c..44610a1b11d3 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -2,7 +2,7 @@ let version = "3.5.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix index 95632a45999d..fc53ad266a65 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -17,7 +17,7 @@ , enableSharedLibraries ? !stdenv.isDarwin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix index b66284152d49..7c965926f2ee 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix index 5fe681185b2d..bca8e7877aca 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -16,7 +16,7 @@ , enableSharedLibraries ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix index af65fd6388ea..9d82aa230357 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix index 74e9b8719d1d..0213741e3e06 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix index ea70382d2ac7..392ef4279096 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix @@ -23,7 +23,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix index 9660be4df11f..c87b0f235961 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix index e3015ae8448d..03d8a2085d0b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix index 23b7bf4e2461..efe2022bedba 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix @@ -21,7 +21,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix index da2a5cfb58ae..4cf79e79569c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix index 906baa4ae646..658068cbfaff 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix index e104d051fed7..2586602d7378 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix @@ -25,7 +25,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix index e9cc6dfc1dbe..0912435327ce 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,5 +1,5 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix index 7f99cc9ae2cd..621a246225d7 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix @@ -111,7 +111,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith rec { + lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; bintools = wrapBintoolsWith { inherit (tools) bintools; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix index fc9e3714db0c..7a0716a6eb38 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix index a9caa88141a6..cfcda02b4131 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix @@ -29,7 +29,7 @@ let let parts = splitString "." release_version; in imap (i: _: concatStringsSep "." (take i parts)) parts; -in stdenv.mkDerivation (rec { +in stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index 1f216178b558..936c877d58c9 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,5 +1,5 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index f864e24acfef..36d7a14142b4 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -145,7 +145,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith rec { + lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index e0bc9e816f50..8ec1c419748d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version , enableShared ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix index 6799a3f935f5..70e666ba27de 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix @@ -27,7 +27,7 @@ let shortVersion = with stdenv.lib; concatStringsSep "." (take 1 (splitString "." release_version)); -in stdenv.mkDerivation (rec { +in stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24"; diff --git a/nixpkgs/pkgs/development/compilers/manticore/default.nix b/nixpkgs/pkgs/development/compilers/manticore/default.nix index 1c0bdf479871..6e0716659c79 100644 --- a/nixpkgs/pkgs/development/compilers/manticore/default.nix +++ b/nixpkgs/pkgs/development/compilers/manticore/default.nix @@ -2,7 +2,7 @@ let rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "manticore"; version = "2018.09.29"; diff --git a/nixpkgs/pkgs/development/compilers/mcpp/default.nix b/nixpkgs/pkgs/development/compilers/mcpp/default.nix index 9ce7c9166bca..d71511479339 100644 --- a/nixpkgs/pkgs/development/compilers/mcpp/default.nix +++ b/nixpkgs/pkgs/development/compilers/mcpp/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mcpp-2.7.2"; + pname = "mcpp"; + version = "2.7.2"; src = fetchurl { - url = "mirror://sourceforge/mcpp/${name}.tar.gz"; + url = "mirror://sourceforge/mcpp/mcpp-${version}.tar.gz"; sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv"; }; diff --git a/nixpkgs/pkgs/development/compilers/mono/4.nix b/nixpkgs/pkgs/development/compilers/mono/4.nix index 3c748e2dff7d..cb6edb2a546d 100644 --- a/nixpkgs/pkgs/development/compilers/mono/4.nix +++ b/nixpkgs/pkgs/development/compilers/mono/4.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; diff --git a/nixpkgs/pkgs/development/compilers/mono/5.nix b/nixpkgs/pkgs/development/compilers/mono/5.nix index 0db13308a5af..0ecb362acb4d 100644 --- a/nixpkgs/pkgs/development/compilers/mono/5.nix +++ b/nixpkgs/pkgs/development/compilers/mono/5.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "5.20.1.27"; sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy"; diff --git a/nixpkgs/pkgs/development/compilers/mono/6.nix b/nixpkgs/pkgs/development/compilers/mono/6.nix index ec91d7e979c1..0157fa7b7f68 100644 --- a/nixpkgs/pkgs/development/compilers/mono/6.nix +++ b/nixpkgs/pkgs/development/compilers/mono/6.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "6.0.0.313"; srcArchiveSuffix = "tar.xz"; diff --git a/nixpkgs/pkgs/development/compilers/mono/llvm.nix b/nixpkgs/pkgs/development/compilers/mono/llvm.nix index 193e45bf55eb..36a457125fad 100644 --- a/nixpkgs/pkgs/development/compilers/mono/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/mono/llvm.nix @@ -13,7 +13,7 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; version = "3.6-mono-2017-02-15"; diff --git a/nixpkgs/pkgs/development/compilers/mozart/binary.nix b/nixpkgs/pkgs/development/compilers/mozart/binary.nix index 2067184a5b00..8eb35f1b5f7a 100644 --- a/nixpkgs/pkgs/development/compilers/mozart/binary.nix +++ b/nixpkgs/pkgs/development/compilers/mozart/binary.nix @@ -8,7 +8,7 @@ let version = "2.0.0"; binaries = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - src = binaries."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = binaries.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index 894ef8c45fa0..357f26cf3141 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -6,6 +6,7 @@ , enableGui ? true , wrapQtAppsHook , qtbase +, OpenGL ? null }: let @@ -41,7 +42,10 @@ with stdenv; mkDerivation rec { "-DSERIALIZE_CHIPDB=OFF" # use PyPy for icestorm if enabled "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" - ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF"); + ] + ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF") + ++ (lib.optional (enableGui && stdenv.isDarwin) + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); # Fix the version number. This is a bit stupid (and fragile) in practice # but works ok. We should probably make this overrideable upstream. @@ -61,7 +65,7 @@ with stdenv; mkDerivation rec { description = "Place and route tool for FPGAs"; homepage = https://github.com/yosyshq/nextpnr; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice emily ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.01.0.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.01.0.nix index aa6cf68d2c96..6362f360f7da 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.01.0.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "01"; patch_version = "0"; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.02.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.02.nix index 9ac53f567909..4773f9f74a5a 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/4.02.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.02.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "02"; patch_version = "3"; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.03.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.03.nix index c9536c487d05..0bbe82330419 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/4.03.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.03.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "03"; patch_version = "0"; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index 0085739147bf..9557d0a79aeb 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -30,7 +30,7 @@ let x11inc = x11env + "/include"; in -stdenv.mkDerivation (args // rec { +stdenv.mkDerivation (args // { inherit name; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 881748c36ea7..aa50cf225cac 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xlibsWrapper, ncurses }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ pname = "metaocaml"; version = "3.09-alpha-30"; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/005_enable-infinality.patch b/nixpkgs/pkgs/development/compilers/openjdk/005_enable-infinality.patch index f8de96989967..cc34e548758e 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/005_enable-infinality.patch +++ b/nixpkgs/pkgs/development/compilers/openjdk/005_enable-infinality.patch @@ -6,7 +6,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native @@ -23,6 +23,9 @@ * questions. */ - + +/* Use Infinality patches as default */ +#define INFINALITY + @@ -21,13 +21,13 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native +#include FT_LCD_FILTER_H +#include <fontconfig/fontconfig.h> +#endif - + #include "fontscaler.h" - + @@ -676,6 +683,147 @@ static void CopyFTSubpixelVToSubpixel(co } } - + +#ifdef INFINALITY +typedef struct { + FT_Render_Mode ftRenderMode; @@ -169,7 +169,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native + rp->ftLcdFilter = ftLcdFilter; +} +#endif - + /* * Class: sun_font_FreetypeFontScaler @@ -691,7 +839,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp @@ -180,28 +180,27 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native int renderFlags = FT_LOAD_RENDER, target; +#endif FT_GlyphSlot ftglyph; - + FTScalerContext* context = -@@ -709,6 +859,11 @@ Java_sun_font_FreetypeFontScaler_getGlyp +@@ -709,5 +859,10 @@ Java_sun_font_FreetypeFontScaler_getGlyp return ptr_to_jlong(getNullGlyphImage()); } - + +#ifdef INFINALITY + RenderingProperties renderingProperties; + readFontconfig((const FcChar8 *) scalerInfo->face->family_name, + context->ptsz, context->aaType, &renderingProperties); +#else - /* if algorithmic styling is required then we do not request bitmap */ - if (context->doBold || context->doItalize) { - renderFlags = FT_LOAD_DEFAULT; + if (!context->useSbits) { + renderFlags |= FT_LOAD_NO_BITMAP; @@ -731,10 +886,17 @@ Java_sun_font_FreetypeFontScaler_getGlyp target = FT_LOAD_TARGET_LCD_V; } renderFlags |= target; +#endif - + glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode); - + +#ifdef INFINALITY + FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter); + error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); @@ -213,7 +212,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native //do not destroy scaler yet. //this can be problem of particular context (e.g. with bad transform) @@ -753,9 +915,13 @@ Java_sun_font_FreetypeFontScaler_getGlyp - + /* generate bitmap if it is not done yet e.g. if algorithmic styling is performed and style was added to outline */ +#ifdef INFINALITY @@ -223,7 +222,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target)); } +#endif - + width = (UInt16) ftglyph->bitmap.width; height = (UInt16) ftglyph->bitmap.rows; @@ -969,7 +1135,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp @@ -239,7 +238,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native @@ -984,11 +1152,22 @@ static FT_Outline* getFTOutline(JNIEnv* return NULL; } - + +#ifdef INFINALITY + RenderingProperties renderingProperties; + readFontconfig((const FcChar8 *) scalerInfo->face->family_name, @@ -247,9 +246,9 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native +#else renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP; +#endif - + glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode); - + +#ifdef INFINALITY + error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); +#else diff --git a/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/11.nix index 7ccbfb6351d5..57911f2d58e6 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -1,42 +1,33 @@ -{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, perl, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr -, libjpeg, giflib +{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama +, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath -, minimal ? false -, enableJavaFX ? true, openjfx +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let - - /** - * The JDK libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else "amd64"; - major = "11"; - update = ".0.3"; + update = ".0.4"; build = "ga"; - repover = "jdk-${major}${update}-${build}"; - openjdk = stdenv.mkDerivation { - name = "openjdk-${major}${update}-${build}"; + openjdk = stdenv.mkDerivation rec { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${major}${update}-${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib - libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ + cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -45,66 +36,60 @@ let ./read-truststore-from-env-jdk10.patch ./currency-date-range-jdk10.patch ./increase-javadoc-heap.patch - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; preConfigure = '' chmod +x configure substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - - configureFlagsArray=( - "--with-boot-jdk=${bootjdk.home}" - "--with-update-version=${major}${update}" - "--with-build-number=${build}" - "--with-milestone=fcs" - "--enable-unlimited-crypto" - "--disable-debug-symbols" - "--with-zlib=system" - "--with-giflib=system" - "--with-stdc++lib=dynamic" - - # glibc 2.24 deprecated readdir_r so we need this - # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" - '' - + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\"" - + lib.optionalString minimal " \"--enable-headless-only\"" - + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\"" - + ");" - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" ''; - NIX_LDFLAGS= lib.optionals (!minimal) [ + configureFlags = [ + "--with-boot-jdk=${openjdk11-bootstrap.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + + NIX_LDFLAGS = lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; buildFlags = [ "all" ]; installPhase = '' - mkdir -p $out/lib/openjdk $out/share + mkdir -p $out/lib - cp -av build/*/images/jdk/* $out/lib/openjdk + mv build/*/images/jdk $out/lib/openjdk # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ # Remove crap from the installation. rm -rf $out/lib/openjdk/demo - ${lib.optionalString minimal '' + ${lib.optionalString headless '' rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so ''} @@ -129,11 +114,12 @@ let # Build the set of output library directories to rpath against LIBDIRS="" for output in $outputs; do + if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done - # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do + if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) echo "$BINLIBS" | while read i; do @@ -141,26 +127,20 @@ let patchelf --shrink-rpath "$i" || true done done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done ''; + disallowedReferences = [ openjdk11-bootstrap ]; + meta = with stdenv.lib; { homepage = http://openjdk.java.net/; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; passthru = { - inherit architecture; + architecture = ""; home = "${openjdk}/lib/openjdk"; }; }; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/8.nix index 952c5d1bf6ae..e764e9c62cb8 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/8.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/8.nix @@ -1,9 +1,10 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib +, openjdk8-bootstrap , setJavaClassPath -, minimal ? false +, headless ? false , enableInfinality ? true # font rendering patch , enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf }: @@ -13,52 +14,71 @@ let /** * The JRE libraries are in directories that depend on the CPU. */ - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else if stdenv.hostPlatform.system == "x86_64-linux" then - "amd64" - else - throw "openjdk requires i686-linux or x86_64 linux"; - - update = "212"; - build = "ga"; - baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; - repover = "jdk8u${update}-${build}"; + architecture = { + i686-linux = "i386"; + x86_64-linux = "amd64"; + aarch64-linux = "aarch64"; + }.${stdenv.system} or (throw "Unsupported platform"); + + update = "222"; + build = if stdenv.isAarch64 then "b10" + else "ga"; + baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" + else "https://hg.openjdk.java.net/jdk8u/jdk8u"; + repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" + + "jdk8u${update}-${build}"; + jdk8 = fetchurl { + name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "00rl33h4cl4b4p3hcid765h38x2jdkb14ylh8k1zhnd0ka76crgg"; + sha256 = if stdenv.isAarch64 then "1h19zpmc76f8v4s0mfvqxmxvv8imdwq92z5dmgi19y4xnl978qq8" + else "19dyqayn8n2y08p08g34xxnf0dkm6bfjxkp7633m7dx50mjcpxnj"; }; langtools = fetchurl { + name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0va6g2dccf1ph6mpwxswbks5axp7zz258cl89qq9r8jn4ni04agw"; + sha256 = if stdenv.isAarch64 then "09phy2izw2yyp3hnw7jmb7lp559dgnp2a0rymx1k3q97anfz3bzj" + else "11nibmqnf7nap10sydk57gimgwpxqk5mn12dyg6fzg4s2fxf0y1q"; }; hotspot = fetchurl { + name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0sgr9df10hs49pjld6c6kr374v4zwd9s52pc3drz68zrlk71ja4s"; + sha256 = if stdenv.isAarch64 then "1dqrzg2af94pjam6jg9nq8ydaibn4bsjv7ai6m7m3r2ph2fml80s" + else "1g512xrrxvnrk5szg7wqqz00x4gv53dx3yffk5im2zfcalyka2q7"; }; corba = fetchurl { + name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1hq0sr4k4k4iv815kg72i9lvd7n7mn5pmw96ckk9p1rnyagn9z03"; + sha256 = if stdenv.isAarch64 then "15l1ccvk2slx8wf5gilzjvhc428hl57gg1knbma1jqgs3ymnqwpr" + else "0h8nprfzpy21mfl39fxxzfa420skwmaaji4r31j7lj3g8c1wp62r"; }; jdk = fetchurl { + name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1fc59jrbfq8l067mggzy5dnrvni7lwaqd7hahs4nqv87kyrfg545"; + sha256 = if stdenv.isAarch64 then "179ij3rs1ahl6dh3n64k4xp2prv413ckqk7sj1g5lw48rj7bjh83" + else "1sb38h0rckgkr2y0kfzav6mb74nv5whb9l8m842mv1jpavxrdv6k"; }; jaxws = fetchurl { + name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1ka2fvyxdmpfhk814s314gx53yvdr19vpsqygx283v9nbq90l1yg"; + sha256 = if stdenv.isAarch64 then "16bayw7c4vzm9s0ixhw2dv6pan6wywyiddh9a8dss35660dnhrm0" + else "0akn5zapff5m32ibgm3f4lhgq96bsqx74g4xl38xmivvxddsd6kz"; }; jaxp = fetchurl { + name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "15vlgs5v2ax8sqwh7bg50fnlrwlpnkp0myzrvpqs1mcza8pyasp8"; + sha256 = if stdenv.isAarch64 then "176db7pi2irc7q87c273cjm5nrlj5g973fjmh24m6a1jxanrrm9x" + else "0bw4q8yhmrl8hqlimy1ijnarav4r91dj73lpr7axba77rqlr41c8"; }; nashorn = fetchurl { + name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "1jzn0yi0v6lda5y8ib07g1p6zymnbcx9yy6iz8niggpm7205y93h"; + sha256 = if stdenv.isAarch64 then "0vi3kbsqfpdjxc08ayxk2c87zycd7z0qbqw9xka1vc59iyv97n62" + else "0bfcf3iv2lr0xlp6sclxq7zz7b9ahajl008hz5rasjnrnr993qja"; }; openjdk8 = stdenv.mkDerivation { - name = "openjdk-8u${update}-${build}"; + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "8u${update}-${build}"; srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; sourceRoot = "."; @@ -67,15 +87,15 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ + libXi libXinerama libXcursor libXrandr fontconfig + ] ++ lib.optionals (!headless && enableGnome2) [ gtk2 gnome_vfs GConf glib ]; - #move the seven other source dirs under the main jdk8u directory, - #with version suffixes removed, as the remainder of the build will expect + # move the seven other source dirs under the main jdk8u directory, + # with version suffixes removed, as the remainder of the build will expect prePatch = '' mainDir=$(find . -maxdepth 1 -name jdk8u\*); find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do @@ -88,10 +108,10 @@ let ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch - ] ++ lib.optionals (!minimal && enableInfinality) [ + ] ++ lib.optionals (!headless && enableInfinality) [ ./004_add-fontconfig.patch ./005_enable-infinality.patch - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk8.patch ]; @@ -103,33 +123,39 @@ let substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" - '' - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" ''; configureFlags = [ - "--with-boot-jdk=${bootjdk.home}" + "--with-boot-jdk=${openjdk8-bootstrap.home}" "--with-update-version=${update}" "--with-build-number=${build}" "--with-milestone=fcs" "--enable-unlimited-crypto" - "--disable-debug-symbols" + "--with-native-debug-symbols=internal" "--disable-freetype-bundling" "--with-zlib=system" "--with-giflib=system" "--with-stdc++lib=dynamic" + ] ++ lib.optional headless "--disable-headful"; + + separateDebugInfo = true; + NIX_CFLAGS_COMPILE = [ # glibc 2.24 deprecated readdir_r so we need this # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=\"-Wno-error=deprecated-declarations\"" - ] ++ lib.optional minimal "--disable-headful"; + "-Wno-error=deprecated-declarations" + ] ++ lib.optionals stdenv.cc.isGNU [ + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + "-fno-lifetime-dse" + "-fno-delete-null-pointer-checks" + "-std=gnu++98" + "-Wno-error" + ]; - NIX_LDFLAGS= lib.optionals (!minimal) [ + NIX_LDFLAGS= lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; @@ -138,45 +164,39 @@ let doCheck = false; # fails with "No rule to make target 'y'." installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk + mkdir -p $out/lib - cp -av build/*/images/j2sdk-image/* $out/lib/openjdk + mv build/*/images/j2sdk-image $out/lib/openjdk # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ # Remove crap from the installation. rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample - ${lib.optionalString minimal '' + ${lib.optionalString headless '' rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so rm $out/lib/openjdk/jre/bin/policytool rm $out/lib/openjdk/bin/{policytool,appletviewer} ''} - # Move the JRE to a separate output and setup fallback fonts - mv $out/lib/openjdk/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - ${lib.optionalString (!minimal) '' - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - ''} - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + # Move the JRE to a separate output + mkdir -p $jre/lib/openjdk + mv $out/lib/openjdk/jre $jre/lib/openjdk/jre + ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre - rm -rf $out/lib/openjdk/jre/bina - ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin - - # Make sure cmm/*.pf are not symlinks: - # https://youtrack.jetbrains.com/issue/IDEA-147272 - rm -rf $out/lib/openjdk/jre/lib/cmm - ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + # Setup fallback fonts + ${lib.optionalString (!headless) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts + ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} # Remove duplicate binaries. for i in $(cd $out/lib/openjdk/bin && echo *); do @@ -198,12 +218,7 @@ let ln -s $jre/lib/openjdk/jre $out/jre ''; - # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" - patchELF $jre - propagatedBuildInputs+=" $jre" - # Propagate the setJavaClassPath setup hook from the JRE so that # any package that depends on the JRE has $CLASSPATH set up # properly. @@ -221,11 +236,12 @@ let # Build the set of output library directories to rpath against LIBDIRS="" for output in $outputs; do + if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done - # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do + if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) echo "$BINLIBS" | while read i; do @@ -233,22 +249,16 @@ let patchelf --shrink-rpath "$i" || true done done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done ''; - meta = with stdenv.lib; { + disallowedReferences = [ openjdk8-bootstrap ]; + + meta = with lib; { homepage = http://openjdk.java.net/; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo nequissimus ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; passthru = { diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix index 61c2d57423e4..4c808302b4fa 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix @@ -52,7 +52,10 @@ let home = jdk; }; - meta.platforms = stdenv.lib.platforms.darwin; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.darwin; + }; }; in jdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix index 7457ffceab1f..045901b1bae6 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix @@ -53,7 +53,10 @@ let home = jdk; }; - meta.platforms = stdenv.lib.platforms.darwin; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.darwin; + }; }; in jdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix index b4e19c32e26d..58e4ba990149 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix @@ -52,7 +52,10 @@ let home = jdk; }; - meta.platforms = stdenv.lib.platforms.darwin; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.darwin; + }; }; in jdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/default.nix index 65c85d055cbb..094bd57e6e98 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/default.nix @@ -1,42 +1,33 @@ -{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr -, libjpeg, giflib +{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama +, libXcursor, libXrandr, fontconfig, openjdk11 , setJavaClassPath -, minimal ? false -, enableJavaFX ? true, openjfx +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let - - /** - * The JDK libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else "amd64"; - major = "12"; update = ".0.2"; build = "ga"; - repover = "jdk-${major}${update}-${build}"; - openjdk = stdenv.mkDerivation { - name = "openjdk-${major}${update}-${build}"; + openjdk = stdenv.mkDerivation rec { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${major}${update}-${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib - libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ + cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk11 + ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -53,62 +44,60 @@ let url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; - preConfigure = '' + prePatch = '' chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - - configureFlagsArray=( - "--with-boot-jdk=${bootjdk.home}" - "--enable-unlimited-crypto" - "--with-zlib=system" - "--with-giflib=system" - "--with-stdc++lib=dynamic" - - # glibc 2.24 deprecated readdir_r so we need this - # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=unused-result" - '' - + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\"" - + lib.optionalString minimal " \"--enable-headless-only\"" - + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\"" - + ");" - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" + patchShebangs --build configure ''; - NIX_LDFLAGS= lib.optionals (!minimal) [ + configureFlags = [ + "--with-boot-jdk=${openjdk11.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + + NIX_LDFLAGS = lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; buildFlags = [ "all" ]; installPhase = '' - mkdir -p $out/lib/openjdk $out/share + mkdir -p $out/lib - cp -av build/*/images/jdk/* $out/lib/openjdk + mv build/*/images/jdk $out/lib/openjdk # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ # Remove crap from the installation. rm -rf $out/lib/openjdk/demo - ${lib.optionalString minimal '' + ${lib.optionalString headless '' rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so ''} @@ -133,11 +122,12 @@ let # Build the set of output library directories to rpath against LIBDIRS="" for output in $outputs; do + if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done - # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do + if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) echo "$BINLIBS" | while read i; do @@ -145,26 +135,20 @@ let patchelf --shrink-rpath "$i" || true done done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done ''; + disallowedReferences = [ openjdk11 ]; + meta = with stdenv.lib; { homepage = http://openjdk.java.net/; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; passthru = { - inherit architecture; + architecture = ""; home = "${openjdk}/lib/openjdk"; }; }; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix index 223feb1e2a14..9e6d30efda81 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf -, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }: +{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby +, openjdk11-bootstrap }: let major = "11"; @@ -7,14 +8,14 @@ let build = "1"; repover = "${major}${update}+${build}"; gradle_ = (gradleGen.override { - java = bootjdk; + java = openjdk11-bootstrap; }).gradle_4_10; makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${repover}"; + version = "${major}${update}-${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; + url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; @@ -25,7 +26,7 @@ let config = writeText "gradle.properties" ('' CONF = Release - JDK_HOME = ${bootjdk}/lib/openjdk + JDK_HOME = ${openjdk11-bootstrap.home} '' + args.gradleProperties or ""); buildPhase = '' @@ -56,11 +57,11 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = - # Downloaded AWT jars differ by platform. - if stdenv.system == "x86_64-linux" then "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a" - else if stdenv.system == "i686-linux" then "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08" - else throw "Unsupported platform"; + # Downloaded AWT jars differ by platform. + outputHash = { + i686-linux = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"; + x86_64-linux = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"; + }.${stdenv.system} or (throw "Unsupported platform"); }; in makePackage { @@ -87,24 +88,20 @@ in makePackage { postFixup = '' # Remove references to bootstrap. find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done - - # Test to make sure that we don't depend on the bootstrap - if grep -q -r '${bootjdk}' "$out"; then - echo "Extraneous references to ${bootjdk} detected" >&2 - exit 1 - fi ''; + disallowedReferences = [ openjdk11-bootstrap ]; + passthru.deps = deps; meta = with stdenv.lib; { homepage = http://openjdk.java.net/projects/openjfx/; - license = openjdk.meta.license; + license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; - platforms = openjdk.meta.platforms; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/12.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/12.nix index 266dd7f334ef..418c58ac683e 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/12.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/12.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf -, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }: +{ stdenv, lib, fetchurl, writeText, openjdk11_headless, gradleGen +, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib +, ffmpeg, python, ruby }: let major = "12"; @@ -7,14 +8,14 @@ let build = "14"; repover = "${major}${update}+${build}"; gradle_ = (gradleGen.override { - java = bootjdk; + java = openjdk11_headless; }).gradle_4_10; makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${repover}"; + version = "${major}${update}-${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; + url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; sha256 = "16jjfjkrg57wsj9mmm52i2kl3byz3ba1f9f8wwc8zwqm4cpjzliz"; }; @@ -25,7 +26,7 @@ let config = writeText "gradle.properties" ('' CONF = Release - JDK_HOME = ${bootjdk}/lib/openjdk + JDK_HOME = ${openjdk11_headless.home} '' + args.gradleProperties or ""); buildPhase = '' @@ -56,11 +57,11 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = - # Downloaded AWT jars differ by platform. - if stdenv.system == "x86_64-linux" then "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci" - else if stdenv.system == "i686-linux" then "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd" - else throw "Unsupported platform"; + # Downloaded AWT jars differ by platform. + outputHash = { + x86_64-linux = "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci"; + i686-linux = "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd"; + }.${stdenv.system} or (throw "Unsupported platform"); }; in makePackage { @@ -87,24 +88,20 @@ in makePackage { postFixup = '' # Remove references to bootstrap. find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11_headless}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done - - # Test to make sure that we don't depend on the bootstrap - if grep -q -r '${bootjdk}' "$out"; then - echo "Extraneous references to ${bootjdk} detected" >&2 - exit 1 - fi ''; + disallowedReferences = [ openjdk11_headless ]; + passthru.deps = deps; meta = with stdenv.lib; { homepage = http://openjdk.java.net/projects/openjfx/; - license = openjdk.meta.license; + license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; - platforms = openjdk.meta.platforms; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch index 4902b8e84011..08cf554a18fe 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch +++ b/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch @@ -1,21 +1,30 @@ -diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 -+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 -@@ -161,6 +161,7 @@ - /* - * Try: - * javax.net.ssl.trustStore (if this variable exists, stop) -+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE - * jssecacerts - * cacerts - * -@@ -169,6 +169,9 @@ - - try { - storeFileName = props.get("trustStore"); -+ if (storeFileName == null) { -+ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); -+ } - if (!"NONE".equals(storeFileName)) { - if (storeFileName != null) { - storeFile = new File(storeFileName); +--- a/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 ++++ b/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400 +@@ -71,6 +71,7 @@ + * + * The preference of the default trusted KeyStore is: + * javax.net.ssl.trustStore ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + */ +@@ -132,7 +133,8 @@ + public TrustStoreDescriptor run() { + // Get the system properties for trust store. + String storePropName = System.getProperty( +- "javax.net.ssl.trustStore", jsseDefaultStore); ++ "javax.net.ssl.trustStore", ++ System.getenv("JAVAX_NET_SSL_TRUSTSTORE")); + String storePropType = System.getProperty( + "javax.net.ssl.trustStoreType", + KeyStore.getDefaultType()); +@@ -144,6 +146,9 @@ + String temporaryName = ""; + File temporaryFile = null; + long temporaryTime = 0L; ++ if (storePropName == null) { ++ storePropName = jsseDefaultStore; ++ } + if (!"NONE".equals(storePropName)) { + String[] fileNames = + new String[] {storePropName, defaultStore}; diff --git a/nixpkgs/pkgs/development/compilers/openspin/default.nix b/nixpkgs/pkgs/development/compilers/openspin/default.nix index 31e3800a6c9c..b1e95bb704cb 100644 --- a/nixpkgs/pkgs/development/compilers/openspin/default.nix +++ b/nixpkgs/pkgs/development/compilers/openspin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openspin"; version = "unstable-2018-10-02"; diff --git a/nixpkgs/pkgs/development/compilers/pforth/default.nix b/nixpkgs/pkgs/development/compilers/pforth/default.nix index 7885582ad125..67d444428e92 100644 --- a/nixpkgs/pkgs/development/compilers/pforth/default.nix +++ b/nixpkgs/pkgs/development/compilers/pforth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "28"; pname = "pforth"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/rust/binary.nix b/nixpkgs/pkgs/development/compilers/rust/binary.nix index acccc749686c..06202901563e 100644 --- a/nixpkgs/pkgs/development/compilers/rust/binary.nix +++ b/nixpkgs/pkgs/development/compilers/rust/binary.nix @@ -18,7 +18,7 @@ let in rec { - rustc = stdenv.mkDerivation rec { + rustc = stdenv.mkDerivation { name = "rustc-${versionType}-${version}"; inherit version; @@ -64,7 +64,7 @@ rec { setupHooks = ./setup-hook.sh; }; - cargo = stdenv.mkDerivation rec { + cargo = stdenv.mkDerivation { name = "cargo-${versionType}-${version}"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix index 5cf48715dae2..43a72985ddec 100644 --- a/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix @@ -32,7 +32,7 @@ let src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; - sha256 = hashes."${platform}"; + sha256 = hashes.${platform}; }; in callPackage ./binary.nix diff --git a/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/nixpkgs/pkgs/development/compilers/rust/cargo.nix index e000edad49b6..2bf2722818b9 100644 --- a/nixpkgs/pkgs/development/compilers/rust/cargo.nix +++ b/nixpkgs/pkgs/development/compilers/rust/cargo.nix @@ -3,7 +3,7 @@ , CoreFoundation, Security }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { name = "cargo-${rustc.version}"; inherit (rustc) version src; diff --git a/nixpkgs/pkgs/development/compilers/rust/clippy.nix b/nixpkgs/pkgs/development/compilers/rust/clippy.nix index 2b8fcbe0ba4b..56b70f21d4c7 100644 --- a/nixpkgs/pkgs/development/compilers/rust/clippy.nix +++ b/nixpkgs/pkgs/development/compilers/rust/clippy.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, rustc, Security, patchelf }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { name = "clippy-${rustc.version}"; inherit (rustc) version src; diff --git a/nixpkgs/pkgs/development/compilers/rust/rls/default.nix b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix index 470611242e07..942e23c6170d 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rls/default.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix @@ -2,7 +2,7 @@ , openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv , CoreFoundation, Security }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "rls"; inherit (rustPlatform.rust.rustc) src version; diff --git a/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix b/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix index 537bdaf445cd..9793eee1708b 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "rustfmt-${version}"; + pname = "rustfmt"; inherit (rustPlatform.rust.rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again diff --git a/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix index 0d2a10b6a998..9c777cc75728 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix @@ -2,38 +2,38 @@ let options = rec { - x86_64-darwin = rec { + x86_64-darwin = { version = "1.2.11"; system = "x86-64-darwin"; sha256 = "0lh4gpvi8hl6g6b9321g5pwh8sk3218i7h4lx7p3vd9z0cf3lz85"; }; - x86_64-linux = rec { + x86_64-linux = { version = "1.3.16"; system = "x86-64-linux"; sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; }; - i686-linux = rec { + i686-linux = { version = "1.2.7"; system = "x86-linux"; sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; }; - aarch64-linux = rec { + aarch64-linux = { version = "1.3.16"; system = "arm64-linux"; sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; }; - armv7l-linux = rec { + armv7l-linux = { version = "1.2.14"; system = "armhf-linux"; sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; }; armv6l-linux = armv7l-linux; - x86_64-freebsd = rec { + x86_64-freebsd = { version = "1.2.7"; system = "x86-64-freebsd"; sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; }; - x86_64-solaris = rec { + x86_64-solaris = { version = "1.2.7"; system = "x86-64-solaris"; sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; diff --git a/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/nixpkgs/pkgs/development/compilers/sbcl/default.nix index e5b36ad78908..e3d9ee98635b 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/default.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "sbcl"; - version = "1.5.3"; + version = "1.5.6"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj"; + sha256 = "10z43dc29p7s8dl3jixklhmzqfp7gcm3fccjdfd36qqhyfxqxx3a"; }; buildInputs = [texinfo]; diff --git a/nixpkgs/pkgs/development/compilers/seexpr/default.nix b/nixpkgs/pkgs/development/compilers/seexpr/default.nix index efcaf56110d2..f6b732f02aeb 100644 --- a/nixpkgs/pkgs/development/compilers/seexpr/default.nix +++ b/nixpkgs/pkgs/development/compilers/seexpr/default.nix @@ -2,7 +2,7 @@ bison, flex, libGLU, pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "seexpr"; version = "2.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/serpent/default.nix b/nixpkgs/pkgs/development/compilers/serpent/default.nix index c9b4f9639d07..6f1156897db9 100644 --- a/nixpkgs/pkgs/development/compilers/serpent/default.nix +++ b/nixpkgs/pkgs/development/compilers/serpent/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "serpent"; # I can't find any version numbers, so we're just using the date diff --git a/nixpkgs/pkgs/development/compilers/swift/default.nix b/nixpkgs/pkgs/development/compilers/swift/default.nix index f21b2ae3cb80..c9698fcad9b4 100644 --- a/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -131,7 +131,7 @@ let extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "swift-${version_friendly}"; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/compilers/urn/default.nix b/nixpkgs/pkgs/development/compilers/urn/default.nix index d5f0dcbec29f..f3ff864f81b1 100644 --- a/nixpkgs/pkgs/development/compilers/urn/default.nix +++ b/nixpkgs/pkgs/development/compilers/urn/default.nix @@ -20,7 +20,7 @@ let inherit (stdenv.lib) optionalString concatMapStringsSep; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/development/compilers/wcc/default.nix b/nixpkgs/pkgs/development/compilers/wcc/default.nix index 3196592da485..5f812e2c4632 100644 --- a/nixpkgs/pkgs/development/compilers/wcc/default.nix +++ b/nixpkgs/pkgs/development/compilers/wcc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wcc-unstable"; version = "2018-04-05"; diff --git a/nixpkgs/pkgs/development/compilers/zulu/8.nix b/nixpkgs/pkgs/development/compilers/zulu/8.nix index f0e0693d12c4..15ee5f403bc3 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/8.nix +++ b/nixpkgs/pkgs/development/compilers/zulu/8.nix @@ -23,7 +23,7 @@ let xorg.libXt xorg.libXrender stdenv.cc.cc ])); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version openjdk platform hash extension; pname = "zulu"; diff --git a/nixpkgs/pkgs/development/compilers/zulu/default.nix b/nixpkgs/pkgs/development/compilers/zulu/default.nix index d4c4c1f0ac31..90b28d318316 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -23,7 +23,7 @@ let xorg.libXt xorg.libXrender stdenv.cc.cc ])); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version openjdk platform hash extension; pname = "zulu"; diff --git a/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix b/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix index d58f65102190..4e75b9407dee 100644 --- a/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-Cheerios-${param.version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix b/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix index 4fe86c3fae18..5df96519e7ff 100644 --- a/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-InfSeqExt-${param.version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix index 874b99f2bebf..b99612894802 100644 --- a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix @@ -14,7 +14,7 @@ let params = sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17"; }; - "8.8" = rec { + "8.8" = { version = "20190311"; rev = "22af9e9a223d0038f05638654422e637e863b355"; sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq"; @@ -26,12 +26,12 @@ let params = sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-QuickChick-${param.version}"; diff --git a/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix index e33b9427223e..2e4d12478b79 100644 --- a/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-StructTact-${param.version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix b/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix index cd7ddfefb84a..92c9b2569ca4 100644 --- a/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix @@ -20,10 +20,10 @@ let params = sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-Velisarios-${param.version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix index 00d088a4a92c..d2e9660a630e 100644 --- a/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix @@ -13,7 +13,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-verdi-${param.version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix index a074b27ff658..fb45e591ec1a 100644 --- a/nixpkgs/pkgs/development/coq-modules/bignums/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix @@ -22,10 +22,10 @@ let params = { sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-bignums"; diff --git a/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix b/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix index 3dfa95154d33..025a67a1e70b 100644 --- a/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix @@ -19,10 +19,10 @@ let "8.8" = v20190414; "8.9" = v20190414; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-category-theory-${param.version}"; diff --git a/nixpkgs/pkgs/development/coq-modules/contribs/default.nix b/nixpkgs/pkgs/development/coq-modules/contribs/default.nix index faf7db09ff9b..91fdb8651cc6 100644 --- a/nixpkgs/pkgs/development/coq-modules/contribs/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/contribs/default.nix @@ -34,7 +34,7 @@ let mkContrib = repo: revs: param: rev = "86ac28259030649ef51460e4de2441c8a1017751"; sha256 = "09bbk2a7pn0j76mmapl583f8a20zqd3a1m9lkml8rpwml692bzi9"; }; - }."${coq.coq-version}"; + }.${coq.coq-version}; abp = mkContrib "abp" [ "8.5" "8.6" "8.7" ] { version = "v8.6.0"; @@ -219,7 +219,7 @@ let mkContrib = repo: revs: param: rev = "aa33052c1edfc5a65885942a67c2773b5d96f8cc"; sha256 = "0mjgfdr9bzsch0dlk4vq1frkaig14dqh46r54cv0l15flxapg0iw"; }; - }."${coq.coq-version}"; + }.${coq.coq-version}; continuations = mkContrib "continuations" [ ] { version = "v8.5.0-13-g6885310"; diff --git a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 04fc428b4092..c689cea1a827 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,7 +7,7 @@ let params = { sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix index cade2bd352eb..898272d402b6 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -8,7 +8,7 @@ let params = "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; }; "8.9" = { version = "0.10.1"; sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix index 57f31e1847c1..e9263fb2be1e 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix @@ -26,10 +26,10 @@ let params = sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-coq-haskell-${param.version}"; diff --git a/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix index 28c651f9b16a..83a505017fbc 100644 --- a/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix @@ -9,7 +9,7 @@ let sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix index c67342f1a2f7..6228bd4be9d0 100644 --- a/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix @@ -15,7 +15,7 @@ let params = "8.9" = v_8_8; "8.10" = v_8_8; }; - param = params."${coq.coq-version}" + param = params.${coq.coq-version} ; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix index e403f7d4fb5c..401cb299497b 100644 --- a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix @@ -22,7 +22,7 @@ let params = { sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; }; -param = params."${coq.coq-version}"; +param = params.${coq.coq-version}; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/development/coq-modules/equations/default.nix b/nixpkgs/pkgs/development/coq-modules/equations/default.nix index 5446b540fac3..38444fe2b061 100644 --- a/nixpkgs/pkgs/development/coq-modules/equations/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/equations/default.nix @@ -32,7 +32,7 @@ let sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/nixpkgs/pkgs/development/coq-modules/iris/default.nix index ea26f3e1ca9d..0718e518b35c 100644 --- a/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/iris/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchzip, coq, ssreflect, stdpp }: +{ stdenv, fetchFromGitLab, coq, stdpp }: stdenv.mkDerivation rec { - version = "3.1.0"; + version = "3.2.0"; name = "coq${coq.coq-version}-iris-${version}"; - src = fetchzip { - url = "https://gitlab.mpi-sws.org/FP/iris-coq/-/archive/iris-${version}/iris-coq-iris-${version}.tar.gz"; - sha256 = "0ipdb061jj205avxifshxkpyxxqykigmlxk2n5nvxj62gs3rl5j1"; + src = fetchFromGitLab { + domain = "gitlab.mpi-sws.org"; + owner = "iris"; + repo = "iris"; + rev = "iris-${version}"; + sha256 = "10dfi7qx6j5w6kbmbrf05xh18jwxr9iz5g7y0f6157msgvl081xs"; }; buildInputs = [ coq ]; - propagatedBuildInputs = [ ssreflect stdpp ]; + propagatedBuildInputs = [ stdpp ]; enableParallelBuilding = true; @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; }; } diff --git a/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix b/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix index 30917fcb78f2..80b167aaa98a 100644 --- a/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix @@ -17,7 +17,7 @@ let params = { sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index d573eca809a2..6798236591c4 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -30,7 +30,7 @@ let # COMPUTED using the configuration above (edit with caution) # ############################################################## default-mathcomp-version = let v = head ( - filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version) + filter (mc: mathcomp-coq-versions.${mc} coq.coq-version) mathcomp-version-preference ++ ["0.0.0"]); in if v == "0.0.0" then max-mathcomp-version else v; @@ -73,7 +73,7 @@ let custom-version = if is-released then mathcomp-version else "custom"; # the base set of attributes for mathcomp - attrs = rec { + attrs = { name = "coq${coq.coq-version}-${pkgname}-${custom-version}"; # used in ssreflect @@ -126,9 +126,9 @@ let }; }; in - {"${mathcomp-pkg}" = stdenv.mkDerivation (attrs // overrides attrs);}; + {${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);}; -getAttrOr = a: n: a."${n}" or (throw a.error); +getAttrOr = a: n: a.${n} or (throw a.error); mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; @@ -136,7 +136,7 @@ mathcompCorePkgs_1_9 = mathcompGen "1.9.0"; mathcompCorePkgs = recurseIntoAttrs (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); -in rec { +in { # mathcompGenSingle: given a version of mathcomp # generates an attribute set {single = <drv>;} with the single mathcomp derivation inherit mathcompGenSingle; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix index 0d9557623c36..c342c25a4118 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix @@ -139,7 +139,7 @@ packageGen = { else compatibleCoqVersions; mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps; in - { "${package}" = let from = src; in + { ${package} = let from = src; in stdenv.mkDerivation rec { inherit version; @@ -149,7 +149,7 @@ packageGen = { owner = owner; repo = package; rev = version; - sha256 = version-sha256."${version}"; + sha256 = version-sha256.${version}; } else from; propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps; @@ -173,7 +173,7 @@ packageGen = { }; }; -current-versions = versions."${current-ssreflect.version}" or {}; +current-versions = versions.${current-ssreflect.version} or {}; select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); @@ -181,14 +181,14 @@ for-version = v: suffix: (mapAttrs' (n: pkg: {name = "mathcomp_${suffix}-${n}"; value = (packageGen ({ ssreflect = coqPackages."mathcomp-ssreflect_${suffix}"; - } // pkg))."${n}";}) - (select versions."${v}")); + } // pkg)).${n};}) + (select versions.${v})); all = (for-version "1.7.0" "1_7") // (for-version "1.8.0" "1_8") // (for-version "1.9.0" "1_9") // (recurseIntoAttrs (mapDerivationAttrset dontDistribute ( - mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";}) + mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};}) (select current-versions)))); in { diff --git a/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix b/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix index 472d3aeb2d08..a8dd74dd5fb6 100644 --- a/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix @@ -15,7 +15,7 @@ let params = sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index 883ed971b083..3ba99e87ffb6 100644 --- a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchzip, coq }: +{ stdenv, fetchFromGitLab, coq }: -stdenv.mkDerivation { - name = "coq${coq.coq-version}-stdpp-1.1"; - src = fetchzip { - url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz"; - sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0"; +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-stdpp-${version}"; + version = "1.2.1"; + src = fetchFromGitLab { + domain = "gitlab.mpi-sws.org"; + owner = "iris"; + repo = "stdpp"; + rev = "coq-stdpp-${version}"; + sha256 = "1lczybg1jq9drbi8nzrlb0k199x4n07aawjwfzrl3qqc0w8kmvdz"; }; buildInputs = [ coq ]; @@ -14,7 +18,7 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { - homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp"; + inherit (src.meta) homepage; description = "An extended “Standard Library” for Coq"; inherit (coq.meta) platforms; license = stdenv.lib.licenses.bsd3; @@ -22,7 +26,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; }; } diff --git a/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix index 80ce29799a88..17f03f67cef5 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { longDescription = '' GNU guile-gnome brings the power of Scheme to your graphical application. guile-gnome modules support the entire Gnome library stack: from Pango to - GnomeCanvas, Gtk+ to GStreamer, Glade to GtkSourceView, you will find in + GnomeCanvas, GTK to GStreamer, Glade to GtkSourceView, you will find in guile-gnome a comprehensive environment for developing modern applications. ''; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index f0e53b97266a..c4cca42309db 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -325,6 +325,7 @@ self: super: { lensref = dontCheck super.lensref; lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; + matplotlib = dontCheck super.matplotlib; memcache = dontCheck super.memcache; MemoTrie = dontHaddock (dontCheck super.MemoTrie); metrics = dontCheck super.metrics; @@ -985,25 +986,17 @@ self: super: { ''; }); - # https://github.com/haskell-rewriting/term-rewriting/issues/11 - term-rewriting = dontCheck (doJailbreak super.term-rewriting); + # https://github.com/haskell-rewriting/term-rewriting/pull/15 + # remove on next hackage update + term-rewriting = doJailbreak super.term-rewriting; - # https://github.com/nick8325/twee/pull/1 - twee-lib = dontHaddock super.twee-lib; - - # Needs older hlint - hpio = dontCheck super.hpio; - - # https://github.com/fpco/inline-c/issues/72 - inline-c = dontCheck super.inline-c; - - # https://github.com/GaloisInc/pure-zlib/issues/6 + # https://github.com/GaloisInc/pure-zlib/pull/11 pure-zlib = doJailbreak super.pure-zlib; - # https://github.com/strake/lenz-template.hs/issues/1 + # https://github.com/strake/lenz-template.hs/pull/2 lenz-template = doJailbreak super.lenz-template; - # https://github.com/haskell-hvr/resolv/issues/1 + # https://github.com/haskell-hvr/resolv/pull/6 resolv = dontCheck super.resolv; resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2; @@ -1016,11 +1009,6 @@ self: super: { testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; }); - arbtt = overrideCabal super.arbtt (drv: { - preCheck = '' - for n in $PWD/dist/build/*; do PATH+=":$n"; done - ''; - }); # This package refers to the wrong library (itself in fact!) vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; @@ -1031,14 +1019,11 @@ self: super: { # }; # https://github.com/dmwit/encoding/pull/3 - encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; + encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch); # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; - # https://github.com/fpco/streaming-commons/issues/49 - streaming-commons = dontCheck super.streaming-commons; - # Test suite depends on old QuickCheck 2.10.x. cassava = dontCheck super.cassava; @@ -1069,16 +1054,9 @@ self: super: { super.dhall-nix ); - # https://github.com/well-typed/cborg/issues/174 - cborg = doJailbreak super.cborg; - serialise = doJailbreak (dontCheck super.serialise); - # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; - # https://github.com/phadej/tree-diff/issues/19 - tree-diff = doJailbreak super.tree-diff; - # https://github.com/haskell-hvr/hgettext/issues/14 hgettext = doJailbreak super.hgettext; @@ -1089,23 +1067,6 @@ self: super: { haddock-library = doJailbreak (dontCheck super.haddock-library); # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); - # haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2” - haskell-names = doJailbreak super.haskell-names; - - # hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*” - # cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7 - hdocs = overrideCabal super.hdocs (drv: { - postPatch = '' - sed -i 's#haddock-api == 2\.21\.\*,#haddock-api == 2.22.*,#' hdocs.cabal - ''; - }); - - # Break out of tasty >=0.10 && <1.2. - aeson-compat = doJailbreak super.aeson-compat; - - # Break out of pretty-show >=1.6 && <1.9 - hedgehog = doJailbreak super.hedgehog; - # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { @@ -1146,22 +1107,6 @@ self: super: { # Generate shell completions purescript = generateOptparseApplicativeCompletion "purs" super.purescript; - # https://github.com/adinapoli/mandrill/pull/52 - mandrill = appendPatch super.mandrill (pkgs.fetchpatch { - url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch; - sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv"; - }); - - # https://github.com/Euterpea/Euterpea2/pull/22 - Euterpea = overrideSrc super.Euterpea { - src = pkgs.fetchFromGitHub { - owner = "Euterpea"; - repo = "Euterpea2"; - rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c"; - sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba"; - }; - }; - # https://github.com/kcsongor/generic-lens/pull/65 generic-lens = dontCheck super.generic-lens; @@ -1186,7 +1131,6 @@ self: super: { # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 - these = doJailbreak super.these; # until these >= 0.7.6 uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch { url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch"; @@ -1198,13 +1142,6 @@ self: super: { testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; }); - # https://github.com/sighingnow/computations/pull/1 - primesieve = appendPatch super.primesieve (pkgs.fetchpatch { - url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch"; - sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; - stripLen = 1; - }); - # Fix for base >= 4.11 scat = overrideCabal super.scat (drv: { patches = [(pkgs.fetchpatch { @@ -1239,9 +1176,6 @@ self: super: { # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; - # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65) - yesod-markdown = doJailbreak super.yesod-markdown; - # These packages needs network 3.x, which is not in LTS-13.x. network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; }; lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); @@ -1270,9 +1204,6 @@ self: super: { # https://github.com/pruvisto/heap/issues/11 heap = dontCheck super.heap; - # https://github.com/hslua/tasty-lua/issues/1 - tasty-lua = dontCheck super.tasty-lua; - # Test suite won't link for no apparent reason. constraints-deriving = dontCheck super.constraints-deriving; @@ -1280,7 +1211,7 @@ self: super: { hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; }; # https://github.com/sol/hpack/issues/366 - hpack = dontCheck super.hpack; + hpack = self.hpack_0_32_0; # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 graphviz = dontCheck super.graphviz; @@ -1288,4 +1219,13 @@ self: super: { # https://github.com/elliottt/hsopenid/issues/15 openid = markBroken super.openid; + # The test suite needs the packages's executables in $PATH to succeed. + arbtt = overrideCabal super.arbtt (drv: { + preCheck = '' + for i in $PWD/dist/build/*; do + export PATH="$i:$PATH" + done + ''; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 76aabb915618..8e796aa3f1fd 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -43,8 +43,8 @@ self: super: { stm = self.stm_2_5_0_0; text = self.text_1_2_4_0; - # Build with the latest Cabal version, which works best albeit not perfectly. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; }; + # Needs Cabal 3.0.x. + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 0919292d44a5..513c55ea9e9c 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -42,6 +42,7 @@ self: super: { # Needs Cabal 3.0.x. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; # Restricts aeson to <1.4 # https://github.com/purescript/purescript/pull/3537 diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 4addc834040a..d2e463b123c0 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -43,6 +43,7 @@ self: super: { # Needs Cabal 3.0.x. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 2209f5707323..69bd3844c9c4 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -59,7 +59,6 @@ self: super: { split = doJailbreak super.split; tasty-expected-failure = doJailbreak super.tasty-expected-failure; test-framework = doJailbreak super.test-framework; - th-lift = self.th-lift_0_8_0_1; # These packages don't work and need patching and/or an update. primitive = overrideSrc (doJailbreak super.primitive) { @@ -71,29 +70,11 @@ self: super: { sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q"; }; }; - tar = overrideCabal (appendPatch super.tar (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.patch"; - sha256 = "1inbfpamfdpi3yfac59j5xpaq5fvh5g1ca8hlbpic1bizd3s03i0"; - })) (drv: { - configureFlags = ["-f-old-time"]; - editedCabalFile = null; - preConfigure = '' - cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.cabal"; sha256 = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";}} tar.cabal - sed -i -e 's/time < 1.9/time < 2/' tar.cabal - ''; - }); - dlist = appendPatch (doJailbreak super.dlist) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch"; - sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc"; - }); vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch"; sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19"; }); - cabal-doctest = appendPatch (doJailbreak super.cabal-doctest) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch"; - sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j"; - }); + cabal-doctest = super.cabal-doctest_1_0_7; regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; @@ -104,15 +85,7 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2"; }); - th-abstraction = appendPatch (doJailbreak super.th-abstraction) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/th-abstraction-0.2.11.0.patch"; - sha256 = "0czqfszfblz6bvsybcd1z5jijj79f9czqq6dn992wp2gibsbrgj3"; - }); - zlib = appendPatch super.zlib (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch"; - sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif"; - }); - haskell-src-exts = appendPatch super.haskell-src-exts_1_21_0 (pkgs.fetchpatch { + haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch"; sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3"; }); @@ -125,8 +98,8 @@ self: super: { sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; }); happy = appendPatch super.happy (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.9.patch"; - sha256 = "1zmcb7dgcwivq2mddcy1f20djw2kds1m7ahwsa4xpbbwnijc6zjx"; + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch"; + sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk"; }); hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch"; @@ -137,15 +110,10 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; }); - unordered-containers = self.unordered-containers_0_2_10_0; - attoparsec = appendPatch super.attoparsec (pkgs.fetchpatch { + attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch"; sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl"; }); - aeson = appendPatch (dontCheck super.aeson) (pkgs.fetchpatch { # the test suite breaks the compiler - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/aeson-1.4.3.0.patch"; - sha256 = "1z6wmsmc682qs3y768r0zx493dxardwbsp0wdc4dsx83c0m5x66f"; - }); cassava = appendPatch super.cassava (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch"; sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g"; @@ -154,9 +122,51 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch"; sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y"; }); + socks = appendPatch super.socks (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; + sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; + }); lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch"; sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1"; }); - + polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch"; + sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; + }); + foundation = dontCheck super.foundation; + memory = overrideCabal (appendPatch super.memory (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.patch"; + sha256 = "16ar8921s3bi31y1az9zgyg0iaxxc2wvvwqjnl11a17p03wi6b29"; + })) (drv: { + editedCabalFile = null; + preConfigure = '' + cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.cabal"; sha256 = "1325wny0irnq51rz0f4xgkvm01p6n4z5jid2jgpkhjac8a2sdgwl";}} memory.cabal + ''; + }); + chell = overrideCabal (doJailbreak super.chell) (_drv: { + broken = false; + }); + th-expand-syns = doJailbreak super.th-expand-syns; + shelly = overrideCabal (appendPatch (doJailbreak super.shelly) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.patch"; + sha256 = "1kglbwrr4ra81v9x3bfsk5l6pyl0my2a1zkr3qjjx7acn0dfpgbc"; + })) (drv: { + editedCabalFile = null; + preConfigure = '' + cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.cabal"; sha256 = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";}} shelly.cabal + sed -i -e 's/< 1.9,/< 2,/' shelly.cabal # bump time version + ''; + }); + system-fileio = doJailbreak super.system-fileio; + yaml = self.yaml_0_11_1_2; + haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch"; + sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc"; + }); + asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch"; + sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5"; + }); + tls = self.tls_1_5_1; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0a269acbdb6f..9cbc4c21aed5 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.3 + # LTS Haskell 14.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -176,7 +176,7 @@ default-package-overrides: - bencoding ==0.4.5.1 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.5.4 + - bifunctors ==5.5.5 - bimap ==0.4.0 - bimap-server ==0.1.0.1 - binary-bits ==0.5 @@ -264,7 +264,7 @@ default-package-overrides: - c2hs ==0.28.6 - Cabal ==2.4.1.0 - cabal2spec ==2.2.2.1 - - cabal-doctest ==1.0.6 + - cabal-doctest ==1.0.7 - cabal-file-th ==0.2.6 - cache ==0.1.1.2 - cacophony ==0.10.1 @@ -511,7 +511,7 @@ default-package-overrides: - dependent-sum-template ==0.0.0.6 - deque ==0.4.2.3 - deriveJsonNoPrefix ==0.1.0.1 - - deriving-compat ==0.5.6 + - deriving-compat ==0.5.7 - derulo ==1.0.5 - detour-via-sci ==1.0.0 - dhall ==1.24.0 @@ -547,7 +547,7 @@ default-package-overrides: - dockerfile ==0.2.0 - docopt ==0.7.0.5 - doctemplates ==0.2.2.1 - - doctest ==0.16.1 + - doctest ==0.16.2 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.1 - doldol ==0.4.1.2 @@ -629,7 +629,7 @@ default-package-overrides: - exact-pi ==0.5.0.1 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - - exceptions ==0.10.2 + - exceptions ==0.10.3 - exception-transformers ==0.4.0.7 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 @@ -709,7 +709,7 @@ default-package-overrides: - format-numbers ==0.1.0.0 - formatting ==6.3.7 - foundation ==0.0.24 - - free ==5.1.1 + - free ==5.1.2 - freenect ==1.2.1 - freer-simple ==1.2.1.0 - freetype2 ==0.1.2 @@ -778,7 +778,7 @@ default-package-overrides: - ghc-prof ==1.4.1.5 - ghc-syntax-highlighter ==0.0.4.0 - ghc-tcplugins-extra ==0.3 - - ghc-typelits-extra ==0.3 + - ghc-typelits-extra ==0.3.1 - ghc-typelits-knownnat ==0.6 - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 @@ -944,7 +944,7 @@ default-package-overrides: - hruby ==0.3.8 - hsass ==0.8.0 - hs-bibutils ==6.7.0.0 - - hsc2hs ==0.68.4 + - hsc2hs ==0.68.6 - hschema ==0.0.1.1 - hschema-aeson ==0.0.1.1 - hschema-prettyprinter ==0.0.1.1 @@ -1037,7 +1037,7 @@ default-package-overrides: - hw-fingertree ==0.1.1.0 - hw-fingertree-strict ==0.1.1.1 - hw-hedgehog ==0.1.0.3 - - hw-hspec-hedgehog ==0.1.0.7 + - hw-hspec-hedgehog ==0.1.0.8 - hw-int ==0.0.0.3 - hw-ip ==2.3.4.1 - hw-json ==1.0.0.2 @@ -1512,7 +1512,7 @@ default-package-overrides: - pandoc-markdown-ghci-filter ==0.1.0.0 - pandoc-pyplot ==2.1.5.1 - pandoc-types ==1.17.6 - - pantry ==0.1.1.1 + - pantry ==0.1.1.2 - parallel ==3.2.2.0 - parallel-io ==0.3.3 - paripari ==0.6.0.0 @@ -1568,11 +1568,11 @@ default-package-overrides: - pg-harness-client ==0.6.0 - pg-harness-server ==0.6.2 - pgp-wordlist ==0.1.0.3 - - pg-transact ==0.1.0.1 + - pg-transact ==0.1.2.0 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.1.4 - - pipes ==4.3.11 + - pipes ==4.3.12 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1731,7 +1731,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - reanimate ==0.1.5.0 - - reanimate-svg ==0.9.0.0 + - reanimate-svg ==0.9.0.1 - rebase ==1.3.1.1 - record-dot-preprocessor ==0.2 - record-hasfield ==1.0 @@ -1740,7 +1740,7 @@ default-package-overrides: - reducers ==3.12.3 - refact ==0.3.0.2 - references ==0.3.3.1 - - reflection ==2.1.4 + - reflection ==2.1.5 - RefSerialize ==0.4.0 - regex ==1.0.2.0 - regex-applicative ==0.3.3.1 @@ -1785,7 +1785,7 @@ default-package-overrides: - rhine ==0.5.1.0 - rhine-gloss ==0.5.1.0 - rigel-viz ==0.2.0.0 - - rio ==0.1.11.0 + - rio ==0.1.12.0 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.0.0 - roc-id ==0.1.0.0 @@ -1809,9 +1809,9 @@ default-package-overrides: - safe-json ==0.1.0 - safe-money ==0.9 - SafeSemaphore ==0.10.1 - - salak ==0.3.5.1 - - salak-toml ==0.3.5.1 - - salak-yaml ==0.3.5.1 + - salak ==0.3.5.3 + - salak-toml ==0.3.5.3 + - salak-yaml ==0.3.5.3 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1843,7 +1843,7 @@ default-package-overrides: - selective ==0.3 - semialign ==1 - semigroupoid-extras ==5 - - semigroupoids ==5.3.2 + - semigroupoids ==5.3.3 - semigroups ==0.18.5 - semirings ==0.4.2 - semiring-simple ==1.0.0.1 @@ -1879,6 +1879,7 @@ default-package-overrides: - servant-mock ==0.8.5 - servant-multipart ==0.11.4 - servant-pipes ==0.15 + - servant-rawm ==0.3.1.0 - servant-ruby ==0.9.0.0 - servant-server ==0.16.2 - servant-static-th ==0.2.2.0 @@ -1929,7 +1930,7 @@ default-package-overrides: - simplistic-generics ==0.1.0.0 - since ==0.0.0 - singleton-bool ==0.1.5 - - singleton-nats ==0.4.2 + - singleton-nats ==0.4.3 - singletons ==2.5.1 - siphash ==1.0.3 - size-based ==0.1.2.0 @@ -1958,7 +1959,6 @@ default-package-overrides: - sox ==0.2.3.1 - soxlib ==0.0.3.1 - sparse-linear-algebra ==0.3.1 - - sparse-tensor ==0.2.1 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - speculate ==0.3.5 @@ -2059,14 +2059,14 @@ default-package-overrides: - tagstream-conduit ==0.5.5.3 - tao ==1.0.0 - tao-example ==1.0.0 - - tar ==0.5.1.0 + - tar ==0.5.1.1 - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - tasty-dejafu ==2.0.0.1 - tasty-discover ==4.2.1 - - tasty-expected-failure ==0.11.1.1 + - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.2 - tasty-hedgehog ==1.0.0.1 - tasty-hspec ==1.1.5.1 @@ -2125,7 +2125,7 @@ default-package-overrides: - th-data-compat ==0.0.2.7 - th-desugar ==1.9 - these ==1.0.1 - - th-expand-syns ==0.4.4.0 + - th-expand-syns ==0.4.5.0 - th-extras ==0.0.0.4 - th-lift ==0.8.0.1 - th-lift-instances ==0.1.14 @@ -2194,7 +2194,7 @@ default-package-overrides: - trivial-constraint ==0.6.0.0 - true-name ==0.1.0.3 - tsv2csv ==0.1.0.2 - - ttl-hashtables ==1.3.1.0 + - ttl-hashtables ==1.3.1.1 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 @@ -2420,17 +2420,17 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.1.1 + - yaml ==0.11.1.2 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.3.0 - - yesod-auth ==1.6.7 + - yesod-auth ==1.6.8 - yesod-auth-hashdb ==1.7.1.1 - - yesod-auth-oauth2 ==0.6.1.1 + - yesod-auth-oauth2 ==0.6.1.2 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.15 + - yesod-core ==1.6.16 - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -2461,7 +2461,7 @@ default-package-overrides: - zip-archive ==0.4.1 - zippers ==0.3 - zip-stream ==0.2.0.1 - - zlib ==0.6.2 + - zlib ==0.6.2.1 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 @@ -3115,6 +3115,7 @@ broken-packages: - armor - arpa - arpack + - array-chunks - array-forth - array-primops - arraylist @@ -3366,7 +3367,9 @@ broken-packages: - Biobase - BiobaseBlast - BiobaseDotP + - BiobaseENA - BiobaseEnsembl + - BiobaseFasta - BiobaseFR3D - BiobaseHTTP - BiobaseHTTPTools @@ -3375,7 +3378,9 @@ broken-packages: - BiobaseNewick - BiobaseTrainingData - BiobaseTurner + - BiobaseTypes - BiobaseVienna + - BiobaseXNA - biocore - biofasta - biofastq @@ -3388,7 +3393,6 @@ broken-packages: - birch-beer - bird - BirdPP - - bisc - bisect-binary - bit-array - bit-stream @@ -3593,8 +3597,6 @@ broken-packages: - cabin - cabocha - cached - - cachix - - cachix-api - cacophony - caffegraph - cairo-core @@ -3948,6 +3950,7 @@ broken-packages: - Conscript - consistent - const-math-ghc-plugin + - constr-eq - constrained-categories - constrained-category - constrained-dynamic @@ -4090,6 +4093,7 @@ broken-packages: - ctpl - cube - cuboid + - cuckoo - cudd - currency-convert - curry-frontend @@ -4488,6 +4492,7 @@ broken-packages: - DysFRP-Cairo - DysFRP-Craftwerk - dywapitchtrack + - dzen-dhall - dzen-utils - earclipper - ease @@ -4533,6 +4538,7 @@ broken-packages: - ekg-rrd - elevator - elision + - elliptic-curve - elm-websocket - elsa - emacs-keys @@ -4548,7 +4554,6 @@ broken-packages: - Empty - empty-monad - enchant - - encoding - encoding-io - engine-io-growler - engine-io-snap @@ -4620,7 +4625,6 @@ broken-packages: - euler-tour-tree - euphoria - eurofxref - - Euterpea - eve - eve-cli - event @@ -4960,6 +4964,7 @@ broken-packages: - funpat - funsat - fusion + - futhark - futun - future - fuzzy-timings @@ -5035,6 +5040,7 @@ broken-packages: - GenSmsPdu - gentlemark - GenussFold + - genvalidity-mergeless - geo-resolver - GeocoderOpenCage - geodetic @@ -5366,6 +5372,7 @@ broken-packages: - hakismet - hakka - hako + - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib @@ -5926,8 +5933,6 @@ broken-packages: - hmt-diagrams - hmumps - hnetcdf - - hnix - - hnix-store-remote - HNM - hnormalise - ho-rewriting @@ -6299,6 +6304,7 @@ broken-packages: - hw-json-simple-cursor - hw-json-standard-cursor - hw-packed-vector + - hw-prim-bits - hw-rankselect - hw-rankselect-base - hw-simd @@ -6353,6 +6359,7 @@ broken-packages: - hypher - hzulip - i18n + - I1M - i3blocks-hs-contrib - i3ipc - iap-verifier @@ -6658,6 +6665,7 @@ broken-packages: - katydid - kawaii - kawhi + - kazura-queue - kd-tree - kdesrc-build-extra - keccak @@ -6882,6 +6890,7 @@ broken-packages: - liblawless - liblinear-enumerator - libltdl + - libmodbus - libmolude - liboath-hs - liboleg @@ -7150,7 +7159,6 @@ broken-packages: - mathflow - mathgenealogy - mathlink - - matplotlib - matrix-as-xyz - matsuri - matterhorn @@ -7423,6 +7431,7 @@ broken-packages: - multibase - multifocal - multihash + - multihash-cryptonite - multihash-serialise - multilinear - multilinear-io @@ -7788,6 +7797,7 @@ broken-packages: - pandoc-japanese-filters - pandoc-lens - pandoc-markdown-ghci-filter + - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot - pandoc-unlit @@ -8005,6 +8015,7 @@ broken-packages: - plat - platinum-parsing - PlayingCards + - plex - plist-buddy - plocketed - plot @@ -8074,6 +8085,7 @@ broken-packages: - postgresql-query - postgresql-simple-bind - postgresql-simple-named + - postgresql-simple-opts - postgresql-simple-queue - postgresql-simple-sop - postgresql-simple-typed @@ -8677,6 +8689,7 @@ broken-packages: - scenegraph - schedevr - schedule-planner + - scheduler - schedyield - schematic - scholdoc @@ -8776,7 +8789,6 @@ broken-packages: - servant-auth-token-leveldb - servant-auth-token-persistent - servant-auth-token-rocksdb - - servant-checked-exceptions - servant-cli - servant-client-namedargs - servant-csharp @@ -8805,7 +8817,6 @@ broken-packages: - servant-pushbullet-client - servant-py - servant-quickcheck - - servant-rawm - servant-reason - servant-reflex - servant-router @@ -9807,6 +9818,7 @@ broken-packages: - unagi-streams - unamb-custom - unbound + - unbound-kind-generics - unbounded-delays-units - unboxed-containers - unbreak @@ -10208,7 +10220,6 @@ broken-packages: - xkcd - xleb - xlsior - - xlsx - xlsx-tabular - xlsx-templater - xml-catalog @@ -10265,7 +10276,10 @@ broken-packages: - yahoo-web-search - yajl - yajl-enumerator + - yam + - yam-datasource - yam-job + - yam-redis - yam-servant - yam-transaction-odbc - yam-web diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index eaa0f799f922..bb00b7c1fbab 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1562,6 +1562,8 @@ self: { ]; description = "European Nucleotide Archive data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseEnsembl" = callPackage @@ -1622,6 +1624,8 @@ self: { ]; description = "streaming FASTA parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseHTTP" = callPackage @@ -1817,6 +1821,8 @@ self: { ]; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseVienna" = callPackage @@ -1875,6 +1881,8 @@ self: { ]; description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BirdPP" = callPackage @@ -1946,8 +1954,8 @@ self: { }: mkDerivation { pname = "BlastHTTP"; - version = "1.4.0"; - sha256 = "0gvgwjsqrbk42vmbsh47d8fiwbwhdbsk5mlqj99pfmqi8fddwdm3"; + version = "1.4.1"; + sha256 = "1h7bj9a6qfzwlclr39dvbcz4r8l8s7n53z6ir8wff5ssq2wvq4qd"; libraryHaskellDepends = [ base BiobaseBlast BiobaseFasta bytestring conduit either-unwrap HTTP http-conduit hxt mtl network transformers zip-archive @@ -5372,8 +5380,6 @@ self: { ]; description = "Library for computer music research and education"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "EventSocket" = callPackage @@ -10598,6 +10604,8 @@ self: { pname = "HsYAML"; version = "0.1.2.0"; sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54"; + revision = "1"; + editedCabalFile = "0j6qmmcz5yqh89hs2cq453maix50q61vl2h0ahj5lg02bygn42cf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10756,6 +10764,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IDynamic" = callPackage @@ -11409,8 +11419,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "2"; - editedCabalFile = "0pp67ygrd3m6q8ry5229m1b2rhy401gb74368h09bqc6wa3g7ygv"; + revision = "3"; + editedCabalFile = "1dkmlrn4vncx6n1646q1z9gfvpbgk0blax1i8n16dl6y5j042xf1"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -14261,8 +14271,8 @@ self: { pname = "OTP"; version = "0.1.0.0"; sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb"; - revision = "1"; - editedCabalFile = "1bcp6mixf0yxn6qmql3zhyshpa55mkrfnxdb1ma6gvbs7h28lnin"; + revision = "2"; + editedCabalFile = "012yi2pvjjlk6vri5zj8a7pipscsfc6rgkw7s5qldqmvvwvrk64s"; libraryHaskellDepends = [ base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 time @@ -14427,8 +14437,8 @@ self: { pname = "OneTuple"; version = "0.2.2"; sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; - revision = "2"; - editedCabalFile = "1ii7hpmxi794xywx89agnvinxgral1rfn5hfnanr4zw26nczhcv3"; + revision = "3"; + editedCabalFile = "0m3a9fj2h0v529q3i1kq1jfbdj68wxsmhq65hgx2rwjpgb8cqf0z"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -15501,20 +15511,20 @@ self: { "PrimitiveArray" = callPackage ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector - , containers, deepseq, DPutils, hashable, lens, log-domain, mtl - , OrderedBits, primitive, QuickCheck, smallcheck, tasty - , tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector + , containers, criterion, deepseq, DPutils, hashable, lens + , log-domain, mtl, OrderedBits, primitive, QuickCheck, smallcheck + , tasty, tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "PrimitiveArray"; - version = "0.9.1.1"; - sha256 = "0q6i5754ysay2c4xs7m6hz69l35qd7irzxinmga431nvmbnqa21y"; + version = "0.10.0.0"; + sha256 = "0g9shj3zqk8rdp905di9i5g5bhga5msc7cs609fk3nkjm16ms0vi"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq DPutils hashable lens log-domain mtl OrderedBits primitive - QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck - tasty-th text vector vector-binary-instances vector-th-unbox + QuickCheck smallcheck text vector vector-binary-instances + vector-th-unbox ]; testHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq @@ -15522,6 +15532,12 @@ self: { QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck tasty-th text vector vector-binary-instances vector-th-unbox ]; + benchmarkHaskellDepends = [ + aeson base binary bits cereal cereal-vector containers criterion + deepseq DPutils hashable lens log-domain mtl OrderedBits primitive + QuickCheck smallcheck text vector vector-binary-instances + vector-th-unbox + ]; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -15736,15 +15752,15 @@ self: { "PyF" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec - , HUnit, megaparsec, process, python3, template-haskell, temporary - , text + , HUnit, megaparsec, mtl, process, python3, template-haskell + , temporary, text }: mkDerivation { pname = "PyF"; - version = "0.8.0.1"; - sha256 = "1bv57hi26nmrhcdr4hki62ycd0k5p0i0jdwcdcxi7vmhjavnyq08"; + version = "0.8.1.0"; + sha256 = "10zmw6ircqq53jvkmpqdf7sqf1pgc85m4w2k981jwbhpc3dycgrb"; libraryHaskellDepends = [ - base containers haskell-src-exts haskell-src-meta megaparsec + base containers haskell-src-exts haskell-src-meta megaparsec mtl template-haskell text ]; testHaskellDepends = [ @@ -16204,13 +16220,13 @@ self: { , ClustalParser, cmdargs, containers, directory, edit-distance , either-unwrap, filepath, hierarchical-clustering, HTTP , http-conduit, http-types, hxt, matrix, network, parsec, process - , pureMD5, random, split, Taxonomy, text, text-metrics, time - , transformers, vector, ViennaRNAParser + , pureMD5, random, silently, split, Taxonomy, text, text-metrics + , time, transformers, vector, ViennaRNAParser }: mkDerivation { pname = "RNAlien"; - version = "1.6.0"; - sha256 = "0pp9rim4k1gbc2dscqygi90c2721xc6q1fl2sqkfpafz30m022pq"; + version = "1.7.0"; + sha256 = "1yqf2i1q5s65i968ha4lhnn0njmgapb30sxwdq5rpf7wbw2f29by"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16218,8 +16234,8 @@ self: { BlastHTTP bytestring cassava ClustalParser cmdargs containers directory edit-distance either-unwrap filepath hierarchical-clustering HTTP http-conduit http-types hxt matrix - network parsec process pureMD5 random Taxonomy text text-metrics - transformers vector ViennaRNAParser + network parsec process pureMD5 random silently Taxonomy text + text-metrics transformers vector ViennaRNAParser ]; executableHaskellDepends = [ base BiobaseFasta BiobaseTypes bytestring cassava cmdargs @@ -20429,6 +20445,8 @@ self: { pname = "X"; version = "0.3.0.0"; sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc"; + revision = "1"; + editedCabalFile = "1nbp0zci2sp07cr5j5xlh7gswcnj52z9dp6akh9xk4mzk3salxwq"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -22468,14 +22486,12 @@ self: { }) {}; "acquire" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "acquire"; - version = "0.2.0.1"; - sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2"; - revision = "1"; - editedCabalFile = "1ihmdh0dpppgshsh7mxdz6bm9kn632xxd3g6nkigpjpfrb372q7z"; - libraryHaskellDepends = [ base ]; + version = "0.3.1"; + sha256 = "1spw70dw8x6d9dy5wg47fim4kpsvzgr25nmwpv8c4wd8g3gmnqmw"; + libraryHaskellDepends = [ base transformers ]; description = "Abstraction over management of resources"; license = stdenv.lib.licenses.mit; }) {}; @@ -22499,8 +22515,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "8"; - editedCabalFile = "1j771jblfaygc3qf8iaw9b87yrqxhkq79mdi9zyhvlr2vcac362s"; + revision = "9"; + editedCabalFile = "1xq08xn26v3zi3fz1y5lhb1q2xv1d413wdg4pibi98n98nc2ypxz"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -22955,6 +22971,8 @@ self: { pname = "aeson"; version = "1.4.4.0"; sha256 = "0bjdgr6wjq6cci5hxb63i18yrg66p892n6xj23rih7k5rbd7rihp"; + revision = "1"; + editedCabalFile = "1mn7ws8v5zsm9fy9ndvb0rygchjbwnnxyyxpl63cf9lmzzffvxd6"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable primitive scientific tagged template-haskell text @@ -23295,8 +23313,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.1.1.0"; - sha256 = "04hg0vdrfb7x6qxwcifsayc6z5vhc1l96ahvswg8q5wddc00ypzp"; + version = "1.1.2.0"; + sha256 = "05506d6nkw7q924l2ww5mg1ahzs9122vj02mgscdh7g72n3krdd4"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable lens servant-docs swagger2 text unordered-containers @@ -24448,8 +24466,8 @@ self: { pname = "alex-tools"; version = "0.4"; sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi"; - revision = "1"; - editedCabalFile = "1dwr1w2zhbvwnjc65zzmwfmwb1yxxyyfrjypvqp3m7fpc7dg1nxg"; + revision = "2"; + editedCabalFile = "1hz7gdff15bxvx5jijgh6ih1m2v39nadfy2yjsb43c48p9hcn93z"; libraryHaskellDepends = [ base deepseq template-haskell text ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; @@ -28619,6 +28637,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-terminal_0_10" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.10"; + sha256 = "0l96g8m88qbyhp6mvm895b102jc5z3b85i0fvb4w99x2zj4pnv7y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base colour ]; + description = "Simple ANSI terminal support, with Windows compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck @@ -28650,6 +28682,8 @@ self: { pname = "ansi-wl-pprint"; version = "0.6.9"; sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7"; + revision = "1"; + editedCabalFile = "0bb5fzjjc00932pny1fql40dmpmikfqzbrbmpwr09bfw9aynvzgn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; @@ -30685,8 +30719,8 @@ self: { pname = "argon2"; version = "1.3.0.1"; sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry"; - revision = "1"; - editedCabalFile = "1bqzf2cfpd03sl3wq9dnrcxaysbs116ib33ja0v8zi4szddm33jv"; + revision = "2"; + editedCabalFile = "0y1dg4dp3f40ghh2zcn1s4l19i8pjs0d1zpbghy4aaar4npiqxz7"; libraryHaskellDepends = [ base bytestring deepseq text-short ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -30966,12 +31000,12 @@ self: { broken = true; }) {inherit (pkgs) arpack;}; - "array_0_5_3_0" = callPackage + "array_0_5_4_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.3.0"; - sha256 = "07pyr2x09n23rdxldqgbx12hlg9dk92q9p56bpcdw3r87ajc3m9z"; + version = "0.5.4.0"; + sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -30993,6 +31027,8 @@ self: { ]; description = "Lists of chunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "array-forth" = callPackage @@ -31596,8 +31632,8 @@ self: { pname = "asn1-data"; version = "0.7.2"; sha256 = "18dc4d71pvp5q6npxicqqj3fk6n39lm98450vvhgg4y9rc1rr6c3"; - revision = "1"; - editedCabalFile = "18qjn7asld26nlri6md4z3kmyvarvvg5wi7rwsg4ngrxw4gbqhqm"; + revision = "2"; + editedCabalFile = "0xnj367rxj21gnxq7d5qih54g0zwwyc6r6gaaijikhprppbvjjvy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -31614,6 +31650,8 @@ self: { pname = "asn1-encoding"; version = "0.9.5"; sha256 = "0adgbamyq0mj1l1hdq4zyyllay714bac1wl0rih3fv1z6vykp1hy"; + revision = "1"; + editedCabalFile = "0vsw8rd6fxd87rx3jyh3bb96sjd7ag0mrlylhkcmgaps2ma8sw5b"; libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; testHaskellDepends = [ asn1-types base bytestring hourglass mtl tasty tasty-quickcheck @@ -31789,6 +31827,8 @@ self: { pname = "assoc"; version = "1"; sha256 = "0i1jj6lrabl0fhh1iya4nxr2hw1s4xmhca5qnim93ng5znziv9n2"; + revision = "1"; + editedCabalFile = "0hcpyypnj9qwbpk079h6lnm8aa3mp3fzjilk9qwibkmnnqwwwcld"; libraryHaskellDepends = [ base bifunctors ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = stdenv.lib.licenses.bsd3; @@ -32673,8 +32713,8 @@ self: { pname = "atto-lisp"; version = "0.2.2.3"; sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd"; - revision = "1"; - editedCabalFile = "0im8kc54hkfj578ck79j0ijc3iaigvx06pgj4sk8za26ryy7v46q"; + revision = "2"; + editedCabalFile = "065v6vllvwvm0zpkra7bl2hpz1lnhara13965p75pzdppv8ghd6w"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers deepseq text @@ -32739,6 +32779,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_3" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.3"; + sha256 = "1ngjn9h5n0vyki0m2jir4mg85875ysswy9hznpmj1r856mqwc6ix"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -33174,46 +33243,41 @@ self: { }) {}; "aura" = callPackage - ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, array - , async, aur, base, base-prelude, bytestring, compactable - , containers, directory, errors, filepath, freer-simple - , generic-lens, http-client, http-client-tls, http-types - , language-bash, megaparsec, microlens, microlens-ghc, mtl - , mwc-random, network-uri, non-empty-containers + ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, aur, base + , base-prelude, bytestring, compactable, containers, directory + , errors, filepath, fused-effects, generic-lens, http-client + , http-client-tls, http-types, language-bash, megaparsec, microlens + , microlens-ghc, mwc-random, network-uri, nonempty-containers , optparse-applicative, paths, pretty-simple, prettyprinter - , prettyprinter-ansi-terminal, semigroupoids, stm, tasty - , tasty-hunit, text, throttled, time, transformers, typed-process - , versions, witherable + , prettyprinter-ansi-terminal, scheduler, semigroupoids, stm, tasty + , tasty-hunit, text, these, time, transformers, typed-process + , unliftio, versions }: mkDerivation { pname = "aura"; - version = "2.0.0"; - sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996"; - revision = "1"; - editedCabalFile = "1z73n5fcrp23hms0l6r45p1knqqlng8g4gfb44a4raqj7da823zj"; + version = "2.0.2"; + sha256 = "1r11dzyy7z759ch664cml6lywh7033s6qrv56mkn41kn91jrl3qy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty algebraic-graphs array async aur base - base-prelude bytestring compactable containers directory errors - filepath freer-simple generic-lens http-client http-types - language-bash megaparsec microlens microlens-ghc mtl mwc-random - network-uri non-empty-containers paths pretty-simple prettyprinter - prettyprinter-ansi-terminal semigroupoids stm text throttled time - transformers typed-process versions witherable + aeson aeson-pretty algebraic-graphs aur base base-prelude + bytestring compactable containers directory errors filepath + fused-effects generic-lens http-client http-types language-bash + megaparsec microlens microlens-ghc mwc-random network-uri + nonempty-containers paths prettyprinter prettyprinter-ansi-terminal + scheduler semigroupoids stm text these time transformers + typed-process unliftio versions ]; executableHaskellDepends = [ - base base-prelude bytestring containers errors freer-simple - http-client http-client-tls language-bash microlens - non-empty-containers optparse-applicative paths pretty-simple - prettyprinter prettyprinter-ansi-terminal text transformers - typed-process versions + base base-prelude bytestring containers errors fused-effects + http-client http-client-tls microlens nonempty-containers + optparse-applicative paths pretty-simple prettyprinter + prettyprinter-ansi-terminal text transformers typed-process + versions ]; testHaskellDepends = [ - base base-prelude bytestring containers errors freer-simple - http-client language-bash megaparsec microlens non-empty-containers - paths pretty-simple prettyprinter prettyprinter-ansi-terminal tasty - tasty-hunit text transformers typed-process versions + base base-prelude bytestring containers megaparsec microlens paths + tasty tasty-hunit text versions ]; description = "A secure package manager for Arch Linux and the AUR, written in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -33556,8 +33620,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "31"; - editedCabalFile = "03nzgni96r6yfmn196iya6akrzh46njqzd2873aj341ynfaqjyy1"; + revision = "32"; + editedCabalFile = "0p4jhc8rxvm82cp3zaibazb5jnjs33vl4f71pvgvzf31xd7immyy"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -35407,6 +35471,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat_0_11_0" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.11.0"; + sha256 = "0svswi3nby9cabai2l9mkcx0c9zqw9y8js50sh09cms1s2jjly26"; + libraryHaskellDepends = [ base unix ]; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-compat-batteries" = callPackage ({ mkDerivation, base, base-compat, hspec, hspec-discover , QuickCheck @@ -35424,6 +35500,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat-batteries_0_11_0" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.11.0"; + sha256 = "0r9p14ks2fspbhj61b2gi4ixipkhhkzpcx0y35nf4yypcqv5262h"; + libraryHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-compat-migrate" = callPackage ({ mkDerivation, base, base-compat }: mkDerivation { @@ -35448,8 +35540,8 @@ self: { pname = "base-encoding"; version = "0.1.0.0"; sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si"; - revision = "1"; - editedCabalFile = "0miysladpqwm5qhphv23qhvambd7245n14qbkgvp664xj56y6df1"; + revision = "2"; + editedCabalFile = "0flfvs03zs7k04x7yhsc3jiw3zpnx7n3637jyy10flpqv90fy6sx"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring text ]; @@ -35712,8 +35804,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "1"; - editedCabalFile = "13yjasdw3dh33rv1jhx5hjdvpp7cnxymrk836jk1mnpjw32606c9"; + revision = "2"; + editedCabalFile = "03qm7fgwwxcc5w65rwwvbl358dfnxmsg4rq1ixi5xpmmhmak67h8"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -35786,6 +35878,8 @@ self: { pname = "basement"; version = "0.0.11"; sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37"; + revision = "2"; + editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = stdenv.lib.licenses.bsd3; @@ -36777,6 +36871,8 @@ self: { pname = "bencode"; version = "0.6.0.0"; sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv"; + revision = "1"; + editedCabalFile = "0nvph7frmrra9k57v01saxgnhf1ma3m8qzwj1i53pswssfnj41mv"; libraryHaskellDepends = [ base binary bytestring containers parsec ]; @@ -37214,30 +37310,6 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.4"; - sha256 = "134vn71wd194175k2fcdvd0ak2bdmdbk6ql5lls4byff7zs2rmi9"; - revision = "1"; - editedCabalFile = "05qh2xh2j3w5f1q94wfgfp06z9c4fyrgm4cncy6y2lbb1ficsh3j"; - libraryHaskellDepends = [ - base base-orphans comonad containers tagged template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ - base hspec QuickCheck template-haskell transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bifunctors_5_5_5" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , hspec-discover, QuickCheck, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - }: - mkDerivation { - pname = "bifunctors"; version = "5.5.5"; sha256 = "0rn47q8dzv0g1fyams99p4py6q0asxdc50q9k0nj497brk738xcb"; libraryHaskellDepends = [ @@ -37251,7 +37323,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -37666,8 +37737,8 @@ self: { pname = "binary-instances"; version = "1"; sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0"; - revision = "1"; - editedCabalFile = "141hhr872rg0g2pvz1mbxamz9cijik9jilr1y0wdx5r71x0m1vyd"; + revision = "2"; + editedCabalFile = "0yawdwm086gk51y5s5zbybiwiv386cx8xyj6kcgj9wwdidcnaxdi"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable scientific tagged text text-binary time-compat unordered-containers @@ -39248,8 +39319,6 @@ self: { ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bisect-binary" = callPackage @@ -40209,6 +40278,8 @@ self: { pname = "blank-canvas"; version = "0.7"; sha256 = "11blkr9yhag4l8lyg5gyi2wzcnapkgihkh01mp9lm28f3bb1v1z7"; + revision = "1"; + editedCabalFile = "11jqhxcr8vynlknpw73s0nmg1a7n9rsbyifyhaxi3aq7hzvb0qai"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -41624,12 +41695,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "boots_0_2" = callPackage + "boots_0_2_0_1" = callPackage ({ mkDerivation, base, exceptions, hspec, mtl }: mkDerivation { pname = "boots"; - version = "0.2"; - sha256 = "0v7p2pfs4kcczc4wpswb0rgl2ak9xijq7ha9c6lagyb1av17sx9r"; + version = "0.2.0.1"; + sha256 = "04dh749p5nwar3hgmx5g12814lazwrzzqxbxbk4f003qpbd8np8w"; libraryHaskellDepends = [ base exceptions mtl ]; testHaskellDepends = [ base exceptions hspec mtl ]; description = "IoC Monad in Haskell"; @@ -41639,19 +41710,20 @@ self: { "boots-app" = callPackage ({ mkDerivation, base, boots, data-default, exceptions, fast-logger - , menshen, microlens, mtl, salak, salak-yaml, splitmix, text, time - , unliftio-core, unordered-containers + , megaparsec, microlens, mtl, optparse-applicative, salak + , salak-yaml, splitmix, text, time, unliftio-core + , unordered-containers }: mkDerivation { pname = "boots-app"; - version = "0.2"; - sha256 = "0rnlb9fzaxcx4lvacqklv1kr2ygzgssgz1xzcfmbgkqpzp08nxqx"; + version = "0.2.0.1"; + sha256 = "0wk177f6ljcqd0ya7cddvx3i6sdwx0wl9fz1idzfa8klb8pnkghh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base boots data-default exceptions fast-logger menshen microlens - mtl salak salak-yaml splitmix text unliftio-core - unordered-containers + base boots data-default exceptions fast-logger megaparsec microlens + mtl optparse-applicative salak salak-yaml splitmix text + unliftio-core unordered-containers ]; executableHaskellDepends = [ base time ]; description = "Factory for quickly building an application"; @@ -41682,18 +41754,17 @@ self: { "boots-web" = callPackage ({ mkDerivation, aeson, base, boots, boots-app, bytestring , containers, ekg-core, http-types, microlens, monad-logger, salak - , servant-server, servant-swagger, swagger2, text, time + , servant, servant-server, servant-swagger, swagger2, text , unordered-containers, vault, wai, warp }: mkDerivation { pname = "boots-web"; - version = "0.2"; - sha256 = "00f55k7gc4dirzxmgngw9vpcl0w8fgklsyscy5h584pbhd84x4mj"; + version = "0.2.0.1"; + sha256 = "1czylbghh9rzhr4zs394gdm39d2xqqkv3v7fjzq1askah48zqx18"; libraryHaskellDepends = [ aeson base boots boots-app bytestring containers ekg-core - http-types microlens monad-logger salak servant-server - servant-swagger swagger2 text time unordered-containers vault wai - warp + http-types microlens monad-logger salak servant servant-server + servant-swagger swagger2 text unordered-containers vault wai warp ]; description = "Factory for quickly building a web application"; license = stdenv.lib.licenses.mit; @@ -41880,8 +41951,8 @@ self: { pname = "bound-extras"; version = "0.0.1"; sha256 = "0f49yqz5s5h4f3m3i7kpm2fqnd42nl4dbl24lvm6z3nb8qrx6ynq"; - revision = "1"; - editedCabalFile = "1gyhbcnb1q1f8fdlmsmjn19xp4nvi2vb6ns0h8h2dvvpz9x3wgab"; + revision = "2"; + editedCabalFile = "1a88bxgz9r1v6lqkab12ljw3vknx7sgi6vi3fsqli8ji2ajfn5k1"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -42247,6 +42318,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_49" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, filepath + , microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.49"; + sha256 = "1jlxzizxgmdsjd0x146kcmp92x7gjn0vkj0lc5dplbgshlg5hfhd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -42675,6 +42773,8 @@ self: { pname = "brotli"; version = "0.0.0.0"; sha256 = "1l9qiw5cl0k1rcnqnj9pb7vgj1b06wckkk5i73nqr15ixgcjmr9j"; + revision = "1"; + editedCabalFile = "0fw26rv8i9zz4qyr32paz2y0psdppdaz427jp8mpbanwmg763024"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; testHaskellDepends = [ @@ -44099,14 +44199,16 @@ self: { }) {}; "bytestring-progress" = callPackage - ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: + ({ mkDerivation, base, bytestring, terminal-progress-bar, text + , time + }: mkDerivation { pname = "bytestring-progress"; - version = "1.2"; - sha256 = "195vsqpmaycxi0k7kk1hasrklnblr3psllc288vkh77pbnfm3vqi"; + version = "1.4"; + sha256 = "140dn6zyc1ka8vjxwd6zzc3mwd651zrawcwk3d5ipfxrgddf9bws"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring terminal-progress-bar time + base bytestring terminal-progress-bar text time ]; description = "A library for tracking the consumption of a lazy ByteString"; license = stdenv.lib.licenses.bsd3; @@ -44358,6 +44460,8 @@ self: { pname = "bzlib"; version = "0.5.0.5"; sha256 = "0zh130vw719a8d11q5qzc3ilzgv8cqyc2a7r1a131cv1fjnd1rwy"; + revision = "1"; + editedCabalFile = "1d4ra5prh2q9h8inpwvrsmkmg1ndisdj47jv06iijpj6xdp5bapl"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bzip2 ]; description = "Compression and decompression in the bzip2 format"; @@ -44891,25 +44995,11 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.6"; - sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; - revision = "2"; - editedCabalFile = "1kbiwqm4fxrsdpcqijdq98h8wzmxydcvxd03f1z8dliqzyqsbd60"; - libraryHaskellDepends = [ base Cabal directory filepath ]; - description = "A Setup.hs helper for doctests running"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-doctest_1_0_7" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "cabal-doctest"; version = "1.0.7"; sha256 = "1v5dlwsxd9kdll07x5apnf76j2g2pqfp138pacc64j6agrgyv00h"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-file-th" = callPackage @@ -45654,6 +45744,28 @@ self: { pname = "cabal2spec"; version = "2.2.2.1"; sha256 = "0jv335b6vz1y6jp381hhrb2miniyqzkn18ansc67as04yf3ngmay"; + revision = "1"; + editedCabalFile = "09bkjwnr01mgn1yf861p3dai18kgpm5mvw8nmh5zvdr8sgqi207v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal filepath time ]; + executableHaskellDepends = [ + base Cabal filepath optparse-applicative + ]; + testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; + description = "Convert Cabal files into rpm spec files"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + + "cabal2spec_2_3" = callPackage + ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty + , tasty-golden, time + }: + mkDerivation { + pname = "cabal2spec"; + version = "2.3"; + sha256 = "1hjxsmfgf3p919d6zr3gwkzizxg4lmqyga84a917qywp9b5g3mfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -45663,6 +45775,7 @@ self: { testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; description = "Convert Cabal files into rpm spec files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -45888,11 +46001,12 @@ self: { }) {}; "cachix" = callPackage - ({ mkDerivation, async, base, base16-bytestring, base64-bytestring - , bytestring, cachix-api, conduit, conduit-extra, cookie + ({ mkDerivation, async, base, base64-bytestring, bytestring + , cachix-api, conduit, conduit-extra, containers, cookie , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here - , hspec, hspec-discover, http-client, http-client-tls, http-conduit - , http-types, lzma-conduit, megaparsec, memory, mmorph, netrc + , hnix-store-core, hspec, hspec-discover, http-client + , http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp + , lzma-conduit, megaparsec, memory, mmorph, netrc, nix , optparse-applicative, process, protolude, resourcet, retry , safe-exceptions, servant, servant-auth, servant-auth-client , servant-client, servant-client-core, servant-conduit, temporary @@ -45900,21 +46014,21 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.2.1"; - sha256 = "1yz0qfpp8d2n4h9k9cy394zgqg24vvb9ahzxdsvabjwbpmg9sijv"; + version = "0.3.0"; + sha256 = "0s22p9dwqw4pqlrqfqspdsiiw2k5zwzzdxc6ha6f4fxa4wa2w5dm"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ - async base base16-bytestring base64-bytestring bytestring - cachix-api conduit conduit-extra cookie cryptonite dhall directory - ed25519 filepath fsnotify here http-client http-client-tls - http-conduit http-types lzma-conduit megaparsec memory mmorph netrc - optparse-applicative process protolude resourcet retry - safe-exceptions servant servant-auth servant-auth-client - servant-client servant-client-core servant-conduit text unix - uri-bytestring versions + async base base64-bytestring bytestring cachix-api conduit + conduit-extra containers cookie cryptonite dhall directory ed25519 + filepath fsnotify here hnix-store-core http-client http-client-tls + http-conduit http-types inline-c inline-c-cpp lzma-conduit + megaparsec memory mmorph netrc optparse-applicative process + protolude resourcet retry safe-exceptions servant servant-auth + servant-auth-client servant-client servant-client-core + servant-conduit text unix uri-bytestring versions ]; + libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ base cachix-api ]; executableToolDepends = [ hspec-discover ]; testHaskellDepends = [ @@ -45922,9 +46036,7 @@ self: { ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; + }) {inherit (pkgs) nix;}; "cachix-api" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring @@ -45937,8 +46049,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "0.2.1"; - sha256 = "1ja724ji12whjhyw135yi2fq323a65h4bj37r43b5d9ir1c04g67"; + version = "0.3.0"; + sha256 = "0lkmdgqvwx6cy1hbrx130yqbcq6ln1i9kr8s9r75g6lnv539lazq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45959,8 +46071,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cacophony" = callPackage @@ -46404,27 +46514,25 @@ self: { "camfort" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers - , directory, fgl, filepath, flint, fortran-src, GenericPretty - , ghc-prim, happy, hmatrix, hspec, hspec-discover, lattices, lens - , matrix, mmorph, mtl, optparse-applicative, parallel, pretty - , QuickCheck, sbv, silently, singletons, strict, syb, syz - , template-haskell, temporary, text, time, transformers, uniplate - , vector, verifiable-expressions, vinyl, writer-cps-morph - , writer-cps-mtl, writer-cps-transformers + , deepseq, directory, fgl, filepath, flint, fortran-src + , GenericPretty, ghc-prim, happy, hmatrix, hspec, hspec-discover + , lattices, lens, matrix, mmorph, mtl, optparse-applicative + , parallel, pipes, pretty, QuickCheck, sbv, silently, singletons + , strict, syb, syz, template-haskell, temporary, text, time + , transformers, uniplate, vector, verifiable-expressions, vinyl }: mkDerivation { pname = "camfort"; - version = "0.906"; - sha256 = "164zrga458nmlyxaaa9wa0x1vamrlf1w1jisnwp87khkw8622nyi"; + version = "1.0"; + sha256 = "1lgsn1jin57677j8xia7ga4pdvs0yrs9spdmm9rbncxcz5c3nf52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - fortran-src GenericPretty ghc-prim hmatrix lattices lens matrix - mmorph mtl parallel pretty sbv singletons strict syb syz - template-haskell text transformers uniplate vector - verifiable-expressions vinyl writer-cps-morph writer-cps-mtl - writer-cps-transformers + array base binary bytestring containers deepseq directory fgl + filepath fortran-src GenericPretty ghc-prim hmatrix lattices lens + matrix mmorph mtl parallel pipes pretty sbv singletons strict syb + syz template-haskell text transformers uniplate vector + verifiable-expressions vinyl ]; librarySystemDepends = [ flint ]; libraryToolDepends = [ alex happy ]; @@ -46493,8 +46601,8 @@ self: { ({ mkDerivation, arithmoi, array, base, containers, random }: mkDerivation { pname = "canon"; - version = "0.1.1.2"; - sha256 = "181c09kh76104b23hf52b049cc6clww1y9kffw1f0hnkxhds9n84"; + version = "0.1.1.4"; + sha256 = "1srixf1m7pzgr16y2xfckhi0xk9js68ps9zw8kvnw01c37x85f48"; libraryHaskellDepends = [ arithmoi array base containers random ]; description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; @@ -46522,6 +46630,8 @@ self: { pname = "canonical-json"; version = "0.6.0.0"; sha256 = "0lb847hvgkn49g6rvmavk14brvvpiy6q5fswk3cm9rc53hbq02zz"; + revision = "1"; + editedCabalFile = "18i3msxza5phvv5mz7gjqcygrm8rxd86pk2vqnsa715qrhsz88ch"; libraryHaskellDepends = [ base bytestring containers deepseq parsec pretty ]; @@ -47296,6 +47406,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "casing_0_1_4_1" = callPackage + ({ mkDerivation, base, split, tasty, tasty-hunit }: + mkDerivation { + pname = "casing"; + version = "0.1.4.1"; + sha256 = "1jpqni00kalydwzjh2ljpgry3w696wa52bkaxzr53da60b072qhh"; + revision = "1"; + editedCabalFile = "1n7w4w2icfppyvlmyzzmfivbx175ckqabs4my5qvvdvwlc89xrqb"; + libraryHaskellDepends = [ base split ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Convert between various source code casing conventions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "casr-logbook" = callPackage ({ mkDerivation, base, containers, digit, lens, lucid, text, time }: @@ -47513,8 +47638,8 @@ self: { pname = "cassava"; version = "0.5.1.0"; sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n"; - revision = "2"; - editedCabalFile = "13mbhan3agzf8ki8hcac1xf50h9nbzx2b47zjqrch2050v6xa351"; + revision = "3"; + editedCabalFile = "0q9hwcn5jr5vs52n246qw8iw9jmc1d3dla071hhc0hdpck4igq6m"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -47529,6 +47654,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava_0_5_2_0" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances + , scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, text-short, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "cassava"; + version = "0.5.2.0"; + sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; + configureFlags = [ "-f-bytestring--lt-0_10_4" ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers deepseq hashable Only + scientific text text-short transformers unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck + quickcheck-instances scientific test-framework test-framework-hunit + test-framework-quickcheck2 text unordered-containers vector + ]; + description = "A CSV parsing and encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-conduit" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, containers, criterion, mtl, QuickCheck, text @@ -48730,23 +48881,23 @@ self: { "cgrep" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, async, base , bytestring, cmdargs, containers, directory, dlist, either - , exceptions, filepath, ghc-prim, mtl, process, regex-base + , exceptions, extra, filepath, ghc-prim, mtl, process, regex-base , regex-pcre, regex-posix, safe, split, stm, stringsearch , transformers, unicode-show, unix-compat, unordered-containers , utf8-string, yaml }: mkDerivation { pname = "cgrep"; - version = "6.6.25"; - sha256 = "0cary2b5jg8151n48a4vij32g68mrql791mhw43v44wvhlag8plw"; + version = "6.6.30"; + sha256 = "1ald0461mnd65g5czp3d8dzdvy8pmdxhzj35sghcnxi6qs18xp69"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal array async base bytestring cmdargs containers - directory dlist either exceptions filepath ghc-prim mtl process - regex-base regex-pcre regex-posix safe split stm stringsearch - transformers unicode-show unix-compat unordered-containers - utf8-string yaml + directory dlist either exceptions extra filepath ghc-prim mtl + process regex-base regex-pcre regex-posix safe split stm + stringsearch transformers unicode-show unix-compat + unordered-containers utf8-string yaml ]; description = "Command line tool"; license = stdenv.lib.licenses.gpl2; @@ -49310,6 +49461,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_5_2" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.5.2"; + sha256 = "1mqfy6lrivc36kxbfr9zyp70pyq3k2xrmavkadznh999d54x11kq"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -49361,6 +49526,8 @@ self: { pname = "chell"; version = "0.5"; sha256 = "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg"; + revision = "1"; + editedCabalFile = "1q93wrw03ix4cmnkz3lzkixcvvizw6i2ia2zifdfak1dvxnblxk0"; libraryHaskellDepends = [ ansi-terminal base bytestring options patience random template-haskell text transformers @@ -50762,15 +50929,13 @@ self: { , filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable , haskeline, integer-gmp, lens, mtl, primitive, process, reflection - , text, time, transformers, unbound-generics, uniplate, unix - , unordered-containers, vector + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "clash-ghc"; - version = "0.99.3"; - sha256 = "0gjbvh6w2yc8pk38h8pw2jqfbyjzadizszy7v24a851m2cg0yiw9"; - revision = "1"; - editedCabalFile = "0r86409nh73wcychmwh2j3qnbbjk9z2yxr5amx7gpc8gar4qb3qi"; + version = "1.0.0"; + sha256 = "1b216mvw4w0yhpr8bi5j6ra2lfhk6imys10r0pidrpfc8wh779lg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50778,8 +50943,8 @@ self: { concurrent-supply containers deepseq directory filepath ghc ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens - mtl primitive process reflection text time transformers - unbound-generics uniplate unix unordered-containers vector + mtl primitive process reflection template-haskell text time + transformers uniplate unix unordered-containers utf8-string vector ]; executableHaskellDepends = [ base ]; description = "CAES Language for Synchronous Hardware"; @@ -50789,25 +50954,28 @@ self: { }) {}; "clash-lib" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , bytestring, clash-prelude, concurrent-supply, containers - , data-binary-ieee754, deepseq, directory, errors, fgl, filepath - , ghc, hashable, integer-gmp, lens, mtl, parsers, prettyprinter - , primitive, process, reducers, template-haskell, text, time - , transformers, trifecta, unbound-generics, unordered-containers - , vector + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, attoparsec + , base, binary, bytestring, clash-prelude, concurrent-supply + , containers, data-binary-ieee754, deepseq, directory, errors + , exceptions, filepath, ghc, hashable, hint, integer-gmp + , interpolate, lens, mtl, parsers, prettyprinter, primitive + , process, reducers, template-haskell, temporary, text, text-show + , time, transformers, trifecta, unordered-containers, vector + , vector-binary-instances }: mkDerivation { pname = "clash-lib"; - version = "0.99.3"; - sha256 = "1fnsffp2qr608sq7z243a772qisyqbndxmprwd43lbvg2v00yssm"; + version = "1.0.0"; + sha256 = "1mh6aj6987i80xkqxw1jrqf0jih7jlgsgf13p30mc1graibxbj95"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base bytestring clash-prelude - concurrent-supply containers data-binary-ieee754 deepseq directory - errors fgl filepath ghc hashable integer-gmp lens mtl parsers - prettyprinter primitive process reducers template-haskell text time - transformers trifecta unbound-generics unordered-containers vector + aeson ansi-terminal ansi-wl-pprint attoparsec base binary + bytestring clash-prelude concurrent-supply containers + data-binary-ieee754 deepseq directory errors exceptions filepath + ghc hashable hint integer-gmp interpolate lens mtl parsers + prettyprinter primitive process reducers template-haskell temporary + text text-show time transformers trifecta unordered-containers + vector vector-binary-instances ]; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; @@ -50832,23 +51000,32 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, bifunctors, constraints, criterion - , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim + ({ mkDerivation, array, base, bifunctors, binary, bytestring + , constraints, containers, criterion, data-binary-ieee754 + , data-default-class, deepseq, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, half, integer-gmp, lens, QuickCheck - , reflection, singletons, template-haskell, transformers, vector + , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp + , lens, QuickCheck, reflection, singletons, tasty, tasty-hunit + , template-haskell, text, th-lift, th-orphans, time, transformers + , type-errors, vector }: mkDerivation { pname = "clash-prelude"; - version = "0.99.3"; - sha256 = "1g3pidjpcpzhkgyxw1w58ck0ihpla58nxx3xgkrcfz903xkjhipg"; + version = "1.0.0"; + sha256 = "045818jkl8q3b5rp52fx5znb0d9ai3ny8avls0jmgf7aqbmcwr5k"; + revision = "2"; + editedCabalFile = "0l7scl33mrr0i2208yh5dqbz8afmh9crhf9wlvyz67j1l91sfaqc"; libraryHaskellDepends = [ - array base bifunctors constraints data-binary-ieee754 data-default - deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise half integer-gmp lens QuickCheck - reflection singletons template-haskell transformers vector + array base bifunctors binary bytestring constraints containers + data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp lens QuickCheck reflection singletons + template-haskell text th-lift th-orphans time transformers + type-errors vector + ]; + testHaskellDepends = [ + base doctest ghc-typelits-knownnat hint tasty tasty-hunit ]; - testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion deepseq template-haskell ]; @@ -53033,6 +53210,8 @@ self: { pname = "coercible-utils"; version = "0.0.0"; sha256 = "164cn0cs7fjfm599v2z8wsgsz599f97wky4h7vycf460rn34jqia"; + revision = "1"; + editedCabalFile = "1xbnkv6fqf4mizqkha8b073p0r84l1rx1kzdsd6nh8b0adrp6i4d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base gauge ]; @@ -54623,8 +54802,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.5.5.0"; - sha256 = "1hmhnkfmdjm5q8lkvlyr7rzs1lfycnblz3q2y8aziy27j7pvnz6h"; + version = "0.6.0.0"; + sha256 = "0r15hc6kwg0dibxix2f5afg91qwc6fd5m9sijn0k0mq62f0ln7ki"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -54649,8 +54828,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.5.5.0"; - sha256 = "0mm0dbsxqw5m78jgdn6vnbck2icqkzgwqyc3c3ghyz46cymd7pjz"; + version = "0.6.0.0"; + sha256 = "1plhqx0k0xab8fkip6v96rqnrdjq02ph1gmrk4r5zq5x4gc7gpps"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -54667,8 +54846,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.5.5.0"; - sha256 = "0qlg979cwkdlfpcwh7r0qr9fjs525b3xly0invr358h2g1lgi0fm"; + version = "0.6.0.0"; + sha256 = "188za7x9069ah8sgf8laqwkg3yfzl7cm23iacbcnbw25jd7k6vy3"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core vinyl @@ -54689,8 +54868,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.5.5.0"; - sha256 = "0bawdcx21dd0szxnnxs2iinzz6h4w2phk7mfs26fxiqx3f375lm4"; + version = "0.6.0.0"; + sha256 = "065aah2jx6r8i8qgwfql90nc6avhrrhc3aq3zlrqimqwv4772pvj"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -54707,8 +54886,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.5.5.0"; - sha256 = "0s54g9c1lm3jrdj44cvzxgbfaf7l2fdq2yy25vhqdmww50h8q1cx"; + version = "0.6.0.0"; + sha256 = "13hpvk6wx7yiz7klay7da8lllvszddlixk9xxyc8w9kqq48b4k92"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -54731,8 +54910,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.5.5.0"; - sha256 = "1qisvrs93jnrrjyhzdn0xwq54jc1mc8avpzq41a39ak5xdslzf6a"; + version = "0.6.0.0"; + sha256 = "1m0a77imgrs55vmzvfx7hy74siwnxpcgjg7cawsmsnarkymb1c5c"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -56188,8 +56367,8 @@ self: { }: mkDerivation { pname = "conferer"; - version = "0.1.0.0"; - sha256 = "0y62yj2cm7q9qwxl3jfdq16rza2mrjg60lchx4s0gbwiw959a83n"; + version = "0.1.0.1"; + sha256 = "1g5kyvy067lll181xqd1lxpzl5965yj847kh6z2r0wvq01i4k467"; libraryHaskellDepends = [ base bytestring containers directory text ]; @@ -56640,14 +56819,34 @@ self: { pname = "connection"; version = "0.3.0"; sha256 = "1f53bysp8zr8c8dhivrq2k9qmlwnk84d4c1s31sd62ws9yddcw34"; + revision = "3"; + editedCabalFile = "17l56sgrirlcfgi18svbkv9233yxd81ymyr3k8k712rzf5gi6rpi"; + libraryHaskellDepends = [ + base basement bytestring containers data-default-class network + socks tls x509 x509-store x509-system x509-validation + ]; + description = "Simple and easy network connections API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "connection_0_3_1" = callPackage + ({ mkDerivation, base, basement, bytestring, containers + , data-default-class, network, socks, tls, x509, x509-store + , x509-system, x509-validation + }: + mkDerivation { + pname = "connection"; + version = "0.3.1"; + sha256 = "1nbmafhlg0wy4aa3p7amjddbamdz6avzrxn4py3lvhrjqn4raxax"; revision = "1"; - editedCabalFile = "0cm421anscv6h4nvhkaqvi5s3lwkc0f34p6z8lzap4wyc4gv578k"; + editedCabalFile = "08f1n38zryd0jklyv3yillilp040zxfxha6jphrmf28haq2irnk5"; libraryHaskellDepends = [ base basement bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation ]; description = "Simple and easy network connections API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "connection-pool" = callPackage @@ -56768,6 +56967,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "constr-eq" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "constr-eq"; + version = "0.1.0.0"; + sha256 = "0vk3cz6897vjnn1q7y1sqxy42ii4pq5h7jxw1zyybi99p6c4vgm6"; + libraryHaskellDepends = [ base ]; + description = "Equality by only Constructor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "constrained-categories" = callPackage ({ mkDerivation, base, contravariant, semigroups, tagged , trivial-constraint, void @@ -56925,18 +57137,18 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "constraints_0_11_1" = callPackage + "constraints_0_11_2" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec , hspec-discover, mtl, semigroups, transformers - , transformers-compat + , transformers-compat, type-equality }: mkDerivation { pname = "constraints"; - version = "0.11.1"; - sha256 = "15768bcd8z70wq0b2igvz8mrl62bqaqad6cpdp9p4awyylba37y6"; + version = "0.11.2"; + sha256 = "10mnhg7p5gk4i3bzldl07qkrihnvmfkgsp32w7p9i7x8cmj5akjq"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl semigroups transformers - transformers-compat + transformers-compat type-equality ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -59571,6 +59783,8 @@ self: { pname = "criterion"; version = "1.5.5.0"; sha256 = "1a5i9ghy4hr3355ml4b0rc3b94fa2ijfflh398ncn9sw1ivmx8pa"; + revision = "2"; + editedCabalFile = "03b2a257spl0ckjw8mx5sf173nfmfqacllvyfskqpn0q1j4aj0qk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -59593,6 +59807,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion_1_5_6_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, binary-orphans, bytestring + , cassava, code-page, containers, criterion-measurement, deepseq + , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery + , microstache, mtl, mwc-random, optparse-applicative, parsec + , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers, transformers-compat, vector + , vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.5.6.0"; + sha256 = "1p8rw70k69bz33a8amn1ibdf6104hjphglyjlzsxa4w949d0ahp2"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat-batteries binary + binary-orphans bytestring cassava code-page containers + criterion-measurement deepseq directory exceptions filepath Glob + js-flot js-jquery microstache mtl mwc-random optparse-applicative + parsec statistics text time transformers transformers-compat vector + vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative + ]; + testHaskellDepends = [ + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-compare" = callPackage ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams , clay, colour, containers, data-default, filepath, lens, lucid @@ -59849,8 +60101,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "2"; - editedCabalFile = "071lxiwsf23ga1fkbjd47ykz7f5irhsh7q7zz2qczzjgnvzadadh"; + revision = "3"; + editedCabalFile = "1l8glrv7bhdi0p1m1xq9majlbh8n9agai9d4mldzi5bnp5m5b79q"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -60330,8 +60582,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.100.1"; sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"; - revision = "3"; - editedCabalFile = "0ld224mdmw9mgzcl20q82rqkyl7d5vmi1iknsyymq58gcvcwdi2m"; + revision = "4"; + editedCabalFile = "0gzaibjkipijwj9m9l6wrhfk5s3kdvfbhdl7cl1373cjfs41v0m3"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -60350,8 +60602,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.100.1"; sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; - revision = "3"; - editedCabalFile = "0i30cc85732v27baibdjy2kjjkdfv335ib5sk5ggwvsysvvvr66l"; + revision = "4"; + editedCabalFile = "0qb2wasfc4dpf6f9ahvhlv8njb3p3p9iwblg4032ssi95cg85718"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -60392,8 +60644,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.100.1"; sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h"; - revision = "3"; - editedCabalFile = "19m1fp0i7ba84aa72d5wf59c7j0p4yr1bc43in8pspgywhsr3lfl"; + revision = "4"; + editedCabalFile = "0iqs51a58w71j1zz3rn9kical63yvvqqqrc6971mh6wfscyi1gqr"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -60413,8 +60665,8 @@ self: { pname = "cryptoids"; version = "0.5.1.0"; sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466"; - revision = "4"; - editedCabalFile = "017fm7rcls5z2sjx4117h9bcc0szh2vs89gj2d8510vajq70yvwq"; + revision = "5"; + editedCabalFile = "1g2p5519rrbiizry5izdmqn47sayv7v7kqmj0w7abdn6b68di73j"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -60463,8 +60715,8 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "2.7.0"; - sha256 = "14yk7qs7laxy5ranx9m911k1lxc4vh4pp83ywmsg1kf0cdfvmij6"; + version = "2.8.0"; + sha256 = "1fqhk7glh1y0a1f0iwdzrljh9k7v06pn0ybhlcs51ph9vs4byqdh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -61175,6 +61427,8 @@ self: { doHaddock = false; description = "Haskell Implementation of Cuckoo Filters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cuckoo-filter" = callPackage @@ -63337,10 +63591,8 @@ self: { }: mkDerivation { pname = "data-interval"; - version = "1.3.0"; - sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9"; - revision = "3"; - editedCabalFile = "0jfqgijikf11lqsvbj0rc2b9n2ym7gn4mhk5xpsginp0vy3bgpbp"; + version = "1.3.1"; + sha256 = "0x09h2a6ay0h6whmja1q5dqmmf3savyvpv8h14rrwqd87x04abl9"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -65596,6 +65848,8 @@ self: { pname = "dec"; version = "0.0.3"; sha256 = "1y8bvlm2371dq2v0jv1srki98nbhbz091wh0g2x58wz78h971f6r"; + revision = "1"; + editedCabalFile = "09dkybwqmayf2a1sn94vmmma2xfvf07bw7grhcyjm7lq9jpxv8y0"; libraryHaskellDepends = [ base ]; description = "Decidable propositions"; license = stdenv.lib.licenses.bsd3; @@ -66414,13 +66668,13 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.0.0"; - sha256 = "1gzqnxnbr9r1zny932pa9qbq4ygdpkmxhb9cflvh2vav548qfkv9"; + version = "0.1.1.0"; + sha256 = "0l5nj7jalyca6vv9aqsx0j799vrr65cm1jzh17fcnwkxair3lkgx"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans ]; - description = "Data.Dependent.Map variant that appends conflicting entries when merging maps instead of discarding one side of the conflict."; + description = "Dependent map that uses semigroup mappend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -66843,29 +67097,6 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.5.6"; - sha256 = "1rsjq3s2m69x2h880r087qbiwp3173pwv2yihlb8aw7dmjybydmf"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell - th-abstraction transformers transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck tagged - template-haskell transformers transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_5_7" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged - , template-haskell, th-abstraction, transformers - , transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; version = "0.5.7"; sha256 = "0bp4f0is84cv139s35669dv23mcp6lhp2wall72yvkk12lp2l2mg"; libraryHaskellDepends = [ @@ -66879,7 +67110,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -66925,8 +67155,8 @@ self: { ({ mkDerivation, base, bytestring, cereal, QuickCheck }: mkDerivation { pname = "describe"; - version = "0.1.0.0"; - sha256 = "0bbi6jih3d2fbsqhvmac8970jczwsq0zq61nlvrvr7nzgl2v07fl"; + version = "0.1.1.0"; + sha256 = "0xnamrmdvcb1spgrm1fh9d98gvdz6kljqsm04chlhz4zxk7ixv0x"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base bytestring cereal QuickCheck ]; description = "Combinators for describing binary data structures"; @@ -67337,6 +67567,8 @@ self: { pname = "dhall"; version = "1.25.0"; sha256 = "0d8qx4fawvxykig628jfgqpa660mzzicysa7g3mda6zni9j4yq0h"; + revision = "1"; + editedCabalFile = "0pbhm350am7qxb92lr7fz5s9znsm9ngfra7w8b93zbabh5hf6mm3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69573,8 +69805,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.0.0"; - sha256 = "1z0d46gd7rgwbh05ws6hcp4rikach0yg1fim6ni0ww4g0mksj8j3"; + version = "1.1.0"; + sha256 = "16n78p6g0rh670zy2pbk59c8nkg5srkhlbya0aknpz2s4smpn891"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70615,6 +70847,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributive_0_6_1" = callPackage + ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest + , generic-deriving, hspec, hspec-discover, tagged, transformers + }: + mkDerivation { + pname = "distributive"; + version = "0.6.1"; + sha256 = "1wnayzzb4vk8rhh9gzhdpd9f64366k4vmbhximavmqqmp3cv2jbp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base base-orphans tagged transformers ]; + testHaskellDepends = [ base doctest generic-deriving hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Distributive functors -- Dual to Traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ditto" = callPackage ({ mkDerivation, base, containers, mtl, semigroups, text, torsor }: mkDerivation { @@ -70799,6 +71048,28 @@ self: { broken = true; }) {}; + "dl-fedora_0_6" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , http-directory, http-types, optparse-applicative, regex-posix + , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "0.6"; + sha256 = "1kq9hhpgh24kfgf9b25zppmfbylcqx0scs96dp0nbyj3rp6yl8rh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath http-directory http-types + optparse-applicative regex-posix simple-cmd simple-cmd-args text + unix xdg-userdirs + ]; + description = "Fedora image download tool"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { @@ -71320,7 +71591,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "doctemplates_0_5" = callPackage + "doctemplates_0_6" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, mtl, parsec, safe, scientific, tasty , tasty-golden, tasty-hunit, temporary, text, unordered-containers @@ -71328,16 +71599,16 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.5"; - sha256 = "0xdma2j1bim31mvkqc6362rbmv193fyznd3y4ipdgd113zkj7hy6"; + version = "0.6"; + sha256 = "1bimvksijpz3czx0si9wwiigi4knc3d4i7rl6fssmz3z9qs6rhxg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath mtl parsec safe scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring filepath Glob tasty tasty-golden tasty-hunit - temporary text + aeson base bytestring doclayout filepath Glob tasty tasty-golden + tasty-hunit temporary text ]; benchmarkHaskellDepends = [ aeson base containers criterion filepath mtl text @@ -71354,34 +71625,6 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.16.1"; - sha256 = "1xnm1sbm9lpfxw5yav8qpqr85aap94k9df6n5kx70bp6h69qnrrq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - executableHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - testHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit mockery process QuickCheck setenv silently - stringbuilder syb transformers - ]; - description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; - }) {}; - - "doctest_0_16_2" = callPackage - ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process - , QuickCheck, setenv, silently, stringbuilder, syb, transformers - }: - mkDerivation { - pname = "doctest"; version = "0.16.2"; sha256 = "0lk4cjfzi5bx2snfzw1zi06li0gvgz3ckfh2kwa98l7nxfdl39ag"; isLibrary = true; @@ -71401,7 +71644,6 @@ self: { ]; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover" = callPackage @@ -72844,8 +73086,8 @@ self: { pname = "dual-tree"; version = "0.2.2"; sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl"; - revision = "2"; - editedCabalFile = "0r8idr1haqixa9nlp8db5iw9vr9sdk6rcargkr7w7s6i99lm6jmh"; + revision = "3"; + editedCabalFile = "00gwdgzy80p9c5r4wafm1fiqnh2hy1xjsbl86h1qkk7xg33g2ssi"; libraryHaskellDepends = [ base monoid-extras newtype-generics semigroups ]; @@ -73647,8 +73889,8 @@ self: { }: mkDerivation { pname = "dzen-dhall"; - version = "1.0.0"; - sha256 = "0im78kvjwanlbi097pyvvpj2isssf3iblqbbqsk2iccvdqjyqf5z"; + version = "1.0.1"; + sha256 = "16rkmiczdgknlq1f8m5n3ila8727z1db77g141sq5qqlgn7x37ww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73668,6 +73910,8 @@ self: { ]; description = "Configure dzen2 bars in Dhall language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dzen-utils" = callPackage @@ -75219,6 +75463,8 @@ self: { ]; description = "Elliptic curve library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "elm-bridge" = callPackage @@ -75543,6 +75789,30 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "elm-street_0_1_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , hspec, prettyprinter, servant, servant-server, text, time, wai + , warp + }: + mkDerivation { + pname = "elm-street"; + version = "0.1.0.1"; + sha256 = "1n02bxyva732dbnrzc6n6v8rsgpbjb6ndh4szwqj8zckj694mc77"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory filepath prettyprinter text time + ]; + executableHaskellDepends = [ + base directory filepath servant servant-server text wai warp + ]; + testHaskellDepends = [ aeson base bytestring hspec ]; + doHaddock = false; + description = "Crossing the road between Haskell and Elm"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elm-websocket" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-extra , containers, directory, formatting, hspec, http-types, lens, mtl @@ -75962,6 +76232,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "emd_0_1_5_1" = callPackage + ({ mkDerivation, base, binary, containers, criterion + , data-default-class, deepseq, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit + , mwc-random, statistics, transformers, typelits-witnesses, vector + , vector-sized + }: + mkDerivation { + pname = "emd"; + version = "0.1.5.1"; + sha256 = "06ii6yw9612dq3ryfv2n7yk5wic3lc3kyvmvbj19wwicwc7315bf"; + libraryHaskellDepends = [ + base binary containers data-default-class deepseq finite-typelits + ghc-typelits-knownnat ghc-typelits-natnormalise transformers + typelits-witnesses vector vector-sized + ]; + testHaskellDepends = [ base containers HUnit ]; + benchmarkHaskellDepends = [ + base criterion deepseq ghc-typelits-knownnat mwc-random statistics + vector vector-sized + ]; + description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emgm" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, syb }: mkDerivation { @@ -76091,8 +76387,6 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck ]; description = "A library for various character encodings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "encoding-io" = callPackage @@ -76285,6 +76579,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "entropy_0_4_1_5" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, unix + }: + mkDerivation { + pname = "entropy"; + version = "0.4.1.5"; + sha256 = "0szf8hi1pi8g0kxnkcymh65gk1b0niyl1nnkckzdqyar87qal0jm"; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ base bytestring unix ]; + description = "A platform independent entropy source"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "entwine" = callPackage ({ mkDerivation, async, base, clock, containers, criterion , directory, exceptions, monad-loops, process, QuickCheck @@ -78837,27 +79146,6 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.10.2"; - sha256 = "0ajiq47xd1paingr7kksh69v6d072zsppfr6cy1gzjh3zg5jr34i"; - libraryHaskellDepends = [ - base mtl stm template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ - base mtl QuickCheck stm template-haskell test-framework - test-framework-hunit test-framework-quickcheck2 transformers - transformers-compat - ]; - description = "Extensible optionally-pure exceptions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "exceptions_0_10_3" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers, transformers-compat - }: - mkDerivation { - pname = "exceptions"; version = "0.10.3"; sha256 = "1w25j4ys5s6v239vbqlbipm9fdwxl1j2ap2lzms7f7rgnik5ir24"; libraryHaskellDepends = [ @@ -78870,7 +79158,6 @@ self: { ]; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exchangerates" = callPackage @@ -79718,8 +80005,8 @@ self: { pname = "extended-reals"; version = "0.2.3.0"; sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw"; - revision = "3"; - editedCabalFile = "0v80m6cnpx1d43cfykz5jbiqkk7l51vmrd48sb8s1h8f2pp9v3dq"; + revision = "4"; + editedCabalFile = "1gzi55w9kpfg51njyi3a28n7nc64chzgnv76m3xyrz7z0gbri93q"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -80574,6 +80861,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-logger_2_4_17" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, hspec-discover, text, unix-compat + , unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "2.4.17"; + sha256 = "02mxb1ckvx1s2r2m11l5i2l5rdl7232p0f61af6773haykjp0qxk"; + revision = "1"; + editedCabalFile = "1yv4f6pbrgqqhc0z3chhjrzz1gs7idrmcbvmbl8pfyn547ci6brb"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath text + unix-compat unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A fast logging system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -82230,8 +82539,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "2"; - editedCabalFile = "0dmg69gsj2k9lf112bvqw6z2w8hl0p1lx5zxdvlvk85bb3qz6304"; + revision = "3"; + editedCabalFile = "138ihhsxzqm0m7890l98j5679dk7r5aa522hcfpggqx12f7g1pnc"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -82406,6 +82715,8 @@ self: { pname = "filepath"; version = "1.4.2.1"; sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb"; + revision = "1"; + editedCabalFile = "1harx8x3g3badj3087c662sd15fk850jqzx0lz5h16zbsv438lqa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Library for manipulating FilePaths in a cross platform way"; @@ -82422,8 +82733,8 @@ self: { pname = "filepath-crypto"; version = "0.1.0.0"; sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; - revision = "8"; - editedCabalFile = "1d4zrj5qqkqnx53fmdrw9dh2hwppc6mmykpxpddh4k84kln3mlym"; + revision = "9"; + editedCabalFile = "09a1y0m7jgchi8bmly49amzjrs25insvaf4ag3wys1ngb1cc2az0"; libraryHaskellDepends = [ base binary bytestring case-insensitive cryptoids cryptoids-class cryptoids-types exceptions filepath sandi template-haskell @@ -82643,6 +82954,8 @@ self: { pname = "fin"; version = "0.1"; sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn"; + revision = "1"; + editedCabalFile = "0kdhmjpifbl1r44jy2spj82gdadd849zz6i0y7mw1ii25w91yb50"; libraryHaskellDepends = [ base dec deepseq hashable ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -85499,18 +85812,18 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.3.0"; - sha256 = "03a1lk0c50v66jax2dya7qhjr3si2anp4yzx03vpf49am2kn2rxq"; + version = "0.4.0"; + sha256 = "1l66f9wcn5dp7i63wapzkx8bgiy22xrlxbfh3jbnhy7glhvk80ja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - GenericPretty mtl pretty text uniplate + array base binary bytestring containers deepseq directory fgl + filepath GenericPretty mtl pretty text uniplate ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - GenericPretty mtl pretty text uniplate + array base binary bytestring containers deepseq directory fgl + filepath GenericPretty mtl pretty text uniplate ]; testHaskellDepends = [ array base binary bytestring containers deepseq directory fgl @@ -85625,11 +85938,29 @@ self: { pname = "foundation"; version = "0.0.24"; sha256 = "1yygliyg5dh06n7iyyrvy4iz2328hgb5igjp832wxrfa529pwqdk"; + revision = "1"; + editedCabalFile = "1p8q1324dfg3w81dv29hc3wgvg43qsfps1c156xmml566jwvf1l2"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "foundation_0_0_25" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.25"; + sha256 = "0q6kx57ygmznlpf8n499hid4x6mj3180paijx0a8dgi9hh7man61"; + revision = "1"; + editedCabalFile = "1ps5sk50sf4b5hd87k3jqykqrwcw2wzyp50rcy6pghd61h83cjg2"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -85953,23 +86284,6 @@ self: { }: mkDerivation { pname = "free"; - version = "5.1.1"; - sha256 = "0f33n7x4z0mc733ck4gg6ljcinfmm946a20g5irv90g77c6jmmak"; - libraryHaskellDepends = [ - base comonad containers distributive exceptions mtl profunctors - semigroupoids template-haskell transformers transformers-base - ]; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_5_1_2" = callPackage - ({ mkDerivation, base, comonad, containers, distributive - , exceptions, mtl, profunctors, semigroupoids, template-haskell - , transformers, transformers-base - }: - mkDerivation { - pname = "free"; version = "5.1.2"; sha256 = "0vlf3f2ckl3cr7z2zl8c9c8qkdlfgvmh04gxkp2fg0z9dz80nlyb"; libraryHaskellDepends = [ @@ -85978,7 +86292,6 @@ self: { ]; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-algebras" = callPackage @@ -86813,6 +87126,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "frotate" = callPackage + ({ mkDerivation, base, doctest, optparse-applicative, time }: + mkDerivation { + pname = "frotate"; + version = "0.1.1"; + sha256 = "1j8xh4k5kkix1aq79vg2kpzqb30pnggs8c6ksf4lqd8nmvzy47vc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base optparse-applicative time ]; + testHaskellDepends = [ base doctest ]; + description = "Advanced rotation of backups and other things"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "frown" = callPackage ({ mkDerivation, base, directory }: mkDerivation { @@ -87128,12 +87455,12 @@ self: { ({ mkDerivation, base, mtl, parsec }: mkDerivation { pname = "ft-generator"; - version = "1.0"; - sha256 = "1kgh8w1ny0zsrbf53vqabkap6zp6fmq2hx35nxw2hcfw7b0pvavk"; + version = "1.0.1"; + sha256 = "17lckkrzil8lznkzswjinh88pp8nm8ijsi2bh31ayjfaqg0m229b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl parsec ]; - description = "implementation accompanying a WFLP'19 submission"; + description = "implementation accompanying a WFLP'19 paper"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -87612,8 +87939,8 @@ self: { pname = "functor-classes-compat"; version = "1"; sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "4"; - editedCabalFile = "1531cmcfgcgry254dn5mx7h5l6nd4afxz6lhlcr0lbbm4y1v59mk"; + revision = "5"; + editedCabalFile = "0n823v0avzdwvmfm5fgw5gsmrlvd12pdx1clkislpd5yq4ffgjw7"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -87929,6 +88256,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects_0_5_0_1" = callPackage + ({ mkDerivation, base, deepseq, doctest, gauge, hspec + , inspection-testing, MonadRandom, QuickCheck, random, transformers + , unliftio-core + }: + mkDerivation { + pname = "fused-effects"; + version = "0.5.0.1"; + sha256 = "0s6y34x29w31lzqlj7xf9sld9dmh3q1f0rl3zfmzd4kpp2ybc965"; + libraryHaskellDepends = [ + base deepseq MonadRandom random transformers unliftio-core + ]; + testHaskellDepends = [ + base doctest hspec inspection-testing QuickCheck transformers + ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "A fast, flexible, fused effect system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fused-effects-exceptions" = callPackage ({ mkDerivation, base, fused-effects, safe-exceptions , unliftio-core @@ -88009,6 +88357,8 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "futun" = callPackage @@ -89332,8 +89682,8 @@ self: { ({ mkDerivation, base, HUnit, template-haskell, th-abstraction }: mkDerivation { pname = "generic-constraints"; - version = "1.1.1"; - sha256 = "0ifia4yw495ikkvjn70c386z3w40vyl2wracmcij025yc9bz4w9q"; + version = "1.1.1.1"; + sha256 = "1id341ih876qzq89cj6y3g87w4l3mfhv412l6czcs51r69s1770r"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base HUnit ]; description = "Constraints via Generic"; @@ -89770,6 +90120,8 @@ self: { pname = "generics-sop-lens"; version = "0.2"; sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a"; + revision = "1"; + editedCabalFile = "1ghgh91wd764firxc2s083jzr38w51fg0ry2b7s1wn71mnvzb893"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -90229,6 +90581,8 @@ self: { typed-uuid uuid ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "genvalidity-path" = callPackage @@ -90524,15 +90878,15 @@ self: { "geoip2" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, iproute - , mmap, reinterpret-cast, text + , lens, mmap, reinterpret-cast, text }: mkDerivation { pname = "geoip2"; - version = "0.3.1.1"; - sha256 = "0nq4kijjd0dmii5949xr7wf4w7fi2ffpbqr9bg7qklxhsrmwywb8"; + version = "0.4.0.0"; + sha256 = "1a2wxblnv611asfwkgm2ndam1jvm2xqajj3rk0ii9qi7j9s5w8v0"; libraryHaskellDepends = [ - base bytestring cereal containers iproute mmap reinterpret-cast - text + base bytestring cereal containers iproute lens mmap + reinterpret-cast text ]; description = "Pure haskell interface to MaxMind GeoIP database"; license = stdenv.lib.licenses.bsd3; @@ -90680,6 +91034,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "getopt-generics_0_13_0_4" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, filepath + , generics-sop, hspec, QuickCheck, safe, silently, tagged + }: + mkDerivation { + pname = "getopt-generics"; + version = "0.13.0.4"; + sha256 = "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr"; + libraryHaskellDepends = [ + base base-compat base-orphans generics-sop tagged + ]; + testHaskellDepends = [ + base base-compat base-orphans filepath generics-sop hspec + QuickCheck safe silently tagged + ]; + description = "Create command line interfaces with ease"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -90798,14 +91172,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_6_5" = callPackage + "ghc-boot_8_8_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.6.5"; - sha256 = "1sxar25ji02a4yaz6s5hksf7b8pbl66vv9nb3bfc7fxq6gzj5n4b"; + version = "8.8.1"; + sha256 = "1f1701nkyn6cig2mh8wb5wn3vwddkfmfqz8lykh8k1sm76qx7yva"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -90814,12 +91188,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_6_5" = callPackage + "ghc-boot-th_8_8_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.6.5"; - sha256 = "18gjvxp3668np9n3c5l65q03nlqhgfjhh9wizvifmk673g0cl7n9"; + version = "8.8.1"; + sha256 = "14aa5jb5wz1yz12l0ixbbwiqj2rg1vgyd2rlfgm2ixsrryans4cb"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the `template-haskell` library"; license = stdenv.lib.licenses.bsd3; @@ -90843,8 +91217,8 @@ self: { pname = "ghc-compact"; version = "0.1.0.0"; sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h"; - revision = "2"; - editedCabalFile = "1i775sc8sb89gali1w7qxs7l6y8vawp1mdd564d5mz95sxj4757b"; + revision = "3"; + editedCabalFile = "09l51r0nk7vj6a9crz7q5sv4962mnq18xb6zkxfl6cnm28v85nsk"; libraryHaskellDepends = [ base bytestring ghc-prim ]; description = "In memory storage of deeply evaluated data structure"; license = stdenv.lib.licenses.bsd3; @@ -90904,8 +91278,8 @@ self: { ({ mkDerivation, base, deepseq, ghc-heap-view }: mkDerivation { pname = "ghc-datasize"; - version = "0.2.0"; - sha256 = "0wmlryqsw4mhk85wnril0p14gx2y0wjmq9iv9jjy0wl6gw5ps1yh"; + version = "0.2.1"; + sha256 = "0qsh4m6vif07nd0r5lbwggqrlykmlnspdx1jwzzhz6mk1hcf914d"; libraryHaskellDepends = [ base deepseq ghc-heap-view ]; description = "Determine the size of data structures in GHC's memory"; license = stdenv.lib.licenses.bsd3; @@ -90996,8 +91370,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.9.0"; - sha256 = "004dfjqhqy0lpmadjmvz270ja6k2dmwbprnispdxmlg8rc5y3m10"; + version = "0.9.1"; + sha256 = "1phq4jxhm05xj42y7aqpjj43vj5mixi3hhf3h5c0dh1vmsz9w3z1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91082,6 +91456,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_6_2" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.6.2"; + sha256 = "1c36f7vjk3gapp761c7w1ncg9hyhx2kxwk51s0d9fvapi1bkxw9j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -91665,13 +92063,17 @@ self: { }) {}; "ghc-source-gen" = callPackage - ({ mkDerivation, base, ghc, ghc-paths, tasty, tasty-hunit }: + ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck + }: mkDerivation { pname = "ghc-source-gen"; - version = "0.1.0.0"; - sha256 = "0sw62jjbd7h9i96hn0srl9m8p0qip6hnm1am6if7snqdm5b4ki3k"; + version = "0.2.0.1"; + sha256 = "1diz1vrhxx8ppj4jljzfwlrg059kdcz20ba635f7hq4kpp0blbjy"; libraryHaskellDepends = [ base ghc ]; - testHaskellDepends = [ base ghc ghc-paths tasty tasty-hunit ]; + testHaskellDepends = [ + base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck + ]; description = "Constructs Haskell syntax trees for the GHC API"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91789,27 +92191,6 @@ self: { }) {}; "ghc-typelits-extra" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , tasty, tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; - version = "0.3"; - sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp transformers - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit template-haskell - ]; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_3_1" = callPackage ({ mkDerivation, base, containers, ghc, ghc-prim , ghc-tcplugins-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit @@ -91830,7 +92211,6 @@ self: { ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-knownnat" = callPackage @@ -91862,6 +92242,8 @@ self: { pname = "ghc-typelits-knownnat"; version = "0.7"; sha256 = "00f8m3kmp572r8jr246m8r6lwzxmiqj4hml06w09l9n3lzvjwv7b"; + revision = "1"; + editedCabalFile = "1jgwa66dbhqsav7764cfcmzs3p0f3csbdjbrnbilhv1bpqyhz8sm"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -93831,8 +94213,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.0.5.0"; - sha256 = "0bnag71l6vjygn5bbfav229pk44xn491jzj13n7m8xdc7nvh7zz1"; + version = "1.0.6.0"; + sha256 = "1zhmzw1vhdxcx69l97xlm8ylfk79f95g83c3nhp39g2lj7z0wqi0"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -94275,6 +94657,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "githash_0_1_3_2" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.3.2"; + sha256 = "0wn0pr7idx6nb6d7nkjx6dfncz15c9wbhpg6s5395pa1s8q7fx3j"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -99956,8 +100358,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.5.0.0"; - sha256 = "12z4fws4vz88j8xj1xvzl8jv6s4i3vnca7xln2q4ssn23a025fcg"; + version = "0.6.0.0"; + sha256 = "03m247xmj8gvvjs4bgsc06daz9avklza7ngs575psaqmkpxd8ga3"; libraryHaskellDepends = [ base containers json text ]; description = "GraphQL interface middleware for (SQL) databases"; license = stdenv.lib.licenses.isc; @@ -100117,8 +100519,8 @@ self: { }: mkDerivation { pname = "gray-extended"; - version = "1.5.7"; - sha256 = "0j2lzy15jiykz9b6cqzh7xhpf1idwxp8illvy3r50g1g4hc8zvyp"; + version = "1.5.8"; + sha256 = "1vli6dc0wc1an6vfhchai6s8xrg8rfds2k07x2xszaqg7r2njc9k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -100354,8 +100756,8 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.12"; - sha256 = "1ax536wr6h8kcnmnnxyd7vcdkqbjlrhrx6jab526b3f2a88n5q6z"; + version = "7.8.14"; + sha256 = "11rnsl6bs6qpx90p8jzdigncv6m5wbn6sav8gb3mlbm40fpi3p93"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -100968,8 +101370,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.2.2.0"; - sha256 = "1h8zg9yyyckyp5irw9gcbzfysav67hn2rlrkwakyh3ghb1rnl71k"; + version = "0.2.3.1"; + sha256 = "0iqrh6h2r7xr9xqk9w7yg1hilghcs0pp5mqq3s2rwmk2drp255l3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103593,6 +103995,36 @@ self: { broken = true; }) {}; + "hadolint_1_17_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, gitrev, hspec, HsYAML, HUnit, language-docker + , megaparsec, mtl, optparse-applicative, ShellCheck, split, text + , void + }: + mkDerivation { + pname = "hadolint"; + version = "1.17.2"; + sha256 = "0s9q0016j3y56sblkq12mai1j58h8w8cy8k2x1bzvhb95zpg1va9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath HsYAML + language-docker megaparsec mtl ShellCheck split text void + ]; + executableHaskellDepends = [ + base containers gitrev language-docker megaparsec + optparse-applicative text + ]; + testHaskellDepends = [ + aeson base bytestring hspec HsYAML HUnit language-docker megaparsec + ShellCheck split text + ]; + description = "Dockerfile Linter JavaScript API"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hadoop-formats" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, snappy , text, vector @@ -104036,14 +104468,14 @@ self: { , lrucache, mtl, network-uri, optparse-applicative, pandoc , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa , resourcet, scientific, tagsoup, tasty, tasty-hunit - , tasty-quickcheck, text, time, time-locale-compat - , unordered-containers, utillinux, vector, wai, wai-app-static - , warp, yaml + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, unordered-containers, utillinux, vector, wai + , wai-app-static, warp, yaml }: mkDerivation { pname = "hakyll"; - version = "4.12.5.2"; - sha256 = "13dc8hj3xnnpyb395pbplwxb4pj4gzckdd8r5wcwg1ln0gd6w7d5"; + version = "4.13.0.0"; + sha256 = "1a7g79j7ai5l46nz205rl6zr3f57m5ngd46v60wll3dj6wkiaw6b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104052,7 +104484,7 @@ self: { cryptohash data-default deepseq directory file-embed filepath fsnotify http-conduit http-types lrucache mtl network-uri optparse-applicative pandoc pandoc-citeproc parsec process random - regex-tdfa resourcet scientific tagsoup text time + regex-tdfa resourcet scientific tagsoup template-haskell text time time-locale-compat unordered-containers vector wai wai-app-static warp yaml ]; @@ -104064,6 +104496,8 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -105721,22 +106155,20 @@ self: { , filepath, hslogger, html, HUnit, monad-control, mtl, network , network-uri, old-locale, parsec, process, semigroups, sendfile , syb, system-filepath, template-haskell, text, threads, time - , time-compat, transformers, transformers-base, transformers-compat - , unix, utf8-string, xhtml, zlib + , transformers, transformers-base, transformers-compat, unix + , utf8-string, xhtml, zlib }: mkDerivation { pname = "happstack-server"; - version = "7.5.1.3"; - sha256 = "0agxmrf2njd3whvgw4in0ixgss1qlmi6cdi9fglhs7nhykpkgllk"; - revision = "1"; - editedCabalFile = "15ira63nilqyq9ggl2jy5ip26aprw79sv5k1hp9n4wp9byhzzyjw"; + version = "7.5.2"; + sha256 = "1w5g5vf6jxb7fi3qg96x17y2i95mv5sbbzmjzy1m55qjqif568v1"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html monad-control mtl network network-uri old-locale parsec process semigroups sendfile syb system-filepath template-haskell text - threads time time-compat transformers transformers-base - transformers-compat unix utf8-string xhtml zlib + threads time transformers transformers-base transformers-compat + unix utf8-string xhtml zlib ]; testHaskellDepends = [ base bytestring containers HUnit parsec zlib @@ -105910,6 +106342,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy_1_19_12" = callPackage + ({ mkDerivation, array, base, containers, mtl, process }: + mkDerivation { + pname = "happy"; + version = "1.19.12"; + sha256 = "03xlmq6qmdx4zvzw8bp33kd9g7yvcq5cz4wg50xilw812kj276pv"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy-hour" = callPackage ({ mkDerivation, base, Chart, Chart-diagrams }: mkDerivation { @@ -106110,21 +106558,21 @@ self: { "harg" = callPackage ({ mkDerivation, aeson, barbies, base, bytestring, directory - , higgledy, markdown-unlit, optparse-applicative, text, yaml + , higgledy, markdown-unlit, optparse-applicative, split, text, yaml }: mkDerivation { pname = "harg"; - version = "0.1.0.1"; - sha256 = "11qkyx9axd8vybkb1kq7vs5v5xf594wgkbpbfpvj0hah7iw9wb95"; + version = "0.2.0.0"; + sha256 = "0zdngzz1p73dpfx4klxf59yhk4qf0r4ming2nw4yqfsyxqfwgw1i"; libraryHaskellDepends = [ aeson barbies base bytestring directory higgledy - optparse-applicative text yaml + optparse-applicative split text yaml ]; testHaskellDepends = [ aeson barbies base higgledy optparse-applicative ]; testToolDepends = [ markdown-unlit ]; - description = "Haskell program configuration from multiple sources"; + description = "Haskell program configuration using higher kinded data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -106312,6 +106760,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt_0_1_3_5" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.3.5"; + sha256 = "0qd5rh0jdwhkjcz5kg1bqwd5hpz5w9ph9k0vxaam1lnjjniw7zbj"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default mtl network text + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, free, hasbolt, lens, mtl, neat-interpolation @@ -106320,8 +106789,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.19"; - sha256 = "11g6rlgyxi57bvmr862ly7yfwiiph1kckr056b5khz8v8k6fhhpv"; + version = "0.0.0.20"; + sha256 = "0xqi3hb1xgbkkj8wmrvp39sh7zcj75v55xbha87nmkl2g56kaxw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107068,6 +107537,8 @@ self: { pname = "haskeline"; version = "0.7.5.0"; sha256 = "1inyq7qwih0hnqlm6gy769vsxzjpvqx9ry390dmcvvql9520hrfj"; + revision = "1"; + editedCabalFile = "0i8fyhk7fvz2bxnh5xsmdw5rr7yywzc2wv115034q1g4sb018zrd"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -107292,21 +107763,24 @@ self: { }) {}; "haskell-ci" = callPackage - ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , Cabal, containers, deepseq, Diff, directory, filepath - , generic-lens, HsYAML, microlens, optparse-applicative, parsec - , pretty, ShellCheck, tasty, tasty-golden, text, transformers + ({ mkDerivation, aeson, ansi-terminal, base, base-compat + , bytestring, Cabal, containers, deepseq, Diff, directory + , exceptions, filepath, generic-lens, HsYAML, lattices, microlens + , mtl, optparse-applicative, parsec, pretty, process, ShellCheck + , tasty, tasty-golden, temporary, text, transformers + , unordered-containers }: mkDerivation { pname = "haskell-ci"; - version = "0.2.1"; - sha256 = "07h99vq4bmphrpi1ggm7h06ard7hyxkmsxypicghvv24cgzl3c70"; + version = "0.4"; + sha256 = "0paw5jczmcayda2pjgp10p983g8kbly33hpabdv37b5mkrair9d8"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - base base-compat bytestring Cabal containers deepseq directory - filepath generic-lens HsYAML microlens optparse-applicative parsec - pretty ShellCheck text transformers + aeson base base-compat bytestring Cabal containers deepseq + directory exceptions filepath generic-lens HsYAML lattices + microlens mtl optparse-applicative parsec pretty process ShellCheck + temporary text transformers unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -107315,7 +107789,7 @@ self: { ]; doHaddock = false; description = "Cabal package script generator for Travis-CI"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -108335,6 +108809,8 @@ self: { pname = "haskell-src"; version = "1.0.3.0"; sha256 = "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l"; + revision = "1"; + editedCabalFile = "1pnrvh9wzdkhvkkky4rlq1imycl9k76x9rvgq7cmfp8rf1iwqi5q"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -108373,6 +108849,28 @@ self: { pname = "haskell-src-exts"; version = "1.21.0"; sha256 = "1wwzd6m5mm76fq7ql7k49b7ghg8ibq5qhqr3d8xs5psfha3w3nlm"; + revision = "1"; + editedCabalFile = "1mmjxh0vhf9pbx9jr1208bbrqj3k5qy6il4ypjmczh9zx2m65lyf"; + libraryHaskellDepends = [ array base ghc-prim pretty ]; + libraryToolDepends = [ happy ]; + testHaskellDepends = [ + base containers directory filepath mtl pretty-show smallcheck tasty + tasty-golden tasty-smallcheck + ]; + doCheck = false; + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-src-exts_1_21_1" = callPackage + ({ mkDerivation, array, base, containers, directory, filepath + , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty + , tasty-golden, tasty-smallcheck + }: + mkDerivation { + pname = "haskell-src-exts"; + version = "1.21.1"; + sha256 = "0q1y8n3d82gid9bcx8wxsqqmj9mq11fg3gp5yzpfbw958dhi3j9f"; libraryHaskellDepends = [ array base ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -108382,6 +108880,7 @@ self: { doCheck = false; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-observe" = callPackage @@ -108494,6 +108993,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_8_3" = callPackage + ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty + , syb, tasty, tasty-hunit, template-haskell, th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.8.3"; + sha256 = "17znnaqj2hnnfyc9p9xjzbs97h2jh1h4f4qbw648y3xa14wx5ra9"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + testHaskellDepends = [ + base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit + template-haskell + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -110734,6 +111253,8 @@ self: { pname = "hasmin"; version = "1.0.3"; sha256 = "0p9a1q8brymkd4y74gn4iiwihikn55wx2h9zz3mpd6ab53rsz43k"; + revision = "1"; + editedCabalFile = "19xr6zk72q5sqgaxfj6xwvd98jv26d54s80gjkkpwh1i2nnsgw4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111103,6 +111624,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-transaction_1" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, hasql, mtl, rebase + , transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "1"; + sha256 = "1k82b0bx4j2g7lhr2p4z4a365kx1i23dr6zikwg1yyhpvhl3xbcj"; + libraryHaskellDepends = [ + base bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async hasql rebase ]; + description = "A composable abstraction over the retryable transactions for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hastache" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, process, syb, text @@ -113058,16 +113598,16 @@ self: { "hedgehog-classes" = callPackage ({ mkDerivation, aeson, base, binary, comonad, containers, hedgehog - , pretty-show, semirings, silently, transformers + , pretty-show, primitive, semirings, silently, transformers , wl-pprint-annotated }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.3"; - sha256 = "0ww1ll557iapbxg6rwhimf5fh8gngk15zlm4mlrh3p3j3xx9f22p"; + version = "0.2.4"; + sha256 = "0cvaa8rrjwz00z377b0s6c2yyfyxka78cpw66bkrlzyihjqqg6gn"; libraryHaskellDepends = [ - aeson base binary comonad containers hedgehog pretty-show semirings - silently transformers wl-pprint-annotated + aeson base binary comonad containers hedgehog pretty-show primitive + semirings silently transformers wl-pprint-annotated ]; testHaskellDepends = [ aeson base binary comonad containers hedgehog @@ -113178,6 +113718,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_12_8" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, stm, test-framework, test-framework-hunit + , text, time, tls, unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.12.8"; + sha256 = "119j0g6b2ci04bax6xl2biwwf7cfk2vybypx3089fm69xgm8spcz"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -114343,6 +114908,8 @@ self: { pname = "hex"; version = "0.1.2"; sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj"; + revision = "1"; + editedCabalFile = "0khmrdni6njr4wxgz15yz77l8ar4qm2jj6v0lvfnwqdms4s6i80y"; libraryHaskellDepends = [ base bytestring ]; description = "Convert strings into hexadecimal and back"; license = stdenv.lib.licenses.bsd3; @@ -115480,6 +116047,64 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hie-bios" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, containers + , cryptohash-sha1, deepseq, directory, extra, file-embed, filepath + , ghc, process, temporary, text, time, transformers, unix-compat + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.1.1"; + sha256 = "119rqh12bq5gq5y708hxr0zci1dq8wf44xzxgxhhx4sb5zgj1l2p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base16-bytestring bytestring containers cryptohash-sha1 + deepseq directory extra file-embed filepath ghc process temporary + text time transformers unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ base directory filepath ghc ]; + description = "Set up a GHC API session"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hie-core" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, containers + , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot + , ghc-boot-th, ghc-paths, hashable, haskell-lsp, haskell-lsp-types + , hie-bios, lens, lsp-test, mtl, network-uri, optparse-applicative + , parser-combinators, prettyprinter, prettyprinter-ansi-terminal + , rope-utf16-splay, safe-exceptions, shake, sorted-list, stm, syb + , tasty, tasty-hunit, text, time, transformers, unix + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "hie-core"; + version = "0.0.1"; + sha256 = "1fdg5vz5qr9y9xmqqb2qcxss8byz3m38d7zcfybq783fxqrcyfsc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring containers data-default deepseq + directory extra filepath ghc ghc-boot ghc-boot-th hashable + haskell-lsp haskell-lsp-types mtl network-uri prettyprinter + prettyprinter-ansi-terminal rope-utf16-splay safe-exceptions shake + sorted-list stm syb text time transformers unix + unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base containers data-default directory extra filepath ghc ghc-paths + haskell-lsp hie-bios optparse-applicative shake text + ]; + testHaskellDepends = [ + base containers extra filepath haskell-lsp-types lens lsp-test + parser-combinators tasty tasty-hunit text + ]; + description = "The core of an IDE"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: mkDerivation { @@ -116796,8 +117421,8 @@ self: { pname = "hjsonpointer"; version = "1.5.0"; sha256 = "1bdr5jpc2vcx6bk724jmfz7nh3jgqwrmj4hab64h9pjdrl4vz00y"; - revision = "2"; - editedCabalFile = "1s43vdkl71msm8kppksn910prs40nwq4cz5klajr8apak77z4dzi"; + revision = "3"; + editedCabalFile = "1y9fhqb8kjgflsds8nkw7nr1b9ydyz5f3227b4k8b7ir97rzy5d0"; libraryHaskellDepends = [ aeson base hashable text unordered-containers vector ]; @@ -117071,7 +117696,7 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, criterion, data-default, Decimal - , Diff, directory, easytest, filepath, hashable, haskeline + , Diff, directory, easytest, extra, filepath, hashable, haskeline , hledger-lib, html, lucid, math-functions, megaparsec, mtl , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa , safe, shakespeare, split, tabular, temporary, terminfo @@ -117081,38 +117706,39 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.14.2"; - sha256 = "1si9zqparkdq77yji87lhcsrf11fr3gisqwsv82cabhrhc36x6l4"; + version = "1.15.2"; + sha256 = "16mpj58519p4ksd0iwwkd63xxcr21k99h015l4kgi6zd934v2qix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal Diff directory easytest filepath - hashable haskeline hledger-lib lucid math-functions megaparsec mtl - mtl-compat old-time parsec pretty-show process regex-tdfa safe - shakespeare split tabular temporary terminfo text time transformers - unordered-containers utf8-string utility-ht wizards + containers data-default Decimal Diff directory easytest extra + filepath hashable haskeline hledger-lib lucid math-functions + megaparsec mtl mtl-compat old-time parsec pretty-show process + regex-tdfa safe shakespeare split tabular temporary terminfo text + time timeit transformers unordered-containers utf8-string + utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal directory easytest filepath + containers data-default Decimal directory easytest extra filepath haskeline hledger-lib math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare - split tabular temporary terminfo text time transformers + split tabular temporary terminfo text time timeit transformers unordered-containers utf8-string utility-ht wizards ]; testHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal directory easytest filepath + containers data-default Decimal directory easytest extra filepath haskeline hledger-lib math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework - test-framework-hunit text time transformers unordered-containers - utf8-string utility-ht wizards + test-framework-hunit text time timeit transformers + unordered-containers utf8-string utility-ht wizards ]; benchmarkHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers criterion data-default Decimal directory easytest + containers criterion data-default Decimal directory easytest extra filepath haskeline hledger-lib html math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time timeit @@ -117284,31 +117910,33 @@ self: { ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec , cmdargs, containers, data-default, Decimal, deepseq, directory - , doctest, easytest, extra, file-embed, filepath, Glob, hashtables - , megaparsec, mtl, mtl-compat, old-time, parsec, parser-combinators - , pretty-show, regex-tdfa, safe, split, tabular, template-haskell - , text, time, transformers, uglymemo, utf8-string + , doctest, easytest, extra, fgl, file-embed, filepath, Glob + , hashtables, megaparsec, mtl, mtl-compat, old-time, parsec + , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular + , template-haskell, text, time, timeit, transformers, uglymemo + , utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.14.1"; - sha256 = "1w6qp01cak6spnpldm01czlm6i5a2alw47w76875l2nagrc4rfp2"; + version = "1.15.2"; + sha256 = "0q6ppizyadilxma3l8bwlswa6syyzkdri0yq0bqfmdzxvh9s3bcm"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal deepseq directory easytest extra file-embed - filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec - parser-combinators pretty-show regex-tdfa safe split tabular - template-haskell text time transformers uglymemo utf8-string + data-default Decimal deepseq directory easytest extra fgl + file-embed filepath Glob hashtables megaparsec mtl mtl-compat + old-time parsec parser-combinators pretty-show regex-tdfa safe + split tabular template-haskell text time timeit transformers + uglymemo utf8-string ]; testHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal deepseq directory doctest easytest extra + data-default Decimal deepseq directory doctest easytest extra fgl file-embed filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec parser-combinators pretty-show regex-tdfa safe - split tabular template-haskell text time transformers uglymemo - utf8-string + split tabular template-haskell text time timeit transformers + uglymemo utf8-string ]; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = stdenv.lib.licenses.gpl3; @@ -117344,8 +117972,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.14.2"; - sha256 = "0bhixvzxv7d0kwb4ppv3sc98wjkc58kna9f91202s63sbikahlcr"; + version = "1.15"; + sha256 = "047ssmix7pxq61hknd40z983aw8110zxzh6z2ick8xkhdsnw3s1q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117390,8 +118018,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.14.1"; - sha256 = "0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1"; + version = "1.15"; + sha256 = "1m54m8v1fzlazrh9hhv4ff7jrg95d03i8wx360l1y731gry54zw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118407,8 +119035,6 @@ self: { ]; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hnix-store-core" = callPackage @@ -118459,8 +119085,6 @@ self: { ]; description = "Remote hnix store"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hnn" = callPackage @@ -120226,6 +120850,45 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_32_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.32.0"; + sha256 = "11qfqyhcwihmx1z9pg5fhza1ww8wapr04wzyx8sknwpxs3hacm4z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -120443,8 +121106,8 @@ self: { pname = "hpc"; version = "0.6.0.3"; sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn"; - revision = "2"; - editedCabalFile = "0ywki1w4kld0m3z8v1i287g6hcsjgmyq4nxx8b9jij721ad9b9w3"; + revision = "3"; + editedCabalFile = "06dbiaf0sangq3zdyr3x9wkvs2fgyas3ipqkfwfmycax6j17jgyy"; libraryHaskellDepends = [ base containers directory filepath time ]; @@ -122262,29 +122925,6 @@ self: { }: mkDerivation { pname = "hsc2hs"; - version = "0.68.4"; - sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6"; - revision = "2"; - editedCabalFile = "178jimc9qwrjmiiz8f0kk7gv2jaf51vv1n40rp42ggmi8mvf0m4v"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base containers directory filepath process - ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - description = "A preprocessor that helps with writing Haskell bindings to C code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hsc2hs_0_68_6" = callPackage - ({ mkDerivation, base, containers, directory, filepath, process - , tasty, tasty-hspec - }: - mkDerivation { - pname = "hsc2hs"; version = "0.68.6"; sha256 = "1clj6bgs9vmiv3mjzp82lvyyik5zr5411nxab7hydbrgq94pbk70"; isLibrary = false; @@ -124736,6 +125376,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-wai_0_10_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, case-insensitive + , hspec, hspec-core, hspec-expectations, http-types, QuickCheck + , text, transformers, wai, wai-extra + }: + mkDerivation { + pname = "hspec-wai"; + version = "0.10.0"; + sha256 = "1gw0z9wwvwzhxxkqp4snx77k956zq0wwdq3mjiznng0pa2xc0fhf"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + testHaskellDepends = [ + base base-compat bytestring case-insensitive hspec hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + description = "Experimental Hspec support for testing WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-wai-json" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell @@ -124753,6 +125417,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-wai-json_0_10_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring + , case-insensitive, hspec, hspec-wai, template-haskell + }: + mkDerivation { + pname = "hspec-wai-json"; + version = "0.10.0"; + sha256 = "1hbmwsl1vsjsqgbdgrs6210cj1zh437smdsnmsmvnyfc0xpr9pcy"; + libraryHaskellDepends = [ + aeson aeson-qq base bytestring case-insensitive hspec-wai + template-haskell + ]; + testHaskellDepends = [ base hspec hspec-wai ]; + description = "Testing JSON APIs with hspec-wai"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-webdriver" = callPackage ({ mkDerivation, aeson, base, data-default, hashable, hspec , hspec-core, HUnit, lifted-base, stm, text, transformers @@ -126350,6 +127032,8 @@ self: { pname = "http-api-data"; version = "0.4.1"; sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv"; + revision = "1"; + editedCabalFile = "0jhaj9qxw8a4gnvqi6i7lmn6vk8cmvc1mm1cp1saqz4whn13fgbs"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring @@ -126773,6 +127457,8 @@ self: { pname = "http-directory"; version = "0.1.5"; sha256 = "075crysy7avf97vlskwlk8813q2bnqw9p3q29c5yb2yhmykrpwyn"; + revision = "1"; + editedCabalFile = "0ynm88f9v3h5dlyf2kzydqwr2l90gwjysffr6gbnlyqw9x46pb04"; libraryHaskellDepends = [ base bytestring html-conduit http-client http-client-tls http-date http-types text time xml-conduit @@ -126897,8 +127583,8 @@ self: { pname = "http-io-streams"; version = "0.1.0.0"; sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv"; - revision = "1"; - editedCabalFile = "10fcy17ny5qvabm98md9j8r7vfklgzxvg89iinna7wm4v6q6j5w5"; + revision = "2"; + editedCabalFile = "0l6afs6bhf5q73nmlmc37qi0anr1dlrz1x10m9ipfssnkb5hp25k"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring case-insensitive containers directory HsOpenSSL io-streams mtl @@ -128239,6 +128925,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hvega_0_4_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , filepath, tasty, tasty-golden, text, unordered-containers, vector + }: + mkDerivation { + pname = "hvega"; + version = "0.4.0.0"; + sha256 = "1clq31aq8vgvvc1mcrz4al3f7kfb6crs2nkc07n87xykmrcjkdyq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base text unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers filepath tasty + tasty-golden text + ]; + description = "Create Vega-Lite visualizations (version 3) in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hvega-theme" = callPackage ({ mkDerivation, base, hvega, text }: mkDerivation { @@ -128606,14 +129314,12 @@ self: { }: mkDerivation { pname = "hw-hspec-hedgehog"; - version = "0.1.0.7"; - sha256 = "0445b5ycr622qjann2yyri8ghkhkw0vqaqn2rlar9wq2ni3b85rv"; - revision = "1"; - editedCabalFile = "0gcfhqasff8ij0xr5wq74blp90ldzgv992agadp63bs4ikg4rajm"; + version = "0.1.0.8"; + sha256 = "0c54mhzbmjfjvy5lyvr6xffrncqmbbr10lran2x9czbkhhbikrss"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; - testHaskellDepends = [ base hedgehog hspec ]; + testHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; testToolDepends = [ hspec-discover ]; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; @@ -128831,6 +129537,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.1.1"; sha256 = "0z0lxzciyw6b49w1s88yx9lcqgk0fjmh1zv7qs3jnn9sk0bqldh5"; + revision = "1"; + editedCabalFile = "15x23pa4im7ll4ipaykqavmh8frpnlmg8617g67c987f66lpyprr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129074,6 +129782,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -129125,6 +129835,8 @@ self: { pname = "hw-rankselect"; version = "0.13.2.0"; sha256 = "00k163jalapxdlcmcvi4ddk60bsj34f7ng05agvh1374kybqscb4"; + revision = "1"; + editedCabalFile = "0a0mlfbln3whziv2rp63qr1qjm4vxgrd8535irnlyy5ba0a0lad8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133479,6 +134191,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.2"; sha256 = "1ikjhg0pdfpnx1d645r92k2dwlk7y935j1w5lcsk23nzpwhbkxja"; + revision = "1"; + editedCabalFile = "1hlinc8nnjlzc6ds3wf8jvkihpcbhz2dk0rqxq1ns0c5zbbhnylq"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -133538,6 +134252,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inspection-testing_0_4_2_2" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.4.2.2"; + sha256 = "1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + description = "GHC plugin to do inspection testing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -133770,8 +134501,8 @@ self: { pname = "int-cast"; version = "0.2.0.0"; sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; - revision = "1"; - editedCabalFile = "111pac97pcrp01zphf96crdx22fnq7ha2s27av0mqki5421rghpm"; + revision = "2"; + editedCabalFile = "1fhc91170q9q9k628wc3dqzdvxfjs97jzg5x7g0ndaqnh60l8cy5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -136647,8 +137378,8 @@ self: { ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.3.4"; - sha256 = "0xvjdn61a8gxqj4jkdql9dyb3jk6lbx9i1w7hc27f2rqrwmfgq68"; + version = "1.3.5"; + sha256 = "1221gxggyk3pjqkc72wxx9gjl8dvqna1rn9nh9zkcmdpv5yww7wd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal ]; @@ -137361,8 +138092,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "joint"; - version = "0.1.0"; - sha256 = "0hzbczwy1w1mw8c4lf52nm6ighjlpiyj91siy9fmqih4fv22a1p2"; + version = "0.1.1"; + sha256 = "1iq29qyi4ij7ffshvz1x9rpbrbpd4088nccdpjzpzgza73w4bqmp"; libraryHaskellDepends = [ base ]; description = "Trying to compose non-composable"; license = stdenv.lib.licenses.bsd3; @@ -137607,6 +138338,8 @@ self: { pname = "jsaddle-dom"; version = "0.9.3.2"; sha256 = "1qc135w1y4f2mbky36dmb0ggcbwkv1vnmszw5lkhkxhkcag2sf07"; + revision = "1"; + editedCabalFile = "0vhqqbcpbrsnbmix0wkkm1d21qwrpicbzjwy42p48g7whg0lf0d5"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base base-compat exceptions jsaddle lens text transformers @@ -137753,6 +138486,8 @@ self: { pname = "json"; version = "0.9.3"; sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb"; + revision = "2"; + editedCabalFile = "0iqmwfq6s1fc8jj16yx2d7jpzf94scd1hc4yvz281zxj7kds2ms5"; libraryHaskellDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -139000,8 +139735,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.5.0"; - sha256 = "0v54x0015im3gbd2rsf87kmppkasd8780sb4pl8mqc82dbf4v18z"; + version = "0.6.0"; + sha256 = "1ipy0vy0pr9pbxjin0d86dwvdy70wxb1cmg1bqcdjdgrg2xbqxf8"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector @@ -139860,6 +140595,8 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kbq-gu" = callPackage @@ -140763,6 +141500,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kind-apply_0_3_2_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "kind-apply"; + version = "0.3.2.0"; + sha256 = "0wq0jfi8jdah6mwc6amrfjs5ld0bz86y53va9sm0hzvpiyb4bpcq"; + libraryHaskellDepends = [ base ]; + description = "Utilities to work with lists of types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kind-generics" = callPackage ({ mkDerivation, base, kind-apply }: mkDerivation { @@ -140774,6 +141523,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kind-generics_0_4_0_0" = callPackage + ({ mkDerivation, base, kind-apply }: + mkDerivation { + pname = "kind-generics"; + version = "0.4.0.0"; + sha256 = "1w3rpvdvgfczsc86y00qbr9s9r8vmv442m4x975f3zcqs4algfhp"; + libraryHaskellDepends = [ base kind-apply ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kind-generics-th" = callPackage ({ mkDerivation, base, kind-generics, template-haskell , th-abstraction @@ -140790,6 +141551,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kind-generics-th_0_2_0_0" = callPackage + ({ mkDerivation, base, kind-generics, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "kind-generics-th"; + version = "0.2.0.0"; + sha256 = "1vj2zbkv51fvcpjrkqqlsd685drnh2yalsplcb6sgrgq9dfdlw2h"; + libraryHaskellDepends = [ + base kind-generics template-haskell th-abstraction + ]; + testHaskellDepends = [ base kind-generics ]; + description = "Template Haskell support for generating `GenericK` instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -141305,6 +142083,17 @@ self: { broken = true; }) {}; + "kuifje" = callPackage + ({ mkDerivation, base, boxes, containers, lens }: + mkDerivation { + pname = "kuifje"; + version = "0.1.1.0"; + sha256 = "1hfrj1msp1g0f4bqih4m1k28vssfds2nmr47adxikgwsfi3qgsq2"; + libraryHaskellDepends = [ base boxes containers lens ]; + description = "A Quantitative Information Flow aware programming language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "kure" = callPackage ({ mkDerivation, base, dlist, transformers }: mkDerivation { @@ -142057,8 +142846,8 @@ self: { }: mkDerivation { pname = "lambdabot-xmpp"; - version = "0.1.0.0"; - sha256 = "1bn8gd2gxl44xqffiy8skh714hkvfv2d318v1qg9k52pp53al2ny"; + version = "0.1.0.3"; + sha256 = "0nixz3g2invajirvhkqwl3cnqiimjfjfsm82b59yyzpdk26c5fmi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142588,8 +143377,8 @@ self: { pname = "language-c"; version = "0.8.2"; sha256 = "05ff3ywh2lpxgd00nv6y3jnqpdl6bg0f2yn3csd043rv4srd6adp"; - revision = "1"; - editedCabalFile = "1xg49j4bykgdm6l14m65wyz8r3s4v4dqc7a9zjcsr12ffkiv8nam"; + revision = "2"; + editedCabalFile = "074mypdymg7543waq68c72viw912w94v94y1287sp67lzwpyiixd"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath pretty process syb @@ -143137,8 +143926,8 @@ self: { }: mkDerivation { pname = "language-lua"; - version = "0.11.0"; - sha256 = "1b65bfjdx7287d65s2ki05yfps8k0w6jfq4avna4z37cqssa0z59"; + version = "0.11.0.1"; + sha256 = "0712xbijag03n61d80bnd9xw94fzywc76l8ya9ijv684ls0qymy2"; libraryHaskellDepends = [ alex-tools array base bytestring deepseq text ]; @@ -145002,6 +145791,47 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "lens_4_18" = callPackage + ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring + , Cabal, cabal-doctest, call-stack, comonad, containers + , contravariant, criterion, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors + , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect + , tagged, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, text + , th-abstraction, transformers, transformers-compat, type-equality + , unordered-containers, vector + }: + mkDerivation { + pname = "lens"; + version = "4.18"; + sha256 = "0wldr36bmlxddc6d874lfl4hwnh5bq5k89v437d7xw5ldj0fgws6"; + setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring call-stack comonad + containers contravariant distributive exceptions filepath free + ghc-prim hashable kan-extensions mtl parallel profunctors + reflection semigroupoids tagged template-haskell text + th-abstraction transformers transformers-compat type-equality + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving HUnit mtl nats parallel QuickCheck semigroups + simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens }: mkDerivation { @@ -145057,6 +145887,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lens-aeson_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, doctest, generic-deriving, lens, scientific + , semigroups, simple-reflect, text, unordered-containers, vector + }: + mkDerivation { + pname = "lens-aeson"; + version = "1.1"; + sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring lens scientific text + unordered-containers vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + description = "Law-abiding lenses for aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-datetime" = callPackage ({ mkDerivation, base, lens, time }: mkDerivation { @@ -145492,6 +146344,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lenz_0_4_0_0" = callPackage + ({ mkDerivation, base, base-unicode-symbols, hs-functors + , transformers + }: + mkDerivation { + pname = "lenz"; + version = "0.4.0.0"; + sha256 = "1bfhs61i7ach2d8bbrcsch57w7imrn22hilv63hif9dmqjnlwvy5"; + libraryHaskellDepends = [ + base base-unicode-symbols hs-functors transformers + ]; + description = "Van Laarhoven lenses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lenz-template" = callPackage ({ mkDerivation, base, base-unicode-symbols, containers, lenz , template-haskell @@ -146134,6 +147002,8 @@ self: { librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {modbus = null;}; "libmolude" = callPackage @@ -147715,22 +148585,22 @@ self: { "linnet" = callPackage ({ mkDerivation, base, bytestring, bytestring-conversion - , case-insensitive, either, exceptions, hspec, http-types - , io-streams, mtl, QuickCheck, quickcheck-classes + , case-insensitive, either, exceptions, hspec, http-media + , http-types, mtl, QuickCheck, quickcheck-classes , quickcheck-instances, text, transformers, uri-encode, wai, warp }: mkDerivation { pname = "linnet"; - version = "0.1.0.1"; - sha256 = "074np5a8xx25k88c82spmvmwiwcm993pvfbwfhjjkcqjqxwwgglf"; + version = "0.3.0.0"; + sha256 = "1ir150a6a94yz23d9w31m2clvi2i7fag6kih4fwrffmnl3p3z6i4"; libraryHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either - exceptions http-types io-streams mtl text transformers uri-encode + exceptions http-media http-types mtl text transformers uri-encode wai warp ]; testHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either - exceptions hspec http-types io-streams mtl QuickCheck + exceptions hspec http-media http-types mtl QuickCheck quickcheck-classes quickcheck-instances text transformers uri-encode wai warp ]; @@ -147744,8 +148614,8 @@ self: { }: mkDerivation { pname = "linnet-aeson"; - version = "0.1.0.1"; - sha256 = "1syfi3ha3z2l1g8qdy5rpla6xafw6dqcwicgns1xy9q9d8jrcjs3"; + version = "0.3.0.0"; + sha256 = "1nfn9xh3dbgbgfgdvrq057lgcrk9ipqq13c6i1y20zg49gpawd9w"; libraryHaskellDepends = [ aeson base bytestring linnet ]; testHaskellDepends = [ aeson base bytestring hspec linnet QuickCheck quickcheck-classes @@ -147755,6 +148625,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "linnet-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, hspec, http-types + , linnet, QuickCheck, quickcheck-classes, quickcheck-instances, wai + , warp + }: + mkDerivation { + pname = "linnet-conduit"; + version = "0.3.0.0"; + sha256 = "0p5fgzvs4cqhc9f37v1fqqq0qbzrywl224wd73mzl1k4v7vj249i"; + libraryHaskellDepends = [ + base bytestring conduit http-types linnet wai warp + ]; + testHaskellDepends = [ + base bytestring conduit hspec http-types linnet QuickCheck + quickcheck-classes quickcheck-instances wai warp + ]; + description = "Conduit-backed support for streaming in Linnet"; + license = stdenv.lib.licenses.asl20; + }) {}; + "linode" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , errors, lens, process, retry, safe, tasty, tasty-hunit @@ -148311,6 +149201,17 @@ self: { broken = true; }) {}; + "list-singleton" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "list-singleton"; + version = "1.0.0.0"; + sha256 = "0xc6vkbvsd7sbccb6pwgmvx34qpnh4ppv6fd5qp0xcylmw4gbvyv"; + libraryHaskellDepends = [ base ]; + description = "Easily and clearly create lists with only one element in them"; + license = stdenv.lib.licenses.isc; + }) {}; + "list-t" = callPackage ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control , mtl, mtl-prelude, transformers, transformers-base @@ -148430,8 +149331,8 @@ self: { ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.4"; - sha256 = "0zia1b2phk4skv39q2k481jsagz1syd6rkgfcdra15i2s5dhzvyp"; + version = "1.0.5"; + sha256 = "192yx9y0sp729dk9xaym1b6kyw9gv7n3fp1dvxw7z2w04s92l1k4"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; description = "List monad transformer"; @@ -149021,6 +149922,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {llvm-config = null;}; + "llvm-hs_9_0_0" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , containers, exceptions, llvm-config, llvm-hs-pure, mtl + , pretty-show, process, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, transformers + , utf8-string + }: + mkDerivation { + pname = "llvm-hs"; + version = "9.0.0"; + sha256 = "0sz1rhdf73v43jz8x7f5f7bjwrkvyyvf950gw9063aapbsdzm76h"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers exceptions llvm-hs-pure + mtl template-haskell transformers utf8-string + ]; + libraryToolDepends = [ llvm-config ]; + testHaskellDepends = [ + base bytestring containers llvm-hs-pure mtl pretty-show process + QuickCheck tasty tasty-hunit tasty-quickcheck temporary + transformers + ]; + description = "General purpose LLVM bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {llvm-config = null;}; + "llvm-hs-pretty" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath , llvm-hs, llvm-hs-pure, mtl, prettyprinter, tasty, tasty-golden @@ -149063,6 +149991,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "llvm-hs-pure_9_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, fail + , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "llvm-hs-pure"; + version = "9.0.0"; + sha256 = "0pxb5ah8r5pzpz2ibqw3g9g1isigb4z7pbzfrwr8kmcjn74ab3kf"; + libraryHaskellDepends = [ + attoparsec base bytestring containers fail mtl template-haskell + transformers unordered-containers + ]; + testHaskellDepends = [ + base containers mtl tasty tasty-hunit tasty-quickcheck transformers + ]; + description = "Pure Haskell LLVM functionality (no FFI)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "llvm-ht" = callPackage ({ mkDerivation, base, bytestring, directory, mtl, process , type-level @@ -150805,8 +151754,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "8"; - editedCabalFile = "11ad87kg09s9md9lqzhbcw19kmzvii4v97nw49q0wb0rs0qizpki"; + revision = "9"; + editedCabalFile = "0rzrj9ziwly33lhkamf9rkrc3jqhid3adl0dv9621n4zzd6dnkb6"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -151521,8 +152470,8 @@ self: { pname = "lzma"; version = "0.0.0.3"; sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg"; - revision = "3"; - editedCabalFile = "1sify6gnsalyp6dakfzi0mdy5jcz2kcp9jsdsgkmxd40nfzgd44m"; + revision = "4"; + editedCabalFile = "0f3zrjq4zxwacmlc934y873pvlqpmmcmhzhp34d8pvhi5c7dg47j"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ @@ -151726,6 +152675,8 @@ self: { pname = "machines"; version = "0.6.4"; sha256 = "0s3pvdklanw6a41pyyqrplm3vid63dpy6vd6qhp86dnb4wp2ppkj"; + revision = "2"; + editedCabalFile = "1h0qq6kxv4kc0j0rmx7rhwhvfg1hc08r10q152km4p8kgshcwlig"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -153710,6 +154661,31 @@ self: { broken = true; }) {}; + "massiv_0_4_1_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest + , data-default-class, deepseq, doctest, exceptions + , mersenne-random-pure64, primitive, QuickCheck, random, scheduler + , splitmix, template-haskell, unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.4.1.0"; + sha256 = "0h6rr5fx3kj5qs30zyfzmmvqnwn43fl4smjfd7qx4fhp48bq89nw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, directory , filepath, JuicyPixels, massiv, netpbm, process, vector @@ -153896,6 +154872,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "math-functions_0_3_2_0" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit + , primitive, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.3.2.0"; + sha256 = "1798n8x3w3x4s058dph18g11k2hm7vcxkbr2rb2snlksjr59c2wa"; + libraryHaskellDepends = [ + base data-default-class deepseq primitive vector vector-th-unbox + ]; + testHaskellDepends = [ + base data-default-class deepseq erf HUnit primitive QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + vector vector-th-unbox + ]; + description = "Collection of tools for numeric computations"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "math-grads" = callPackage ({ mkDerivation, aeson, array, base, containers, hspec, linear , matrix, mtl, random, vector @@ -154091,8 +155089,6 @@ self: { ]; description = "Bindings to Matplotlib; a Python plotting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "matrices" = callPackage @@ -155534,14 +156530,33 @@ self: { pname = "memory"; version = "0.14.18"; sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm"; + revision = "2"; + editedCabalFile = "1kwlgsjxh4ncvc6x9rps82bm55qyzn8lvzg49s4rbyc7vjjsbmx6"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim + ]; + testHaskellDepends = [ base basement bytestring foundation ]; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "memory_0_15_0" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim + }: + mkDerivation { + pname = "memory"; + version = "0.15.0"; + sha256 = "0a9mxcddnqn4359hk59d6l2zbh0vp154yb5vs1a8jw4l38n8kzz3"; revision = "1"; - editedCabalFile = "0h4d0avv8kv3my4rim79lcamv2dyibld7w6ianq46nhwgr0h2lzm"; + editedCabalFile = "136qfj1cbg9571mlwywaqml75ijx3pcgvbpbgwxrqsl71ssj8w5y"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim ]; testHaskellDepends = [ base basement bytestring foundation ]; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memorypool" = callPackage @@ -155612,6 +156627,8 @@ self: { pname = "menshen"; version = "0.0.3"; sha256 = "0zx530ksb0zmczbl6k70xg6pxgr2wfga2pg0ghgmpgd9f307xrwb"; + revision = "1"; + editedCabalFile = "0hxj40q50pbl57dribvnk8ak907p15jnk3zycv6n9vj91la9js48"; libraryHaskellDepends = [ base regex-tdfa scientific text ]; testHaskellDepends = [ aeson base hspec QuickCheck regex-tdfa scientific text @@ -156169,8 +157186,8 @@ self: { pname = "microaeson"; version = "0.1.0.0"; sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; - revision = "1"; - editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq"; + revision = "2"; + editedCabalFile = "1n3jhbwic8c2pa6dcz36a6fgna4b854ml5d5n8qzzhjshb0v60ri"; libraryHaskellDepends = [ array base bytestring containers deepseq text ]; @@ -156283,6 +157300,8 @@ self: { pname = "microlens"; version = "0.4.10"; sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw"; + revision = "1"; + editedCabalFile = "1qh5ifbwh62v14ygg3fj22wqimylph17ykng70vqv5x2rkp630jq"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; license = stdenv.lib.licenses.bsd3; @@ -158622,6 +159641,8 @@ self: { pname = "monad-chronicle"; version = "1"; sha256 = "03x19683pm99zcw7gkipmdkrqwaspcyvy7yv68nlh6g4swl31a0l"; + revision = "1"; + editedCabalFile = "059qa4kb6x3vqw0pahbkp3i6v33cyaiizzkgxd1n36l9ybchwr4l"; libraryHaskellDepends = [ base data-default-class mtl semigroupoids these transformers transformers-compat @@ -160255,8 +161276,8 @@ self: { pname = "monoid-extras"; version = "0.5"; sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6"; - revision = "2"; - editedCabalFile = "1q73ghd12fd451zm4m045h8v3y61jmfhj6k890gnv6z7lyb7xwg2"; + revision = "3"; + editedCabalFile = "1f6yd2lzvcr983xh68wgvxibx2a8ldgkcvac48pqqcxl1ywx1iny"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -160346,6 +161367,8 @@ self: { pname = "monoidal-containers"; version = "0.4.0.0"; sha256 = "15mh2hx7a31gr5zb2g30h2fcnb3a2wvv2y8hvzzk5l9cr2nvhcm1"; + revision = "1"; + editedCabalFile = "18m2r5kfvkss8vh537vh2k4zbpncmwadg1g4pzsw0rdmkyn7lyjd"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semigroups unordered-containers @@ -160362,6 +161385,8 @@ self: { pname = "monoidal-containers"; version = "0.6"; sha256 = "1ii09s068g6bj2j10ig3g3ymv1ci6zg596pmmaw6als15j9bybc9"; + revision = "1"; + editedCabalFile = "1k4k8g5a7swaylcqnga7lyp0lly8j1fqzdwsnznmps8bwn1pn1kk"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -160736,8 +161761,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.2.1"; - sha256 = "1qdd21mwxsn3yw9c0vxcsmx6ixp90lpy2ghk6ix2s06cs4d5s3h9"; + version = "0.2.2"; + sha256 = "1cgf6l6p97dfgj49gyygbd088smah3ichryrr8xvl1mr6pjclq5b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -161146,6 +162171,33 @@ self: { broken = true; }) {inherit (pkgs) openmpi;}; + "mpi-hs_0_5_3_0" = callPackage + ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion + , monad-loops, openmpi, store + }: + mkDerivation { + pname = "mpi-hs"; + version = "0.5.3.0"; + sha256 = "0z2m4xfk0w1zx29jb27xb6hs01xid0ghv93yhqx7zwiw01815krk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cereal monad-loops store + ]; + librarySystemDepends = [ openmpi ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base binary ]; + executableSystemDepends = [ openmpi ]; + testHaskellDepends = [ base monad-loops ]; + testSystemDepends = [ openmpi ]; + benchmarkHaskellDepends = [ base criterion ]; + benchmarkSystemDepends = [ openmpi ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) openmpi;}; + "mpppc" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, split, text }: mkDerivation { @@ -161527,8 +162579,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.5.0.0"; - sha256 = "0k0j87h37hya42fv045z44p9issic0a0wswy75ymclizsbip1fl4"; + version = "0.5.0.1"; + sha256 = "174qqm4y38b4x0nc4kfrafr0cqcqshdxgxj2amn58m5zvclhn3fs"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds mtl network template-haskell text time tls uuid-types @@ -162139,6 +163191,8 @@ self: { testHaskellDepends = [ base cryptonite doctest hedgehog ]; description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multihash-serialise" = callPackage @@ -164523,6 +165577,17 @@ self: { broken = true; }) {}; + "natural-arithmetic" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "natural-arithmetic"; + version = "0.1.0.0"; + sha256 = "0h5ga04hw7v54xsxjj852238spl3px190g67qjqzxvnyn0f76jrp"; + libraryHaskellDepends = [ base ]; + description = "Arithmetic of natural numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "natural-induction" = callPackage ({ mkDerivation, base, peano }: mkDerivation { @@ -165092,8 +166157,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.2.4.1"; - sha256 = "0s0drakh05ygwkvlcd8z0f5168hvk8qmvdq3mg2bk1p2fjd2hfb2"; + version = "0.2.4.2"; + sha256 = "1ygd0ncwzzy4i2m4n0ax02csyjdsn2y66amr9yilxn6x0yhbq9rj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165405,8 +166470,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "5"; - editedCabalFile = "0v383hy7iw44xxnpdp2fla2dc8ivrhwgh2m303ps4z9fsw25cyka"; + revision = "6"; + editedCabalFile = "0mn0ar2xhjdsm50kmpw5ndvbyfmc30b3x0bx291d2ml7hqspnnsw"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -166343,8 +167408,8 @@ self: { ({ mkDerivation, base, network }: mkDerivation { pname = "network-run"; - version = "0.1.0"; - sha256 = "16n7d0vgzcp6qq3y2vs1wjlj81xdi3a1kyk9qncmj3h7djav3r5b"; + version = "0.2.0"; + sha256 = "1iabxk341yzsr28mpiam01wris20na4kbvbpxfzbcvlb1q2pjz5v"; libraryHaskellDepends = [ base network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -167585,6 +168650,26 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) nix;}; + "nixfmt" = callPackage + ({ mkDerivation, base, cmdargs, directory, filepath, megaparsec + , parser-combinators, safe-exceptions, text, unix + }: + mkDerivation { + pname = "nixfmt"; + version = "0.3.0"; + sha256 = "0y9r7l2iwy6kqqli8bfcgrcr07pqvpaym895qn21d467ybcmgqih"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base megaparsec parser-combinators text + ]; + executableHaskellDepends = [ + base cmdargs directory filepath safe-exceptions text unix + ]; + description = "An opinionated formatter for Nix"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "nixfromnpm" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , classy-prelude, containers, curl, data-default, data-fix @@ -170093,6 +171178,27 @@ self: { broken = true; }) {}; + "oeis2_1_0_3" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, http-conduit, lens + , lens-aeson, QuickCheck, text, vector + }: + mkDerivation { + pname = "oeis2"; + version = "1.0.3"; + sha256 = "04dbly6ggadmy1bi10x9bbsa6dvynb5g1m5hdrlzv3mpyfahxvwp"; + libraryHaskellDepends = [ + aeson base containers http-conduit lens lens-aeson text vector + ]; + testHaskellDepends = [ + aeson base containers hspec http-conduit lens lens-aeson QuickCheck + text vector + ]; + description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "off-simple" = callPackage ({ mkDerivation, base, parsec3, vector }: mkDerivation { @@ -171766,14 +172872,103 @@ self: { broken = true; }) {}; + "optics" = callPackage + ({ mkDerivation, array, base, bytestring, containers, criterion + , inspection-testing, lens, mtl, optics-core, optics-extra + , optics-th, random, tasty, tasty-hunit, template-haskell + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "optics"; + version = "0.1"; + sha256 = "1xkccyshhzbf8c7v1vi7cw4k1a1gfgw9yl2wfma4q36bv96qq2lk"; + revision = "1"; + editedCabalFile = "01hbhb642f596a8dwx6rxq53cqhf40vgr6c3xrbvs025by890mpi"; + libraryHaskellDepends = [ + array base containers mtl optics-core optics-extra optics-th + transformers + ]; + testHaskellDepends = [ + base containers inspection-testing mtl optics-core random tasty + tasty-hunit template-haskell + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion lens transformers + unordered-containers vector + ]; + description = "Optics as an abstract interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optics-core" = callPackage + ({ mkDerivation, array, base, containers, transformers }: + mkDerivation { + pname = "optics-core"; + version = "0.1"; + sha256 = "0vyvvjlqps0sa03rxp0p2v9vjllff53adn3y6qfwrpc08kxwh7q1"; + libraryHaskellDepends = [ array base containers transformers ]; + description = "Optics as an abstract interface: core definitions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optics-extra" = callPackage + ({ mkDerivation, array, base, bytestring, containers, hashable, mtl + , optics-core, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "optics-extra"; + version = "0.1"; + sha256 = "1z0blxm9gxbzqxxcm9bkj8jvf9apgn8abh0wdc4f220rs32c3v7g"; + revision = "1"; + editedCabalFile = "03n8pk423ckyk5rz8z8x9g0amxqpd75lsr90bjsjcp16qak4zjc7"; + libraryHaskellDepends = [ + array base bytestring containers hashable mtl optics-core text + transformers unordered-containers vector + ]; + description = "Extra utilities and instances for optics-core"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optics-th" = callPackage + ({ mkDerivation, base, containers, mtl, optics-core + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "optics-th"; + version = "0.1"; + sha256 = "1fqaxp7divk2wj7mvnsyzclly99l895dss1ssk6dzfgdijjjipk6"; + revision = "2"; + editedCabalFile = "1m5wcl6h83hhiyic7khw6lylmb4rvbaskvpssrd52b2a73gpzm69"; + libraryHaskellDepends = [ + base containers mtl optics-core template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base optics-core ]; + description = "Optics construction using TemplateHaskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optics-vl" = callPackage + ({ mkDerivation, base, optics-core, profunctors }: + mkDerivation { + pname = "optics-vl"; + version = "0.1"; + sha256 = "03khw0aqv7wdlym5maasm1l20gj4y1jzci89y592hx3y07mzvapl"; + revision = "1"; + editedCabalFile = "06x99059qi5qhsq7cql2l0pk0d1kh8is320xsnxw6qjp2c4hild2"; + libraryHaskellDepends = [ base optics-core profunctors ]; + description = "Utilities for compatibility with van Laarhoven optics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "optima" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base , optparse-applicative, rerebase, text, text-builder }: mkDerivation { pname = "optima"; - version = "0.3.0.3"; - sha256 = "1m6lbwy5y8nmgadqx6lax1laqgs90gbg9waffbd962n2xscbwbww"; + version = "0.4"; + sha256 = "0ryrz9739g1zql9ldll2ilfiyazgz5xixk31wajdqz0xdzqg3bbl"; libraryHaskellDepends = [ attoparsec attoparsec-data base optparse-applicative text text-builder @@ -172004,8 +173199,8 @@ self: { pname = "optparse-generic"; version = "1.3.0"; sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0"; - revision = "2"; - editedCabalFile = "1ldkzq0g70y2w69ywg2d5agrd74y7c4iblg3yflyvmzifr11d1ls"; + revision = "3"; + editedCabalFile = "0vszcjmxywblx5z9yvrz8c6yc104jgr1nv0sbv58ansd3rkjlzfn"; libraryHaskellDepends = [ base bytestring Only optparse-applicative semigroups system-filepath text time transformers void @@ -173660,6 +174855,8 @@ self: { ]; description = "Pandoc filter to include CSV files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-plantuml-diagrams" = callPackage @@ -173977,58 +175174,6 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.1.1.1"; - sha256 = "082p2shapgnv10qjm77bpn0y6p6582n38xcgirh2l8mhs1yqflyg"; - libraryHaskellDepends = [ - aeson ansi-terminal array base base-orphans base64-bytestring - bytestring Cabal conduit conduit-extra containers contravariant - cryptonite cryptonite-conduit deepseq digest directory filelock - filepath generic-deriving ghc-prim hackage-security hashable hpack - http-client http-client-tls http-conduit http-download http-types - integer-gmp memory mono-traversable mtl network network-uri path - path-io persistent persistent-sqlite persistent-template primitive - resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit - template-haskell text text-metrics th-lift th-lift-instances - th-orphans th-reify-many th-utilities time transformers unix-compat - unliftio unordered-containers vector yaml zip-archive - ]; - testHaskellDepends = [ - aeson ansi-terminal array base base-orphans base64-bytestring - bytestring Cabal conduit conduit-extra containers contravariant - cryptonite cryptonite-conduit deepseq digest directory exceptions - filelock filepath generic-deriving ghc-prim hackage-security - hashable hedgehog hpack hspec http-client http-client-tls - http-conduit http-download http-types integer-gmp memory - mono-traversable mtl network network-uri path path-io persistent - persistent-sqlite persistent-template primitive QuickCheck - raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb - tar-conduit template-haskell text text-metrics th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unix-compat unliftio unordered-containers vector yaml - zip-archive - ]; - description = "Content addressable Haskell package management"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pantry_0_1_1_2" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans - , base64-bytestring, bytestring, Cabal, conduit, conduit-extra - , containers, contravariant, cryptonite, cryptonite-conduit - , deepseq, digest, directory, exceptions, filelock, filepath - , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog - , hpack, hspec, http-client, http-client-tls, http-conduit - , http-download, http-types, integer-gmp, memory, mono-traversable - , mtl, network, network-uri, path, path-io, persistent - , persistent-sqlite, persistent-template, primitive, QuickCheck - , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint - , safe, syb, tar-conduit, template-haskell, text, text-metrics - , th-lift, th-lift-instances, th-orphans, th-reify-many - , th-utilities, time, transformers, unix-compat, unliftio - , unordered-containers, vector, yaml, zip-archive - }: - mkDerivation { - pname = "pantry"; version = "0.1.1.2"; sha256 = "1m1sps9kc7y8zpba486lv5z8an3z8493zxb1qhghql6pybsprsgi"; libraryHaskellDepends = [ @@ -174061,7 +175206,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pantry-tmp" = callPackage @@ -174620,6 +175764,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; + revision = "1"; + editedCabalFile = "0a3kn7arck8f2gwm8cwfkplsw4q9v9j6ifbhj1l3bmclmkwcckcj"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; @@ -175769,8 +176915,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.2.5"; - sha256 = "1hss18gb71xrjgncjr4g5935k7kcwxpxxb6j52i32ans43xavhiv"; + version = "0.8.3.0"; + sha256 = "1dldaqa1qbwdia6rcf0sb6bnqldcpgrimd3yx00idyjy0msl0xh6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178630,8 +179776,8 @@ self: { }: mkDerivation { pname = "pg-transact"; - version = "0.1.0.1"; - sha256 = "0zf9mfhpknaa0vggv60gpkfr0ak51n1xbw5lfqx8l8p1kqv3d0jr"; + version = "0.1.2.0"; + sha256 = "1xgma50c4pvvb9h2wksx8wl4sf0625ngbsb2c828xd0aqj171qmj"; libraryHaskellDepends = [ base bytestring exceptions monad-control postgresql-simple transformers @@ -178647,6 +179793,30 @@ self: { broken = true; }) {}; + "pg-transact_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hspec + , hspec-discover, hspec-expectations-lifted, monad-control + , postgresql-simple, tmp-postgres, transformers + }: + mkDerivation { + pname = "pg-transact"; + version = "0.2.0.1"; + sha256 = "1abv2h52x624wsrm8lhafsjdsmldghqjksww12b0g119msbsbdq9"; + libraryHaskellDepends = [ + base bytestring exceptions monad-control postgresql-simple + transformers + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-discover + hspec-expectations-lifted postgresql-simple tmp-postgres + ]; + testToolDepends = [ hspec-discover ]; + description = "Another postgresql-simple transaction monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pgdl" = callPackage ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit , conduit-extra, configurator, containers, directory @@ -179663,29 +180833,6 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.3.11"; - sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv"; - libraryHaskellDepends = [ - base exceptions mmorph mtl semigroups transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes_4_3_12" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, semigroups, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; version = "4.3.12"; sha256 = "0ni5szs9jl4map05lcyl97dgb69g2xk1a1rdiw8p4024vfyskp8c"; libraryHaskellDepends = [ @@ -179700,7 +180847,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -180154,6 +181300,8 @@ self: { pname = "pipes-extras"; version = "1.0.15"; sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82"; + revision = "1"; + editedCabalFile = "0xrd5zwkr1c7lswzi91gxl3ndra8y9g2b4j00sszyy3w187a2zwi"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -180464,13 +181612,13 @@ self: { }) {}; "pipes-ordered-zip" = callPackage - ({ mkDerivation, base, foldl, pipes }: + ({ mkDerivation, base, foldl, hspec, pipes, pipes-safe }: mkDerivation { pname = "pipes-ordered-zip"; - version = "1.0.1"; - sha256 = "10ywi5ykp398mghc3mvcy2alz1lp6kah0yxmn5pz1l6nbsv7wyk5"; - libraryHaskellDepends = [ base pipes ]; - testHaskellDepends = [ base foldl pipes ]; + version = "1.1.0"; + sha256 = "1fs0qyhc4a7xnglxl7b1d615s9ajml6pvch337ivny31cxrngcsa"; + libraryHaskellDepends = [ base pipes pipes-safe ]; + testHaskellDepends = [ base foldl hspec pipes pipes-safe ]; description = "merge two ordered Producers into a new Producer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180635,6 +181783,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-safe_2_3_2" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control, mtl + , pipes, primitive, transformers, transformers-base + }: + mkDerivation { + pname = "pipes-safe"; + version = "2.3.2"; + sha256 = "10m6f52nahxwnl2zvgnbilllcvd3lpi0dxl3j6fk20lryjzmhyqc"; + libraryHaskellDepends = [ + base containers exceptions monad-control mtl pipes primitive + transformers transformers-base + ]; + description = "Safety for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-shell" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec, pipes , pipes-bytestring, pipes-safe, process, stm, stm-chans, text @@ -181351,6 +182516,8 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plist" = callPackage @@ -181630,14 +182797,15 @@ self: { "plugins" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, ghc, ghc-paths, ghc-prim, haskell-src, process, random + , split }: mkDerivation { pname = "plugins"; - version = "1.5.7"; - sha256 = "1l9ymnsxvgjp7p2j5mvyygrsg7qf2yam1k4y3gz8s2l6kl78ri5f"; + version = "1.6.0"; + sha256 = "0wbmvcb2j4qi29yrmvjfhdf8251lam5yiqshk9gf6dlprz2kvww1"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths - ghc-prim haskell-src process random + ghc-prim haskell-src process random split ]; description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; @@ -181948,8 +183116,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.13"; - sha256 = "0f761h5a8byfpkf8nby4wkhra64qv7fzs3rx6gf4v07w9b2s5ph8"; + version = "1.1.1.14"; + sha256 = "08b2dslkblxch8k6wlc6xx50lva8abdkdwibgfxdj2yw4mgdnhry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182397,7 +183565,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "polysemy_1_1_0_0" = callPackage + "polysemy_1_2_0_0" = callPackage ({ mkDerivation, async, base, containers, criterion, doctest , first-class-families, free, freer-simple, hspec, hspec-discover , inspection-testing, mtl, stm, syb, template-haskell @@ -182406,8 +183574,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.1.0.0"; - sha256 = "1slc177ygphiaaxr301nmn47q7jl71rmzcw8h9q7az2s2f3gy83p"; + version = "1.2.0.0"; + sha256 = "14cl4h78vhi83c3ccz3hy1cbh21a7ry7n5z2i7m3zm2cyj4sbw4q"; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb template-haskell th-abstraction transformers type-errors @@ -182475,6 +183643,29 @@ self: { broken = true; }) {}; + "polysemy-plugin_0_2_3_0" = callPackage + ({ mkDerivation, base, containers, doctest, ghc + , ghc-tcplugins-extra, hspec, hspec-discover, inspection-testing + , polysemy, should-not-typecheck, syb, transformers + }: + mkDerivation { + pname = "polysemy-plugin"; + version = "0.2.3.0"; + sha256 = "1icaxdw2670svhns5g40d1kzxxx3yhcza660a0csdh83f3jzjy2w"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra polysemy syb transformers + ]; + testHaskellDepends = [ + base containers doctest ghc ghc-tcplugins-extra hspec + inspection-testing polysemy should-not-typecheck syb transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Disambiguate obvious uses of effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-zoo" = callPackage ({ mkDerivation, async, base, binary, bytestring, constraints , containers, ghc-prim, hedis, hspec, hspec-discover, mtl, polysemy @@ -183260,12 +184451,12 @@ self: { }) {}; "postgres-options" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, bytestring }: mkDerivation { pname = "postgres-options"; - version = "0.1.0.0"; - sha256 = "17a2w4fb85mp9v1rghgkm0cvgzxvvahcvfi3vmlzrdqhlsm0si7c"; - libraryHaskellDepends = [ base ]; + version = "0.1.0.1"; + sha256 = "0pysvgg2p032j5a9qdysbndy0a0fzm41zgv070cwqk199w1lh3h7"; + libraryHaskellDepends = [ base bytestring ]; description = "An Options type representing options for postgres connections"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -183692,23 +184883,25 @@ self: { "postgresql-simple-opts" = callPackage ({ mkDerivation, base, bytestring, data-default, either , generic-deriving, hspec, optparse-applicative, optparse-generic - , postgresql-simple, split, uri-bytestring + , postgres-options, postgresql-simple, split, uri-bytestring }: mkDerivation { pname = "postgresql-simple-opts"; - version = "0.3.0.1"; - sha256 = "19jhrz2lghiycb81dzzz5g2kwzaahn27q7diw6nn9qmcpwgw3rly"; + version = "0.4.0.0"; + sha256 = "0zrmqd25xni2d51jna2a52l3bmdn6lpx9mbjzllnf6zn6ckw4ja8"; libraryHaskellDepends = [ base bytestring data-default either generic-deriving - optparse-applicative optparse-generic postgresql-simple split - uri-bytestring + optparse-applicative optparse-generic postgres-options + postgresql-simple split uri-bytestring ]; testHaskellDepends = [ base bytestring data-default hspec optparse-applicative - postgresql-simple + postgres-options postgresql-simple ]; description = "An optparse-applicative parser for postgresql-simple's connection options"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-simple-queue" = callPackage @@ -184019,8 +185212,8 @@ self: { pname = "postmaster"; version = "0.3.3"; sha256 = "05608xvaig1d67j3h8ykw7a11yr1mqkw98p0ii7gbp4mp3d9kncd"; - revision = "1"; - editedCabalFile = "00rp6mdds4kssvcyc9n6iz1asgkhv96050x50jwvg3wp3pp69fg2"; + revision = "2"; + editedCabalFile = "0jchzy502czxfm34v9b1jyfzzaiphvfqm5vdk9fz9d0vhqwr7jjg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186592,14 +187785,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "profunctors_5_4" = callPackage + "profunctors_5_5" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "5.4"; - sha256 = "1b5hidvd3rd8ilzr5ipzw0mg0a2x0ldrrcx6bacalafg7407bfhh"; + version = "5.5"; + sha256 = "0z7kf8hkfk5wfxw80zs9jsh22mk3mjzfvqbdkihrw1wiyw4xkjfl"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -188539,6 +189732,33 @@ self: { pname = "pure-zlib"; version = "0.6.4"; sha256 = "05rhvhvdn8ly5jldxg3q7ip6zflzqa1wyj8mlcl0scgsngn9lrzb"; + revision = "1"; + editedCabalFile = "0mskig3fppav6f6x34vl5fxsih2hndiqvbdxz24hmr1dzkpnfvq1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base base-compat bytestring bytestring-builder containers + fingertree + ]; + executableHaskellDepends = [ base base-compat bytestring ]; + testHaskellDepends = [ + base base-compat bytestring filepath HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base base-compat bytestring time ]; + description = "A Haskell-only implementation of zlib / DEFLATE"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "pure-zlib_0_6_6" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , bytestring-builder, containers, filepath, fingertree, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "pure-zlib"; + version = "0.6.6"; + sha256 = "1fby7dj8yp8yqycxzl1dr4s6i0isnx24zxbcan672wwrhdxh9s6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188553,6 +189773,7 @@ self: { benchmarkHaskellDepends = [ base base-compat bytestring time ]; description = "A Haskell-only implementation of zlib / DEFLATE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pureMD5" = callPackage @@ -192439,6 +193660,39 @@ self: { broken = true; }) {}; + "rattletrap_9_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, containers, filepath, http-client, http-client-tls + , HUnit, scientific, template-haskell, temporary, text + , transformers + }: + mkDerivation { + pname = "rattletrap"; + version = "9.0.2"; + sha256 = "14dnnaii24c9vh4jvdymnnhrhvgwzfr6al4qcm4bj9wk55jgj71r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls scientific template-haskell + text transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls scientific template-haskell + text transformers + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls HUnit scientific + template-haskell temporary text transformers + ]; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -193451,8 +194705,28 @@ self: { }: mkDerivation { pname = "reanimate-svg"; - version = "0.9.0.0"; - sha256 = "0x4d06vsxz3845w05d4qnfbmws2bc7vxpny8hiqbv1wwgjwig327"; + version = "0.9.0.1"; + sha256 = "0a4gp16zm1j6xi9algg4fkl53rxjzq38dvfjk0bzw6sm727rxvnf"; + libraryHaskellDepends = [ + attoparsec base bytestring containers JuicyPixels lens linear mtl + scientific text transformers vector xml + ]; + testHaskellDepends = [ + attoparsec base hspec linear scientific svg-tree + ]; + description = "SVG file loader and serializer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "reanimate-svg_0_9_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, hspec + , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text + , transformers, vector, xml + }: + mkDerivation { + pname = "reanimate-svg"; + version = "0.9.0.2"; + sha256 = "1nlxdyvy4fzr21qm428112w7af9ziajg9vqiv73q45ijgc6icgc9"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -193462,6 +194736,7 @@ self: { ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reason-export" = callPackage @@ -193854,8 +195129,8 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "2.0.4.0"; - sha256 = "1wcg8a3aql1jmnfl7q5gzjgxl4z6780zgp8w10v3g52ilcdq4myn"; + version = "2.1.0.2"; + sha256 = "0xfvvhdqnhialxf13xw894mpsf8xj8jig5zipqj1hh6galb0b164"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty @@ -194326,19 +195601,6 @@ self: { }) {}; "reflection" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "reflection"; - version = "2.1.4"; - sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj"; - revision = "1"; - editedCabalFile = "05ibi4ivvh87d96xl09yh0day08p5www5vp568mvn2dp37rxyngc"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Reifies arbitrary terms into types that can be reflected back into terms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "reflection_2_1_5" = callPackage ({ mkDerivation, base, hspec, hspec-discover, QuickCheck , template-haskell }: @@ -194351,7 +195613,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reifies arbitrary terms into types that can be reflected back into terms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflection-extras" = callPackage @@ -195032,6 +196293,8 @@ self: { pname = "regex-dfa"; version = "0.91"; sha256 = "1f846d86wg7yha29qinchpi3r5gv9795f384pqahbyc13wfky7dp"; + revision = "1"; + editedCabalFile = "089gzj8yih2f4ijyk9c49zyq6cws68z2rnklhiww9f3nb75lg6a9"; libraryHaskellDepends = [ base mtl parsec regex-base ]; description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; @@ -195154,6 +196417,8 @@ self: { pname = "regex-parsec"; version = "0.90"; sha256 = "0zf5cr10mxlxxd8fp4q4ix6ibxc5xx3ml3k043kx28f9vfdh2xnx"; + revision = "1"; + editedCabalFile = "19y0kgmqpcz4k0l3cfjbxirq844zqm71gaz7117pm399x8bz1df7"; libraryHaskellDepends = [ base parsec regex-base ]; description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; @@ -195371,6 +196636,8 @@ self: { pname = "regex-tre"; version = "0.91"; sha256 = "1b7x0y8q1fvipnzh06by48f8l9l5ypm6yblpl35fzf641z3m9b7j"; + revision = "1"; + editedCabalFile = "1xxxn1i6pgmba4p15hjw8achaiy4lfbib9gl0xz9z0jz9fmvfdab"; libraryHaskellDepends = [ base regex-base ]; librarySystemDepends = [ tre ]; description = "Replaces/Enhances Text.Regex"; @@ -196716,15 +197983,20 @@ self: { }) {}; "replace-megaparsec" = callPackage - ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: + ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec + , text + }: mkDerivation { pname = "replace-megaparsec"; - version = "1.0.1.0"; - sha256 = "18aipcrmic0xgfjg1cia6zs7m5a9xq7srm1r713qxri9pm5ynqd6"; + version = "1.1.1.0"; + sha256 = "1g8hwjiv7lrx1vvnylbzn4l7dxnn73blfhv2w9j1zz37f87jyr7m"; libraryHaskellDepends = [ base megaparsec ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + benchmarkHaskellDepends = [ + base bytestring criterion megaparsec text + ]; description = "Stream editing with parsers"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "replica" = callPackage @@ -198687,31 +199959,6 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.11.0"; - sha256 = "17p3zr1fncwqc1rz181mfbxi9dlyd2cd8xcxhnxm3fgnq6i9cj4l"; - libraryHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive process text time typed-process - unix unliftio unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive process QuickCheck text time - typed-process unix unliftio unliftio-core unordered-containers - vector - ]; - description = "A standard library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rio_0_1_12_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , process, QuickCheck, text, time, typed-process, unix, unliftio - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "rio"; version = "0.1.12.0"; sha256 = "0xzjkh6aavynpyskikhs8dmv0zhkiqiwz9zdn80zbd25b2182pif"; libraryHaskellDepends = [ @@ -198727,7 +199974,6 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rio-orphans" = callPackage @@ -199535,15 +200781,16 @@ self: { "ron" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , containers, criterion, deepseq, hashable, integer-gmp, mtl - , scientific, template-haskell, text, time, unordered-containers + , scientific, template-haskell, text, time, transformers + , unordered-containers }: mkDerivation { pname = "ron"; - version = "0.8"; - sha256 = "1j5agf0367ldn3jb1jwgi9x9r4sss4jb93j6sgw5w9yzgqj23i8w"; + version = "0.9"; + sha256 = "0brjqb6lrcs711g5aqw3d5nidikmvjyyps8hcifzwpjanq0l8cvg"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable - integer-gmp mtl scientific template-haskell text time + integer-gmp mtl scientific template-haskell text time transformers unordered-containers ]; benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ]; @@ -199557,8 +200804,8 @@ self: { }: mkDerivation { pname = "ron-rdt"; - version = "0.8"; - sha256 = "1k8xyxi5s3c1q45j51s7ssghqq5m5ka3hn29z4wb7inyzllz6ifx"; + version = "0.9.1"; + sha256 = "1kx858d3pyj2dlpznd9n0aw6yhkq4ac9789kkan9yi8mf0vdbn3i"; libraryHaskellDepends = [ base containers Diff hashable integer-gmp mtl ron text time transformers unordered-containers @@ -199574,8 +200821,8 @@ self: { }: mkDerivation { pname = "ron-schema"; - version = "0.8"; - sha256 = "1hqf9wpiwckaj25ljfyfl6dkp53jg31x3wyryc0vwfdy269v8lfb"; + version = "0.9.1"; + sha256 = "0pw398dq30bq554yfc9c6x43ng3bv5qx7mdw18ira92zlf5yh3qc"; libraryHaskellDepends = [ base bytestring containers hedn integer-gmp megaparsec mtl ron ron-rdt template-haskell text transformers @@ -199587,15 +200834,15 @@ self: { "ron-storage" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , integer-gmp, mtl, network-info, ron, ron-rdt, stm, text - , transformers + , tf-random, transformers }: mkDerivation { pname = "ron-storage"; - version = "0.9"; - sha256 = "0bvmy5mya2v64cj3sxvr0mlfp4zc0xy4q33qr6hk3r6k5jwdfqwx"; + version = "0.10.1"; + sha256 = "1wck9d188kinfzmz7ff8vw39ff5garfy6nw0cwkr4k3qdvcajj1r"; libraryHaskellDepends = [ base bytestring containers directory filepath integer-gmp mtl - network-info ron ron-rdt stm text transformers + network-info ron ron-rdt stm text tf-random transformers ]; description = "RON Storage"; license = stdenv.lib.licenses.bsd3; @@ -199874,16 +201121,17 @@ self: { "rounded" = callPackage ({ mkDerivation, base, ghc-prim, gmp, hgmp, long-double, mpfr - , reflection, singletons + , reflection }: mkDerivation { pname = "rounded"; - version = "0.1.0.1"; - sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls"; + version = "1.0"; + sha256 = "1vwy8sc457bxq3x8wzfsr5v01lp38ynwg8hp97likkckd13vkh7v"; libraryHaskellDepends = [ - base ghc-prim hgmp long-double reflection singletons + base ghc-prim hgmp long-double reflection ]; librarySystemDepends = [ gmp mpfr ]; + libraryPkgconfigDepends = [ mpfr ]; testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -201442,48 +202690,16 @@ self: { "salak" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, dlist, exceptions, filepath, hashable - , heaps, hspec, hspec-discover, megaparsec, menshen, mtl - , QuickCheck, random, scientific, text, time, unliftio-core - , unordered-containers + , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random + , scientific, text, time, unliftio-core, unordered-containers }: mkDerivation { pname = "salak"; - version = "0.3.5.1"; - sha256 = "0g41h9a89cp24cm99q1lgiyz794szf85hinybbjz75s33a3lykgv"; - libraryHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps megaparsec menshen mtl scientific text time - unliftio-core unordered-containers - ]; - testHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps hspec megaparsec menshen mtl QuickCheck - random scientific text time unliftio-core unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion data-default directory dlist - exceptions filepath hashable heaps megaparsec menshen mtl - scientific text time unliftio-core unordered-containers - ]; - description = "Configuration (re)Loader and Parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salak_0_3_5_2" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, dlist, exceptions, filepath, hashable - , heaps, hspec, hspec-discover, megaparsec, menshen, mtl - , QuickCheck, random, scientific, text, time, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "salak"; - version = "0.3.5.2"; - sha256 = "1zz1dy3350amn9mbkmpysk4ykz8x40bmhrbbkbswrqf5kaa2d7xn"; + version = "0.3.5.3"; + sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions - filepath hashable heaps megaparsec menshen mtl scientific text time + filepath hashable heaps megaparsec mtl scientific text time unliftio-core unordered-containers ]; testHaskellDepends = [ @@ -201496,7 +202712,6 @@ self: { ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salak-toml" = callPackage @@ -201505,8 +202720,8 @@ self: { }: mkDerivation { pname = "salak-toml"; - version = "0.3.5.1"; - sha256 = "1clgsr1aqz2zfnsazhql6m125161yxbfp6q0lc4dllbvdhjygmrf"; + version = "0.3.5.3"; + sha256 = "18spk2m75inddz9k0pwg58cr61rfbw1fnki56nnq7jng0wii376y"; libraryHaskellDepends = [ base salak text time tomland unordered-containers ]; @@ -201529,8 +202744,8 @@ self: { }: mkDerivation { pname = "salak-yaml"; - version = "0.3.5.1"; - sha256 = "1qzpbv2g7ds3dbcfi90ncjrk66vm1kxdkkdx1i49jq9g2xcai9n6"; + version = "0.3.5.3"; + sha256 = "07wcwld58bdr8n5fdfq98x6c1xdr8rrx919y4f9y7abdnc4aj000"; libraryHaskellDepends = [ base conduit libyaml salak text ]; testHaskellDepends = [ base conduit exceptions hspec libyaml mtl QuickCheck salak text @@ -202216,6 +203431,35 @@ self: { broken = true; }) {inherit (pkgs) z3;}; + "sbv_8_4" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, deepseq, directory, doctest, filepath, generic-deriving + , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, transformers, z3 + }: + mkDerivation { + pname = "sbv"; + version = "8.4"; + sha256 = "0fv1l99zw29vsfgzym0qvb8qcy1jb7gkd1yj48vy1w0ayg9w01i0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time transformers + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -202693,6 +203937,8 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schedyield" = callPackage @@ -203131,8 +204377,35 @@ self: { pname = "scotty"; version = "0.11.4"; sha256 = "13z0zmginaa1y5iywbbygvb9q3cmfgjkv6n2drs8gfbv3sirrf7i"; - revision = "1"; - editedCabalFile = "1kzp19ff7mh30y6mdqrxngyv7ph3rc95sahlnjzv9wj8j2fb66vn"; + revision = "2"; + editedCabalFile = "168wg4kbqfg907gwyyxj159rk3ayfjcmyfbfsf97lxqic72vcff9"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class exceptions fail http-types monad-control mtl + nats network regex-compat text transformers transformers-base + transformers-compat wai wai-extra warp + ]; + testHaskellDepends = [ + async base bytestring data-default-class directory hspec hspec-wai + http-types lifted-base network text wai + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "scotty_0_11_5" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, data-default-class, directory, exceptions, fail + , hspec, hspec-discover, hspec-wai, http-types, lifted-base + , monad-control, mtl, nats, network, regex-compat, text + , transformers, transformers-base, transformers-compat, wai + , wai-extra, warp + }: + mkDerivation { + pname = "scotty"; + version = "0.11.5"; + sha256 = "1pyj7j3zk80lv1c62ccna7nrsql5wf7pi5jscmypr2zd5xgfffvg"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -203146,6 +204419,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-binding-play" = callPackage @@ -204581,6 +205855,8 @@ self: { pname = "semialign"; version = "1"; sha256 = "004x0a80sqqdgvsyk4z0nasxpi6z3g1d8kgwj804bj9ka8dlc75m"; + revision = "1"; + editedCabalFile = "0qnqnyfng4kwy2h2anrcy5id2ijnawava3zcc5h5b8ri1y6ks6zi"; libraryHaskellDepends = [ base base-compat containers hashable semigroupoids tagged these transformers unordered-containers vector @@ -204597,11 +205873,13 @@ self: { pname = "semialign-indexed"; version = "1"; sha256 = "0m37c4bfvph7w241cgr2adp3x13ffgnw2l66wyn7y9rdvm2983k2"; + revision = "1"; + editedCabalFile = "1m08sj2xd97ix5bkm5hpyyb7inqfqic9m5dmy5jyg0ws41077frg"; libraryHaskellDepends = [ base containers hashable lens semialign these unordered-containers vector ]; - description = "SemialignWithIndex, i.e. izip and ialign"; + description = "SemialignWithIndex, i.e. izipWith and ialignWith"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -204638,29 +205916,6 @@ self: { }: mkDerivation { pname = "semigroupoids"; - version = "5.3.2"; - sha256 = "01cxdcflfzx674bhdclf6c7lwgjpbj5yqv8w1fi9dvipyhyj3a31"; - revision = "1"; - editedCabalFile = "1r88pi1bvc1w0nys810p3drra6na02zhbaf257dl4lyxl8iv5466"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad containers contravariant - distributive hashable tagged template-haskell transformers - transformers-compat unordered-containers - ]; - testHaskellDepends = [ base doctest ]; - description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semigroupoids_5_3_3" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, Cabal - , cabal-doctest, comonad, containers, contravariant, distributive - , doctest, hashable, tagged, template-haskell, transformers - , transformers-compat, unordered-containers - }: - mkDerivation { - pname = "semigroupoids"; version = "5.3.3"; sha256 = "016hc4imr9l4szs3p7f1aahvxr5wv4clvr3qzrm3nibssg5vrs61"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -204672,7 +205927,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoids-syntax" = callPackage @@ -204827,6 +206081,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semirings_0_5" = callPackage + ({ mkDerivation, base, containers, hashable, integer-gmp + , unordered-containers + }: + mkDerivation { + pname = "semirings"; + version = "0.5"; + sha256 = "1xfmb017jjlas0lq4969d1dw7wifsym8m2qnadz7bywhjl96kzxh"; + libraryHaskellDepends = [ + base containers hashable integer-gmp unordered-containers + ]; + description = "two monoids as one, in holy haskimony"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semver" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable , tasty, tasty-hunit, text @@ -205222,22 +206492,22 @@ self: { "sequence-formats" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors - , exceptions, foldl, lens-family, pipes, pipes-attoparsec + , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers , vector }: mkDerivation { pname = "sequence-formats"; - version = "1.3.2.1"; - sha256 = "0fl3sg4znmnil08vbjf50xcbs5blh9pvg1jakbhikj1aab68vpp5"; + version = "1.4.0.1"; + sha256 = "1inw4agbm722zjbxi1ys73pssx76k8pg1s3cyxl5v1czqlyjxppy"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe transformers vector ]; testHaskellDepends = [ - base bytestring containers foldl pipes pipes-safe tasty tasty-hunit - transformers vector + base bytestring containers foldl hspec pipes pipes-safe tasty + tasty-hunit transformers vector ]; description = "A package with basic parsing utilities for several Bioinformatic data formats"; license = stdenv.lib.licenses.gpl3; @@ -205982,8 +207252,6 @@ self: { ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-checked-exceptions-core" = callPackage @@ -206701,6 +207969,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-kotlin_0_1_1_9" = callPackage + ({ mkDerivation, aeson, base, containers, directory, formatting + , hspec, http-api-data, lens, servant, servant-foreign, shelly + , text, time, wl-pprint-text + }: + mkDerivation { + pname = "servant-kotlin"; + version = "0.1.1.9"; + sha256 = "1wywp494wbhs32szyni294k5qf8fjbznydwss7lwxprnli1hh1qm"; + libraryHaskellDepends = [ + base containers directory formatting lens servant servant-foreign + text time wl-pprint-text + ]; + testHaskellDepends = [ + aeson base containers directory formatting hspec http-api-data lens + servant servant-foreign text time wl-pprint-text + ]; + benchmarkHaskellDepends = [ + aeson base containers directory formatting http-api-data lens + servant servant-foreign shelly text time wl-pprint-text + ]; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp @@ -207142,8 +208436,35 @@ self: { ]; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-rawm_0_3_2_0" = callPackage + ({ mkDerivation, base, bytestring, doctest, filepath, Glob + , hspec-wai, http-client, http-media, http-types, lens, resourcet + , servant, servant-client, servant-client-core, servant-docs + , servant-server, tasty, tasty-hspec, tasty-hunit, text + , transformers, wai, wai-app-static, warp + }: + mkDerivation { + pname = "servant-rawm"; + version = "0.3.2.0"; + sha256 = "013d89zmlmwwwhgyc57xbzsd4phz347if5y6iz93wrw4lbvc341d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring filepath http-client http-media http-types lens + resourcet servant-client servant-client-core servant-docs + servant-server wai wai-app-static + ]; + testHaskellDepends = [ + base bytestring doctest Glob hspec-wai http-client http-media + http-types servant servant-client servant-client-core + servant-server tasty tasty-hspec tasty-hunit text transformers wai + warp + ]; + description = "Embed a raw 'Application' in a Servant API"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-reason" = callPackage @@ -207696,8 +209017,8 @@ self: { }: mkDerivation { pname = "servant-waargonaut"; - version = "0.6.0.0"; - sha256 = "17igh9s4bmzsx10qscrqpqd8djkmr2krfc660nhdsi7cx5hmlwl3"; + version = "0.7.0.0"; + sha256 = "0fn7ph0805n297nzi3ig9wfx27kz6bmn4r914ibx44927xifms59"; libraryHaskellDepends = [ base bytestring http-media lens servant text waargonaut wl-pprint-annotated @@ -208224,6 +209545,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "set-cover_0_1" = callPackage + ({ mkDerivation, array, base, containers, enummapset, non-empty + , prelude-compat, psqueues, QuickCheck, random, semigroups, timeit + , transformers, utility-ht + }: + mkDerivation { + pname = "set-cover"; + version = "0.1"; + sha256 = "1yidgc1nbhbkxpchd96vzfgkk95hdwgpvd9ys2b4xw2m1zyzi1kb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers enummapset non-empty prelude-compat psqueues + semigroups transformers utility-ht + ]; + testHaskellDepends = [ + array base containers enummapset QuickCheck transformers utility-ht + ]; + benchmarkHaskellDepends = [ + array base containers enummapset QuickCheck random timeit + transformers utility-ht + ]; + description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "set-extra" = callPackage ({ mkDerivation, base, containers, mtl, syb }: mkDerivation { @@ -209200,6 +210548,32 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_21" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.21"; + sha256 = "1assgcinf9i9rm7mphqfymzvn7z1m2jjkm98z7l2pb76z53mcvgh"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -209755,6 +211129,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shelly_1_9_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , text, time, transformers, transformers-base, unix, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.9.0"; + sha256 = "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday"; + revision = "1"; + editedCabalFile = "0827p6wq8j92svrvmx02gdk961xx42g1ng4j6g7nflrfks9hw0zf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath lifted-async lifted-base monad-control mtl + process text time transformers transformers-base unix unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process text time transformers + transformers-base unix unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -209797,8 +211201,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.7.0.4"; - sha256 = "10gnkk0645aznkry063kl5m68n7ip88m8cf97lwffj1y86iazk5b"; + version = "0.7.0.5"; + sha256 = "119b9rvvdsw1al0i4lqa25z7ykwwqi46xz22az1b8fi3xiijprs3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211642,6 +213046,8 @@ self: { pname = "singleton-bool"; version = "0.1.5"; sha256 = "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0"; + revision = "1"; + editedCabalFile = "1g2dchvp5clg3hfdrp7hf5pbl9kcyhqhnqxqxd7n861nfd661wqd"; libraryHaskellDepends = [ base dec ]; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; @@ -211664,23 +213070,11 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.2"; - sha256 = "1wcwks2acnql5ihkjn2543hgdnlw049z8av8x5dp5r552fq6k0cg"; - libraryHaskellDepends = [ base singletons ]; - description = "Unary natural numbers relying on the singletons infrastructure"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singleton-nats_0_4_3" = callPackage - ({ mkDerivation, base, singletons }: - mkDerivation { - pname = "singleton-nats"; version = "0.4.3"; sha256 = "0xj5w6dszm832y90qxmwqnyiwpav30q199cjcdbdxr7q1d4klszi"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-typelits" = callPackage @@ -212761,22 +214155,26 @@ self: { }) {}; "small-bytearray-builder" = callPackage - ({ mkDerivation, base, byteslice, bytestring, gauge, primitive - , primitive-offset, QuickCheck, run-st, tasty, tasty-quickcheck + ({ mkDerivation, base, byteslice, bytestring, gauge + , natural-arithmetic, primitive, primitive-offset, QuickCheck + , run-st, tasty, tasty-hunit, tasty-quickcheck, text, text-short , vector }: mkDerivation { pname = "small-bytearray-builder"; - version = "0.1.1.0"; - sha256 = "1i3b77mczfy9f0gp5ckqln1vdhnqflz8lajfiygx5spxf9kraf9d"; + version = "0.2.1.0"; + sha256 = "11r0nz8z16h75867xq4c62s69ic7vhwfwhl2c11441mkhbrk2nbw"; libraryHaskellDepends = [ - base byteslice primitive primitive-offset run-st vector + base byteslice bytestring natural-arithmetic primitive + primitive-offset run-st text-short vector ]; testHaskellDepends = [ - base byteslice bytestring primitive QuickCheck tasty - tasty-quickcheck vector + base byteslice bytestring natural-arithmetic primitive QuickCheck + tasty tasty-hunit tasty-quickcheck text vector + ]; + benchmarkHaskellDepends = [ + base gauge natural-arithmetic primitive ]; - benchmarkHaskellDepends = [ base gauge primitive ]; description = "Serialize to a small byte arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -215334,6 +216732,8 @@ self: { pname = "socks"; version = "0.6.0"; sha256 = "10bkf2gw5l48j6g1i2slndcg4nzdqj8syrnbj21gjz6sms3zlqlp"; + revision = "1"; + editedCabalFile = "0a7p6gfcmxgrs3rx62qm7fi5hvn90r64px7wbqva4h6scrmywn50"; libraryHaskellDepends = [ base basement bytestring cereal network ]; @@ -216099,30 +217499,6 @@ self: { }: mkDerivation { pname = "sparse-tensor"; - version = "0.2.1"; - sha256 = "10950cp07m1p011n3a14bka2rpfrmn20k0kjb1cvca7dnxn2iv2f"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - ad base bytestring cereal containers deepseq ghc-typelits-knownnat - ghc-typelits-natnormalise hmatrix parallel tf-random zlib - ]; - testHaskellDepends = [ - base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "typesafe tensor algebra library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "sparse-tensor_0_2_1_1" = callPackage - ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers - , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise - , hmatrix, parallel, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tf-random, zlib - }: - mkDerivation { - pname = "sparse-tensor"; version = "0.2.1.1"; sha256 = "1bjia89as14i2cif9nf7rsifazg305l7cl040gb7xbi3szlc621y"; setupHaskellDepends = [ base Cabal ]; @@ -217111,8 +218487,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.97.0"; - sha256 = "1in8sb41bl46xwk49904xkm3k5s59xikvmyyani1p60l0zfrb2jk"; + version = "1.97.1"; + sha256 = "1rbklqbmp0j9wy60j03bccbc0czd4s4ki8bl3l93p8mvkv55hcx4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -219751,6 +221127,8 @@ self: { pname = "stm"; version = "2.5.0.0"; sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr"; + revision = "1"; + editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = stdenv.lib.licenses.bsd3; @@ -220448,15 +221826,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_41_0" = callPackage + "stratosphere_0_42_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.41.0"; - sha256 = "1prwkvlc9qglc0465gibv26h1nd06bdiayp22i91dw3ws3mbhzs5"; + version = "0.42.0"; + sha256 = "1520dhfad9j1aa9sjxq56v6hivbfnm2vi19hjn7y0m6a80q2wawp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220676,8 +222054,8 @@ self: { pname = "streaming"; version = "0.2.2.0"; sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss"; - revision = "1"; - editedCabalFile = "1sq8blxh4s1lsvxkc64x7drxwn75kszxicjhvw4cg505fp9bfc7y"; + revision = "2"; + editedCabalFile = "0cfxibcf0lkzbbyxl96dpnmacxv39ljwrlr3935bxykihr83j9xf"; libraryHaskellDepends = [ base containers ghc-prim mmorph mtl semigroups transformers transformers-base @@ -223829,16 +225207,17 @@ self: { }) {}; "syb-with-class" = callPackage - ({ mkDerivation, array, base, bytestring, containers + ({ mkDerivation, array, base, bytestring, containers, HUnit , template-haskell }: mkDerivation { pname = "syb-with-class"; - version = "0.6.1.10"; - sha256 = "0fhkxzcvalaqv554cmjmc56b3h7vxai3k2dd1fsp7ca124ikyzm7"; + version = "0.6.1.11"; + sha256 = "0fgmcxhrhcjcv5nmb5irp6mqcwknpk15azzd0qhajwx8mqpw6b8l"; libraryHaskellDepends = [ array base bytestring containers template-haskell ]; + testHaskellDepends = [ base HUnit ]; description = "Scrap Your Boilerplate With Class"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -226258,32 +227637,6 @@ self: { }: mkDerivation { pname = "tar"; - version = "0.5.1.0"; - sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8"; - revision = "1"; - editedCabalFile = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x"; - libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath time - ]; - testHaskellDepends = [ - array base bytestring bytestring-handle containers deepseq - directory filepath QuickCheck tasty tasty-quickcheck time - ]; - benchmarkHaskellDepends = [ - array base bytestring containers criterion deepseq directory - filepath time - ]; - description = "Reading, writing and manipulating \".tar\" archive files."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tar_0_5_1_1" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-handle - , containers, criterion, deepseq, directory, filepath, QuickCheck - , tasty, tasty-quickcheck, time - }: - mkDerivation { - pname = "tar"; version = "0.5.1.1"; sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; libraryHaskellDepends = [ @@ -226299,7 +227652,6 @@ self: { ]; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tar-conduit" = callPackage @@ -226611,10 +227963,8 @@ self: { ({ mkDerivation, base, tagged, tasty }: mkDerivation { pname = "tasty-expected-failure"; - version = "0.11.1.1"; - sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji"; - revision = "1"; - editedCabalFile = "1b3fn7d3zwhhwm3gp8cmmsdcrvn9dhshd665xrx1mk6cmy4m8k16"; + version = "0.11.1.2"; + sha256 = "175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n"; libraryHaskellDepends = [ base tagged tasty ]; description = "Mark tasty tests as failure expected"; license = stdenv.lib.licenses.mit; @@ -227353,8 +228703,8 @@ self: { pname = "tdigest"; version = "0.2.1"; sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl"; - revision = "2"; - editedCabalFile = "1q517siz4l55l7ssrbc3rm0szf41k7wy4p26lch03i57lzldf2hf"; + revision = "3"; + editedCabalFile = "1gdmfh1xhwg18lq9awpmcn2zzirxspi31fa7y3nzh6mkzyz5dz5r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers @@ -227687,12 +229037,12 @@ self: { broken = true; }) {}; - "template-haskell_2_14_0_0" = callPackage + "template-haskell_2_15_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.14.0.0"; - sha256 = "1y8l2g95mhd2j09bq05q2rj6rn2ni86yhf4kgha3y5qig7j8lyy9"; + version = "2.15.0.0"; + sha256 = "16p8szb5by7gyk5r5cnrdp3b613vp5wasqj8dz63my17l2lsp2wl"; libraryHaskellDepends = [ base ghc-boot-th pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -228315,8 +229665,8 @@ self: { }: mkDerivation { pname = "term-rewriting"; - version = "0.4.0.1"; - sha256 = "14mgpwhpfa0w5xgwsqa5nklagw6scs51cjwin7d34gx8bkvw9m13"; + version = "0.4.0.2"; + sha256 = "0k0aylm6vzcqghp5zw461p68zgzjzr6k4ki7d00zl471lmbdbs8n"; libraryHaskellDepends = [ ansi-wl-pprint array base containers mtl multiset parsec union-find-array @@ -229945,6 +231295,8 @@ self: { pname = "text-short"; version = "0.1.3"; sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; + revision = "1"; + editedCabalFile = "0lb4papn54fbgjdqj4ladaf5q12dhlwkg5z2vc5qxlh35x82sw4a"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -229969,6 +231321,8 @@ self: { pname = "text-show"; version = "3.8.2"; sha256 = "0n46q5gjlxz3g4flj5mn8s78dpdfd65fjl7b5174pykanwqsqqwz"; + revision = "1"; + editedCabalFile = "0fdlba9rmjk7irf376rglyyi9rbz49mhm5zyx112ah8nqgh50myi"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -230001,6 +231355,41 @@ self: { pname = "text-show-instances"; version = "3.8.1"; sha256 = "1z54vgw1rsck3lr6jnl5vdd0aq1hni1wy0fag985d6b73qmxlm1l"; + revision = "1"; + editedCabalFile = "1yprndi65gspjp8srqciwjx81wbh2yyyrsj0905zqd9g150sj121"; + libraryHaskellDepends = [ + base base-compat-batteries bifunctors binary containers directory + ghc-boot-th haskeline hpc old-locale old-time pretty random + semigroups tagged template-haskell terminfo text text-short + text-show time transformers transformers-compat unix + unordered-containers vector xhtml + ]; + testHaskellDepends = [ + base base-compat-batteries bifunctors binary containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec + old-locale old-time pretty QuickCheck quickcheck-instances random + tagged template-haskell terminfo text-short text-show th-orphans + time transformers transformers-compat unix unordered-containers + vector xhtml + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional instances for text-show"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "text-show-instances_3_8_2" = callPackage + ({ mkDerivation, base, base-compat-batteries, bifunctors, binary + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hpc, hspec, hspec-discover, old-locale, old-time + , pretty, QuickCheck, quickcheck-instances, random, semigroups + , tagged, template-haskell, terminfo, text, text-short, text-show + , th-orphans, time, transformers, transformers-compat, unix + , unordered-containers, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.8.2"; + sha256 = "075a2dzbdkh13q9a1w4v0dm40rqrv1wq8nsqh4g4872h29df5mka"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -230019,6 +231408,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -230569,10 +231959,8 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.4.4.0"; - sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc"; - revision = "1"; - editedCabalFile = "1zbdg3hrqv7rzlsrw4a2vjr3g4nzny32wvjcpxamlvx77b1jvsw9"; + version = "0.4.5.0"; + sha256 = "1p4wfyycan8zsp9wi7npx36qwbfsbcgdyxi3ii51scf69dkrx42y"; libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; @@ -230779,6 +232167,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_8" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.8"; + sha256 = "0f5rf8jr9g5pgnqv7i60ygmnycjq1qbfvccjpagc1xy4gbgjng41"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -231130,6 +232538,8 @@ self: { pname = "these"; version = "1.0.1"; sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r"; + revision = "1"; + editedCabalFile = "0923r86fnmgpx0msm68aszirh2n19nn5bccgjxfh2146jw4z7w3z"; libraryHaskellDepends = [ aeson assoc base base-compat binary deepseq hashable QuickCheck semigroupoids unordered-containers @@ -231144,11 +232554,26 @@ self: { pname = "these-lens"; version = "1"; sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y"; + revision = "1"; + editedCabalFile = "1lrpq5a8ldddmsi7ckaqinamn2f7kkijq5jq05yzdx818b2563wn"; libraryHaskellDepends = [ base base-compat lens these ]; description = "Lenses for These"; license = stdenv.lib.licenses.bsd3; }) {}; + "these-optics" = callPackage + ({ mkDerivation, base, optics-core, these }: + mkDerivation { + pname = "these-optics"; + version = "1"; + sha256 = "0gmsykzcjx5h6dbfny4dw3jrm33ykcw6rpngf5awwdpg3a4cfgi7"; + revision = "1"; + editedCabalFile = "1fvi4m04xy3mj22ajgi95bsbr7jhm5f8dnan6hihkplqbjgrjma3"; + libraryHaskellDepends = [ base optics-core these ]; + description = "Optics for These"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "these-skinny" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -231842,8 +233267,8 @@ self: { }: mkDerivation { pname = "tidal-vis"; - version = "1.0.14"; - sha256 = "1l924nqv8ljd9ljpy05r18j0rc5if3k5lvpifv2g8fn967gi0nfs"; + version = "1.0.15"; + sha256 = "0h198v3p1z8bmn993w54a7pm4s445lvf7683h23wydpnfckxv06h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233356,6 +234781,30 @@ self: { broken = true; }) {}; + "tmp-postgres_0_3_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, directory, hspec + , hspec-discover, mtl, network, port-utils, postgres-options + , postgresql-libpq, postgresql-simple, process, temporary, unix + }: + mkDerivation { + pname = "tmp-postgres"; + version = "0.3.0.1"; + sha256 = "1h0n3kd5wz4lhg2m4zkyd0vhynrpdvvwlrngyj62d27i1qk2livy"; + libraryHaskellDepends = [ + async base bytestring directory network port-utils postgres-options + postgresql-simple process temporary unix + ]; + testHaskellDepends = [ + base bytestring directory hspec hspec-discover mtl postgresql-libpq + postgresql-simple process temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Start and stop a temporary postgres for testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tmpl" = callPackage ({ mkDerivation, base, bytestring, directory, template, text }: mkDerivation { @@ -234103,6 +235552,8 @@ self: { pname = "topograph"; version = "1"; sha256 = "0vm7ja5f677lpphfmggx68h144k0fzj0n6r6ypf5474da405xad7"; + revision = "1"; + editedCabalFile = "0pgvjjzmlc947xb1jx1l3bjxz6p9ldm3zlqlm7wf0bcfrznfxgqc"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -235439,6 +236890,8 @@ self: { pname = "tree-diff"; version = "0.1"; sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3"; + revision = "1"; + editedCabalFile = "1nxwbn3z4a2102r45yhk0i6vb8fyc5mb894daai7l3l16rjzkp5a"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers hashable parsec parsers pretty @@ -235476,17 +236929,17 @@ self: { }) {}; "tree-sitter" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , fused-effects, hedgehog, hspec, split, template-haskell, text - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, fused-effects, hedgehog, hspec, split, template-haskell + , text, unordered-containers }: mkDerivation { pname = "tree-sitter"; - version = "0.1.0.0"; - sha256 = "16yanr4k3zc55xgm5yajka7wgy475x2aq9lfv4j5lmxk0z7m9n9m"; + version = "0.2.0.0"; + sha256 = "03xdyvmnpjswh0rkn718n1w8kqvly86s6k3cwqgb6r1ygd6kqmim"; libraryHaskellDepends = [ - aeson base bytestring directory filepath fused-effects hedgehog - split template-haskell text unordered-containers + aeson base bytestring containers directory filepath fused-effects + hedgehog split template-haskell text unordered-containers ]; testHaskellDepends = [ base hedgehog hspec ]; description = "Unstable bindings for the tree-sitter parsing library"; @@ -235568,17 +237021,18 @@ self: { }) {}; "tree-sitter-python" = callPackage - ({ mkDerivation, aeson, base, directory, filepath, template-haskell - , tree-sitter + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , hedgehog, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-python"; - version = "0.1.0.1"; - sha256 = "0pq4cl4fb14x9dfnc83glpvzq65li4bvl0jidbsji34v9hzkr2x1"; + version = "0.2.0.0"; + sha256 = "1grkz8i3d37cci1w4i1lvdr2bjp7ddhq1fbyf240132rbhx67pg8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base directory filepath template-haskell tree-sitter ]; + testHaskellDepends = [ base bytestring hedgehog tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Python"; license = stdenv.lib.licenses.bsd3; @@ -235872,8 +237326,8 @@ self: { pname = "trifecta"; version = "2"; sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk"; - revision = "2"; - editedCabalFile = "1ihw0dm0sjn7cql6rb3y0gb5kxy1ca3ggflm4lxlmhm3gfrj2sxc"; + revision = "3"; + editedCabalFile = "11c4y7qx3389ghcjnsl1xm7dz6bhndx27xs36ply2rvx4aly976c"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -235886,6 +237340,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "trifecta_2_1" = callPackage + ({ mkDerivation, ansi-terminal, array, base, blaze-builder + , blaze-html, blaze-markup, bytestring, Cabal, cabal-doctest + , charset, comonad, containers, deepseq, doctest, fingertree + , ghc-prim, hashable, lens, mtl, parsers, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck, reducers + , semigroups, transformers, unordered-containers, utf8-string + }: + mkDerivation { + pname = "trifecta"; + version = "2.1"; + sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal array base blaze-builder blaze-html blaze-markup + bytestring charset comonad containers deepseq fingertree ghc-prim + hashable lens mtl parsers prettyprinter prettyprinter-ansi-terminal + profunctors reducers semigroups transformers unordered-containers + utf8-string + ]; + testHaskellDepends = [ base doctest parsers QuickCheck ]; + description = "A modern parser combinator library with convenient diagnostics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "trigger" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, clock, directory , exceptions, filepath, formatting, fsnotify, Glob, hspec, process @@ -236350,8 +237830,8 @@ self: { }: mkDerivation { pname = "ttl-hashtables"; - version = "1.3.1.0"; - sha256 = "0ny9iynlhpaqvqip7i9n5as21mk0kzm6akbcy7xgkams8dv76k5h"; + version = "1.3.1.1"; + sha256 = "14ammgggkfmc4divr1zykjadad5fzgspjnzpjfdzj3vwm1rf5gwv"; libraryHaskellDepends = [ base clock containers data-default failable hashable hashtables mtl transformers @@ -236643,6 +238123,22 @@ self: { broken = true; }) {}; + "tuples" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "tuples"; + version = "0.1.0.0"; + sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck + ]; + description = "Small monomorphic tuples"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tuples-homogenous-h98" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -236854,28 +238350,27 @@ self: { }) {}; "tweet-hs" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base - , bytestring, composition-prelude, containers, criterion - , data-default, directory, extra, hspec, htoml-megaparsec - , http-client, http-client-tls, http-types, megaparsec, microlens - , optparse-applicative, split, text, unordered-containers + ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base + , bytestring, composition-prelude, containers, criterion, directory + , extra, htoml-megaparsec, http-client, http-client-tls, http-types + , megaparsec, microlens, optparse-applicative, split, text + , unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.43"; - sha256 = "10bxkllxiwm1xbvpz4wh1gd24qkz8y0b7z4ciwqk13jz5ha966x0"; + version = "1.0.2.1"; + sha256 = "0b277whd3jywb6w0gkaijmzadpwabmyxvxyg6fmsysq1kp3isrnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default extra htoml-megaparsec - http-client http-client-tls http-types megaparsec microlens split - text unordered-containers + ansi-wl-pprint authenticate-oauth base bytestring + composition-prelude containers extra htoml-megaparsec http-client + http-client-tls http-types megaparsec microlens split text + unordered-containers ]; executableHaskellDepends = [ base bytestring directory optparse-applicative ]; - testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; @@ -237650,10 +239145,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "type-equality"; - version = "0.1.2"; - sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr"; + version = "1"; + sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; libraryHaskellDepends = [ base ]; - description = "Type equality, coercion/cast and other operations"; + description = "Data.Type.Equality compat package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -239206,6 +240701,8 @@ self: { pname = "unagi-chan"; version = "0.4.1.2"; sha256 = "1lnl5n4jnjmm4chp461glcwkrrw63rjz3fvprwxcy3lkpbkrqvgn"; + revision = "1"; + editedCabalFile = "09pqi867wskwgc5lpn197f895mbn1174ydgllvcppcsmrz2b6yr6"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -239321,6 +240818,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unbound-kind-generics" = callPackage + ({ mkDerivation, base, kind-generics, kind-generics-th + , unbound-generics + }: + mkDerivation { + pname = "unbound-kind-generics"; + version = "0.2.0.0"; + sha256 = "1hn78dixgd1p0pabh7pg0c7q607irs68vs3ggay8i1s72nc9lvj8"; + libraryHaskellDepends = [ + base kind-generics kind-generics-th unbound-generics + ]; + description = "Support for programming with names and binders using kind-generics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "unbounded-delays" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -240402,6 +241916,34 @@ self: { broken = true; }) {}; + "universum_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog + , text, transformers, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "universum"; + version = "1.6.0"; + sha256 = "12gz4hpwmykb73dplbd8j628f54ipk0pygrswy0k1k7j68awnjl6"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable microlens + microlens-mtl mtl safe-exceptions stm text transformers + unordered-containers utf8-string vector + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge text unordered-containers + ]; + description = "Custom prelude used in Serokell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "unix_2_7_2_2" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { @@ -241224,6 +242766,22 @@ self: { broken = true; }) {}; + "urbit-hob" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, murmur3 + , text + }: + mkDerivation { + pname = "urbit-hob"; + version = "0.1.0"; + sha256 = "01mrj3irlsqfxvswm00k893n6wybc6wxcqddd645wb9q5mpzdsqi"; + libraryHaskellDepends = [ + base bytestring cereal containers murmur3 text + ]; + testHaskellDepends = [ base ]; + description = "Hoon-style atom manipulation and printing functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "ureader" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring , containers, curl, data-default, deepseq, directory, download-curl @@ -243340,6 +244898,8 @@ self: { pname = "vec"; version = "0.1.1.1"; sha256 = "0gzypyi4vv5ajysbmnpicm8r2qh95nmmrj9l6hp30b95i36cb5as"; + revision = "1"; + editedCabalFile = "137f3zjj0fwn3dmynvjg7k4v7k9h24a1gzqfma36hd2svksg8c3d"; libraryHaskellDepends = [ adjunctions base base-compat deepseq distributive fin hashable lens semigroupoids transformers @@ -243473,6 +245033,8 @@ self: { pname = "vector-binary-instances"; version = "0.2.5.1"; sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r"; + revision = "1"; + editedCabalFile = "1p7cbxdpix0rakvggnnb06kcrb787fyyqlzric6i4s3rn34547q8"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -243877,6 +245439,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.6"; sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy"; + revision = "1"; + editedCabalFile = "1bpxdliw7jmks1rkmb8hbr7hng3niz1pfc6n3s8ndj1acrksmfmv"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -244094,6 +245658,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_5_1_1" = callPackage + ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable + , megaparsec, microlens, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.5.1.1"; + sha256 = "1cs004ixw6rp2zg9hyw4yf0n15rq3s1ns9yy18rr8sxmcsw6jb9g"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base base-prelude checkers megaparsec microlens QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -244245,6 +245828,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_29" = callPackage + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.29"; + sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty + ]; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -245082,33 +246684,35 @@ self: { ({ mkDerivation, attoparsec, base, bifunctors, bytestring, Cabal , cabal-doctest, containers, contravariant, digit, directory , distributive, doctest, errors, filepath, generics-sop, hedgehog - , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json - , hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers - , scientific, semigroupoids, semigroups, tagged, tasty - , tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit - , template-haskell, text, transformers, unordered-containers - , vector, witherable, wl-pprint-annotated, zippers + , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits + , hw-json-standard-cursor, hw-prim, hw-rankselect, lens, mmorph + , mtl, nats, natural, parsers, records-sop, scientific + , semigroupoids, semigroups, tagged, tasty, tasty-expected-failure + , tasty-golden, tasty-hedgehog, tasty-hunit, template-haskell, text + , transformers, unordered-containers, vector, witherable + , wl-pprint-annotated, zippers }: mkDerivation { pname = "waargonaut"; - version = "0.6.2.0"; - sha256 = "1s9il54r5hqp4fbxn5012f7l6ir6fy2v6xv5xf57zh1sz0ifxj2f"; + version = "0.8.0.0"; + sha256 = "1pvs379s1w5nzr5hb1c5fbbbjgvsnvggj3l1l5j6klm0zf1y7x4h"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant digit distributive errors generics-sop hoist-error - hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph - mtl nats natural parsers scientific semigroupoids semigroups tagged - text transformers unordered-containers vector witherable - wl-pprint-annotated zippers + hw-balancedparens hw-bits hw-json-standard-cursor hw-prim + hw-rankselect lens mmorph mtl nats natural parsers records-sop + scientific semigroupoids semigroups tagged text transformers + unordered-containers vector witherable wl-pprint-annotated zippers ]; testHaskellDepends = [ attoparsec base bytestring containers contravariant digit directory distributive doctest filepath generics-sop hedgehog hedgehog-fn - hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mtl - natural scientific semigroupoids semigroups tagged tasty - tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit - template-haskell text unordered-containers vector zippers + hw-balancedparens hw-bits hw-json-standard-cursor hw-prim + hw-rankselect lens mtl natural scientific semigroupoids semigroups + tagged tasty tasty-expected-failure tasty-golden tasty-hedgehog + tasty-hunit template-haskell text unordered-containers vector + zippers ]; description = "JSON wrangling"; license = stdenv.lib.licenses.bsd3; @@ -249338,6 +250942,8 @@ self: { pname = "witherable"; version = "0.3.2"; sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi"; + revision = "1"; + editedCabalFile = "01mprffm41km3pm5nlpsp2ig2izgl6ll9ylrym3dg01f9609aa0z"; libraryHaskellDepends = [ base base-orphans containers hashable monoidal-containers transformers transformers-compat unordered-containers vector @@ -249346,6 +250952,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_3_3" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable, lens + , monoidal-containers, transformers, transformers-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.3.3"; + sha256 = "0pp2p2zhdjv3kq8dywcj9hcdaf0i37vihaxcxbs889iiw2cgy9hj"; + revision = "1"; + editedCabalFile = "1v10h2biv5k9amahw77755k60wgqp0d36d1rb2vy8qjh07gnnanr"; + libraryHaskellDepends = [ + base base-orphans containers hashable lens monoidal-containers + transformers transformers-compat unordered-containers vector + ]; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -251767,8 +253393,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xlsx-tabular" = callPackage @@ -252057,6 +253681,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-hamlet_0_5_0_1" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, parsec + , shakespeare, template-haskell, text, xml-conduit + }: + mkDerivation { + pname = "xml-hamlet"; + version = "0.5.0.1"; + sha256 = "0jrhcjy7ww59dafg857f2g2df1fw2jmbwcs1q379ph0pc5rxj3lj"; + libraryHaskellDepends = [ + base containers parsec shakespeare template-haskell text + xml-conduit + ]; + testHaskellDepends = [ + base containers hspec HUnit parsec shakespeare template-haskell + text xml-conduit + ]; + description = "Hamlet-style quasiquoter for XML content"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-helpers" = callPackage ({ mkDerivation, base, xml }: mkDerivation { @@ -252848,8 +254493,8 @@ self: { ({ mkDerivation, base, containers, dbus, X11 }: mkDerivation { pname = "xmonad-spotify"; - version = "0.1.1.0"; - sha256 = "1pihi0959wys3sd4r8r1rmh5vx84174wmjpanbyihzjhykvf7n2j"; + version = "0.1.2.2"; + sha256 = "0hps37yqn3grgg65wm3j41dh40fqi64ni12mgk0lfigw2fghfnvj"; libraryHaskellDepends = [ base containers dbus X11 ]; description = "Bind media keys to work with Spotify"; license = stdenv.lib.licenses.bsd3; @@ -252901,6 +254546,8 @@ self: { pname = "xmonad-volume"; version = "0.1.1.0"; sha256 = "0bc52vy142hn75k52zz8afjfxwv86p73kmqmi48rqiws10kpnclw"; + revision = "2"; + editedCabalFile = "1m1kcsvz3h8qfdbsr7xjibay9377jqq6pj5mgq08s0kmgqi4h0wn"; libraryHaskellDepends = [ alsa-mixer base composition-prelude containers X11 ]; @@ -253497,6 +255144,8 @@ self: { ]; description = "A wrapper of servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-app" = callPackage @@ -253553,6 +255202,8 @@ self: { ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-job" = callPackage @@ -253596,6 +255247,8 @@ self: { ]; description = "Yam Redis Middleware"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-servant" = callPackage @@ -253716,35 +255369,6 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.1.1"; - sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath libyaml mtl resourcet scientific template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq - resourcet scientific template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_1_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; version = "0.11.1.2"; sha256 = "028pz77n92l6kjgjv263h4b6yhw1iibdbf3a3dkn5qnz537xpzhc"; configureFlags = [ "-fsystem-libyaml" ]; @@ -253763,7 +255387,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -254618,8 +256241,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.7"; - sha256 = "0p9c26ic45bmsjvfb7kam87ja2vbd4m7qm27znvfrn9wvijhjzp9"; + version = "1.6.8"; + sha256 = "0d2nrzrqymbbp5hfwp7c6k6gr0vn6ladq0dl7wgwrybfx8nqgf65"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -254938,8 +256561,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.1.1"; - sha256 = "19y5m94njn26vglnyrpzy59614dj7f7wbgnc354syr8qmdiliczp"; + version = "0.6.1.2"; + sha256 = "07jm60q1fbdk53ncirbi8clsimg28k9j12kaq0vx2apn2rlmdy2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255197,8 +256820,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.15"; - sha256 = "0rzmx9cx2lzlmhjrbczdpzv6divwr0n6h3330rsdh15kn8wjkfr8"; + version = "1.6.16"; + sha256 = "02bzg0cyvb56hjmrcc0m6a0r7y4kq1cjqhkds542rh73w6dm6fpd"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -258474,23 +260097,6 @@ self: { }: mkDerivation { pname = "zlib"; - version = "0.6.2"; - sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ zlib ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Compression and decompression in the gzip and zlib formats"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) zlib;}; - - "zlib_0_6_2_1" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, zlib - }: - mkDerivation { - pname = "zlib"; version = "0.6.2.1"; sha256 = "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h"; libraryHaskellDepends = [ base bytestring ]; @@ -258500,7 +260106,6 @@ self: { ]; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zlib;}; "zlib-bindings" = callPackage diff --git a/nixpkgs/pkgs/development/haskell-modules/hoogle.nix b/nixpkgs/pkgs/development/haskell-modules/hoogle.nix index c7fbab6ab88c..0bb930a8bb3a 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hoogle.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hoogle.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation { name = "hoogle-local-0.1"; buildInputs = [ghc hoogle]; - phases = [ "buildPhase" ]; - inherit docPackages; - buildPhase = '' + passAsFile = ["buildCommand"]; + + buildCommand = '' ${lib.optionalString (packages != [] -> docPackages == []) ("echo WARNING: localHoogle package list empty, even though" + " the following were specified: " diff --git a/nixpkgs/pkgs/development/interpreters/acl2/default.nix b/nixpkgs/pkgs/development/interpreters/acl2/default.nix index d53337aca1ad..8d93492209c6 100644 --- a/nixpkgs/pkgs/development/interpreters/acl2/default.nix +++ b/nixpkgs/pkgs/development/interpreters/acl2/default.nix @@ -17,8 +17,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; - rev = revs."${version}"; - sha256 = hashes."${version}"; + rev = revs.${version}; + sha256 = hashes.${version}; }; buildInputs = [ sbcl diff --git a/nixpkgs/pkgs/development/interpreters/ceptre/default.nix b/nixpkgs/pkgs/development/interpreters/ceptre/default.nix index 29d63f1d0048..cde9146f78c6 100644 --- a/nixpkgs/pkgs/development/interpreters/ceptre/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ceptre/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, mlton }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ceptre-2016-11-27"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/interpreters/clips/default.nix b/nixpkgs/pkgs/development/interpreters/clips/default.nix index 918c577356cd..c70bfd9406e0 100644 --- a/nixpkgs/pkgs/development/interpreters/clips/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clips/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "6.30"; pname = "clips"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix index ab8e616ac6d5..0e9d81d5e959 100644 --- a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -126,7 +126,7 @@ let # packageJSON=./package.json; getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; pname = "lumo"; diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.5.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.5.nix index d32f91275652..229c42d9f7b2 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/1.5.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/1.5.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.5.3"; sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5"; minimumOTPVersion = "18"; diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix index 73afcbd1597e..94dffd1f763d 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.6.6"; sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl"; minimumOTPVersion = "19"; diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.7.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.7.nix index adbbbaff890b..10ebd5438a11 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/1.7.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/1.7.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.7.4"; sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla"; minimumOTPVersion = "19"; diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix index e240e1907e06..931fa50b1f72 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.8.2"; sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq"; minimumOTPVersion = "20"; diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.9.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.9.nix index 41601eeaa118..b9b2400b78b9 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/1.9.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/1.9.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.9.1"; sha256 = "106s2a3dykc5iwfrd5icqd737yfzaz1dw4x5v1j5z2fvf46h96dx"; minimumOTPVersion = "20"; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix b/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix index c263551de2da..11637868ed0f 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -1,6 +1,6 @@ { pkgs, mkDerivation }: -mkDerivation rec { +mkDerivation { baseName = "erlang"; version = "16B02.basho10"; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R18.nix b/nixpkgs/pkgs/development/interpreters/erlang/R18.nix index 58b7fd71f0be..e9d9366851eb 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R18.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R18.nix @@ -21,7 +21,7 @@ let sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c"; }; -in mkDerivation rec { +in mkDerivation { version = "18.3.4.8"; sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g"; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R19.nix b/nixpkgs/pkgs/development/interpreters/erlang/R19.nix index 25a3f662565c..d5f3afe5f3df 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R19.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R19.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchpatch }: -mkDerivation rec { +mkDerivation { version = "19.3.6.11"; sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm"; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R20.nix b/nixpkgs/pkgs/development/interpreters/erlang/R20.nix index 016e175d6b56..3a33e55767b4 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R20.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R20.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "20.3.8.9"; sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix index e21bf6dafbff..fdd034fc6075 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "21.3.8.3"; sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R22.nix b/nixpkgs/pkgs/development/interpreters/erlang/R22.nix index a8c05513c5a6..8b471f632471 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R22.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R22.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "22.0.4"; sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; diff --git a/nixpkgs/pkgs/development/interpreters/falcon/default.nix b/nixpkgs/pkgs/development/interpreters/falcon/default.nix index 744a0f76ff09..39d4918a70bf 100644 --- a/nixpkgs/pkgs/development/interpreters/falcon/default.nix +++ b/nixpkgs/pkgs/development/interpreters/falcon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "falcon"; version = "2013-09-19"; diff --git a/nixpkgs/pkgs/development/interpreters/joker/default.nix b/nixpkgs/pkgs/development/interpreters/joker/default.nix index 4ab9427934d7..233900cadd03 100644 --- a/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -1,27 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "joker"; - version = "0.12.4"; - - goPackagePath = "github.com/candid82/joker"; + version = "0.12.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1swi991khmyhxn6w6xsdqp1wbyx3qmd9d7yhpwvqasyxp8gg3szm"; + sha256 = "0panmhrg1i158xbvqvq3s3217smbj7ynwlaiks18pmss36xx9dk4"; }; - preBuild = "go generate ./..."; - - postBuild = "rm go/bin/sum256dir"; - - dontInstallSrc = true; - - excludedPackages = "gen"; # Do not install private generators. - - goDeps = ./deps.nix; + modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j"; meta = with stdenv.lib; { homepage = https://github.com/candid82/joker; diff --git a/nixpkgs/pkgs/development/interpreters/joker/deps.nix b/nixpkgs/pkgs/development/interpreters/joker/deps.nix deleted file mode 100644 index 4eff988796b3..000000000000 --- a/nixpkgs/pkgs/development/interpreters/joker/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "6a4bc7b4feaeff8feb63f87d5fb2cf3e3610a559"; - sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc"; - }; - } - { - goPackagePath = "github.com/pkg/profile"; - fetch = { - type = "git"; - url = "https://github.com/pkg/profile"; - rev = "5b67d428864e92711fcbd2f8629456121a56d91f"; - sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } -] diff --git a/nixpkgs/pkgs/development/interpreters/love/0.10.nix b/nixpkgs/pkgs/development/interpreters/love/0.10.nix index 07ce9347cf70..bba54c83f5c5 100644 --- a/nixpkgs/pkgs/development/interpreters/love/0.10.nix +++ b/nixpkgs/pkgs/development/interpreters/love/0.10.nix @@ -8,7 +8,7 @@ let version = "0.10.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromBitbucket { owner = "rude"; diff --git a/nixpkgs/pkgs/development/interpreters/love/11.1.nix b/nixpkgs/pkgs/development/interpreters/love/11.1.nix index 7adaca7b8656..1c64c417cb0c 100644 --- a/nixpkgs/pkgs/development/interpreters/love/11.1.nix +++ b/nixpkgs/pkgs/development/interpreters/love/11.1.nix @@ -8,7 +8,7 @@ let version = "11.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromBitbucket { owner = "rude"; diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix b/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix index 0ac1fa30e2f8..64050ea95f87 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lua5 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.6.2"; pname = "lua-filesystem"; isLibrary = true; diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.sh b/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.sh index 3989bedffdb1..f7e56b62ac90 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.sh +++ b/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.sh @@ -1,47 +1,47 @@ # set -e nix_print() { - if [ ${NIX_DEBUG:-0} -ge $1 ]; then - echo "$2" - fi + if [ ${NIX_DEBUG:-0} -ge $1 ]; then + echo "$2" + fi } nix_debug() { - nix_print 3 "$1" + nix_print 3 "$1" } addToLuaSearchPathWithCustomDelimiter() { - local varName="$1" - local absPattern="$2" - # delete longest match starting from the lua placeholder '?' - local topDir="${absPattern%%\?*}" + local varName="$1" + local absPattern="$2" + # delete longest match starting from the lua placeholder '?' + local topDir="${absPattern%%\?*}" - # export only if the folder exists else LUA_PATH grows too big - if [ ! -d "$topDir" ]; then return; fi + # export only if the folder exists else LUA_PATH/LUA_CPATH grow too large + if [[ ! -d "$topDir" ]]; then return; fi - export "${varName}=${!varName:+${!varName};}${absPattern}" + # export only if we haven't already got this dir in the search path + if [[ ${!varName} == *"$absPattern"* ]]; then return; fi + + export "${varName}=${!varName:+${!varName};}${absPattern}" } addToLuaPath() { - local dir="$1" - - if [[ ! -d "$dir" ]]; then - nix_debug "$dir not a directory abort" - return 0 - fi - cd "$dir" - for pattern in @luapathsearchpaths@; - do - addToLuaSearchPathWithCustomDelimiter NIX_LUA_PATH "$PWD/$pattern" - done - - # LUA_CPATH - for pattern in @luacpathsearchpaths@; - do - addToLuaSearchPathWithCustomDelimiter NIX_LUA_CPATH "$PWD/$pattern" - done - cd - >/dev/null + local dir="$1" + + if [[ ! -d "$dir" ]]; then + nix_debug "$dir not a directory abort" + return 0 + fi + cd "$dir" + for pattern in @luapathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" + done + + # LUA_CPATH + for pattern in @luacpathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" + done + cd - >/dev/null } addEnvHooks "$hostOffset" addToLuaPath - diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh b/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh index 545a0ae271c4..5941ff4a6b98 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh +++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh @@ -4,73 +4,72 @@ set -e wrapLuaPrograms() { - wrapLuaProgramsIn "$out/bin" "$out $luaPath" + wrapLuaProgramsIn "$out/bin" "$out $luaPath" } # Builds environment variables like LUA_PATH and PATH walking through closure # of dependencies. buildLuaPath() { - local luaPath="$1" - local path - - # Create an empty table of paths (see doc on loadFromPropagatedInputs - # for how this is used). Build up the program_PATH and program_LUA_PATH - # variables. - declare -A luaPathsSeen=() - program_PATH= - luaPathsSeen["@lua@"]=1 - addToSearchPath program_PATH @lua@/bin - for path in $luaPath; do - addToLuaPath "$path" - done + local luaPath="$1" + local path + + # Create an empty table of paths (see doc on loadFromPropagatedInputs + # for how this is used). Build up the program_PATH and program_LUA_PATH + # variables. + declare -A luaPathsSeen=() + program_PATH= + luaPathsSeen["@lua@"]=1 + addToSearchPath program_PATH @lua@/bin + for path in $luaPath; do + addToLuaPath "$path" + done } - # with an executable shell script which will set some environment variables # and then call into the original binary (which has been given a .wrapped suffix). # luaPath is a list of directories wrapLuaProgramsIn() { - local dir="$1" - local luaPath="$2" - local f - - buildLuaPath "$luaPath" - - if [ ! -d "$dir" ]; then - nix_debug "$dir not a directory" - return + local dir="$1" + local luaPath="$2" + local f + + buildLuaPath "$luaPath" + + if [ ! -d "$dir" ]; then + nix_debug "$dir not a directory" + return + fi + + nix_debug "wrapping programs in [$dir]" + + # Find all regular files in the output directory that are executable. + find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do + # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". + # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which + # Lua to use besides one with this hook anyway. + if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" fi - nix_debug "wrapping programs in [$dir]" - - # Find all regular files in the output directory that are executable. - find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do - # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". - # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which - # Lua to use besides one with this hook anyway. - if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then - sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" - fi - - # wrapProgram creates the executable shell script described - # above. The script will set LUA_(C)PATH and PATH variables! - # (see pkgs/build-support/setup-hooks/make-wrapper.sh) - local -a wrap_args=("$f" - --prefix PATH ':' "$program_PATH" - --prefix LUA_PATH ';' "$NIX_LUA_PATH" - --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" - ) - - # Add any additional arguments provided by makeWrapperArgs - # argument to buildLuaPackage. - # makeWrapperArgs - local -a user_args="($makeWrapperArgs)" - local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") - - # see setup-hooks/make-wrapper.sh - wrapProgram "${wrapProgramArgs[@]}" - - done + # wrapProgram creates the executable shell script described + # above. The script will set LUA_(C)PATH and PATH variables! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + local -a wrap_args=("$f" + --prefix PATH ':' "$program_PATH" + --prefix LUA_PATH ';' "$LUA_PATH" + --prefix LUA_CPATH ';' "$LUA_CPATH" + ) + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildLuaPackage. + # makeWrapperArgs + local -a user_args="($makeWrapperArgs)" + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") + + # see setup-hooks/make-wrapper.sh + wrapProgram "${wrapProgramArgs[@]}" + + done } # Adds the lib and bin directories to the LUA_PATH and PATH variables, @@ -78,22 +77,22 @@ wrapLuaProgramsIn() { # `propagated-native-build-inputs`, while avoiding duplicating paths by # flagging the directories it has visited in `luaPathsSeen`. loadFromPropagatedInputs() { - local dir="$1" - # Stop if we've already visited here. - if [ -n "${luaPathsSeen[$dir]}" ]; then - return; - fi - luaPathsSeen[$dir]=1 - - addToLuaPath "$dir" - addToSearchPath program_PATH $dir/bin - - # Inspect the propagated inputs (if they exist) and recur on them. - local prop="$dir/nix-support/propagated-native-build-inputs" - if [ -e "$prop" ]; then - local new_path - for new_path in $(cat $prop); do - loadFromPropagatedInputs "$new_path" - done - fi + local dir="$1" + # Stop if we've already visited here. + if [ -n "${luaPathsSeen[$dir]}" ]; then + return + fi + luaPathsSeen[$dir]=1 + + addToLuaPath "$dir" + addToSearchPath program_PATH $dir/bin + + # Inspect the propagated inputs (if they exist) and recur on them. + local prop="$dir/nix-support/propagated-native-build-inputs" + if [ -e "$prop" ]; then + local new_path + for new_path in $(cat $prop); do + loadFromPropagatedInputs "$new_path" + done + fi } diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix index 14bd4a416468..816744e61cff 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix @@ -43,7 +43,7 @@ let rm -f "$out/bin/$prg" if [ -x "$prg" ]; then nix_debug "Making wrapper $prg" - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$NIX_LUA_PATH" --suffix LUA_CPATH ';' "$NIX_LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/nixpkgs/pkgs/development/interpreters/maude/default.nix b/nixpkgs/pkgs/development/interpreters/maude/default.nix index afd2627d20ec..e44209799a31 100644 --- a/nixpkgs/pkgs/development/interpreters/maude/default.nix +++ b/nixpkgs/pkgs/development/interpreters/maude/default.nix @@ -13,7 +13,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "maude"; inherit version; diff --git a/nixpkgs/pkgs/development/interpreters/metamath/default.nix b/nixpkgs/pkgs/development/interpreters/metamath/default.nix index cd325c949489..686cfee19a6d 100644 --- a/nixpkgs/pkgs/development/interpreters/metamath/default.nix +++ b/nixpkgs/pkgs/development/interpreters/metamath/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "metamath"; version = "0.172"; diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix index f65b4628e8c8..9a82868b7b3d 100644 --- a/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -254,16 +254,16 @@ let in { php72 = generic { - version = "7.2.21"; - sha256 = "1vqldc2namfblwyv87fgpfffkjpzawfpcp48f40nfdl3pshq6c9l"; + version = "7.2.22"; + sha256 = "12phn0rrd5r1j6xlz83h7v6gszmj4lb5gwj927psbbc6nn1rh2n1"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.8"; - sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm"; + version = "7.3.9"; + sha256 = "1i33v50rbqrfwjwch1d46mbpwbxrg1xfycs9mjl7xsy9m04rg753"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix index 009f9b48ea4e..30a601ef8dfd 100644 --- a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -2,8 +2,9 @@ let version = "0.9.5.1.1"; in -python2Packages.buildPythonPackage rec { - name = "pyrex-${version}"; +python2Packages.buildPythonPackage { + pname = "pyrex"; + inherit version; src = fetchurl { url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix index d79cd58c1598..69a930891885 100644 --- a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -2,8 +2,9 @@ let version = "0.9.6.4"; in -python2Packages.buildPythonPackage rec { - name = "pyrex-${version}"; +python2Packages.buildPythonPackage { + pname = "pyrex"; + inherit version; src = fetchurl { url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 60d067c1bf2c..1de1c401c37c 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -142,6 +142,8 @@ in with passthru; stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (sqlite != null && isPy3k) [ + "--enable-loadable-sqlite-extensions" ] ++ optionals (openssl != null) [ "--with-openssl=${openssl.dev}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index 73d1e0ea9fd7..e27959c05e8d 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-html-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 54c0954ae5d0..0226f7cd8809 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-pdf-a4-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 059908029c0b..88d1a6931668 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-pdf-letter-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 53c5aa3b629b..ea35e9fb6a35 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-text-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix index 5a6dcc63225e..45783eb82632 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-html-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix index a122d7519f5d..998af644c718 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-pdf-a4-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix index 4473f2e351c4..1c6aea5ee3c1 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-pdf-letter-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix index d9d21bfe3a57..32388780f6ff 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-text-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/template.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/template.nix index 4a0c84fb272e..3cc0c2a9ee85 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pythonMAJORMINOR-docs-TYPE-VERSION"; src = fetchurl { url = URL; diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index 3e86ddef4ed4..8154a87f667d 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let isPy3k = substring 0 1 pythonVersion == "3"; - passthru = passthruFun rec { + passthru = passthruFun { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index af933f0a4bd0..7ac8037293ff 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -6,7 +6,7 @@ # Dependencies , bzip2 , zlib -, openssl +, openssl_1_0_2 , expat , libffi , ncurses @@ -27,7 +27,7 @@ with stdenv.lib; let isPy3k = majorVersion == "3"; - passthru = passthruFun rec { + passthru = passthruFun { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; @@ -44,7 +44,7 @@ let deps = [ bzip2 zlib - openssl + openssl_1_0_2 expat libffi ncurses diff --git a/nixpkgs/pkgs/development/interpreters/qnial/default.nix b/nixpkgs/pkgs/development/interpreters/qnial/default.nix index 3b41e14be850..d49886da8f54 100644 --- a/nixpkgs/pkgs/development/interpreters/qnial/default.nix +++ b/nixpkgs/pkgs/development/interpreters/qnial/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qnial"; version = "6.3"; diff --git a/nixpkgs/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix index 35bd1729866e..f13adc21d9e6 100644 --- a/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: - fetchurl rec { + fetchurl { url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; inherit sha256; } diff --git a/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix index a938897227e2..142881e5b4f2 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -39,7 +39,7 @@ let ruby = self; }; self = lib.makeOverridable ( - { stdenv, buildPackages, lib, makeWrapper + { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , rubygemsSupport ? true @@ -51,8 +51,9 @@ let , libyaml, yamlSupport ? true , libffi, fiddleSupport ? true , autoreconfHook, bison, autoconf - , buildEnv, bundler, bundix, defaultGemConfig, buildRubyGem + , buildEnv, bundler, bundix , libiconv, libobjc, libunwind, Foundation + , makeWrapper, buildRubyGem, defaultGemConfig }: stdenv.mkDerivation rec { pname = "ruby"; @@ -97,9 +98,9 @@ let patches = (import ./patchsets.nix { - inherit patchSet useRailsExpress ops; + inherit patchSet useRailsExpress ops fetchpatch; patchLevel = ver.patchLevel; - })."${ver.majMinTiny}"; + }).${ver.majMinTiny}; postUnpack = opString rubygemsSupport '' rm -rf $sourceRoot/{lib,test}/rubygems* @@ -253,35 +254,27 @@ in { }; }; - ruby_2_3 = generic { - version = rubyVersion "2" "3" "8" ""; - sha256 = { - src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm"; - git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f"; - }; - }; - ruby_2_4 = generic { - version = rubyVersion "2" "4" "5" ""; + version = rubyVersion "2" "4" "7" ""; sha256 = { - src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7"; - git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43"; + src = "12cbyf7zai8mi3mxffm5ynq3mmkcbvs7kb1bbrs259m61irgqvnd"; + git = "1dgch9xz4wdcncb6pf2dvijm10yk6mbw2wfdrj7d3wazrjzh305z"; }; }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "5" ""; + version = rubyVersion "2" "5" "6" ""; sha256 = { - src = "0k2in88jymqh727s88yjsv7wrqs2hdj9h2w9zh2bmrj0ygylba98"; - git = "0l7b7xv48gvvlqs27gghfi645qvc1nwiz8ym4j8w100rzzzfy6zz"; + src = "19xy6rf138ys4qycv0ibsycqwbjmf1j6iv9plw9cs81hcxnd0zhx"; + git = "067gyy7149m6vk9dfyx22mghm2gbgy7snfa7df4ddrvr1pqffqmz"; }; }; ruby_2_6 = generic { - version = rubyVersion "2" "6" "3" ""; + version = rubyVersion "2" "6" "4" ""; sha256 = { - src = "1yw23hmllxsc4b7zqndn5l4d9503gdik6rsf3lfdkf12bxwx6zsp"; - git = "1h4k2kw0vr4jh2ra9l89i8lnddfh2qfw67y9cknjylf7kw2m1pmh"; + src = "0dvrw4g2igvjclxk9bmb9pf6mzxwm22zqvqa0abkfnshfnxdihag"; + git = "1h4z66amjykpzl6lxx6yad2yfpwnwix4sw19bd96jnwg248kviqf"; }; }; } diff --git a/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix index 8cfc3385b061..56898e7886a0 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,6 +1,6 @@ -{ patchSet, useRailsExpress, ops, patchLevel }: +{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: -rec { +{ "1.9.3" = [ ./ssl_v3.patch ./rand-egd.patch @@ -60,17 +60,22 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.5" = ops useRailsExpress [ + "2.4.7" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.5" = ops useRailsExpress [ + "2.5.6" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.6.3" = ops useRailsExpress [ + "2.6.4" = [ + (fetchpatch { + url = "https://git.ruby-lang.org/ruby.git/patch/?id=ade1283ca276f7d589ffd3539fbc7b9817f682d5"; + sha256 = "1vgrckmzz0ykyxgzyp8fcifa93xz2hvyfil79bw1gc3xx94wnnxd"; + }) + ] ++ ops useRailsExpress [ "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" diff --git a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 90adcb7011dd..7bc1a8f1fd91 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,22 +2,17 @@ stdenv.mkDerivation rec { name = "rubygems"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "0b6b9ads8522804xv8b8498gqwsv4qawv13f81kyc7g966y7lfmy"; + sha256 = "1ca1i4xmggizr59m6p28gprlvshczsbx30q8iyzxb2vj4jn8arzx"; }; patches = [ ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch - - (fetchpatch { - url = https://github.com/rubygems/rubygems/commit/f4061357d812e9033f07ae3f8f44c4e26839f1e5.patch; - sha256 = "0m1s5brd30bqcr8v99sczihm83g270philx83kkw5bpix462fdm3"; - }) ]; installPhase = '' diff --git a/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 95b38fc8ebd5..883987683b0a 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "e6e12c2c32ff184e0409d8f9f2a870f2dfbd06a3"; - sha256 = "0n71h2ip1k18icb3bcr1jz4161lh6vr6i3f7b45jswg77c4rrxcy"; + rev = "58f72dccc8bb4dc9b1035f6af903d21f2465367a"; + sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag"; } diff --git a/nixpkgs/pkgs/development/interpreters/self/default.nix b/nixpkgs/pkgs/development/interpreters/self/default.nix index c6c8caa7cf3e..43f5758e4c49 100644 --- a/nixpkgs/pkgs/development/interpreters/self/default.nix +++ b/nixpkgs/pkgs/development/interpreters/self/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self # so that it can be written to when using the Self transposer. Running 'Self' # after installation runs without an image. You can then build a Self image with: diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix index e00af6213479..8f9477c4c4ac 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,6 +1,6 @@ { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spidermonkey"; version = "1.8.5"; diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix index 1e1ea10ef6dd..238afd4bd040 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix @@ -2,7 +2,7 @@ let version = "52.9.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "spidermonkey"; inherit version; diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix index 175b2f2e7671..f62638dd8386 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix @@ -5,7 +5,7 @@ with stdenv.lib; let version = "60.4.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "spidermonkey"; inherit version; diff --git a/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix index 049dd9192d7e..b4ed92324521 100644 --- a/nixpkgs/pkgs/development/interpreters/supercollider/default.nix +++ b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in mkDerivation rec { pname = "supercollider"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq"; + url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; + sha256 = "1wvsrr4qcqmpxpn57wwrnwbnf3pflr3n4wkj9j6b9cdisp34kv5d"; }; hardeningDisable = [ "stackprotector" ]; @@ -26,6 +26,8 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; + enableParallelBuilding = true; + buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] ++ optional (!stdenv.isDarwin) alsaLib @@ -33,7 +35,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Programming language for real time audio synthesis"; - homepage = http://supercollider.sourceforge.net/; + homepage = "https://supercollider.github.io"; maintainers = with maintainers; [ mrmebelman ]; license = licenses.gpl3; platforms = [ "x686-linux" "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index d4ec1677bfbc..3c585c3f07fa 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tcl"; inherit version; diff --git a/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix b/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix index 30ea124cf4bb..bb4a2d01499d 100644 --- a/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix +++ b/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, libX11, libXt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "unicon-lang"; version = "11.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix b/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix index ac291668e2d9..44ac11be5400 100644 --- a/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "wasm-gc-${version}"; + pname = "wasm-gc"; version = "0.1.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 90fc38afa061..b53b3ed9dbfb 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -1,6 +1,6 @@ { rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "wasmtime"; version = "20190521"; diff --git a/nixpkgs/pkgs/development/java-modules/apache/ant-launcher.nix b/nixpkgs/pkgs/development/java-modules/apache/ant-launcher.nix index e6a2b0cae99d..e5f4d5f6ee0f 100644 --- a/nixpkgs/pkgs/development/java-modules/apache/ant-launcher.nix +++ b/nixpkgs/pkgs/development/java-modules/apache/ant-launcher.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ antLauncher_1_8_2 = map (obj: fetchMaven { version = "1.8.2"; artifactId = "ant-launcher"; diff --git a/nixpkgs/pkgs/development/java-modules/apache/ant.nix b/nixpkgs/pkgs/development/java-modules/apache/ant.nix index b4a6aa68f448..5de82b1703b3 100644 --- a/nixpkgs/pkgs/development/java-modules/apache/ant.nix +++ b/nixpkgs/pkgs/development/java-modules/apache/ant.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ ant_1_8_2 = map (obj: fetchMaven { version = "1.8.2"; artifactId = "ant"; diff --git a/nixpkgs/pkgs/development/java-modules/apache/commons-cli.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-cli.nix index 050d511b0a10..5cb25a0f379e 100644 --- a/nixpkgs/pkgs/development/java-modules/apache/commons-cli.nix +++ b/nixpkgs/pkgs/development/java-modules/apache/commons-cli.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsCli_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "commons-cli"; diff --git a/nixpkgs/pkgs/development/java-modules/apache/commons-io.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-io.nix index 70ce940ccf17..28bb9d381f9e 100644 --- a/nixpkgs/pkgs/development/java-modules/apache/commons-io.nix +++ b/nixpkgs/pkgs/development/java-modules/apache/commons-io.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsIo_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "commons-io"; diff --git a/nixpkgs/pkgs/development/java-modules/apache/commons-lang.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-lang.nix index a2d71e9db0c8..501da6d204d0 100644 --- a/nixpkgs/pkgs/development/java-modules/apache/commons-lang.nix +++ b/nixpkgs/pkgs/development/java-modules/apache/commons-lang.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLang_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "commons-lang"; diff --git a/nixpkgs/pkgs/development/java-modules/apache/commons-lang3.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-lang3.nix index 63f68b925430..3bbbe9d2e39a 100644 --- a/nixpkgs/pkgs/development/java-modules/apache/commons-lang3.nix +++ b/nixpkgs/pkgs/development/java-modules/apache/commons-lang3.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLang3_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "commons-lang3"; diff --git a/nixpkgs/pkgs/development/java-modules/apache/commons-logging-api.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-logging-api.nix index 47750abe4623..befb2003d01c 100644 --- a/nixpkgs/pkgs/development/java-modules/apache/commons-logging-api.nix +++ b/nixpkgs/pkgs/development/java-modules/apache/commons-logging-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLoggingApi_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "commons-logging-api"; diff --git a/nixpkgs/pkgs/development/java-modules/apache/xbean-reflect.nix b/nixpkgs/pkgs/development/java-modules/apache/xbean-reflect.nix index f0614ec99e36..8f7c35b716f9 100644 --- a/nixpkgs/pkgs/development/java-modules/apache/xbean-reflect.nix +++ b/nixpkgs/pkgs/development/java-modules/apache/xbean-reflect.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xbeanReflect_3_4 = map (obj: fetchMaven { version = "3.4"; artifactId = "xbean-reflect"; diff --git a/nixpkgs/pkgs/development/java-modules/beanshell/bsh.nix b/nixpkgs/pkgs/development/java-modules/beanshell/bsh.nix index 41756bb80d50..783fdc8679cc 100644 --- a/nixpkgs/pkgs/development/java-modules/beanshell/bsh.nix +++ b/nixpkgs/pkgs/development/java-modules/beanshell/bsh.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ bsh_2_0_b4 = map (obj: fetchMaven { version = "2.0b4"; artifactId = "bsh"; diff --git a/nixpkgs/pkgs/development/java-modules/classworlds/classworlds.nix b/nixpkgs/pkgs/development/java-modules/classworlds/classworlds.nix index f8bbc07f1025..3561c0b6e5e1 100644 --- a/nixpkgs/pkgs/development/java-modules/classworlds/classworlds.nix +++ b/nixpkgs/pkgs/development/java-modules/classworlds/classworlds.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ classworlds_1_1_alpha2 = map (obj: fetchMaven { version = "1.1-alpha-2"; artifactId = "classworlds"; diff --git a/nixpkgs/pkgs/development/java-modules/collections.nix b/nixpkgs/pkgs/development/java-modules/collections.nix index 39b274b5030a..83f7a95af81d 100644 --- a/nixpkgs/pkgs/development/java-modules/collections.nix +++ b/nixpkgs/pkgs/development/java-modules/collections.nix @@ -2,7 +2,7 @@ with pkgs.javaPackages; -rec { +{ mavenLibs_2_0_1 = [ mavenArtifact_2_0_1 mavenArtifactManager_2_0_1 diff --git a/nixpkgs/pkgs/development/java-modules/eclipse/aether-util.nix b/nixpkgs/pkgs/development/java-modules/eclipse/aether-util.nix index 60aac560b9b2..6ebca58c44e5 100644 --- a/nixpkgs/pkgs/development/java-modules/eclipse/aether-util.nix +++ b/nixpkgs/pkgs/development/java-modules/eclipse/aether-util.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ aetherUtil_0_9_0_M2 = map (obj: fetchMaven { version = "0.9.0.M2"; artifactId = "aether-util"; diff --git a/nixpkgs/pkgs/development/java-modules/findbugs/jsr305.nix b/nixpkgs/pkgs/development/java-modules/findbugs/jsr305.nix index 2e842410aafb..7816ab49d612 100644 --- a/nixpkgs/pkgs/development/java-modules/findbugs/jsr305.nix +++ b/nixpkgs/pkgs/development/java-modules/findbugs/jsr305.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ findbugsJsr305_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "jsr305"; diff --git a/nixpkgs/pkgs/development/java-modules/google/collections.nix b/nixpkgs/pkgs/development/java-modules/google/collections.nix index ec874c73e365..b5b4551dd97b 100644 --- a/nixpkgs/pkgs/development/java-modules/google/collections.nix +++ b/nixpkgs/pkgs/development/java-modules/google/collections.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ googleCollections_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "google-collections"; diff --git a/nixpkgs/pkgs/development/java-modules/hamcrest/all.nix b/nixpkgs/pkgs/development/java-modules/hamcrest/all.nix index bab9e1b115d0..73c27c4af8b1 100644 --- a/nixpkgs/pkgs/development/java-modules/hamcrest/all.nix +++ b/nixpkgs/pkgs/development/java-modules/hamcrest/all.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ hamcrestAll_1_3 = map (obj: fetchMaven { version = "1.3"; artifactId = "hamcrest-all"; diff --git a/nixpkgs/pkgs/development/java-modules/hamcrest/core.nix b/nixpkgs/pkgs/development/java-modules/hamcrest/core.nix index 3842b8c5afa0..4145191fdd91 100644 --- a/nixpkgs/pkgs/development/java-modules/hamcrest/core.nix +++ b/nixpkgs/pkgs/development/java-modules/hamcrest/core.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ hamcrestCore_1_3 = map (obj: fetchMaven { version = "1.3"; artifactId = "hamcrest-core"; diff --git a/nixpkgs/pkgs/development/java-modules/jogl/default.nix b/nixpkgs/pkgs/development/java-modules/jogl/default.nix index abb549110a87..d179fb531789 100644 --- a/nixpkgs/pkgs/development/java-modules/jogl/default.nix +++ b/nixpkgs/pkgs/development/java-modules/jogl/default.nix @@ -15,7 +15,7 @@ in sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0"; fetchSubmodules = true; }; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { pname = "jogl"; inherit version; diff --git a/nixpkgs/pkgs/development/java-modules/junit/default.nix b/nixpkgs/pkgs/development/java-modules/junit/default.nix index a7bfa545908a..6f86cede5120 100644 --- a/nixpkgs/pkgs/development/java-modules/junit/default.nix +++ b/nixpkgs/pkgs/development/java-modules/junit/default.nix @@ -6,7 +6,7 @@ let poms = import (../poms.nix) { inherit fetchMaven; }; collections = import (../collections.nix) { inherit pkgs; }; in rec { - junitGen = { mavenDeps, sha512, version }: mavenbuild rec { + junitGen = { mavenDeps, sha512, version }: mavenbuild { inherit mavenDeps sha512 version; name = "junit-${version}"; diff --git a/nixpkgs/pkgs/development/java-modules/log4j/default.nix b/nixpkgs/pkgs/development/java-modules/log4j/default.nix index a8b1ea9f0217..e95c0847aacc 100644 --- a/nixpkgs/pkgs/development/java-modules/log4j/default.nix +++ b/nixpkgs/pkgs/development/java-modules/log4j/default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ log4j_1_2_12 = map (obj: fetchMaven { version = "1.2.12"; artifactId = "log4j"; diff --git a/nixpkgs/pkgs/development/java-modules/m2install.nix b/nixpkgs/pkgs/development/java-modules/m2install.nix index 7ebe655580e5..3a289c9c9c4a 100644 --- a/nixpkgs/pkgs/development/java-modules/m2install.nix +++ b/nixpkgs/pkgs/development/java-modules/m2install.nix @@ -5,11 +5,11 @@ let name = "${artifactId}-${version}"; m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; m2File = "${name}${suffix}.${type}"; - src = fetchurl rec { + src = fetchurl { inherit sha512; url = "mirror://maven/${m2Path}/${m2File}"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name m2Path m2File src; installPhase = '' diff --git a/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix b/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix index f3d5fb3e9342..b8e128ac728c 100644 --- a/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix +++ b/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix @@ -5,7 +5,7 @@ with pkgs.javaPackages; let poms = import ../poms.nix { inherit fetchMaven; }; in rec { - mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec { + mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild { inherit mavenDeps sha512 version skipTests quiet; name = "maven-hello-${version}"; diff --git a/nixpkgs/pkgs/development/java-modules/maven-minimal.nix b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix index f63c91cd360a..c1fab1e9bc97 100644 --- a/nixpkgs/pkgs/development/java-modules/maven-minimal.nix +++ b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix @@ -8,7 +8,7 @@ let fetchMaven = pkgs.callPackage ./m2install.nix { }; plugins = import ./mavenPlugins.nix { inherit pkgs; }; poms = import ./poms.nix { inherit fetchMaven; }; -in rec { +in { # Maven needs all of these to function mavenMinimal = flatten collections.mavenLibs_2_0_6 diff --git a/nixpkgs/pkgs/development/java-modules/maven/archiver.nix b/nixpkgs/pkgs/development/java-modules/maven/archiver.nix index 14c5a99d42ff..9965f86f72bd 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/archiver.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/archiver.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArchiver_2_5 = map (obj: fetchMaven { version = "2.5"; artifactId = "maven-archiver"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/artifact-manager.nix b/nixpkgs/pkgs/development/java-modules/maven/artifact-manager.nix index 0796d0665103..5bf3ef01bc65 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/artifact-manager.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/artifact-manager.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArtifactManager_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-artifact-manager"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/artifact.nix b/nixpkgs/pkgs/development/java-modules/maven/artifact.nix index bb0e578d5d63..80e3392abd2f 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/artifact.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/artifact.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArtifact_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-artifact"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/common-artifact-filters.nix b/nixpkgs/pkgs/development/java-modules/maven/common-artifact-filters.nix index 948dbc3baf6c..8c3886679919 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/common-artifact-filters.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven { version = "1.2"; artifactId = "maven-common-artifact-filters"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/core.nix b/nixpkgs/pkgs/development/java-modules/maven/core.nix index 5b45f89e9d54..a1ea9292a513 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/core.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/core.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenCore_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-core"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/dependency-tree.nix b/nixpkgs/pkgs/development/java-modules/maven/dependency-tree.nix index 00d089ea249b..aa3a93849c25 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/dependency-tree.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/dependency-tree.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenDependencyTree_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "maven-dependency-tree"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/doxia-sink-api.nix b/nixpkgs/pkgs/development/java-modules/maven/doxia-sink-api.nix index 9fa1051cd80b..8314abe4924f 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/doxia-sink-api.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/doxia-sink-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven { version = "1.0-alpha-6"; artifactId = "doxia-sink-api"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/enforcer.nix b/nixpkgs/pkgs/development/java-modules/maven/enforcer.nix index 014f678bc149..c7a1d212e0e5 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/enforcer.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/enforcer.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenEnforcerApi_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; artifactId = "enforcer-api"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/error-diagnostics.nix b/nixpkgs/pkgs/development/java-modules/maven/error-diagnostics.nix index 80cbf993a60d..f16f10462ff2 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/error-diagnostics.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-error-diagnostics"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/filtering.nix b/nixpkgs/pkgs/development/java-modules/maven/filtering.nix index 963d6c6b646d..f1e2e551cee2 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/filtering.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/filtering.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenFiltering_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-filtering"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/model.nix b/nixpkgs/pkgs/development/java-modules/maven/model.nix index 2ae3bfe6034c..147b15b6e400 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/model.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/model.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenModel_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-model"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/monitor.nix b/nixpkgs/pkgs/development/java-modules/maven/monitor.nix index ce6c7c176941..609745e94229 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/monitor.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/monitor.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenMonitor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-monitor"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/plugin-annotations.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-annotations.nix index f852cc957a56..bf8d608488e8 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/plugin-annotations.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginAnnotations_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "maven-plugin-annotations"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/plugin-api.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-api.nix index be9642b0e206..55fb0d2c5ddf 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/plugin-api.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-api"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/plugin-descriptor.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-descriptor.nix index dbdc09a46734..7f5c22fe3b3a 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/plugin-descriptor.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-descriptor"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix index 9e11c0f40829..4ff07574dc92 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-parameter-documenter"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/plugin-registry.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-registry.nix index f0074ef816ed..a7bb92e645d3 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/plugin-registry.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-registry.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginRegistry_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-registry"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-testing-harness.nix index a65f19620485..4cd32d508f33 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/plugin-testing-harness.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-testing-harness.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginTestingHarness_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-plugin-testing-harness"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/profile.nix b/nixpkgs/pkgs/development/java-modules/maven/profile.nix index 6940fafae821..c40f87f1c45d 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/profile.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/profile.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenProfile_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-profile"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/project.nix b/nixpkgs/pkgs/development/java-modules/maven/project.nix index 0b07d8b8679b..fad53a0250b3 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/project.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/project.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenProject_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-project"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/reporting-api.nix b/nixpkgs/pkgs/development/java-modules/maven/reporting-api.nix index 8a508cf15053..87999d452fc4 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/reporting-api.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/reporting-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenReportingApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-reporting-api"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/repository-metadata.nix b/nixpkgs/pkgs/development/java-modules/maven/repository-metadata.nix index 443a1acd4513..0d8f55737b77 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/repository-metadata.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/repository-metadata.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-repository-metadata"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/settings.nix b/nixpkgs/pkgs/development/java-modules/maven/settings.nix index 6b42082cfd8a..09e0170945d5 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/settings.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/settings.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSettings_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-settings"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/shared-incremental.nix b/nixpkgs/pkgs/development/java-modules/maven/shared-incremental.nix index 67c44986d0a0..9fa74f8bfe77 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/shared-incremental.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/shared-incremental.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSharedIncremental_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-shared-incremental"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/shared-utils.nix b/nixpkgs/pkgs/development/java-modules/maven/shared-utils.nix index b3cfc9280914..38addcfe8aa9 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/shared-utils.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/shared-utils.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSharedUtils_0_1 = map (obj: fetchMaven { version = "0.1"; artifactId = "maven-shared-utils"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/surefire-api.nix b/nixpkgs/pkgs/development/java-modules/maven/surefire-api.nix index c1f7fcc3f76c..9ad284365d95 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/surefire-api.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/surefire-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireApi_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-api"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/surefire-booter.nix b/nixpkgs/pkgs/development/java-modules/maven/surefire-booter.nix index b62aa86bf45c..41f9848d5cd9 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/surefire-booter.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/surefire-booter.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-booter"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/surefire-common.nix b/nixpkgs/pkgs/development/java-modules/maven/surefire-common.nix index bc0573f6b706..2f4617eff8c0 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/surefire-common.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/surefire-common.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireCommon_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "maven-surefire-common"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/surefire-junit4.nix b/nixpkgs/pkgs/development/java-modules/maven/surefire-junit4.nix index 1374080d0874..d67177d80d23 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/surefire-junit4.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/surefire-junit4.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-junit4"; diff --git a/nixpkgs/pkgs/development/java-modules/maven/toolchain.nix b/nixpkgs/pkgs/development/java-modules/maven/toolchain.nix index 864d3b98f7ba..91f8fdb77a41 100644 --- a/nixpkgs/pkgs/development/java-modules/maven/toolchain.nix +++ b/nixpkgs/pkgs/development/java-modules/maven/toolchain.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenToolchain_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "maven-toolchain"; diff --git a/nixpkgs/pkgs/development/java-modules/mavenPlugins.nix b/nixpkgs/pkgs/development/java-modules/mavenPlugins.nix index 8cc79dc1d228..e481f5d250a3 100644 --- a/nixpkgs/pkgs/development/java-modules/mavenPlugins.nix +++ b/nixpkgs/pkgs/development/java-modules/mavenPlugins.nix @@ -5,7 +5,7 @@ with pkgs.javaPackages; let fetchMaven = pkgs.callPackage ./m2install.nix { }; -in rec { +in { inherit fetchMaven; animalSniffer_1_11 = map (obj: fetchMaven { @@ -19,7 +19,7 @@ in rec { { type = "jar"; sha512 = "24dih4wp7p1rddvxcznlz42yxhqlln5ljdbvwnp75rsyf3ng25zv881ixk5qx8canr1lxx4kh22kwkaahz3qnw54fqn7w5z58m5768n"; } ]; - mavenClean_2_5 = map (obj: fetchMaven rec { + mavenClean_2_5 = map (obj: fetchMaven { version = "2.5"; artifactId = "maven-clean-plugin"; groupId = "org.apache.maven.plugins"; @@ -30,7 +30,7 @@ in rec { { type = "jar"; sha512 = "2fprppwpmzyvaynadm6slk382khlpf5s8sbi5x249qcaw2vkg5n77q79lgq981v9kjlr5wighjzpjqv8gdig45m2p37mcfwsy3jsv89"; } ]; - mavenCompiler_3_1 = map (obj: fetchMaven rec { + mavenCompiler_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "maven-compiler-plugin"; groupId = "org.apache.maven.plugins"; @@ -41,7 +41,7 @@ in rec { { type = "jar"; sha512 = "1dvq13yc8yacxr66pkvwwd4cvx0jln8dv9fh5gmd5vir05h8l5j4y324r1bklnzpx0ancs5ad8z944zgmpaq3w195kfsarmndp0gv2y"; } ]; - mavenEnforcer_1_3_1 = map (obj: fetchMaven rec { + mavenEnforcer_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; artifactId = "maven-enforcer-plugin"; groupId = "org.apache.maven.plugins"; @@ -52,7 +52,7 @@ in rec { { type = "jar"; sha512 = "15sb9qmxgbq82nzc9x66152va121vf33nn0ah2g4z169cv6jnjq05gk1472k59imypvwsh9hd3hqi9q6g8d0sawgk5l1ax900cx7n25"; } ]; - mavenInstall_2_4 = map (obj: fetchMaven rec { + mavenInstall_2_4 = map (obj: fetchMaven { version = "2.4"; artifactId = "maven-install-plugin"; groupId = "org.apache.maven.plugins"; @@ -63,7 +63,7 @@ in rec { { type = "jar"; sha512 = "35hbj5hbz085y1dxfmza6m207kn68q2g1k5a9mc75i9pj8fww7xm7xzcdv81xyxjm3r4qbqf1izlg16l99b93rfii9rg8kqz8mxqmb6"; } ]; - mavenJar_2_4 = map (obj: fetchMaven rec { + mavenJar_2_4 = map (obj: fetchMaven { version = "2.4"; artifactId = "maven-jar-plugin"; groupId = "org.apache.maven.plugins"; @@ -74,7 +74,7 @@ in rec { { type = "jar"; sha512 = "0frbikq8jm5pynlmv51k349kiaipd9jsrh6970313s0g6n4i0ws9vi232wc1mjrc3d27k63xqmb97jzgbbc6q337ypv5vil1ql9wh0d"; } ]; - mavenReplacer_1_5_3 = map (obj: fetchMaven rec { + mavenReplacer_1_5_3 = map (obj: fetchMaven { version = "1.5.3"; artifactId = "replacer"; groupId = "com.google.code.maven-replacer-plugin"; @@ -85,7 +85,7 @@ in rec { { type = "jar"; sha512 = "0f2rngcxpll0iigv115132fld5n6shjfn7m981sg7mdzlj75q2h5knd4x1ip33w60cm1j0rmqaxp1y6qn76ykvhprdyy9smiy667l9x"; } ]; - mavenResources_2_6 = map (obj: fetchMaven rec { + mavenResources_2_6 = map (obj: fetchMaven { version = "2.6"; artifactId = "maven-resources-plugin"; groupId = "org.apache.maven.plugins"; @@ -96,7 +96,7 @@ in rec { { type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; } ]; - mavenSurefire_2_12_4 = map (obj: fetchMaven rec { + mavenSurefire_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "maven-surefire-plugin"; groupId = "org.apache.maven.plugins"; @@ -107,7 +107,7 @@ in rec { { type = "jar"; sha512 = "2sjq2l8i97h3ay8wwrsi75cfs9d1im5ar2sn2zv4q6xsv4v3hh5y481l9xwc5dnbcfdjs38ald0z60pxpcyiqrng6h69s2ws8fhb0mm"; } ]; - mavenSurefire_2_17 = map (obj: fetchMaven rec { + mavenSurefire_2_17 = map (obj: fetchMaven { version = "2.17"; artifactId = "maven-surefire-plugin"; groupId = "org.apache.maven.plugins"; diff --git a/nixpkgs/pkgs/development/java-modules/mojo/animal-sniffer.nix b/nixpkgs/pkgs/development/java-modules/mojo/animal-sniffer.nix index dd9b1d1b0aa5..221e59f766b9 100644 --- a/nixpkgs/pkgs/development/java-modules/mojo/animal-sniffer.nix +++ b/nixpkgs/pkgs/development/java-modules/mojo/animal-sniffer.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mojoAnimalSniffer_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "animal-sniffer"; diff --git a/nixpkgs/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/nixpkgs/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix index 245daa5fdb90..f6f7e490c7cf 100644 --- a/nixpkgs/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix +++ b/nixpkgs/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "java-boot-classpath-detector"; diff --git a/nixpkgs/pkgs/development/java-modules/ow2/asm-all.nix b/nixpkgs/pkgs/development/java-modules/ow2/asm-all.nix index 08d18745ed7f..92418d8c6194 100644 --- a/nixpkgs/pkgs/development/java-modules/ow2/asm-all.nix +++ b/nixpkgs/pkgs/development/java-modules/ow2/asm-all.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ ow2AsmAll_4_0 = map (obj: fetchMaven { version = "4.0"; artifactId = "asm-all"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/archiver.nix b/nixpkgs/pkgs/development/java-modules/plexus/archiver.nix index 384b92859762..41a334007e8f 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/archiver.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/archiver.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusArchiver_1_0_alpha7 = map (obj: fetchMaven { version = "1.0-alpha-7"; artifactId = "plexus-archiver"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/build-api.nix b/nixpkgs/pkgs/development/java-modules/plexus/build-api.nix index c417c955b69b..b362f905091e 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/build-api.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/build-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusBuildApi_0_0_4 = map (obj: fetchMaven { version = "0.0.4"; artifactId = "plexus-build-api"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/classworlds.nix b/nixpkgs/pkgs/development/java-modules/plexus/classworlds.nix index 6ff1755e8f53..7cb6c3dbf558 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/classworlds.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/classworlds.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusClassworlds_2_2_2 = map (obj: fetchMaven { version = "2.2.2"; artifactId = "plexus-classworlds"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/compiler-api.nix b/nixpkgs/pkgs/development/java-modules/plexus/compiler-api.nix index 11baab0950d0..a1c6556a7699 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/compiler-api.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/compiler-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerApi_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-api"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/compiler-javac.nix b/nixpkgs/pkgs/development/java-modules/plexus/compiler-javac.nix index a42064a0e9e8..d86240b6d45b 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/compiler-javac.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/compiler-javac.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerJavac_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-javac"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/compiler-manager.nix b/nixpkgs/pkgs/development/java-modules/plexus/compiler-manager.nix index f7221a96627f..3f27981b1540 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/compiler-manager.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/compiler-manager.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerManager_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-manager"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/component-annotations.nix b/nixpkgs/pkgs/development/java-modules/plexus/component-annotations.nix index fd3fc80e7e05..89ae778e762f 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/component-annotations.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/component-annotations.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven { version = "1.5.5"; artifactId = "plexus-component-annotations"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/container-default.nix b/nixpkgs/pkgs/development/java-modules/plexus/container-default.nix index 375a1913afcd..79d8ac1087b4 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/container-default.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/container-default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven { version = "1.0-alpha-9"; artifactId = "plexus-container-default"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/digest.nix b/nixpkgs/pkgs/development/java-modules/plexus/digest.nix index be2013a26760..a9c80c146c9b 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/digest.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/digest.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusDigest_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "plexus-digest"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/i18n.nix b/nixpkgs/pkgs/development/java-modules/plexus/i18n.nix index 5b34cde0503c..0b016a7bd493 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/i18n.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/i18n.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusI18n_1_0_beta6 = map (obj: fetchMaven { version = "1.0-beta-6"; artifactId = "plexus-i18n"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/interactivity-api.nix b/nixpkgs/pkgs/development/java-modules/plexus/interactivity-api.nix index 8ada106f48fd..378fa76d8c62 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/interactivity-api.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/interactivity-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven { version = "1.0-alpha-4"; artifactId = "plexus-interactivity-api"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/interpolation.nix b/nixpkgs/pkgs/development/java-modules/plexus/interpolation.nix index 90ff3de6a3fe..f2813e103f5c 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/interpolation.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/interpolation.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusInterpolation_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "plexus-interpolation"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/io.nix b/nixpkgs/pkgs/development/java-modules/plexus/io.nix index eee41f5ed2fd..e2cfd4b5882d 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/io.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/io.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusIo_2_0_2 = map (obj: fetchMaven { version = "2.0.2"; artifactId = "plexus-io"; diff --git a/nixpkgs/pkgs/development/java-modules/plexus/utils.nix b/nixpkgs/pkgs/development/java-modules/plexus/utils.nix index ce0537cea7d8..c52425342b0e 100644 --- a/nixpkgs/pkgs/development/java-modules/plexus/utils.nix +++ b/nixpkgs/pkgs/development/java-modules/plexus/utils.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusUtils_1_0_4 = map (obj: fetchMaven { version = "1.0.4"; artifactId = "plexus-utils"; diff --git a/nixpkgs/pkgs/development/java-modules/poms.nix b/nixpkgs/pkgs/development/java-modules/poms.nix index 610f98a7e466..d93edb7aa4fd 100644 --- a/nixpkgs/pkgs/development/java-modules/poms.nix +++ b/nixpkgs/pkgs/development/java-modules/poms.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ aether_0_9_0_M2 = fetchMaven { version = "0.9.0.M2"; artifactId = "aether"; diff --git a/nixpkgs/pkgs/development/java-modules/sisu/guice.nix b/nixpkgs/pkgs/development/java-modules/sisu/guice.nix index 51a004ed5451..e4d0e1f98d4a 100644 --- a/nixpkgs/pkgs/development/java-modules/sisu/guice.nix +++ b/nixpkgs/pkgs/development/java-modules/sisu/guice.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuGuice_2_9_4 = map (obj: fetchMaven { version = "2.9.4"; artifactId = "sisu-guice"; diff --git a/nixpkgs/pkgs/development/java-modules/sisu/inject-bean.nix b/nixpkgs/pkgs/development/java-modules/sisu/inject-bean.nix index bca16ccd114c..22d3582608a3 100644 --- a/nixpkgs/pkgs/development/java-modules/sisu/inject-bean.nix +++ b/nixpkgs/pkgs/development/java-modules/sisu/inject-bean.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuInjectBean_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; artifactId = "sisu-inject-bean"; diff --git a/nixpkgs/pkgs/development/java-modules/sisu/inject-plexus.nix b/nixpkgs/pkgs/development/java-modules/sisu/inject-plexus.nix index 0a181dc1a1ec..aee624c551c9 100644 --- a/nixpkgs/pkgs/development/java-modules/sisu/inject-plexus.nix +++ b/nixpkgs/pkgs/development/java-modules/sisu/inject-plexus.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuInjectPlexus_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; artifactId = "sisu-inject-plexus"; diff --git a/nixpkgs/pkgs/development/java-modules/xerces/impl.nix b/nixpkgs/pkgs/development/java-modules/xerces/impl.nix index 11295b3128fd..2ea05581d0d3 100644 --- a/nixpkgs/pkgs/development/java-modules/xerces/impl.nix +++ b/nixpkgs/pkgs/development/java-modules/xerces/impl.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xercesImpl_2_8_0 = map (obj: fetchMaven { version = "2.8.0"; artifactId = "xercesImpl"; diff --git a/nixpkgs/pkgs/development/java-modules/xml-apis/default.nix b/nixpkgs/pkgs/development/java-modules/xml-apis/default.nix index a96e3670b401..871629dbf3c2 100644 --- a/nixpkgs/pkgs/development/java-modules/xml-apis/default.nix +++ b/nixpkgs/pkgs/development/java-modules/xml-apis/default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xmlApis_1_3_03 = map (obj: fetchMaven { version = "1.3.03"; artifactId = "xml-apis"; diff --git a/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix index fcb708c829be..94b36b855f25 100644 --- a/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix +++ b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, xorg, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "AntTweakBar-1.16"; buildInputs = [ unzip xorg.libX11 libGLU_combined ]; diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index d538a0969b04..37e38e03b8cf 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95"; + sha256 = "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch b/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch index a6114901055a..a6b10ddb7edf 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch +++ b/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,12 +1,13 @@ diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in --- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300 +++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300 -@@ -6,5 +6,5 @@ +@@ -6,5 +6,6 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") set(SDL2_LIBDIR "@libdir@") -set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") +set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) ++separate_arguments(SDL2_INCLUDE_DIRS) set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in --- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300 diff --git a/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix index dc88b7b12ef3..f15009c2f5d9 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SDL_gpu-unstable"; version = "2019-01-24"; diff --git a/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix index 7b8fb67a30f1..66fa8888fd19 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SDL_sixel"; version = "1.2-nightly"; diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix index 8713663ecca7..860ac3fde41f 100644 --- a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix +++ b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dadmin_group=wheel" "-Dlocalstatedir=/var" - "-Dsystemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/amtk/default.nix b/nixpkgs/pkgs/development/libraries/amtk/default.nix index cb22c9ee790b..e8ecd0c0f1ef 100644 --- a/nixpkgs/pkgs/development/libraries/amtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amtk/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Amtk; - description = "Actions, Menus and Toolbars Kit for GTK+ applications"; + description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = [ maintainers.manveru ]; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/nixpkgs/pkgs/development/libraries/appstream/qt.nix index 307f57d20cf5..22f1566ad0ac 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -2,7 +2,7 @@ # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "appstream-qt"; inherit (appstream) version src prePatch; diff --git a/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix b/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix index 4b8093f74031..17093deae00f 100644 --- a/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix +++ b/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix @@ -19,7 +19,7 @@ let sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "argp-standalone-1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix index 992119faf65e..fa9a45f1ed3c 100644 --- a/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix @@ -160,7 +160,7 @@ in rec { ### Languages - af = buildOfficialDict rec { + af = buildOfficialDict { language = "af"; version = "0.50-0"; fullName = "Afrikaans"; @@ -168,7 +168,7 @@ in rec { sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; }; - am = buildOfficialDict rec { + am = buildOfficialDict { language = "am"; version = "0.03-1"; fullName = "Amharic"; @@ -176,7 +176,7 @@ in rec { sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; }; - ar = buildOfficialDict rec { + ar = buildOfficialDict { language = "ar"; version = "1.2-0"; fullName = "Arabic"; @@ -184,7 +184,7 @@ in rec { sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; }; - ast = buildOfficialDict rec { + ast = buildOfficialDict { language = "ast"; version = "0.01"; fullName = "Asturian"; @@ -192,7 +192,7 @@ in rec { sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; }; - az = buildOfficialDict rec { + az = buildOfficialDict { language = "az"; version = "0.02-0"; fullName = "Azerbaijani"; @@ -200,7 +200,7 @@ in rec { sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; }; - be = buildOfficialDict rec { + be = buildOfficialDict { language = "be"; version = "0.01"; fullName = "Belarusian"; @@ -208,7 +208,7 @@ in rec { sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; }; - bg = buildOfficialDict rec { + bg = buildOfficialDict { language = "bg"; version = "4.1-0"; fullName = "Bulgarian"; @@ -216,7 +216,7 @@ in rec { sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; }; - bn = buildOfficialDict rec { + bn = buildOfficialDict { language = "bn"; version = "0.01.1-1"; fullName = "Bengali"; @@ -224,7 +224,7 @@ in rec { sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; }; - br = buildOfficialDict rec { + br = buildOfficialDict { language = "br"; version = "0.50-2"; fullName = "Breton"; @@ -232,7 +232,7 @@ in rec { sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; }; - ca = buildOfficialDict rec { + ca = buildOfficialDict { language = "ca"; version = "2.1.5-1"; fullName = "Catalan"; @@ -240,7 +240,7 @@ in rec { sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; - cs = buildOfficialDict rec { + cs = buildOfficialDict { language = "cs"; version = "20040614-1"; fullName = "Czech"; @@ -248,7 +248,7 @@ in rec { sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; }; - csb = buildOfficialDict rec { + csb = buildOfficialDict { language = "csb"; version = "0.02-0"; fullName = "Kashubian"; @@ -256,7 +256,7 @@ in rec { sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; }; - cy = buildOfficialDict rec { + cy = buildOfficialDict { language = "cy"; version = "0.50-3"; fullName = "Welsh"; @@ -264,7 +264,7 @@ in rec { sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; }; - da = buildOfficialDict rec { + da = buildOfficialDict { language = "da"; version = "1.4.42-1"; fullName = "Danish"; @@ -272,7 +272,7 @@ in rec { sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; - de = buildOfficialDict rec { + de = buildOfficialDict { language = "de"; version = "20030222-1"; fullName = "German"; @@ -280,7 +280,7 @@ in rec { sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; - de-alt = buildOfficialDict rec { + de-alt = buildOfficialDict { language = "de-alt"; version = "2.1-1"; fullName = "German - Old Spelling"; @@ -288,7 +288,7 @@ in rec { sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; }; - el = buildOfficialDict rec { + el = buildOfficialDict { language = "el"; version = "0.08-0"; fullName = "Greek"; @@ -296,7 +296,7 @@ in rec { sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; }; - en = buildOfficialDict rec { + en = buildOfficialDict { language = "en"; version = "2018.04.16-0"; fullName = "English"; @@ -304,7 +304,7 @@ in rec { sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; }; - eo = buildOfficialDict rec { + eo = buildOfficialDict { language = "eo"; version = "2.1.20000225a-2"; fullName = "Esperanto"; @@ -312,7 +312,7 @@ in rec { sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; - es = buildOfficialDict rec { + es = buildOfficialDict { language = "es"; version = "1.11-2"; fullName = "Spanish"; @@ -320,7 +320,7 @@ in rec { sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; - et = buildOfficialDict rec { + et = buildOfficialDict { language = "et"; version = "0.1.21-1"; fullName = "Estonian"; @@ -328,7 +328,7 @@ in rec { sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; }; - fa = buildOfficialDict rec { + fa = buildOfficialDict { language = "fa"; version = "0.11-0"; fullName = "Persian"; @@ -336,7 +336,7 @@ in rec { sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; }; - fi = buildOfficialDict rec { + fi = buildOfficialDict { language = "fi"; version = "0.7-0"; fullName = "Finnish"; @@ -344,7 +344,7 @@ in rec { sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; }; - fo = buildOfficialDict rec { + fo = buildOfficialDict { language = "fo"; version = "0.2.16-1"; fullName = "Faroese"; @@ -352,7 +352,7 @@ in rec { sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; }; - fr = buildOfficialDict rec { + fr = buildOfficialDict { language = "fr"; version = "0.50-3"; fullName = "French"; @@ -360,7 +360,7 @@ in rec { sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; - fy = buildOfficialDict rec { + fy = buildOfficialDict { language = "fy"; version = "0.12-0"; fullName = "Frisian"; @@ -368,7 +368,7 @@ in rec { sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; }; - ga = buildOfficialDict rec { + ga = buildOfficialDict { language = "ga"; version = "4.5-0"; fullName = "Irish"; @@ -376,7 +376,7 @@ in rec { sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; }; - gd = buildOfficialDict rec { + gd = buildOfficialDict { language = "gd"; version = "0.1.1-1"; fullName = "Scottish Gaelic"; @@ -384,7 +384,7 @@ in rec { sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; }; - gl = buildOfficialDict rec { + gl = buildOfficialDict { language = "gl"; version = "0.5a-2"; fullName = "Galician"; @@ -392,7 +392,7 @@ in rec { sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; }; - grc = buildOfficialDict rec { + grc = buildOfficialDict { language = "grc"; version = "0.02-0"; fullName = "Ancient Greek"; @@ -400,7 +400,7 @@ in rec { sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; }; - gu = buildOfficialDict rec { + gu = buildOfficialDict { language = "gu"; version = "0.03-0"; fullName = "Gujarati"; @@ -408,7 +408,7 @@ in rec { sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; }; - gv = buildOfficialDict rec { + gv = buildOfficialDict { language = "gv"; version = "0.50-0"; fullName = "Manx Gaelic"; @@ -416,7 +416,7 @@ in rec { sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; }; - he = buildOfficialDict rec { + he = buildOfficialDict { language = "he"; version = "1.0-0"; fullName = "Hebrew"; @@ -424,7 +424,7 @@ in rec { sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; }; - hi = buildOfficialDict rec { + hi = buildOfficialDict { language = "hi"; version = "0.02-0"; fullName = "Hindi"; @@ -432,7 +432,7 @@ in rec { sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; }; - hil = buildOfficialDict rec { + hil = buildOfficialDict { language = "hil"; version = "0.11-0"; fullName = "Hiligaynon"; @@ -440,7 +440,7 @@ in rec { sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; }; - hr = buildOfficialDict rec { + hr = buildOfficialDict { language = "hr"; version = "0.51-0"; fullName = "Croatian"; @@ -448,7 +448,7 @@ in rec { sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; }; - hsb = buildOfficialDict rec { + hsb = buildOfficialDict { language = "hsb"; version = "0.02-0"; fullName = "Upper Sorbian"; @@ -456,7 +456,7 @@ in rec { sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; }; - hu = buildOfficialDict rec { + hu = buildOfficialDict { language = "hu"; version = "0.99.4.2-0"; fullName = "Hungarian"; @@ -464,7 +464,7 @@ in rec { sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; }; - hus = buildOfficialDict rec { + hus = buildOfficialDict { language = "hus"; version = "0.03-1"; fullName = "Huastec"; @@ -472,7 +472,7 @@ in rec { sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; }; - hy = buildOfficialDict rec { + hy = buildOfficialDict { language = "hy"; version = "0.10.0-0"; fullName = "Armenian"; @@ -480,7 +480,7 @@ in rec { sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; }; - ia = buildOfficialDict rec { + ia = buildOfficialDict { language = "ia"; version = "0.50-1"; fullName = "Interlingua"; @@ -488,7 +488,7 @@ in rec { sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; }; - id = buildOfficialDict rec { + id = buildOfficialDict { language = "id"; version = "1.2-0"; fullName = "Indonesian"; @@ -496,7 +496,7 @@ in rec { sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; }; - is = buildOfficialDict rec { + is = buildOfficialDict { language = "is"; version = "0.51.1-0"; fullName = "Icelandic"; @@ -504,7 +504,7 @@ in rec { sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; }; - it = buildOfficialDict rec { + it = buildOfficialDict { language = "it"; version = "2.2_20050523-0"; fullName = "Italian"; @@ -512,7 +512,7 @@ in rec { sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; - kn = buildOfficialDict rec { + kn = buildOfficialDict { language = "kn"; version = "0.01-1"; fullName = "Kannada"; @@ -520,7 +520,7 @@ in rec { sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; }; - ku = buildOfficialDict rec { + ku = buildOfficialDict { language = "ku"; version = "0.20-1"; fullName = "Kurdi"; @@ -528,7 +528,7 @@ in rec { sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; }; - ky = buildOfficialDict rec { + ky = buildOfficialDict { language = "ky"; version = "0.01-0"; fullName = "Kirghiz"; @@ -536,7 +536,7 @@ in rec { sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; }; - la = buildOfficialDict rec { + la = buildOfficialDict { language = "la"; version = "20020503-0"; fullName = "Latin"; @@ -544,7 +544,7 @@ in rec { sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; - lt = buildOfficialDict rec { + lt = buildOfficialDict { language = "lt"; version = "1.2.1-0"; fullName = "Lithuanian"; @@ -552,7 +552,7 @@ in rec { sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; }; - lv = buildOfficialDict rec { + lv = buildOfficialDict { language = "lv"; version = "0.5.5-1"; fullName = "Latvian"; @@ -560,7 +560,7 @@ in rec { sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; }; - mg = buildOfficialDict rec { + mg = buildOfficialDict { language = "mg"; version = "0.03-0"; fullName = "Malagasy"; @@ -568,7 +568,7 @@ in rec { sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; }; - mi = buildOfficialDict rec { + mi = buildOfficialDict { language = "mi"; version = "0.50-0"; fullName = "Maori"; @@ -576,7 +576,7 @@ in rec { sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; }; - mk = buildOfficialDict rec { + mk = buildOfficialDict { language = "mk"; version = "0.50-0"; fullName = "Macedonian"; @@ -584,7 +584,7 @@ in rec { sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; }; - ml = buildOfficialDict rec { + ml = buildOfficialDict { language = "ml"; version = "0.03-1"; fullName = "Malayalam"; @@ -592,7 +592,7 @@ in rec { sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; }; - mn = buildOfficialDict rec { + mn = buildOfficialDict { language = "mn"; version = "0.06-2"; fullName = "Mongolian"; @@ -600,7 +600,7 @@ in rec { sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; }; - mr = buildOfficialDict rec { + mr = buildOfficialDict { language = "mr"; version = "0.10-0"; fullName = "Marathi"; @@ -608,7 +608,7 @@ in rec { sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; }; - ms = buildOfficialDict rec { + ms = buildOfficialDict { language = "ms"; version = "0.50-0"; fullName = "Malay"; @@ -616,7 +616,7 @@ in rec { sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; }; - mt = buildOfficialDict rec { + mt = buildOfficialDict { language = "mt"; version = "0.50-0"; fullName = "Maltese"; @@ -624,7 +624,7 @@ in rec { sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; }; - nb = buildOfficialDict rec { + nb = buildOfficialDict { language = "nb"; version = "0.50.1-0"; fullName = "Norwegian Bokmal"; @@ -632,7 +632,7 @@ in rec { sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; }; - nds = buildOfficialDict rec { + nds = buildOfficialDict { language = "nds"; version = "0.01-0"; fullName = "Low Saxon"; @@ -640,7 +640,7 @@ in rec { sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; }; - nl = buildOfficialDict rec { + nl = buildOfficialDict { language = "nl"; version = "0.50-2"; fullName = "Dutch"; @@ -652,7 +652,7 @@ in rec { ''; }; - nn = buildOfficialDict rec { + nn = buildOfficialDict { language = "nn"; version = "0.50.1-1"; fullName = "Norwegian Nynorsk"; @@ -660,7 +660,7 @@ in rec { sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; }; - ny = buildOfficialDict rec { + ny = buildOfficialDict { language = "ny"; version = "0.01-0"; fullName = "Chichewa"; @@ -668,7 +668,7 @@ in rec { sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; }; - or = buildOfficialDict rec { + or = buildOfficialDict { language = "or"; version = "0.03-1"; fullName = "Oriya"; @@ -676,7 +676,7 @@ in rec { sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; }; - pa = buildOfficialDict rec { + pa = buildOfficialDict { language = "pa"; version = "0.01-1"; fullName = "Punjabi"; @@ -684,7 +684,7 @@ in rec { sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; }; - pl = buildOfficialDict rec { + pl = buildOfficialDict { language = "pl"; version = "6.0_20061121-0"; fullName = "Polish"; @@ -692,7 +692,7 @@ in rec { sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; - pt_BR = buildOfficialDict rec { + pt_BR = buildOfficialDict { language = "pt_BR"; version = "20090702-0"; fullName = "Brazilian Portuguese"; @@ -700,7 +700,7 @@ in rec { sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; - pt_PT = buildOfficialDict rec { + pt_PT = buildOfficialDict { language = "pt_PT"; version = "20070510-0"; fullName = "Portuguese"; @@ -708,7 +708,7 @@ in rec { sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; - qu = buildOfficialDict rec { + qu = buildOfficialDict { language = "qu"; version = "0.02-0"; fullName = "Quechua"; @@ -716,7 +716,7 @@ in rec { sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; }; - ro = buildOfficialDict rec { + ro = buildOfficialDict { language = "ro"; version = "3.3-2"; fullName = "Romanian"; @@ -724,7 +724,7 @@ in rec { sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; - ru = buildOfficialDict rec { + ru = buildOfficialDict { language = "ru"; version = "0.99f7-1"; fullName = "Russian"; @@ -732,7 +732,7 @@ in rec { sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; - rw = buildOfficialDict rec { + rw = buildOfficialDict { language = "rw"; version = "0.50-0"; fullName = "Kinyarwanda"; @@ -740,7 +740,7 @@ in rec { sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; }; - sc = buildOfficialDict rec { + sc = buildOfficialDict { language = "sc"; version = "1.0"; fullName = "Sardinian"; @@ -748,7 +748,7 @@ in rec { sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; }; - sk = buildOfficialDict rec { + sk = buildOfficialDict { language = "sk"; version = "2.01-2"; fullName = "Slovak"; @@ -756,7 +756,7 @@ in rec { sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; }; - sl = buildOfficialDict rec { + sl = buildOfficialDict { language = "sl"; version = "0.50-0"; fullName = "Slovenian"; @@ -764,7 +764,7 @@ in rec { sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; }; - sr = buildOfficialDict rec { + sr = buildOfficialDict { language = "sr"; version = "0.02"; fullName = "Serbian"; @@ -772,7 +772,7 @@ in rec { sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; }; - sv = buildOfficialDict rec { + sv = buildOfficialDict { language = "sv"; version = "0.51-0"; fullName = "Swedish"; @@ -780,7 +780,7 @@ in rec { sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; }; - sw = buildOfficialDict rec { + sw = buildOfficialDict { language = "sw"; version = "0.50-0"; fullName = "Swahili"; @@ -788,7 +788,7 @@ in rec { sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; }; - ta = buildOfficialDict rec { + ta = buildOfficialDict { language = "ta"; version = "20040424-1"; fullName = "Tamil"; @@ -796,7 +796,7 @@ in rec { sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; }; - te = buildOfficialDict rec { + te = buildOfficialDict { language = "te"; version = "0.01-2"; fullName = "Telugu"; @@ -804,7 +804,7 @@ in rec { sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; }; - tet = buildOfficialDict rec { + tet = buildOfficialDict { language = "tet"; version = "0.1.1"; fullName = "Tetum"; @@ -812,7 +812,7 @@ in rec { sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; }; - tk = buildOfficialDict rec { + tk = buildOfficialDict { language = "tk"; version = "0.01-0"; fullName = "Turkmen"; @@ -820,7 +820,7 @@ in rec { sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; }; - tl = buildOfficialDict rec { + tl = buildOfficialDict { language = "tl"; version = "0.02-1"; fullName = "Tagalog"; @@ -828,7 +828,7 @@ in rec { sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; }; - tn = buildOfficialDict rec { + tn = buildOfficialDict { language = "tn"; version = "1.0.1-0"; fullName = "Setswana"; @@ -836,7 +836,7 @@ in rec { sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; }; - tr = buildOfficialDict rec { + tr = buildOfficialDict { language = "tr"; version = "0.50-0"; fullName = "Turkish"; @@ -844,7 +844,7 @@ in rec { sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; - uk = buildOfficialDict rec { + uk = buildOfficialDict { language = "uk"; version = "1.4.0-0"; fullName = "Ukrainian"; @@ -852,7 +852,7 @@ in rec { sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; }; - uz = buildOfficialDict rec { + uz = buildOfficialDict { language = "uz"; version = "0.6-0"; fullName = "Uzbek"; @@ -860,7 +860,7 @@ in rec { sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; }; - vi = buildOfficialDict rec { + vi = buildOfficialDict { language = "vi"; version = "0.01.1-1"; fullName = "Vietnamese"; @@ -868,7 +868,7 @@ in rec { sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; }; - wa = buildOfficialDict rec { + wa = buildOfficialDict { language = "wa"; version = "0.50-0"; fullName = "Walloon"; @@ -876,7 +876,7 @@ in rec { sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; }; - yi = buildOfficialDict rec { + yi = buildOfficialDict { language = "yi"; version = "0.01.1-1"; fullName = "Yiddish"; @@ -884,7 +884,7 @@ in rec { sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; }; - zu = buildOfficialDict rec { + zu = buildOfficialDict { language = "zu"; version = "0.50-0"; fullName = "Zulu"; @@ -894,7 +894,7 @@ in rec { ### Jargons - en-computers = buildTxtDict rec { + en-computers = buildTxtDict { shortName = "en-computers"; fullName = "English Computer Jargon"; @@ -913,7 +913,7 @@ in rec { }; }; - en-science = buildTxtDict rec { + en-science = buildTxtDict { shortName = "en-science"; fullName = "English Scientific Jargon"; diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 7adc84f47861..e7cea235ceb4 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -5,6 +5,8 @@ , ninja , pkgconfig , gobject-introspection +, gsettings-desktop-schemas +, makeWrapper , dbus , glib @@ -27,19 +29,32 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ] + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ] # Fixup rpaths because of meson, remove with meson-0.47 ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ dbus glib libX11 libXtst libXi ]; doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" + # Provide dbus-daemon fallback when it is not already running when + # at-spi2-bus-launcher is executed. This allows us to avoid + # including the entire dbus closure in libraries linked with + # the at-spi2-core libraries. + mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ]; + passthru = { updateScript = gnome3.updateScript { packageName = pname; }; }; + postFixup = '' + # Cannot use wrapGAppsHook'due to a dependency cycle + wrapProgram $out/libexec/at-spi-bus-launcher \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} + ''; + meta = with stdenv.lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; diff --git a/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix index 978376eb4fa7..6f10283b07bf 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lv2-unstable"; version = "2017-07-08"; diff --git a/nixpkgs/pkgs/development/libraries/audio/vamp/default.nix b/nixpkgs/pkgs/development/libraries/audio/vamp/default.nix index f8b1006d2eb7..2ac3115af2aa 100644 --- a/nixpkgs/pkgs/development/libraries/audio/vamp/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/vamp/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsndfile }: -rec { +{ vampSDK = stdenv.mkDerivation { name = "vamp-sdk-2.7.1"; diff --git a/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/nixpkgs/pkgs/development/libraries/avro-c/default.nix index 9582e54ffaca..f66d9369c20a 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -2,7 +2,7 @@ let version = "1.9.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "avro-c"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/bamf/default.nix b/nixpkgs/pkgs/development/libraries/bamf/default.nix index de436864edaa..b1fb17b08fa9 100644 --- a/nixpkgs/pkgs/development/libraries/bamf/default.nix +++ b/nixpkgs/pkgs/development/libraries/bamf/default.nix @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/beignet/default.nix b/nixpkgs/pkgs/development/libraries/beignet/default.nix index 05203d6c233a..af0053519e3d 100644 --- a/nixpkgs/pkgs/development/libraries/beignet/default.nix +++ b/nixpkgs/pkgs/development/libraries/beignet/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { python3 ]; - passthru.utests = stdenv.mkDerivation rec { + passthru.utests = stdenv.mkDerivation { pname = "beignet-utests"; inherit version src; diff --git a/nixpkgs/pkgs/development/libraries/blitz/default.nix b/nixpkgs/pkgs/development/libraries/blitz/default.nix index 503e4b0fa43b..fd0da496fa40 100644 --- a/nixpkgs/pkgs/development/libraries/blitz/default.nix +++ b/nixpkgs/pkgs/development/libraries/blitz/default.nix @@ -22,7 +22,7 @@ let inherit (stdenv.lib) optional optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "blitz++-0.10"; src = fetchurl { url = mirror://sourceforge/blitz/blitz-0.10.tar.gz; @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" - "--disable-static" "--enable-fortran" "--enable-optimize" "--with-pic=yes" diff --git a/nixpkgs/pkgs/development/libraries/boost/1.55.nix b/nixpkgs/pkgs/development/libraries/boost/1.55.nix index 0a38f35af753..bcb452ea4f86 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.55.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.55.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.55.0"; patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.59.nix b/nixpkgs/pkgs/development/libraries/boost/1.59.nix index f4931dfe5474..fb65e49c500c 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.59.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.59.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.59.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.60.nix b/nixpkgs/pkgs/development/libraries/boost/1.60.nix index b6d74234f799..646f4652f77d 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.60.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.60.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.60.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.62.nix b/nixpkgs/pkgs/development/libraries/boost/1.62.nix index 871ef392c1ae..a1b3c51d0e69 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.62.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.62.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.62.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.63.nix b/nixpkgs/pkgs/development/libraries/boost/1.63.nix index c4749bc3ee41..a8b459f4b12f 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.63.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.63.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.63.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.64.nix b/nixpkgs/pkgs/development/libraries/boost/1.64.nix index 1cf9bfa51f4b..32632f79d225 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.64.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.64.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.64.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.65.nix b/nixpkgs/pkgs/development/libraries/boost/1.65.nix index 9837e1c69193..922c09ba7fe9 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.65.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.65.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.65.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.66.nix b/nixpkgs/pkgs/development/libraries/boost/1.66.nix index b44c1a3823a9..0a99717a7997 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.66.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.66.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.66.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.67.nix b/nixpkgs/pkgs/development/libraries/boost/1.67.nix index 406e63b9622b..a2fe9447c125 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.67.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.67.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.67.0"; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/boost/1.68.nix b/nixpkgs/pkgs/development/libraries/boost/1.68.nix index cd980439b710..4d98172c6d05 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.68.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.68.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.68.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.69.nix b/nixpkgs/pkgs/development/libraries/boost/1.69.nix index 959fa851fe22..95c4aa854a46 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.69.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.69.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.69.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boost/1.70.nix b/nixpkgs/pkgs/development/libraries/boost/1.70.nix index 5f7b39c1189e..45a8bdb93185 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.70.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.70.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.70.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/bootil/default.nix b/nixpkgs/pkgs/development/libraries/bootil/default.nix index 3c27281571af..9283f37a8c47 100644 --- a/nixpkgs/pkgs/development/libraries/bootil/default.nix +++ b/nixpkgs/pkgs/development/libraries/bootil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, premake4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bootil-unstable-2015-12-17"; meta = { diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix index 7db73f5ad47c..67e2794c8a29 100644 --- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, perl, go }: # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "boringssl"; version = "2017-02-23"; diff --git a/nixpkgs/pkgs/development/libraries/brigand/default.nix b/nixpkgs/pkgs/development/libraries/brigand/default.nix index ba7b51bb0e4e..7710747d8004 100644 --- a/nixpkgs/pkgs/development/libraries/brigand/default.nix +++ b/nixpkgs/pkgs/development/libraries/brigand/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "brigand"; version = "1.3.0"; diff --git a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix index 97fe7e512993..8b0901832d11 100644 --- a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -2,7 +2,7 @@ , Cocoa, OpenGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bullet"; version = "2019-03-27"; diff --git a/nixpkgs/pkgs/development/libraries/celt/generic.nix b/nixpkgs/pkgs/development/libraries/celt/generic.nix index d9e69b8e7512..3b7e870b4fe9 100644 --- a/nixpkgs/pkgs/development/libraries/celt/generic.nix +++ b/nixpkgs/pkgs/development/libraries/celt/generic.nix @@ -6,7 +6,7 @@ # The celt codec has been deprecated and is now a part of the opus codec -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "celt"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/clipp/clipp.pc b/nixpkgs/pkgs/development/libraries/clipp/clipp.pc new file mode 100644 index 000000000000..38c07e5ba162 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/clipp/clipp.pc @@ -0,0 +1,9 @@ +prefix=@out@ +includedir=${prefix}/include + +Name: @pname@ +Description: Easy to use, powerful and expressive command line argument \ +handling for C++11/14/17 +URL: https://github.com/muellan/clipp +Version: @version@ +Cflags: -I${includedir} diff --git a/nixpkgs/pkgs/development/libraries/clipp/default.nix b/nixpkgs/pkgs/development/libraries/clipp/default.nix new file mode 100644 index 000000000000..f7c8f90e8686 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/clipp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "clipp"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "muellan"; + repo = pname; + rev = "v${version}"; + sha256 = "0rq80ba2krwzvcg4r2g1al88453c7lz6ziri2s1ygv8inp9r775s"; + }; + + installPhase = '' + mkdir -p $out/share/pkgconfig + cp -r include $out/ + substitute ${./clipp.pc} $out/share/pkgconfig/clipp.pc \ + --subst-var out \ + --subst-var pname \ + --subst-var version + ''; + + meta = with stdenv.lib; { + description = "Easy to use, powerful and expressive command line argument handling for C++11/14/17"; + homepage = "https://github.com/muellan/clipp"; + license = licenses.mit; + maintainers = with maintainers; [ xbreak ]; + platforms = with platforms; all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/nixpkgs/pkgs/development/libraries/coin3d/default.nix index 80b6480323be..74fd12ffea26 100644 --- a/nixpkgs/pkgs/development/libraries/coin3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix @@ -1,6 +1,6 @@ { fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "coin"; version = "unstable-2019-06-12"; diff --git a/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix index 2585a7abaed1..dfebccc88e35 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cpp-ipfs-api"; version = "2017-01-04"; diff --git a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix index aa0708daaa7f..9b6407715df5 100644 --- a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix @@ -3,7 +3,7 @@ let pname = "cxxtest"; version = "4.4"; -in python2Packages.buildPythonApplication rec { +in python2Packages.buildPythonApplication { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/db/db-4.8.nix b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix index 76e30e921ba1..dc668a233b06 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-4.8.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/db/db-5.3.nix b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix index 7894e4c73262..1223cb897e86 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-5.3.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix index bafca3bd52d2..642054b5a018 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix index 96f7668aa903..dee07a9637e6 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = stdenv.lib.licenses.agpl3; diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix index abc32b90c6b8..616ad869d57c 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -1,92 +1,105 @@ -{ stdenv, lib, fetchurl, pkgconfig, expat, systemd -, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: +{ stdenv +, lib +, fetchurl +, pkgconfig +, expat +, systemd +, libX11 ? null +, libICE ? null +, libSM ? null +, x11Support ? (stdenv.isLinux || stdenv.isDarwin) +, dbus +}: + +assert + x11Support -> + libX11 != null && libICE != null && libSM != null; + +stdenv.mkDerivation rec { + pname = "dbus"; + version = "1.12.16"; -assert x11Support -> libX11 != null - && libICE != null - && libSM != null; + src = fetchurl { + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; + sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"; + }; -let - version = "1.12.16"; - sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"; - -self = stdenv.mkDerivation { - name = "dbus-${version}"; - inherit version; - - src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - inherit sha256; - }; - - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; - postPatch = '' - substituteInPlace tools/Makefile.in \ - --replace 'install-localstatelibDATA:' 'disabled:' \ - --replace 'install-data-local:' 'disabled:' \ - --replace 'installcheck-local:' 'disabled:' - substituteInPlace bus/Makefile.in \ - --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' - '' + /* cleanup of runtime references */ '' - substituteInPlace ./dbus/dbus-sysdeps-unix.c \ - --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\"" - substituteInPlace ./tools/dbus-launch.c \ - --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' - ''; - - outputs = [ "out" "dev" "lib" "doc" ]; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ expat ]; - buildInputs = lib.optional stdenv.isLinux systemd - ++ lib.optionals x11Support [ libX11 libICE libSM ]; - # ToDo: optional selinux? - - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-session-socket-dir=/tmp" - "--with-system-pid-file=/run/dbus/pid" - "--with-system-socket=/run/dbus/system_bus_socket" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--enable-user-session" - "--datadir=/etc" - "--libexecdir=$(out)/libexec" - ] ++ lib.optional (!x11Support) "--without-x"; - - # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 - # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. - # problems building without x11Support so disabled in that case for now - NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; - NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; - - enableParallelBuilding = true; - - doCheck = true; - - installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ]; - - postInstall = '' - mkdir -p "$out/share/xml/dbus" - cp doc/*.dtd "$out/share/xml/dbus" - ''; - - # it's executed from $lib by absolute path - postFixup = '' - moveToOutput bin/dbus-launch "$lib" - ln -s "$lib/bin/dbus-launch" "$out/bin/" - ''; - - passthru = { - dbus-launch = "${self.lib}/bin/dbus-launch"; - daemon = self.out; - }; - - meta = with stdenv.lib; { - description = "Simple interprocess messaging system"; - homepage = http://www.freedesktop.org/wiki/Software/dbus/; - license = licenses.gpl2Plus; # most is also under AFL-2.1 - platforms = platforms.unix; - }; + patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + + postPatch = '' + substituteInPlace tools/Makefile.in \ + --replace 'install-localstatelibDATA:' 'disabled:' \ + --replace 'install-data-local:' 'disabled:' \ + --replace 'installcheck-local:' 'disabled:' + substituteInPlace bus/Makefile.in \ + --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' + '' + /* cleanup of runtime references */ '' + substituteInPlace ./dbus/dbus-sysdeps-unix.c \ + --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\"" + substituteInPlace ./tools/dbus-launch.c \ + --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' + ''; + + outputs = [ "out" "dev" "lib" "doc" ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + propagatedBuildInputs = [ + expat + ]; + + buildInputs = lib.optionals x11Support [ + libX11 + libICE + libSM + ] ++ lib.optional stdenv.isLinux systemd; + # ToDo: optional selinux? + + configureFlags = [ + "--enable-user-session" + "--libexecdir=${placeholder ''out''}/libexec" + "--localstatedir=/var" + "--runstatedir=/run" + "--sysconfdir=/etc" + "--with-session-socket-dir=/tmp" + "--with-system-pid-file=/run/dbus/pid" + "--with-system-socket=/run/dbus/system_bus_socket" + "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" + ] ++ lib.optional (!x11Support) "--without-x"; + + # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 + # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. + # problems building without x11Support so disabled in that case for now + NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; + NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; + + enableParallelBuilding = true; + + doCheck = true; + + installFlags = [ + "sysconfdir=${placeholder ''out''}/etc" + "datadir=${placeholder ''out''}/share" + ]; + + # it's executed from $lib by absolute path + postFixup = '' + moveToOutput bin/dbus-launch "$lib" + ln -s "$lib/bin/dbus-launch" "$out/bin/" + ''; + + passthru = { + dbus-launch = "${dbus.lib}/bin/dbus-launch"; + daemon = dbus.out; + }; + + meta = with stdenv.lib; { + description = "Simple interprocess messaging system"; + homepage = http://www.freedesktop.org/wiki/Software/dbus/; + license = licenses.gpl2Plus; # most is also under AFL-2.1 + platforms = platforms.unix; }; -in self +} diff --git a/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix index 5d441c5d1331..e714b96b7e9f 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -22,7 +22,7 @@ runCommand "dbus-1" <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <rewriteSystem systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/" - rewritePrefix="file://${dbus}/share/xml/dbus/"/> + rewritePrefix="file://${dbus}/share/xml/dbus-1/"/> </catalog> ''; nativeBuildInputs = [ libxslt.bin ]; diff --git a/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl b/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl index 9544aa13db56..6a19ee14a22c 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl +++ b/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl @@ -24,6 +24,7 @@ <xsl:for-each select="str:tokenize($serviceDirectories)"> <servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir> <includedir><xsl:value-of select="." />/etc/dbus-1/session.d</includedir> + <includedir><xsl:value-of select="." />/share/dbus-1/session.d</includedir> </xsl:for-each> </busconfig> </xsl:template> diff --git a/nixpkgs/pkgs/development/libraries/dbus/systemd.patch b/nixpkgs/pkgs/development/libraries/dbus/systemd.patch deleted file mode 100644 index 7e6cb1f87d07..000000000000 --- a/nixpkgs/pkgs/development/libraries/dbus/systemd.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 24fcc9e..98e0459 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1167,7 +1167,8 @@ else - PKG_CHECK_MODULES(SYSTEMD, - [libsystemd-login >= 32, libsystemd-daemon >= 32], - have_systemd=yes, -- have_systemd=no) -+ have_systemd=yes) -+ AC_MSG_NOTICE([NixOS: do not care whether we found systemd or not]) - fi - - if test x$have_systemd = xyes; then diff --git a/nixpkgs/pkgs/development/libraries/dee/default.nix b/nixpkgs/pkgs/development/libraries/dee/default.nix index 04ecadadefa0..093cc2bdf058 100644 --- a/nixpkgs/pkgs/development/libraries/dee/default.nix +++ b/nixpkgs/pkgs/development/libraries/dee/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-gtk-doc" - "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/dyncall/default.nix b/nixpkgs/pkgs/development/libraries/dyncall/default.nix index a6ff37bee97a..cfc95de15552 100644 --- a/nixpkgs/pkgs/development/libraries/dyncall/default.nix +++ b/nixpkgs/pkgs/development/libraries/dyncall/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dyncall"; version = "1.0"; diff --git a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix index 566f8bfd8d15..13617d67bf57 100644 --- a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elementary-cmake-modules"; version = "0.1.0"; diff --git a/nixpkgs/pkgs/development/libraries/embree/2.x.nix b/nixpkgs/pkgs/development/libraries/embree/2.x.nix index 4fc85aee69f6..e968e09459a0 100644 --- a/nixpkgs/pkgs/development/libraries/embree/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/embree/2.x.nix @@ -2,7 +2,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "embree"; version = "2.17.4"; diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 3f46390c12ba..92e34145abde 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -1,24 +1,50 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell, unittest-cpp }: +{ stdenv +, fetchurl +, aspell +, pkgconfig +, glib +, hunspell +, hspell +, unittest-cpp +}: stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.4"; + version = "2.2.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm"; + sha256 = "0r41qjz3104h5raiwlw5ywwybafbxdjz12j1bnq3kq60jlr6d2pf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib hunspell ]; - checkInputs = [ unittest-cpp ]; - propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + glib + hunspell + ]; + + checkInputs = [ + unittest-cpp + ]; + + # libtool puts these to .la files + propagatedBuildInputs = [ + hspell + aspell + ]; enableParallelBuilding = true; - doCheck = false; # https://github.com/AbiWord/enchant/issues/219 + doCheck = true; + + configureFlags = [ + "--enable-relocatable" # needed for tests + ]; meta = with stdenv.lib; { description = "Generic spell checking library"; diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index ec6f07f0953a..21f63e07335d 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.2"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index 858bc2093916..a2b048ebd19a 100644 --- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { pname = "fflas-ffpack"; - version = "2.4.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; - rev = "v${version}"; - sha256 = "1q1ala88ysz14pb5cn2kskv829nc1qif7zfzjwzhd5nnzwyivmc4"; + rev = "${version}"; + sha256 = "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74"; }; checkInputs = [ @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { "--with-lapack-libs=-l${blas.linkName}" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 3b1aeeebaabd..45a4f48fd337 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -272,7 +272,7 @@ stdenv.mkDerivation rec { * Build flags */ # On some ARM platforms --enable-thumb - "--enable-shared --disable-static" + "--enable-shared" (enableFeature true "pic") (if stdenv.cc.isClang then "--cc=clang" else null) (enableFeature smallBuild "small") diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix index 439342a50b85..f5ef8e850ddc 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ffmpeg-sixel"; version = "nightly-2.3.x"; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 84260f3f57c7..4c0ca0210cc8 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers +, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -89,7 +89,6 @@ stdenv.mkDerivation rec { "--enable-version3" # Build flags "--enable-shared" - "--disable-static" (ifMinVer "0.6" "--enable-pic") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") "--enable-hardcoded-tables" @@ -145,6 +144,7 @@ stdenv.mkDerivation rec { (ifMinVer "2.8" "--enable-libopus") "--enable-libspeex" (ifMinVer "2.8" "--enable-libx265") + (ifMinVer "4.2" (enableFeature (dav1d != null) "libdav1d")) # Developer flags (enableFeature debugDeveloper "debug") (enableFeature optimizationsDeveloper "optimizations") @@ -170,7 +170,8 @@ stdenv.mkDerivation rec { ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau - ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL); + ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL) + ++ optional (reqMin "4.2") dav1d; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/fftw/default.nix b/nixpkgs/pkgs/development/libraries/fftw/default.nix index bc5de5f9730f..c9577436c300 100644 --- a/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -9,7 +9,7 @@ let withDoc = stdenv.cc.isGNU; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fftw-${precision}-${version}"; src = fetchurl { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; # fftw-wisdom configureFlags = - [ "--enable-shared" "--disable-static" + [ "--enable-shared" "--enable-threads" ] ++ optional (precision != "double") "--enable-${precision}" diff --git a/nixpkgs/pkgs/development/libraries/flite/default.nix b/nixpkgs/pkgs/development/libraries/flite/default.nix index 0b4172cdc764..4ac8150274cf 100644 --- a/nixpkgs/pkgs/development/libraries/flite/default.nix +++ b/nixpkgs/pkgs/development/libraries/flite/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, alsaLib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flite-2.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index 186560ae101f..5c9a0ecc71b7 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation rec { src = ./config-compat.patch; inherit configVersion; }) + + # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67 + ./fix-joypixels.patch ]; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/fix-joypixels.patch b/nixpkgs/pkgs/development/libraries/fontconfig/fix-joypixels.patch new file mode 100644 index 000000000000..d5654063fe89 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/fontconfig/fix-joypixels.patch @@ -0,0 +1,23 @@ +--- a/conf.d/45-generic.conf ++++ b/conf.d/45-generic.conf +@@ -5,6 +5,10 @@ + + <!-- Emoji --> + ++ <alias binding="same"> ++ <family>JoyPixels</family> ++ <default><family>emoji</family></default> ++ </alias> + <alias binding="same"> + <family>Emoji Two</family> + <default><family>emoji</family></default> +--- a/conf.d/60-generic.conf ++++ b/conf.d/60-generic.conf +@@ -29,6 +29,7 @@ + <alias binding="same"> + <family>emoji</family> + <prefer> ++ <family>JoyPixels</family> + <family>Emoji Two</family> + <family>Emoji One</family> + <!-- System fonts --> diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 2ee0af8cfc13..5b98d6523b9a 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,7 +1,7 @@ { runCommand, lib, fontconfig, fontDirectories }: runCommand "fc-cache" - rec { + { buildInputs = [ fontconfig.bin ]; preferLocalBuild = true; allowSubstitutes = false; diff --git a/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/nixpkgs/pkgs/development/libraries/freeimage/default.nix index b2c66ad346d0..188543bf7bf7 100644 --- a/nixpkgs/pkgs/development/libraries/freeimage/default.nix +++ b/nixpkgs/pkgs/development/libraries/freeimage/default.nix @@ -1,65 +1,46 @@ -{ stdenv, fetchurl, unzip, darwin }: +{ lib, stdenv, fetchurl, unzip, darwin }: stdenv.mkDerivation { - name = "freeimage-3.17.0"; + name = "freeimage-3.18.0"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3170.zip; - sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; + url = mirror://sourceforge/freeimage/FreeImage3180.zip; + sha256 = "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl"; }; - patches = let - patchURL = https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches; - in [ - (fetchurl { - url = patchURL + "/Fix-CVE-2015-0852.patch"; - sha256 = "1vxdck4i5qi5j6i3cjja0gfy79mmbf0lq2qdrnqdsl4kclbvw2c8"; - }) - (fetchurl { - url = patchURL + "/Fix-CVE-2016-5684.patch"; - sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3"; - }) - (fetchurl { - url = https://raw.githubusercontent.com/buildroot/buildroot/2018.05/package/libfreeimage/0005-Manage-powf64-with-glibc.patch; - sha256 = "1lis479ad5cfkhqm044nk4x97wfwm3hry3bvij1w5xkndnlfppc2"; - }) - ]; + patches = lib.optional stdenv.isDarwin ./dylib.patch; - buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin darwin.cctools; - prePatch = if stdenv.isDarwin - then '' - sed -e 's/gcc-4.0/clang/g' \ - -e 's/g++-4.0/clang++/g' \ - -e 's/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__/' \ + prePatch = if stdenv.isDarwin then '' + sed -e 's/$(shell xcrun -find clang)/clang/g' \ + -e 's/$(shell xcrun -find clang++)/clang++/g' \ -e "s|PREFIX = /usr/local|PREFIX = $out|" \ - -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk||g' \ - -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk||g' \ - -e 's|-isysroot /Developer/SDKs/MacOSX10.6.sdk||g' \ - -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||g' \ - -e 's| $(STATICLIB)-ppc $(STATICLIB)-i386||g' \ - -e 's| $(SHAREDLIB)-ppc $(SHAREDLIB)-i386||g' \ + -e 's|-Wl,-syslibroot $(MACOSX_SYSROOT)||g' \ + -e 's|-isysroot $(MACOSX_SYSROOT)||g' \ -e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \ -e 's| -m 644 -o root -g wheel||g' \ -i ./Makefile.osx # Fix LibJXR performance timers sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs - '' - else '' + '' else '' sed -e s@/usr/@$out/@ \ -e 's@-o root -g root@@' \ -e 's@ldconfig@echo not running ldconfig@' \ -i Makefile.gnu Makefile.fip - # Fix gcc 5.1 macro problems - # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/ - sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/* ''; - postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip"; - preInstall = "mkdir -p $out/include $out/lib"; - postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install"; + postBuild = lib.optionalString (!stdenv.isDarwin) '' + make -f Makefile.fip + ''; + + preInstall = '' + mkdir -p $out/include $out/lib + ''; - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + postInstall = lib.optionalString (!stdenv.isDarwin) '' + make -f Makefile.fip install + ''; enableParallelBuilding = true; @@ -67,7 +48,7 @@ stdenv.mkDerivation { description = "Open Source library for accessing popular graphics image file formats"; homepage = http://freeimage.sourceforge.net/; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/freeimage/dylib.patch b/nixpkgs/pkgs/development/libraries/freeimage/dylib.patch new file mode 100644 index 000000000000..0d8188aca707 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/freeimage/dylib.patch @@ -0,0 +1,16 @@ +--- a/Makefile.osx ++++ b/Makefile.osx +@@ -60,1 +60,1 @@ +-FreeImage: $(STATICLIB) ++FreeImage: $(STATICLIB) $(SHAREDLIB) +@@ -87,7 +87,7 @@ +-$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 +- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) ++#$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 ++# $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) + + $(SHAREDLIB)-i386: $(MODULES_I386) + $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) + +-$(SHAREDLIB)-x86_64: $(MODULES_X86_64) ++$(SHAREDLIB): $(MODULES_X86_64) diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index eb26a241d1cd..6eaf1bbcc2f4 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ]; + configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ]; # native compiler to generate building tool CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; diff --git a/nixpkgs/pkgs/development/libraries/funambol/default.nix b/nixpkgs/pkgs/development/libraries/funambol/default.nix index 100c00eea497..04903cc5e9ee 100644 --- a/nixpkgs/pkgs/development/libraries/funambol/default.nix +++ b/nixpkgs/pkgs/development/libraries/funambol/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "funambol-client-cpp-9.0.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/g2o/default.nix b/nixpkgs/pkgs/development/libraries/g2o/default.nix index 909c504870f0..21975766e74e 100644 --- a/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { - "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; - "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; - "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; - "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + westmere = [ "-DDISABLE_SSE4_A=ON" ]; + sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; + ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; + haswell = [ "-DDISABLE_SSE4_A=ON" ]; + broadwell = [ "-DDISABLE_SSE4_A=ON" ]; + skylake = [ "-DDISABLE_SSE4_A=ON" ]; + skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix index b7043b61c8a6..1a3447f6674f 100644 --- a/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix @@ -2,7 +2,7 @@ let newtonsoft-json = dotnetPackages.NewtonsoftJson; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gdata-sharp"; version = "2.2.0.0"; diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix index 79fb7a8d738f..4c1e538dcd66 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; # On darwin, tests are linked to dylib in the nix store, so we need to make diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 48e65cc063b0..29360585b7e5 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -174,8 +174,10 @@ stdenv.mkDerivation rec { inherit doCheck; - passthru = { + passthru = rec { gioModuleDir = "lib/gio/modules"; + makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; + getSchemaPath = pkg: makeSchemaPath pkg pkg.name; inherit flattenInclude; updateScript = gnome3.updateScript { packageName = "glib"; }; }; diff --git a/nixpkgs/pkgs/development/libraries/gloox/default.nix b/nixpkgs/pkgs/development/libraries/gloox/default.nix index d44bcdda9aed..51e981a2a338 100644 --- a/nixpkgs/pkgs/development/libraries/gloox/default.nix +++ b/nixpkgs/pkgs/development/libraries/gloox/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let version = "1.0.22"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gloox"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix b/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix index 501fe4d0849f..f6ff3a2ea4ad 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index e914f9d78eef..638d483b60e9 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix @@ -13,7 +13,7 @@ let sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnu-config"; version = "2019-04-15"; diff --git a/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix b/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix index e245496c63ac..015163b32931 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix @@ -1,6 +1,6 @@ { callPackage, fetchFromGitHub, autoreconfHook, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix index a14c40e6d87e..a18bdb177449 100644 --- a/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A Glib/GTK+ set of document centric objects and utilities"; + description = "A Glib/GTK set of document centric objects and utilities"; longDescription = '' There are common operations for document centric applications that are diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix index c7556276dc39..1440d3f6aa04 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; meta = with stdenv.lib; { - description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = https://wiki.gnome.org/Projects/GooCanvas; license = licenses.lgpl2; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/default.nix b/nixpkgs/pkgs/development/libraries/goocanvas/default.nix index 435c1f30bace..024ac363af18 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvas/default.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvas/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/graphene/default.nix b/nixpkgs/pkgs/development/libraries/graphene/default.nix index c439e763e73d..0348135c7b20 100644 --- a/nixpkgs/pkgs/development/libraries/graphene/default.nix +++ b/nixpkgs/pkgs/development/libraries/graphene/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" - "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" - "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" + "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" + "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix index 812128fb12fb..8b118fe94834 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix @@ -3,7 +3,7 @@ , glib, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsettings-qt"; version = "0.1.20170824"; diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 0ba3bf354235..ebaf694f04e9 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; version = "2018-05-07"; diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix index d9afecc6d0c1..a140859b6931 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -2,7 +2,7 @@ , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-oauth"; version = "2018-10-15"; diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix index b9eecaf0946f..af57950ac653 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-sasl"; version = "2018-10-15"; diff --git a/nixpkgs/pkgs/development/libraries/gsl/default.nix b/nixpkgs/pkgs/development/libraries/gsl/default.nix index c8846509d004..1fd086ca23c7 100644 --- a/nixpkgs/pkgs/development/libraries/gsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-2.5"; + name = "gsl-2.6"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04"; + sha256 = "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp"; }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) diff --git a/nixpkgs/pkgs/development/libraries/gspell/default.nix b/nixpkgs/pkgs/development/libraries/gspell/default.nix index 776125a7537d..fd6b12ccaac1 100644 --- a/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "A spell-checking library for GTK+ applications"; + description = "A spell-checking library for GTK applications"; homepage = https://wiki.gnome.org/Projects/gspell; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index fb1d627d7b12..81d914581321 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -6,6 +6,7 @@ , libjpeg , libvisual , tremor # provides 'virbisidec' +, libGL , gtk-doc, docbook_xsl, docbook_xml_dtd_412 , enableX11 ? stdenv.isLinux, libXv , enableWayland ? stdenv.isLinux, wayland @@ -75,7 +76,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" ; - buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor ] + buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor libGL ] ++ lib.optional (!stdenv.isDarwin) libvisual ++ lib.optional enableAlsa alsaLib ++ lib.optionals enableX11 [ libXv pango ] diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 8acaefcedf46..27036ad86edf 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -4,7 +4,7 @@ let ver_maj = "0.10"; ver_min = "11"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gstreamermm-${ver_maj}.${ver_min}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/gthree/default.nix b/nixpkgs/pkgs/development/libraries/gthree/default.nix index 6588b8ab4407..1af62e14d8d2 100644 --- a/nixpkgs/pkgs/development/libraries/gthree/default.nix +++ b/nixpkgs/pkgs/development/libraries/gthree/default.nix @@ -15,7 +15,7 @@ , json-glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gthree"; version = "unstable-2019-08-21"; diff --git a/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix index 26d0b5c35958..2281055c62b7 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gtk-mac-integration-2.0.8"; src = fetchFromGitHub { @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Provides integration for Gtk+ applications into the Mac desktop"; + description = "Provides integration for GTK applications into the Mac desktop"; license = licenses.lgpl21; - homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Integration; + homepage = https://wiki.gnome.org/Projects/GTK/OSX/Integration; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix index 1e3b7d45edda..065dc2ac077e 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - description = "Binds some API from Gtk+ that isn't in Gtk# 2.12.x"; + description = "Binds some API from GTK that isn't in GTK# 2.12.x"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/nixpkgs/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch index ec69a12514fe..ec69a12514fe 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch +++ b/nixpkgs/pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch diff --git a/nixpkgs/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch b/nixpkgs/pkgs/development/libraries/gtk/2.0-darwin-x11.patch index 9725cfb84260..9725cfb84260 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch +++ b/nixpkgs/pkgs/development/libraries/gtk/2.0-darwin-x11.patch diff --git a/nixpkgs/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch b/nixpkgs/pkgs/development/libraries/gtk/2.0-immodules.cache.patch index 1b8231756e71..1b8231756e71 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch +++ b/nixpkgs/pkgs/development/libraries/gtk/2.0-immodules.cache.patch diff --git a/nixpkgs/pkgs/development/libraries/gtk+/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 886f0aefafb8..f1a53390467a 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -83,13 +83,13 @@ stdenv.mkDerivation rec { platforms = platforms.all; longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating + GTK is a highly usable, feature rich toolkit for creating graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, + compatibility and an easy to use API. GTK it is written in C, but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed + such as C++, Python and C# among others. GTK is licensed under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or + proprietary software with GTK without any license fees or royalties. ''; }; diff --git a/nixpkgs/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch b/nixpkgs/pkgs/development/libraries/gtk/3.0-darwin-x11.patch index 86631634b5bd..86631634b5bd 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch +++ b/nixpkgs/pkgs/development/libraries/gtk/3.0-darwin-x11.patch diff --git a/nixpkgs/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch b/nixpkgs/pkgs/development/libraries/gtk/3.0-immodules.cache.patch index bbe5f28dbd3e..bbe5f28dbd3e 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch +++ b/nixpkgs/pkgs/development/libraries/gtk/3.0-immodules.cache.patch diff --git a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 40be17fcac7c..aee97d9bad00 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -181,13 +181,13 @@ stdenv.mkDerivation rec { meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating + GTK is a highly usable, feature rich toolkit for creating graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, + compatibility and an easy to use API. GTK it is written in C, but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed + such as C++, Python and C# among others. GTK is licensed under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or + proprietary software with GTK without any license fees or royalties. ''; homepage = https://www.gtk.org/; diff --git a/nixpkgs/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch b/nixpkgs/pkgs/development/libraries/gtk/gtk2-theme-paths.patch index edd69b078076..edd69b078076 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch +++ b/nixpkgs/pkgs/development/libraries/gtk/gtk2-theme-paths.patch diff --git a/nixpkgs/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh b/nixpkgs/pkgs/development/libraries/gtk/gtk3-setup-hook.sh index bddeb2d25d50..bddeb2d25d50 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/gtk/gtk3-setup-hook.sh diff --git a/nixpkgs/pkgs/development/libraries/gtk+/setup-hook.sh b/nixpkgs/pkgs/development/libraries/gtk/setup-hook.sh index c2b0ab502db7..c2b0ab502db7 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/gtk/setup-hook.sh diff --git a/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix index d26cc9692596..31a3242cdef5 100644 --- a/nixpkgs/pkgs/development/libraries/gtkd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkd/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { installFlags = "prefix=$(out)"; meta = with stdenv.lib; { - description = "D binding and OO wrapper for GTK+"; + description = "D binding and OO wrapper for GTK"; homepage = https://gtkd.org; license = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix index 1caac3914a58..54054270c3c6 100644 --- a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gtk2 ]; meta = { - description = "Gtk+ widget for displaying large amounts of numerical data"; + description = "GTK widget for displaying large amounts of numerical data"; license = stdenv.lib.licenses.lgpl2; diff --git a/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix b/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix index d6d32c26a509..babcaa993340 100644 --- a/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://wiki.gnome.org/Projects/GTK%2B/GtkImageView"; - description = "Image viewer widget for GTK+"; + description = "Image viewer widget for GTK"; longDescription = - '' GtkImageView is a simple image viewer widget for GTK+. Similar to + '' GtkImageView is a simple image viewer widget for GTK. Similar to the image viewer panes in gThumb or Eye of Gnome. It makes writing image viewing and editing applications easy. Among its features are: mouse and keyboard zooming; scrolling and dragging; adjustable diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix index 69fd3f30e92d..523c5b50d283 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "C++ interface to the GTK+ graphical user interface library"; + description = "C++ interface to the GTK graphical user interface library"; longDescription = '' gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a + GTK. Highlights include typesafe callbacks, and a comprehensive set of widgets that are easily extensible via inheritance. You can create user interfaces either in code or with the Glade User Interface designer, using libglademm. diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index 1a5b0fe62875..f977af046ca2 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "C++ interface to the GTK+ graphical user interface library"; + description = "C++ interface to the GTK graphical user interface library"; longDescription = '' gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a + GTK. Highlights include typesafe callbacks, and a comprehensive set of widgets that are easily extensible via inheritance. You can create user interfaces either in code or with the Glade User Interface designer, using libglademm. diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 60188d77962b..8b3bc30a6616 100644 --- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -1,20 +1,49 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus -, glib, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp -, gnomeSupport ? false, gnome, gcr, wrapGAppsHook -, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh -, libsecret, libgdata, python3 +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, dbus +, glib +, libgudev +, udisks2 +, libgcrypt +, libcap +, polkit +, libgphoto2 +, avahi +, libarchive +, fuse +, libcdio +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, samba +, libmtp +, gnomeSupport ? false +, gnome3 +, gcr +, glib-networking +, gnome-online-accounts +, wrapGAppsHook +, libimobiledevice +, libbluray +, libcdio-paranoia +, libnfs +, openssh +, libsecret +, libgdata +, python3 }: -let +stdenv.mkDerivation rec { pname = "gvfs"; version = "1.40.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx"; }; @@ -26,28 +55,56 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - meson ninja python3 - pkgconfig gettext wrapGAppsHook - libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + meson + ninja + python3 + pkgconfig + gettext + wrapGAppsHook + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_42 ]; buildInputs = [ - glib libgudev udisks2 libgcrypt dbus - libgphoto2 avahi libarchive fuse libcdio - samba libmtp libcap polkit libimobiledevice libbluray - libcdio-paranoia libnfs openssh - # ToDo: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - libsoup gcr + glib + libgudev + udisks2 + libgcrypt + dbus + libgphoto2 + avahi + libarchive + fuse + libcdio + samba + libmtp + libcap + polkit + libimobiledevice + libbluray + libcdio-paranoia + libnfs + openssh + # TODO: a ligther version of libsoup to have FTP/HTTP support? + ] ++ stdenv.lib.optionals gnomeSupport [ + gnome3.libsoup + gcr glib-networking # TLS support - gnome-online-accounts libsecret libgdata - ]); + gnome-online-accounts + libsecret + libgdata + ]; mesonFlags = [ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" "-Dtmpfilesdir=no" ] ++ stdenv.lib.optionals (!gnomeSupport) [ - "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" + "-Dgcr=false" + "-Dgoa=false" + "-Dkeyring=false" + "-Dhttp=false" "-Dgoogle=false" ] ++ stdenv.lib.optionals (samba == null) [ # Xfce don't want samba diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 26a3428f6793..87453a09e7f9 100644 --- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.5.3"; + version = "2.6.0"; inherit (stdenv.lib) optional optionals optionalString; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz"; - sha256 = "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y"; + sha256 = "0rn9fvnrxds7f4812yx68myy3x7szb4z9ql4m1fgjrc2ahbx3xww"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 4fa369e299d2..3e1799d82cde 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -6,7 +6,7 @@ let mkDict = { name, readmeFile, dictFileName, ... }@args: - stdenv.mkDerivation (rec { + stdenv.mkDerivation ({ inherit name; installPhase = '' # hunspell dicts @@ -141,11 +141,12 @@ let }; mkDictFromWordlist = - { shortName, shortDescription, dictFileName, src }: + { shortName, shortDescription, srcFileName, dictFileName, src }: mkDict rec { - inherit src dictFileName; + inherit src srcFileName dictFileName; version = "2018.04.16"; name = "hunspell-dict-${shortName}-wordlist-${version}"; + srcReadmeFile = "README_" + srcFileName + ".txt"; readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription} from Wordlist"; @@ -158,7 +159,12 @@ let phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' - unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile} + ''; + postUnpack = '' + mv ${srcFileName}.dic ${dictFileName}.dic || true + mv ${srcFileName}.aff ${dictFileName}.aff || true + mv ${srcReadmeFile} ${readmeFile} || true ''; }; @@ -294,6 +300,7 @@ in rec { en-us = mkDictFromWordlist { shortName = "en-us"; shortDescription = "English (United States)"; + srcFileName = "en_US"; dictFileName = "en_US"; src = fetchurl { url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip; @@ -301,10 +308,23 @@ in rec { }; }; + en_US-large = en-us-large; + en-us-large = mkDictFromWordlist { + shortName = "en-us-large"; + shortDescription = "English (United States) Large"; + srcFileName = "en_US-large"; + dictFileName = "en_US"; + src = fetchurl { + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-large-2018.04.16.zip; + sha256 = "1xm9jgqbivp5cb78ykjxg47vzq1yqj82l7r4q5cjpivrv99s49qc"; + }; + }; + en_CA = en-ca; en-ca = mkDictFromWordlist { shortName = "en-ca"; shortDescription = "English (Canada)"; + srcFileName = "en_CA"; dictFileName = "en_CA"; src = fetchurl { url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip; @@ -312,24 +332,50 @@ in rec { }; }; + en_CA-large = en-ca-large; + en-ca-large = mkDictFromWordlist { + shortName = "en-ca-large"; + shortDescription = "English (Canada) Large"; + srcFileName = "en_CA-large"; + dictFileName = "en_CA"; + src = fetchurl { + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-large-2018.04.16.zip; + sha256 = "1200xxyvv6ni8nk52v3059c367817vnrkm0cdh38rhiigb5flfha"; + }; + }; + + en_AU = en-au; en-au = mkDictFromWordlist { shortName = "en-au"; shortDescription = "English (Australia)"; + srcFileName = "en_AU"; dictFileName = "en_AU"; src = fetchurl { url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-2018.04.16.zip; sha256 = "1kp06npl1kd05mm9r52cg2iwc13x02zwqgpibdw15b6x43agg6f5"; }; }; - en_AU = en-au; + + en_AU-large = en-au-large; + en-au-large = mkDictFromWordlist { + shortName = "en-au-large"; + shortDescription = "English (Australia) Large"; + srcFileName = "en_AU-large"; + dictFileName = "en_AU"; + src = fetchurl { + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-large-2018.04.16.zip; + sha256 = "14l1w4dpk0k1js2wwq5ilfil89ni8cigph95n1rh6xi4lzxj7h6g"; + }; + }; en_GB-ise = en-gb-ise; en-gb-ise = mkDictFromWordlist { shortName = "en-gb-ise"; shortDescription = "English (United Kingdom, 'ise' ending)"; - dictFileName = "en_GB-ise"; + srcFileName = "en_GB-ise"; + dictFileName = "en_GB"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ise-2018.04.16.zip; + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ise-2018.04.16.zip; sha256 = "0ylg1zvfvsawamymcc9ivrqcb9qhlpgpnizm076xc56jz554xc2l"; }; }; @@ -338,13 +384,26 @@ in rec { en-gb-ize = mkDictFromWordlist { shortName = "en-gb-ize"; shortDescription = "English (United Kingdom, 'ize' ending)"; - dictFileName = "en_GB-ize"; + srcFileName = "en_GB-ize"; + dictFileName = "en_GB"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ize-2018.04.16.zip; + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ize-2018.04.16.zip; sha256 = "1rmwy6sxmd400cwjf58az6g14sq28p18f5mlq8ybg8y33q9m42ps"; }; }; + en_GB-large = en-gb-large; + en-gb-large = mkDictFromWordlist { + shortName = "en-gb-large"; + shortDescription = "English (United Kingdom) Large"; + srcFileName = "en_GB-large"; + dictFileName = "en_GB"; + src = fetchurl { + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-large-2018.04.16.zip; + sha256 = "1y4d7x5vvi1qh1s3i09m0vvqrpdzzqhsdngr8nsh7hc5bnlm37mi"; + }; + }; + /* SPANISH */ es_ANY = es-any; @@ -542,7 +601,7 @@ in rec { /* ITALIAN */ it_IT = it-it; - it-it = mkDictFromLinguistico rec { + it-it = mkDictFromLinguistico { shortName = "it-it"; dictFileName = "it_IT"; shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; @@ -598,7 +657,7 @@ in rec { /* SWEDISH */ sv_SE = sv-se; - sv-se = mkDictFromDSSO rec { + sv-se = mkDictFromDSSO { shortName = "sv-se"; dictFileName = "sv_SE"; shortDescription = "Swedish (Sweden)"; @@ -606,7 +665,7 @@ in rec { # Finlandian Swedish (hello Linus Torvalds) sv_FI = sv-fi; - sv-fi = mkDictFromDSSO rec { + sv-fi = mkDictFromDSSO { shortName = "sv-fi"; dictFileName = "sv_FI"; shortDescription = "Swedish (Finland)"; diff --git a/nixpkgs/pkgs/development/libraries/ignition-math/default.nix b/nixpkgs/pkgs/development/libraries/ignition-math/default.nix index 297365be8749..3a642c8837a3 100644 --- a/nixpkgs/pkgs/development/libraries/ignition-math/default.nix +++ b/nixpkgs/pkgs/development/libraries/ignition-math/default.nix @@ -3,7 +3,7 @@ let version = "2.6.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ign-math2"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix b/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix index 31b9a4b0e9f7..0e7603db5856 100644 --- a/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ign-transport"; inherit version; inherit src; diff --git a/nixpkgs/pkgs/development/libraries/ijs/default.nix b/nixpkgs/pkgs/development/libraries/ijs/default.nix index a5b226ee9c74..98a34477e4f1 100644 --- a/nixpkgs/pkgs/development/libraries/ijs/default.nix +++ b/nixpkgs/pkgs/development/libraries/ijs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - configureFlags = [ "--disable-static" "--enable-shared" ]; + configureFlags = [ "--enable-shared" ]; meta = with stdenv.lib; { homepage = https://www.openprinting.org/download/ijs/; diff --git a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix index 2beff09d0b4e..f74477eab384 100644 --- a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, tcl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "incrtcl"; version = "4.0.4"; diff --git a/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix b/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix index f97f8b7d82d5..16a21382d857 100644 --- a/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "Indicator to take menus from applications and place them in the panel (GTK+ 2 library for Xfce/LXDE)"; + description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)"; homepage = https://launchpad.net/indicators-gtk2; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix b/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix index 20a60f1a102d..13c71dc8f704 100644 --- a/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix +++ b/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix index 599e8dcc5975..37d6c0643c73 100644 --- a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix +++ b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iso-codes"; - version = "3.79"; + version = "4.3"; src = fetchurl { - url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${pname}-${version}.tar.xz"; - sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; + url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2"; + sha256 = "11n3sccwapfr7npxad8m3xmc7w8i11kk70ffbz25gj82bn8rylvb"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 68e2a7377919..1f2aeda80cfe 100644 --- a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, ant, jdk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hydra-ant-logger"; version = "2010.2"; diff --git a/nixpkgs/pkgs/development/libraries/java/swt/default.nix b/nixpkgs/pkgs/development/libraries/java/swt/default.nix index 591de48d3195..a93d77742915 100644 --- a/nixpkgs/pkgs/development/libraries/java/swt/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/swt/default.nix @@ -5,13 +5,13 @@ let platformMap = { - "x86_64-linux" = + x86_64-linux = { platform = "gtk-linux-x86_64"; sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; }; - "i686-linux" = + i686-linux = { platform = "gtk-linux-x86"; sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; }; - "x86_64-darwin" = + x86_64-darwin = { platform = "cocoa-macosx-x86_64"; sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; }; }; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix index e8a7aa7322f3..ef1171b17601 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix @@ -64,7 +64,7 @@ let let inherit (args) name; - inherit (srcs."${name}") src version; + inherit (srcs.${name}) src version; outputs = args.outputs or [ "bin" "dev" "out" ]; hasSeparateDev = lib.elem "dev" outputs; diff --git a/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix b/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix index 1ebf2c2e21e5..21e3c4d3424e 100644 --- a/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -8,7 +8,7 @@ let sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kinetic-cpp-client-2015-04-14"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix index 3f84706bffb3..71e88559dee6 100644 --- a/nixpkgs/pkgs/development/libraries/kmsxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kmsxx"; version = "2018-10-23"; diff --git a/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix index 7f9dbf3a21fc..07e0a3500a76 100644 --- a/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22 patches = [ ./py-override.patch ]; - nativeBuildInputs = [ + nativeBuildInputs = [ check docbook_xml_dtd_43 docbook_xsl @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/libagar/default.nix b/nixpkgs/pkgs/development/libraries/libagar/default.nix index a8ddab2978d1..48fb0f1153e7 100644 --- a/nixpkgs/pkgs/development/libraries/libagar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libagar/default.nix @@ -4,7 +4,7 @@ }: let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libagar"; inherit (srcs) version src; diff --git a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix index 43d66b8251cf..4295971d5a0b 100644 --- a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix +++ b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libagar-test"; inherit (srcs) version src; diff --git a/nixpkgs/pkgs/development/libraries/libbap/default.nix b/nixpkgs/pkgs/development/libraries/libbap/default.nix index b20850e88ff0..9aedde923f0b 100644 --- a/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libbap"; version = "master-2019-04-05"; diff --git a/nixpkgs/pkgs/development/libraries/libbfd/default.nix b/nixpkgs/pkgs/development/libraries/libbfd/default.nix index 5af8acb5ed76..89ca984767b3 100644 --- a/nixpkgs/pkgs/development/libraries/libbfd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbfd/default.nix @@ -3,7 +3,7 @@ , libiberty, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libbfd"; inherit (binutils-unwrapped) version src; diff --git a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix index 1a0be52dbbe5..519c94dd9956 100644 --- a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix +++ b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { longDescription = '' libchamplain is a C library providing a ClutterActor to display - maps. It also provides a Gtk+ widget to display maps in Gtk+ + maps. It also provides a GTK widget to display maps in GTK applications. Python and Perl bindings are also available. It supports numerous free map sources such as OpenStreetMap, OpenCycleMap, OpenAerialMap, and Maps for free. diff --git a/nixpkgs/pkgs/development/libraries/libcredis/default.nix b/nixpkgs/pkgs/development/libraries/libcredis/default.nix index 10a4c276ebd5..bfc7fe1d9498 100644 --- a/nixpkgs/pkgs/development/libraries/libcredis/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcredis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libcredis-0.2.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index f7e0a987b063..5b6d92d629dc 100644 --- a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library to delight your users with fancy features"; longDescription = '' - The libdazzle library is a companion library to GObject and Gtk+. It + The libdazzle library is a companion library to GObject and GTK. It provides various features that we wish were in the underlying library but cannot for various reasons. In most cases, they are wildly out of scope for those libraries. In other cases, our design isn't quite generic diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix index e064084f695e..a7bfe7f17a24 100644 --- a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { doCheck = false; # generates shebangs in check phase, too lazy to fix installFlags = [ - "sysconfdir=${placeholder ''out''}/etc" + "sysconfdir=${placeholder "out"}/etc" "localstatedir=\${TMPDIR}" - "typelibdir=${placeholder ''out''}/lib/girepository-1.0" + "typelibdir=${placeholder "out"}/lib/girepository-1.0" ]; meta = { diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index 29d59659f90d..11fb21fe52e2 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess, valgrind-light }: +{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess +, withValgrind ? valgrind-light.meta.available, valgrind-light +}: stdenv.mkDerivation rec { pname = "libdrm"; @@ -12,7 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "bin" ]; nativeBuildInputs = [ pkgconfig meson ninja ]; - buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; + buildInputs = [ libpthreadstubs libpciaccess ] + ++ lib.optional withValgrind valgrind-light; patches = [ ./cross-build-nm-path.patch ]; @@ -22,14 +25,14 @@ stdenv.mkDerivation rec { done ''; - mesonFlags = - [ - "-Dnm-path=${stdenv.cc.targetPrefix}nm" - "-Dinstall-test-programs=true" ] - ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) - [ "-Dtegra=true" "-Detnaviv=true" ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false" - ; + mesonFlags = [ + "-Dnm-path=${stdenv.cc.targetPrefix}nm" + "-Dinstall-test-programs=true" + "-Domap=true" + ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ + "-Dtegra=true" + "-Detnaviv=true" + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"; enableParallelBuilding = true; @@ -37,6 +40,6 @@ stdenv.mkDerivation rec { homepage = https://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix index 3fd2a328558e..352d2b17406b 100644 --- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix @@ -16,7 +16,7 @@ let }; in rec { - libdwarf = stdenv.mkDerivation rec { + libdwarf = stdenv.mkDerivation { pname = "libdwarf"; inherit version; @@ -37,7 +37,7 @@ in rec { inherit meta src; }; - dwarfdump = stdenv.mkDerivation rec { + dwarfdump = stdenv.mkDerivation { pname = "dwarfdump"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/libesmtp/default.nix b/nixpkgs/pkgs/development/libraries/libesmtp/default.nix index 8555449f28bd..9650f540fcfb 100644 --- a/nixpkgs/pkgs/development/libraries/libesmtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libesmtp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libESMTP"; version = "1.0.6"; diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix index 5fb46bff0756..a94b6d1dc2a6 100644 --- a/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -6,11 +6,11 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { pname = "libevent"; - version = "2.1.10"; + version = "2.1.11"; src = fetchurl { url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; - sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78"; + sha256 = "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6"; }; # libevent_openssl is moved into its own output, so that openssl isn't present diff --git a/nixpkgs/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix index 0c8a7084e095..e007ab2f95af 100644 --- a/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -2,7 +2,7 @@ zlib, libpng, boost, qt5, guile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libfive"; version = "2018-07-01"; diff --git a/nixpkgs/pkgs/development/libraries/libfreefare/default.nix b/nixpkgs/pkgs/development/libraries/libfreefare/default.nix index c0595ac93d1c..8ddce0aa98c6 100644 --- a/nixpkgs/pkgs/development/libraries/libfreefare/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfreefare/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libnfc, openssl , libobjc ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libfreefare"; version = "0.4.0"; diff --git a/nixpkgs/pkgs/development/libraries/libgap/default.nix b/nixpkgs/pkgs/development/libraries/libgap/default.nix deleted file mode 100644 index b6a8ae3c8dfe..000000000000 --- a/nixpkgs/pkgs/development/libraries/libgap/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv -, fetchurl -, gmp -}: -# will probably be obsolte (or at leat built from the upstream gap sources) soon (gap 4.9?). See -# - https://github.com/gap-system/gap/projects/5#card-6239828 -# - https://github.com/markuspf/gap/issues/2 -# - https://trac.sagemath.org/ticket/22626 -stdenv.mkDerivation rec { - pname = "libgap"; - # Has to be the same version as "gap" - version = "4.8.6"; - src = fetchurl { - url = "mirror://sageupstream/libgap/libgap-${version}.tar.gz"; - sha256 = "1h5fx5a55857w583ql7ly2jl49qyx9mvs7j5abys00ra9gzrpn5v"; - }; - buildInputs = [gmp]; - meta = { - inherit version; - description = ''A library-packaged fork of the GAP kernel''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 36a1b7d37208..75d8e6710e09 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n"; + sha256 = "1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv"; }; outputs = [ "out" "dev" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/nixpkgs/pkgs/development/libraries/libgdata/default.nix index f61283aec4a0..14fc7e64a0b4 100644 --- a/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=false" - "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" - "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" + "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" + "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_tests=true" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix index ba9eab432029..9ba3cdbd09aa 100644 --- a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix @@ -2,7 +2,7 @@ , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libgdiplus-5.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libgee/default.nix b/nixpkgs/pkgs/development/libraries/libgee/default.nix index 260c3a3d97bf..b9e1d668cd3e 100644 --- a/nixpkgs/pkgs/development/libraries/libgee/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.1"; + version = "0.20.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; + sha256 = "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy"; }; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index ed6139d48f6f..2b64d5b7220a 100644 --- a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -43,10 +43,11 @@ stdenv.mkDerivation rec { }); outputs = [ "out" "dev" ]; - # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. + # Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib. + # Note that libEGL does not need it because it uses driver config files which should + # contain absolute paths to libraries. postFixup = '' - addOpenGLRunpath $out/lib/libGLX.so $out/lib/libEGL.so + addOpenGLRunpath $out/lib/libGLX.so ''; passthru = { inherit (addOpenGLRunpath) driverLink; }; diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index f3e1b8b0f997..d7fb35897dc4 100644 --- a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, gettext +{ stdenv, lib, buildPackages, fetchurl, gettext, fetchpatch , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -24,7 +24,18 @@ in stdenv.mkDerivation (rec { sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"; }; + # Remove gawk buildfix on > 1.36 + patches = [ + (fetchpatch { + url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1"; + sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq"; + }) + ]; + postPatch = '' + # Remove on > 1.36 release: gawk upgrade fix didn't include Makefile regeneration + sed 's/-v namespace=errnos_/-v pkg_namespace=errnos_/' -i src/Makefile.in + sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h diff --git a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index 23f46ad2a0cf..782c0a8857a4 100644 --- a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tools=${if enable-tools then "yes" else "no"}" "--enable-bindings-cxx" - "--prefix=${placeholder ''out''}" + "--prefix=${placeholder "out"}" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/libgumath/default.nix b/nixpkgs/pkgs/development/libraries/libgumath/default.nix index b82c547fb331..f1483c38c154 100644 --- a/nixpkgs/pkgs/development/libraries/libgumath/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgumath/default.nix @@ -4,7 +4,7 @@ , libxnd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libgumath"; version = "unstable-2018-11-27"; diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 4883b39b7cf7..c4f353fb6d51 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -5,11 +5,9 @@ , hicolor-icon-theme }: -let +stdenv.mkDerivation rec { pname = "libhandy"; version = "0.0.11"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; @@ -49,7 +47,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A library full of GTK+ widgets for mobile phones"; + description = "A library full of GTK widgets for mobile phones"; homepage = https://source.puri.sm/Librem5/libhandy; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; diff --git a/nixpkgs/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/nixpkgs/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch deleted file mode 100644 index 2ea1b124ce7b..000000000000 --- a/nixpkgs/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch +++ /dev/null @@ -1,15 +0,0 @@ -Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014 ---- a/libheif/heif_context.cc -+++ b/libheif/heif_context.cc -@@ -571,6 +571,11 @@ - image->set_is_alpha_channel_of(refs[0]); - - auto master_iter = m_all_images.find(refs[0]); -+ if (master_iter == m_all_images.end()) { -+ return Error(heif_error_Invalid_input, -+ heif_suberror_Nonexisting_item_referenced, -+ "Non-existing alpha image referenced"); -+ } - master_iter->second->set_alpha_channel(image); - } - diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix index 7e1bb2daa9e1..02c4dd334813 100644 --- a/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.0"; pname = "libheif"; + version = "1.5.0"; src = fetchFromGitHub { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2"; + sha256 = "1nvfjmnha06689imm8v24nlc011814gc9xq3x54cnmqvh5gn98ah"; }; - patches = [ ./1.4.0-CVE-2019-11471.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; diff --git a/nixpkgs/pkgs/development/libraries/libiberty/default.nix b/nixpkgs/pkgs/development/libraries/libiberty/default.nix index ab1858c51a61..08a88bfee459 100644 --- a/nixpkgs/pkgs/development/libraries/libiberty/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiberty/default.nix @@ -2,7 +2,7 @@ let inherit (buildPackages.buildPackages) gcc; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libiberty-${gcc.cc.version}"; inherit (gcc.cc) src; diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix index d8881b929a05..050cba5460d9 100644 --- a/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -1,34 +1,64 @@ -{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection -, python3, tzdata, glib, libxml2, icu }: +{ stdenv +, fetchFromGitHub +, cmake +, glib +, gobject-introspection +, icu +, libxml2 +, ninja +, perl +, pkgconfig +, python3 +, tzdata +, vala +}: stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.4"; + version = "3.0.5"; - outputs = [ "out" "dev" ]; #"devdoc" ]; + outputs = [ "out" "dev" ]; # "devdoc" ]; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "1qgpbdjd6jsivw87v5w52268kqp0rv780kli8cgb3ndlv592wlbm"; + sha256 = "03kjc4s1svmzkmzkr0irgczq37aslhj4bxnvjqav0jwa2zrynhra"; }; nativeBuildInputs = [ - perl pkgconfig cmake ninja vala gobject-introspection - (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests -# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 -# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs + cmake + gobject-introspection + ninja + perl + pkgconfig + vala + # Docs building fails: + # https://github.com/NixOS/nixpkgs/pull/67204 + # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 + # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs + ]; + installCheckInputs = [ + # running libical-glib tests + (python3.withPackages (pkgs: with pkgs; [ + pygobject3 + ])) + ]; + + buildInputs = [ + glib + libxml2 + icu ]; - buildInputs = [ glib libxml2 icu ]; cmakeFlags = [ "-DGOBJECT_INTROSPECTION=True" + "-DENABLE_GTK_DOC=False" "-DICAL_GLIB_VAPI=True" ]; patches = [ - # TODO: upstream this patch + # Will appear in 3.1.0 # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix index c1ee68a2470b..044ef2dd6a79 100644 --- a/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.13.4"; + version = "1.14.1"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"; + sha256 = "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libipfix/default.nix b/nixpkgs/pkgs/development/libraries/libipfix/default.nix index c4dca659d366..fccf4b3d50f2 100644 --- a/nixpkgs/pkgs/development/libraries/libipfix/default.nix +++ b/nixpkgs/pkgs/development/libraries/libipfix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libipfix"; version = "110209"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libirecovery/default.nix b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix index 32a2971b3e36..be05f120e13a 100644 --- a/nixpkgs/pkgs/development/libraries/libirecovery/default.nix +++ b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # as only the `idevicerestore` binary was tested so far (which worked # without further configuration). configureFlags = [ - "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" + "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' ]; diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-drop/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-drop/default.nix index 0f2c9dce28a2..4e9c165e71fb 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-drop/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libjpeg-drop-9b"; srcs = [ diff --git a/nixpkgs/pkgs/development/libraries/libjson/default.nix b/nixpkgs/pkgs/development/libraries/libjson/default.nix index ba92bdd51655..b62f0f116a09 100644 --- a/nixpkgs/pkgs/development/libraries/libjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjson/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: let version = "7.6.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "libjson"; inherit version; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libksi/default.nix b/nixpkgs/pkgs/development/libraries/libksi/default.nix index 92e7d26f5afa..b4e9f2bdf885 100644 --- a/nixpkgs/pkgs/development/libraries/libksi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libksi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libksi-2015-07-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix b/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix index d9f460d44e8c..c51cb9baead6 100644 --- a/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, curl, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "liblastfm-SF-0.5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index a61c21ffec5f..6dfb95d1fb83 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -4,7 +4,7 @@ let version = "3.10.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "liblouis"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 406b88ea8c1b..7a7bd1153280 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; configureFlags = [ - "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-udev-base-dir=${placeholder "out"}/lib/udev" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix index 2ce11b998a1a..4a4074e2f229 100644 --- a/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libmcrypt-2.5.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libmemcached/default.nix b/nixpkgs/pkgs/development/libraries/libmemcached/default.nix index d2fba5cddd82..57053103417a 100644 --- a/nixpkgs/pkgs/development/libraries/libmemcached/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmemcached/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libmemcached-1.0.18"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix index 719053e7ecf1..f8f4439a3dfe 100644 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.64"; + version = "0.9.66"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7"; + sha256 = "06xblz77bnn29y7sl43avxbcrjbw486x3416plpr3x3l2pdx8rjf"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/nixpkgs/pkgs/development/libraries/libmpc/default.nix index e4010280f4bd..9ffbc95b1fd1 100644 --- a/nixpkgs/pkgs/development/libraries/libmpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmpc/default.nix @@ -5,7 +5,7 @@ let version = "1.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libmpc"; inherit version; # to avoid clash with the MPD client diff --git a/nixpkgs/pkgs/development/libraries/libmypaint/default.nix b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix index cde4251e2c69..91e0b5ef0722 100644 --- a/nixpkgs/pkgs/development/libraries/libmypaint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix @@ -1,31 +1,45 @@ -{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}: - -let - version = "1.3.0"; -in stdenv.mkDerivation rec { +{ stdenv +, autoconf +, automake +, fetchFromGitHub +, glib +, intltool +, json_c +, libtool +, pkgconfig +, python2 +}: + +stdenv.mkDerivation rec { pname = "libmypaint"; - inherit version; + version = "1.4.0"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc"; + sha256 = "1ynm2g2wdb9zsymncndlgs6gpcbsa122n52d11161jrj5nrdliaq"; }; - patches = [ - # build with automake 1.16 - (fetchpatch { - url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch; - sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi"; - }) + nativeBuildInputs = [ + autoconf + automake + intltool + libtool + pkgconfig + python2 ]; - nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; - - buildInputs = [ glib ]; + buildInputs = [ + glib + ]; - propagatedBuildInputs = [ json_c ]; # for libmypaint.pc + # for libmypaint.pc + propagatedBuildInputs = [ + json_c + ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libndtypes/default.nix b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix index 6c4fc798f335..a522c72fc766 100644 --- a/nixpkgs/pkgs/development/libraries/libndtypes/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libndtypes"; version = "unstable-2018-11-27"; diff --git a/nixpkgs/pkgs/development/libraries/libnfc/default.nix b/nixpkgs/pkgs/development/libraries/libnfc/default.nix index 695ddadb5f39..3d069d7a168d 100644 --- a/nixpkgs/pkgs/development/libraries/libnfc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnfc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libusb, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libnfc"; version = "1.7.1"; diff --git a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix index ad51ac8d6dbb..815ed3a6bd40 100644 --- a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - version = "1.1.3"; + version = "1.1.4"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92"; + sha256 = "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libnih/default.nix b/nixpkgs/pkgs/development/libraries/libnih/default.nix index c0c66bc1a4a0..4049a18145c7 100644 --- a/nixpkgs/pkgs/development/libraries/libnih/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnih/default.nix @@ -2,7 +2,7 @@ let version = "1.0.3"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libnih"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/nixpkgs/pkgs/development/libraries/libnotify/default.nix index be1daa0505a0..d4ac3ae8dc9e 100644 --- a/nixpkgs/pkgs/development/libraries/libnotify/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnotify/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # disable tests as we don't need to depend on gtk+(2/3) + # disable tests as we don't need to depend on GTK (2/3) "-Dtests=false" "-Ddocbook_docs=disabled" "-Dgtk_doc=false" diff --git a/nixpkgs/pkgs/development/libraries/libopcodes/default.nix b/nixpkgs/pkgs/development/libraries/libopcodes/default.nix index c42cd3206b41..aa307f68ca00 100644 --- a/nixpkgs/pkgs/development/libraries/libopcodes/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopcodes/default.nix @@ -3,7 +3,7 @@ , libiberty, libbfd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopcodes"; inherit (binutils-unwrapped) version src; diff --git a/nixpkgs/pkgs/development/libraries/libopus/default.nix b/nixpkgs/pkgs/development/libraries/libopus/default.nix index 752be52963cb..01da76749bab 100644 --- a/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -4,7 +4,7 @@ let version = "1.3.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopus"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/libopusenc/default.nix b/nixpkgs/pkgs/development/libraries/libopusenc/default.nix index e1d70bee6c4c..9b91e32f2285 100644 --- a/nixpkgs/pkgs/development/libraries/libopusenc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopusenc/default.nix @@ -3,7 +3,7 @@ let version = "0.2.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopusenc"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix b/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix index 54ee86f0a39a..4be744e7ba93 100644 --- a/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, protobuf}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libosmpbf-1.3.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/nixpkgs/pkgs/development/libraries/libpsl/default.nix index 7e2443d31e92..15aa7c9e22d1 100644 --- a/nixpkgs/pkgs/development/libraries/libpsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpsl/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-static" # "--enable-gtk-doc" "--enable-man" "--enable-valgrind-tests" diff --git a/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix b/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix index f1c7874e313e..41a2a1b669d8 100644 --- a/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix @@ -2,7 +2,7 @@ , qtbase, qtmultimedia }: let - generic = version: sha256: prefix: stdenv.mkDerivation rec { + generic = version: sha256: prefix: stdenv.mkDerivation { pname = "libqmatrixclient"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 8a2390483908..930eafc96759 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; configureFlags = [ - "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-udev-base-dir=${placeholder "out"}/lib/udev" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/librep/default.nix b/nixpkgs/pkgs/development/libraries/librep/default.nix index f11a7eb1fe54..43f80076328e 100644 --- a/nixpkgs/pkgs/development/libraries/librep/default.nix +++ b/nixpkgs/pkgs/development/libraries/librep/default.nix @@ -19,10 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ readline texinfo ]; propagatedBuildInputs = [ gdbm gmp libffi ]; - configureFlags = [ - "--disable-static" - ]; - setupHook = ./setup-hook.sh; meta = { diff --git a/nixpkgs/pkgs/development/libraries/libsexy/default.nix b/nixpkgs/pkgs/development/libraries/libsexy/default.nix index 49cdb2c95ba0..cb22d9f97bc7 100644 --- a/nixpkgs/pkgs/development/libraries/libsexy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsexy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig , glib, gtk2, libxml2, pango }: - + stdenv.mkDerivation { name = "libsexy-0.1.11"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ glib gtk2 libxml2 pango ]; meta = with stdenv.lib; { - description = "A collection of GTK+ widgets"; + description = "A collection of GTK widgets"; homepage = https://blog.chipx86.com/tag/libsexy/; license = licenses.lgpl21; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix index bdca44dc7d03..d85c9e94ebdf 100644 --- a/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix @@ -2,7 +2,7 @@ let version = "1.8.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libspatialindex"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/libstemmer/default.nix b/nixpkgs/pkgs/development/libraries/libstemmer/default.nix index 67d6d8d42ead..2f6b2835c4e3 100644 --- a/nixpkgs/pkgs/development/libraries/libstemmer/default.nix +++ b/nixpkgs/pkgs/development/libraries/libstemmer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libstemmer-2017-03-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libtasn1/default.nix b/nixpkgs/pkgs/development/libraries/libtasn1/default.nix index 302400388437..004d2ef0dd5b 100644 --- a/nixpkgs/pkgs/development/libraries/libtasn1/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.13"; + name = "libtasn1-4.14"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky"; + sha256 = "025sqnlzji78ss2fi78dajc0v0h5fi02wp39hws41sn8qnjlnq4y"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libtcod/default.nix b/nixpkgs/pkgs/development/libraries/libtcod/default.nix index 7a25980a38b9..6d95d81e5d9c 100644 --- a/nixpkgs/pkgs/development/libraries/libtcod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtcod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtcod"; version = "1.5.1"; diff --git a/nixpkgs/pkgs/development/libraries/libtelnet/default.nix b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix index 139de830972f..043acee0cfeb 100644 --- a/nixpkgs/pkgs/development/libraries/libtelnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtelnet"; version = "0.21+45f2d5c"; diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix index 9bccff49b540..e9267df5047b 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix @@ -3,7 +3,7 @@ let generic = { version, sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "libtoxcore"; inherit version; @@ -42,7 +42,7 @@ let }; }; -in rec { +in { libtoxcore_0_1 = generic { version = "0.1.11"; sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix index c3981f5c58ea..6cd5f9122a4f 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tox-core-new-20160727"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 9a3671c32589..4959674f0ad2 100644 --- a/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -2,7 +2,7 @@ let version = "1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtxc_dxtn_s2tc"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/libui/default.nix b/nixpkgs/pkgs/development/libraries/libui/default.nix index 446d30c609ee..e333e73de3ff 100644 --- a/nixpkgs/pkgs/development/libraries/libui/default.nix +++ b/nixpkgs/pkgs/development/libraries/libui/default.nix @@ -6,7 +6,7 @@ let backend = if stdenv.isDarwin then "darwin" else "unix"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${shortName}-${version}"; src = fetchgit { url = "https://github.com/andlabs/libui.git"; diff --git a/nixpkgs/pkgs/development/libraries/libunity/default.nix b/nixpkgs/pkgs/development/libraries/libunity/default.nix index a0ec3b74cc17..2baaa14b88ea 100644 --- a/nixpkgs/pkgs/development/libraries/libunity/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunity/default.nix @@ -12,7 +12,7 @@ , autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libunity"; version = "unstable-2019-03-19"; @@ -48,8 +48,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-static" - "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/nixpkgs/pkgs/development/libraries/libvpx/default.nix index ee36365c03ff..d80fe6a998c9 100644 --- a/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { (if isDarwin || isCygwin then "--enable-static --disable-shared" else - "--disable-static --enable-shared") + "--enable-shared") (enableFeature smallSupport "small") (enableFeature postprocVisualizerSupport "postproc-visualizer") (enableFeature unitTestsSupport "unit-tests") diff --git a/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix b/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix index 75e935d18d90..48dbc5f395c8 100644 --- a/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix @@ -4,7 +4,7 @@ , libtool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libvterm-neovim"; version = "2018-11-26"; diff --git a/nixpkgs/pkgs/development/libraries/libxnd/default.nix b/nixpkgs/pkgs/development/libraries/libxnd/default.nix index 9eb891544b5f..eb031eb2a9d7 100644 --- a/nixpkgs/pkgs/development/libraries/libxnd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxnd/default.nix @@ -4,7 +4,7 @@ , libndtypes }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libxnd"; version = "unstable-2018-11-27"; diff --git a/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix index 75b377ff8d4d..fbc4b4bcec57 100644 --- a/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; + cmakeFlags = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF"; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/nixpkgs/pkgs/development/libraries/libykclient/default.nix b/nixpkgs/pkgs/development/libraries/libykclient/default.nix index 9aa189586f05..e1bf4fca7b55 100644 --- a/nixpkgs/pkgs/development/libraries/libykclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libykclient/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libykclient"; version = "unstable-2019-03-18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix index f5cb197dfe5e..8635b8c412f3 100644 --- a/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ++ stdenv.lib.optionals withSage [ "--enable-sage" diff --git a/nixpkgs/pkgs/development/libraries/linenoise/default.nix b/nixpkgs/pkgs/development/libraries/linenoise/default.nix index 857f5247cd51..0098116563ae 100644 --- a/nixpkgs/pkgs/development/libraries/linenoise/default.nix +++ b/nixpkgs/pkgs/development/libraries/linenoise/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "linenoise"; version = "1.0.10"; # Its version 1.0 plus 10 commits diff --git a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix index 8b0aecdab168..8c691f775916 100644 --- a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix +++ b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liquid-dsp"; version = "20170307"; diff --git a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix index 9c1815f840b4..2df7ef94cf36 100644 --- a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix +++ b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix @@ -8,7 +8,7 @@ let hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = requireFile { url = sourceInfo.url; sha256 = sourceInfo.hash; diff --git a/nixpkgs/pkgs/development/libraries/log4shib/default.nix b/nixpkgs/pkgs/development/libraries/log4shib/default.nix index ab8c2c9385f8..ccf246c044e9 100644 --- a/nixpkgs/pkgs/development/libraries/log4shib/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4shib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "log4shib"; version = "1.0.9"; diff --git a/nixpkgs/pkgs/development/libraries/luabind/default.nix b/nixpkgs/pkgs/development/libraries/luabind/default.nix index 50baad6a7a0b..7ca7456f7897 100644 --- a/nixpkgs/pkgs/development/libraries/luabind/default.nix +++ b/nixpkgs/pkgs/development/libraries/luabind/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, boost-build, lua, boost}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "luabind-0.9.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix index ebd68134ba55..38261bd1e53a 100644 --- a/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -2,7 +2,7 @@ , fetchgit, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mediastreamer-openh264"; version = "0.0pre20160801"; diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 7610b15296ee..cf1bdaf64323 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; let - version = "19.1.3"; + version = "19.1.5"; branch = head (splitString "." version); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "1q5p4mw7zrklwx1is09knnb762zzk33xwhwp99fw25ax4ar60m44"; + sha256 = "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v"; }; prePatch = "patchShebangs ."; diff --git a/nixpkgs/pkgs/development/libraries/miniball/default.nix b/nixpkgs/pkgs/development/libraries/miniball/default.nix index 3493bc5d9679..287241a75c92 100644 --- a/nixpkgs/pkgs/development/libraries/miniball/default.nix +++ b/nixpkgs/pkgs/development/libraries/miniball/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "miniball"; version = "3.0"; diff --git a/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/nixpkgs/pkgs/development/libraries/mm-common/default.nix index 9519e295213b..f590653df6ba 100644 --- a/nixpkgs/pkgs/development/libraries/mm-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/mm-common/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Common build files of GLib/GTK+ C++ bindings"; + description = "Common build files of GLib/GTK C++ bindings"; longDescription = '' The mm-common module provides the build infrastructure and utilities shared among the GNOME C++ binding libraries. It is only a required diff --git a/nixpkgs/pkgs/development/libraries/msgpack/generic.nix b/nixpkgs/pkgs/development/libraries/msgpack/generic.nix index 04f84d49f844..c8ea3315f8b7 100644 --- a/nixpkgs/pkgs/development/libraries/msgpack/generic.nix +++ b/nixpkgs/pkgs/development/libraries/msgpack/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "msgpack"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/mumlib/default.nix b/nixpkgs/pkgs/development/libraries/mumlib/default.nix index 7117599d15ec..f936fc8b3df6 100644 --- a/nixpkgs/pkgs/development/libraries/mumlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/mumlib/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig , boost, openssl, log4cpp, libopus, protobuf }: -with lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation { pname = "mumlib"; version = "unstable-2018-12-12"; diff --git a/nixpkgs/pkgs/development/libraries/mutest/default.nix b/nixpkgs/pkgs/development/libraries/mutest/default.nix index 423a93b69a80..37bfb05c4eef 100644 --- a/nixpkgs/pkgs/development/libraries/mutest/default.nix +++ b/nixpkgs/pkgs/development/libraries/mutest/default.nix @@ -4,7 +4,7 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mutest"; version = "unstable-2019-08-26"; diff --git a/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix b/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix index 140dbcc937b5..3dac7c93e84b 100644 --- a/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix @@ -3,7 +3,7 @@ let pname = "mypaint-brushes"; version = "1.3.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/mysocketw/default.nix b/nixpkgs/pkgs/development/libraries/mysocketw/default.nix index 6ec288f985b0..8164f4ec9729 100644 --- a/nixpkgs/pkgs/development/libraries/mysocketw/default.nix +++ b/nixpkgs/pkgs/development/libraries/mysocketw/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mysocketw-031026"; src = fetchurl { url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz; diff --git a/nixpkgs/pkgs/development/libraries/ndpi/default.nix b/nixpkgs/pkgs/development/libraries/ndpi/default.nix index 83d01f85d0a4..2e29ab395d6b 100644 --- a/nixpkgs/pkgs/development/libraries/ndpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndpi/default.nix @@ -2,7 +2,7 @@ let version = "2.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ndpi"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/neardal/default.nix b/nixpkgs/pkgs/development/libraries/neardal/default.nix index 65679c7e2825..a79c42a1c8f4 100644 --- a/nixpkgs/pkgs/development/libraries/neardal/default.nix +++ b/nixpkgs/pkgs/development/libraries/neardal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "neardal-0.7-post-git-20150930"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/nettle/generic.nix b/nixpkgs/pkgs/development/libraries/nettle/generic.nix index d78a31d65cd3..064ef3443980 100644 --- a/nixpkgs/pkgs/development/libraries/nettle/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nettle/generic.nix @@ -4,7 +4,7 @@ , version, src , ...}: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "nettle-${version}"; inherit src; diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index d6fcfb411491..d02247196b1a 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.39.1"; + version = "1.39.2"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1vzmkh3pky3l3w6iaffhikh7hslp8zp0jsdqpd6knbflsmzp511a"; + sha256 = "1l51q8xqg7d7y9413z8l0scxgbbl1qkwgq4f09jqb31j492kx8lj"; }; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix index b7b4ea45d8b0..b6b1d406eacd 100644 --- a/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.44.1"; + version = "3.46"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w"; + sha256 = "1vqcl6wxn2nsm2fmlwzmxyagrsj1p1y9bc54b2i2nq45s94rcsbb"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix index 798f9d3a3965..b7d46cd5537d 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nvidia-video-sdk-6.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix index 6cab843a22b1..84205253554c 100644 --- a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix +++ b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; - nativeBuildInputs = [ ruby addOpenGLRunpath ]; + nativeBuildInputs = [ ruby ]; buildInputs = [ opencl-headers ]; @@ -17,12 +17,6 @@ stdenv.mkDerivation rec { sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; - # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - postFixup = '' - addOpenGLRunpath $out/lib/libOpenCL.so - ''; - meta = with stdenv.lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = https://forge.imag.fr/projects/ocl-icd/; diff --git a/nixpkgs/pkgs/development/libraries/openbr/default.nix b/nixpkgs/pkgs/development/libraries/openbr/default.nix index 5aeb07de9235..4d4505c3e703 100644 --- a/nixpkgs/pkgs/development/libraries/openbr/default.nix +++ b/nixpkgs/pkgs/development/libraries/openbr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.5"; pname = "openbr"; diff --git a/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix b/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix index 9ce8bb618bf9..d0cc6396b8d8 100644 --- a/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix @@ -2,7 +2,7 @@ , version # "12" for "1.2", "22" for "2.2" and so on }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "opencl-headers-${version}-2017-07-18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index d3efb022a0e0..d8946dae095b 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -140,7 +140,7 @@ let printEnabled = enabled : if enabled then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opencv"; inherit version src; diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 205a87d78e8f..aa4c7afa4dbe 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -153,7 +153,7 @@ let printEnabled = enabled : if enabled then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opencv"; inherit version src; diff --git a/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix index 5d26063adb61..b8a3c4a81e00 100644 --- a/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "openexrid-unstable"; version = "2017-09-17"; diff --git a/nixpkgs/pkgs/development/libraries/openfx/default.nix b/nixpkgs/pkgs/development/libraries/openfx/default.nix index abc60f026e57..4a7927bfcb2e 100644 --- a/nixpkgs/pkgs/development/libraries/openfx/default.nix +++ b/nixpkgs/pkgs/development/libraries/openfx/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "openfx"; version = "1.4"; diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix b/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix index 2a625f32e7ff..beb151f0d2de 100644 --- a/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix +++ b/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.5.2"; branch = "1.5"; revision = "version.1.5.2"; diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix b/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix index 55d003d2d92b..64ed6cb58f0b 100644 --- a/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix @@ -23,7 +23,7 @@ let mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openjpeg"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/openldap/default.nix b/nixpkgs/pkgs/development/libraries/openldap/default.nix index 04988debb723..fbc9de11e8f7 100644 --- a/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.47"; + name = "openldap-2.4.48"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "02sj0p1pq12hqq29b22m3f5zs2rykgvc0q3wlynxjcsjhrvmhk7m"; + sha256 = "0k87qra4kirb6xgja4q1jyw6piwb9v8b8g6gkxq4plawmgy3ylnr"; }; # TODO: separate "out" and "bin" diff --git a/nixpkgs/pkgs/development/libraries/openssl/chacha.nix b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix index 46028d3a7ea4..e2f641147166 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/chacha.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix @@ -3,7 +3,7 @@ }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openssl-chacha"; version = "2016-08-22"; diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index bd4802b8775b..03082eab0917 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -44,10 +44,10 @@ let # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; configureScript = { - "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; - "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; - "armv6l-linux" = "./Configure linux-armv4 -march=armv6"; - "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a"; + x86_64-darwin = "./Configure darwin64-x86_64-cc"; + x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + armv6l-linux = "./Configure linux-armv4 -march=armv6"; + armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" @@ -73,7 +73,14 @@ let ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"; - makeFlags = [ "MANDIR=$(man)/share/man" ]; + makeFlags = [ + "MANDIR=$(man)/share/man" + # This avoids conflicts between man pages of openssl subcommands (for + # example 'ts' and 'err') man pages and their equivalent top-level + # command in other packages (respectively man-pages and moreutils). + # This is done in ubuntu and archlinux, and possiibly many other distros. + "MANSUFFIX=ssl" + ]; enableParallelBuilding = true; @@ -114,7 +121,6 @@ let license = licenses.openssl; platforms = platforms.all; maintainers = [ maintainers.peti ]; - priority = 10; # resolves collision with ‘man-pages’ }; }; diff --git a/nixpkgs/pkgs/development/libraries/openzwave/default.nix b/nixpkgs/pkgs/development/libraries/openzwave/default.nix index c3407289f020..3d5988f8114e 100644 --- a/nixpkgs/pkgs/development/libraries/openzwave/default.nix +++ b/nixpkgs/pkgs/development/libraries/openzwave/default.nix @@ -5,7 +5,7 @@ let version = "2018-11-13"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openzwave"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix index 06b9e360d1a3..ea4ee44eb2df 100644 --- a/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix @@ -51,9 +51,9 @@ let # convert platform to oracle architecture names arch = { - "x86_64-linux" = "linux.x64"; - "x86_64-darwin" = "macos.x64"; - }."${stdenv.hostPlatform.system}" or throwSystem; + x86_64-linux = "linux.x64"; + x86_64-darwin = "macos.x64"; + }.${stdenv.hostPlatform.system} or throwSystem; # calculate the filename of a single zip file srcFilename = component: arch: version: rel: diff --git a/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix index 551c70cebcc2..14483a12f7ed 100644 --- a/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix +++ b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Gtk+ widget for displaying OpenStreetMap tiles"; + description = "GTK widget for displaying OpenStreetMap tiles"; homepage = https://nzjrs.github.io/osm-gps-map; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index b67db91ef642..0f84b382f4de 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cairo, harfbuzz +{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz , libintl, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib @@ -37,10 +37,10 @@ in stdenv.mkDerivation rec { optional x11Support libXft; patches = [ - (fetchurl { + (fetchpatch { # Add gobject-2 to .pc file url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch"; - sha256 = "034na38cq98vk8gggn3yfr65jmv3jgig8d25zg89wydrandp14yr"; + sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2"; }) ]; @@ -70,8 +70,8 @@ in stdenv.mkDerivation rec { Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. ''; homepage = https://www.pango.org/; diff --git a/nixpkgs/pkgs/development/libraries/pangolin/default.nix b/nixpkgs/pkgs/development/libraries/pangolin/default.nix index 44293d52da48..d788f1eff346 100644 --- a/nixpkgs/pkgs/development/libraries/pangolin/default.nix +++ b/nixpkgs/pkgs/development/libraries/pangolin/default.nix @@ -3,7 +3,7 @@ , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pangolin"; version = "2017-08-02"; diff --git a/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/nixpkgs/pkgs/development/libraries/pangomm/default.nix index 064ebf71cc32..6cb2c070c94f 100644 --- a/nixpkgs/pkgs/development/libraries/pangomm/default.nix +++ b/nixpkgs/pkgs/development/libraries/pangomm/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. ''; }; } diff --git a/nixpkgs/pkgs/development/libraries/partio/default.nix b/nixpkgs/pkgs/development/libraries/partio/default.nix index d90a27ed5458..b08936dd34de 100644 --- a/nixpkgs/pkgs/development/libraries/partio/default.nix +++ b/nixpkgs/pkgs/development/libraries/partio/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "partio"; version = "2018-03-01"; diff --git a/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix index 32fc27f9ab4d..5a02229cb0e2 100644 --- a/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix @@ -3,7 +3,7 @@ , portaudio, alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pcaudiolib"; version = "2016-07-19"; diff --git a/nixpkgs/pkgs/development/libraries/pcre/default.nix b/nixpkgs/pkgs/development/libraries/pcre/default.nix index 6d2896ac3396..2e111240758d 100644 --- a/nixpkgs/pkgs/development/libraries/pcre/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcre/default.nix @@ -13,7 +13,7 @@ let else if (variant == "cpp") then "pcre-cpp" else variant; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix index 67f343d60380..ef7633dadaf3 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -14,7 +14,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix index 829ecdb86e06..98c6be85672c 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix @@ -15,7 +15,7 @@ assert withQt4 -> qt4 != null; assert !withQt4 -> qtbase != null; assert !withQt4 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/phonon/default.nix b/nixpkgs/pkgs/development/libraries/phonon/default.nix index 2dd0cc10c947..dc32c4ebfb05 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -15,7 +15,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qttools != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index fb108dd7c257..4ec117777857 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -35,7 +35,7 @@ , libXmu }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "10.4.1"; pname = "geant4"; diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix index dd39fbbc84b7..3d6891c48e2b 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -14,7 +14,7 @@ let boost_python = boost.override { enablePython = true; inherit python; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (geant4_nomt) version src; pname = "g4py"; diff --git a/nixpkgs/pkgs/development/libraries/portaudio/default.nix b/nixpkgs/pkgs/development/libraries/portaudio/default.nix index 89248597f5d9..92b56467aee9 100644 --- a/nixpkgs/pkgs/development/libraries/portaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/portaudio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, pkgconfig, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "portaudio-190600-20161030"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/portmidi/default.nix b/nixpkgs/pkgs/development/libraries/portmidi/default.nix index ffe7f46b77d8..37958038601c 100644 --- a/nixpkgs/pkgs/development/libraries/portmidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/portmidi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; # XXX: This is to deactivate Java support. - patches = stdenv.lib.singleton (fetchurl rec { + patches = stdenv.lib.singleton (fetchurl { url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/" + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; diff --git a/nixpkgs/pkgs/development/libraries/ppl/default.nix b/nixpkgs/pkgs/development/libraries/ppl/default.nix index 8f6adaf03d9b..7839547ee928 100644 --- a/nixpkgs/pkgs/development/libraries/ppl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ppl/default.nix @@ -2,7 +2,7 @@ let version = "1.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ppl"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index 957b59a6f662..01f74bc48eb7 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -6,7 +6,7 @@ }: let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { +mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { pname = "protobuf"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix index 773e31391758..3c08537db0b6 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protobuf"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix b/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix index c3a815c45ac8..304f9d61f397 100644 --- a/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix +++ b/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix @@ -1,6 +1,6 @@ { callPackage, fetchFromGitHub, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.3.1"; src = fetchFromGitHub { owner = "protobuf-c"; diff --git a/nixpkgs/pkgs/development/libraries/protobufc/generic.nix b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix index 91c0ae5624e8..838fa7de8261 100644 --- a/nixpkgs/pkgs/development/libraries/protobufc/generic.nix +++ b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protobuf-c"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/qhull/default.nix b/nixpkgs/pkgs/development/libraries/qhull/default.nix index 596dc543e335..92f927ee3985 100644 --- a/nixpkgs/pkgs/development/libraries/qhull/default.nix +++ b/nixpkgs/pkgs/development/libraries/qhull/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "qhull-2016.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix index 083e0a51b813..03247f9d695b 100644 --- a/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,5 +1,5 @@ {stdenv, qtdeclarative, fetchFromGitHub, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "qml-box2d-2018-04-06"; src = fetchFromGitHub { owner = "qml-box2d"; diff --git a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index d3f4a8e88e2e..b156a1cbf992 100644 --- a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-11-24"; pname = "qmltermwidget-unstable"; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index e7d7d1326174..eb6e7715385c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -82,7 +82,7 @@ wrapQtAppsHook() { find "$targetDir" -executable -print0 | while IFS= read -r -d '' file do - isELF "$file" || continue + isELFExec "$file" || continue if [ -f "$file" ] then diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8250e42a1b6c..e2c71a77062e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -255,14 +255,14 @@ stdenv.mkDerivation { if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] else lib.optionals (compareVersion "5.9.0" >= 0) { - "default" = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; - "westmere" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; - "sandybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - "ivybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - "haswell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "broadwell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "skylake" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "skylake-avx512" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; + westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; + sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ) ++ [ diff --git a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index 84a9d30918b1..5003205ef37d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -8,14 +8,14 @@ args: let inherit (args) name; - version = args.version or srcs."${name}".version; - src = args.src or srcs."${name}".src; + version = args.version or srcs.${name}.version; + src = args.src or srcs.${name}.src; in mkDerivation (args // { name = "${name}-${version}"; inherit src; - patches = args.patches or patches."${name}" or []; + patches = args.patches or patches.${name} or []; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix index dd50e6ec0398..50a1e90588cb 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,6 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: -mkDerivation rec { +mkDerivation { name = "qtstyleplugins-2017-03-11"; src = fetchFromGitHub { @@ -14,7 +14,7 @@ mkDerivation rec { buildInputs = [ gtk2 ]; meta = with stdenv.lib; { - description = "Additional style plugins for Qt5, including BB10, GTK+, Cleanlooks, Motif, Plastique"; + description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique"; homepage = http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/; license = licenses.lgpl21; maintainers = [ maintainers.gnidorah ]; diff --git a/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix index 96a2347c50fa..afb4e0daeb66 100644 --- a/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rabbitmq-java-client-3.3.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index e36b6f9488a5..2b60c3cbf546 100644 --- a/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "re2"; version = "20190401"; diff --git a/nixpkgs/pkgs/development/libraries/readline/6.3.nix b/nixpkgs/pkgs/development/libraries/readline/6.3.nix index f9a20a535cb3..73ed823d2be5 100644 --- a/nixpkgs/pkgs/development/libraries/readline/6.3.nix +++ b/nixpkgs/pkgs/development/libraries/readline/6.3.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "readline-6.3p08"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix index a43700ce439e..7530cc64bf5f 100644 --- a/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GTK+ bindings for librep"; + description = "GTK bindings for librep"; homepage = http://sawfish.wikia.com; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; diff --git a/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix index 75beddcd22ca..53d30019f28d 100644 --- a/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "5.6.0"; pname = "papi"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix index 9c412f93d137..a14ed4e6a30b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix @@ -44,6 +44,15 @@ stdenv.mkDerivation rec { install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" ln -s libblas.so.${version} "$out/lib/libblas.so.3" ln -s libblas.so.${version} "$out/lib/libblas.so" + # Write pkgconfig alias. + # See also openblas/default.nix + mkdir $out/lib/pkgconfig + cat <<EOF > $out/lib/pkgconfig/blas.pc +Name: blas +Version: ${version} +Description: blas provided by the BLAS package. +Libs: -L$out/lib -lblas +EOF ''; preFixup = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix index d22858d64d0c..26ec1237601f 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix @@ -38,7 +38,7 @@ let ''; cub = { - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "NVlabs"; repo = "cub"; rev = "v1.7.4"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index 3c448abeccf6..f0f5829ce465 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -10,7 +10,7 @@ , addOpenGLRunpath }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix index 2e5bb5e371f5..5a62578481c6 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix @@ -11,7 +11,7 @@ let version = "3.8.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liblapack"; inherit version; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix index d036e39d01ae..c428fbab588b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix @@ -1,24 +1,31 @@ -{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, liblapack }: +{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, liblapack +, mklSupport ? false, mkl ? null +}: + +assert !mklSupport || mkl != null; with stdenv.lib; -let version = "2.0.2"; +let version = "2.5.0"; in stdenv.mkDerivation { pname = "magma"; inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; - sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk"; + sha256 = "0czspk93cv1fy37zyrrc9k306q4yzfxkhy1y4lj937dx8rz5rm2g"; name = "magma-${version}.tar.gz"; }; - buildInputs = [ gfortran cudatoolkit libpthreadstubs liblapack cmake ]; + buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake ] + ++ (if mklSupport then [ mkl ] else [ liblapack ]); doCheck = false; - #checkTarget = "tests"; + + MKLROOT = optionalString mklSupport "${mkl}"; enableParallelBuilding=true; + buildFlags = [ "magma" "magma_sparse" ]; # MAGMA's default CMake setup does not care about installation. So we copy files directly. installPhase = '' @@ -42,6 +49,6 @@ in stdenv.mkDerivation { license = licenses.bsd3; homepage = http://icl.cs.utk.edu/magma/index.html; platforms = platforms.unix; - maintainers = with maintainers; [ ianwookim ]; + maintainers = with maintainers; [ tbenst ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix index 892dfa2a6097..76f0c5eea7fa 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix @@ -1,14 +1,14 @@ { version = "1.14.0"; -"cpu-linux-x86_64" = { +cpu-linux-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz"; sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k"; }; -"gpu-linux-x86_64" = { +gpu-linux-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz"; sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6"; }; -"cpu-darwin-x86_64" = { +cpu-darwin-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz"; sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92"; }; diff --git a/nixpkgs/pkgs/development/libraries/scmccid/default.nix b/nixpkgs/pkgs/development/libraries/scmccid/default.nix index c9c26ca0d66c..ff29ae82c5ce 100644 --- a/nixpkgs/pkgs/development/libraries/scmccid/default.nix +++ b/nixpkgs/pkgs/development/libraries/scmccid/default.nix @@ -2,7 +2,7 @@ assert stdenv ? cc && stdenv.cc.libc != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "scmccid-5.0.11"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/sdformat/3.nix b/nixpkgs/pkgs/development/libraries/sdformat/3.nix index 116f248b3b4e..b78f1d5624ca 100644 --- a/nixpkgs/pkgs/development/libraries/sdformat/3.nix +++ b/nixpkgs/pkgs/development/libraries/sdformat/3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, callPackage, ... } @ args: -callPackage ./default.nix (args // rec { +callPackage ./default.nix (args // { version = "3.7.0"; srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q"; }) diff --git a/nixpkgs/pkgs/development/libraries/sdformat/default.nix b/nixpkgs/pkgs/development/libraries/sdformat/default.nix index f81eb9b259e8..66ad311387f8 100644 --- a/nixpkgs/pkgs/development/libraries/sdformat/default.nix +++ b/nixpkgs/pkgs/development/libraries/sdformat/default.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = fetchurl { url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2"; sha256 = srchash-sha256; diff --git a/nixpkgs/pkgs/development/libraries/sfml/default.nix b/nixpkgs/pkgs/development/libraries/sfml/default.nix index cf73e205830b..4726221a40d9 100644 --- a/nixpkgs/pkgs/development/libraries/sfml/default.nix +++ b/nixpkgs/pkgs/development/libraries/sfml/default.nix @@ -7,7 +7,7 @@ let version = "2.5.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sfml"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/soil/default.nix b/nixpkgs/pkgs/development/libraries/soil/default.nix index 2f3ec44a08ce..d9fcea767d5e 100644 --- a/nixpkgs/pkgs/development/libraries/soil/default.nix +++ b/nixpkgs/pkgs/development/libraries/soil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, mesa, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "soil"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/sonic/default.nix b/nixpkgs/pkgs/development/libraries/sonic/default.nix index edcb3549c310..4a744c08ae33 100644 --- a/nixpkgs/pkgs/development/libraries/sonic/default.nix +++ b/nixpkgs/pkgs/development/libraries/sonic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sonic"; version = "2016-03-01"; diff --git a/nixpkgs/pkgs/development/libraries/soqt/default.nix b/nixpkgs/pkgs/development/libraries/soqt/default.nix index 98226ce20f4a..79084ceda1c3 100644 --- a/nixpkgs/pkgs/development/libraries/soqt/default.nix +++ b/nixpkgs/pkgs/development/libraries/soqt/default.nix @@ -1,6 +1,6 @@ { fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soqt"; version = "1.6.0a"; diff --git a/nixpkgs/pkgs/development/libraries/soxt/default.nix b/nixpkgs/pkgs/development/libraries/soxt/default.nix index 50ba9c944ab5..11ba48c59716 100644 --- a/nixpkgs/pkgs/development/libraries/soxt/default.nix +++ b/nixpkgs/pkgs/development/libraries/soxt/default.nix @@ -1,6 +1,6 @@ { fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soxt"; version = "unstable-2019-06-14"; diff --git a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index 8f92e0b64f6a..7ba120d661bf 100644 --- a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -117,9 +117,9 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "A GTK+3 SPICE widget"; + description = "GTK 3 SPICE widget"; longDescription = '' - spice-gtk is a GTK+3 SPICE widget. It features glib-based + spice-gtk is a GTK 3 SPICE widget. It features glib-based objects for SPICE protocol parsing and a gtk widget for embedding the SPICE display into other applications such as virt-manager. Python bindings are available too. diff --git a/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix index e4c1f8eb5f68..739dfc3bc5b4 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fuse, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sqlar"; version = "2018-01-07"; diff --git a/nixpkgs/pkgs/development/libraries/stb/default.nix b/nixpkgs/pkgs/development/libraries/stb/default.nix index 440f0c22ea6f..c2353c7b7061 100644 --- a/nixpkgs/pkgs/development/libraries/stb/default.nix +++ b/nixpkgs/pkgs/development/libraries/stb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stb"; version = "20180211"; diff --git a/nixpkgs/pkgs/development/libraries/sundials/3.x.nix b/nixpkgs/pkgs/development/libraries/sundials/3.x.nix new file mode 100644 index 000000000000..879f13e8bf53 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sundials/3.x.nix @@ -0,0 +1,52 @@ +{ stdenv +, cmake +, fetchurl +, python +, liblapack +, gfortran +, lapackSupport ? true }: + +let liblapackShared = liblapack.override { + shared = true; +}; + +in stdenv.mkDerivation rec { + pname = "sundials"; + version = "3.2.1"; + + buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ]; + nativeBuildInputs = [ cmake ]; + + src = fetchurl { + url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; + sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7"; + }; + + patches = [ + (fetchurl { + # https://github.com/LLNL/sundials/pull/19 + url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; + sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; + }) + ]; + + cmakeFlags = [ + "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" + ] ++ stdenv.lib.optionals (lapackSupport) [ + "-DSUNDIALS_INDEX_TYPE=int32_t" + "-DLAPACK_ENABLE=ON" + "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + ]; + + # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3 + doCheck = false; + checkPhase = "make test"; + + meta = with stdenv.lib; { + description = "Suite of nonlinear differential/algebraic equation solvers"; + homepage = https://computation.llnl.gov/projects/sundials; + platforms = platforms.all; + maintainers = with maintainers; [ flokli idontgetoutmuch ]; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix index abe444c63c32..4bc066df32e2 100644 --- a/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -1,28 +1,58 @@ -{ cmake, fetchurl, python, stdenv }: +{ stdenv +, cmake +, fetchurl +, python +, liblapack +, gfortran +, lapackSupport ? true }: -stdenv.mkDerivation rec { +let liblapackShared = liblapack.override { + shared = true; +}; +in stdenv.mkDerivation rec { pname = "sundials"; version = "4.1.0"; + buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ]; + nativeBuildInputs = [ cmake ]; + src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; sha256 = "19ca4nmlf6i9ijqcibyvpprxzsdfnackgjs6dw51fq13gg1f2398"; }; - preConfigure = '' - export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags" - ''; + patches = [ + (fetchurl { + # https://github.com/LLNL/sundials/pull/19 + url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; + sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; + }) + (fetchurl { + # https://github.com/LLNL/sundials/pull/20 + url = "https://github.com/LLNL/sundials/pull/20/commits/2d951bbe1ff7842fcd0dafa28c61b0aa94015f66.patch"; + sha256 = "0lcr6m4lk14yqrxah4rdscpczny5l7m1zpfsjh8bgspadfsgk512"; + }) + # https://github.com/LLNL/sundials/pull/21 + ./tests-parallel.patch + ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ python ]; + cmakeFlags = [ + "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" + ] ++ stdenv.lib.optionals (lapackSupport) [ + "-DSUNDIALS_INDEX_TYPE=int32_t" + "-DLAPACK_ENABLE=ON" + "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + ]; + + doCheck = true; + checkPhase = "make test"; meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = https://computation.llnl.gov/projects/sundials; platforms = platforms.all; - maintainers = [ maintainers.idontgetoutmuch ]; + maintainers = with maintainers; [ flokli idontgetoutmuch ]; license = licenses.bsd3; }; - } diff --git a/nixpkgs/pkgs/development/libraries/sundials/tests-parallel.patch b/nixpkgs/pkgs/development/libraries/sundials/tests-parallel.patch new file mode 100644 index 000000000000..a785a1dade9b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sundials/tests-parallel.patch @@ -0,0 +1,45 @@ +diff --git a/config/SundialsAddTest.cmake b/config/SundialsAddTest.cmake +index e965fed..a7fb1d2 100644 +--- a/config/SundialsAddTest.cmake ++++ b/config/SundialsAddTest.cmake +@@ -70,7 +70,7 @@ MACRO(SUNDIALS_ADD_TEST NAME EXECUTABLE) + "--verbose" + "--testname=${NAME}" + "--executablename=$<TARGET_FILE:${EXECUTABLE}>" +- "--outputdir=${CMAKE_BINARY_DIR}/Testing/output" ++ "--outputdir=${TEST_OUTPUT_DIR}" + ) + + # do not diff the output and answer files +diff --git a/config/SundialsTesting.cmake b/config/SundialsTesting.cmake +index 815576a..d91801a 100644 +--- a/config/SundialsTesting.cmake ++++ b/config/SundialsTesting.cmake +@@ -29,6 +29,13 @@ IF(SUNDIALS_DEVTESTS) + ENDIF() + ENDIF() + ++ # Directory for test output ++ SET(TEST_OUTPUT_DIR ${PROJECT_BINARY_DIR}/Testing/output) ++ ++ IF(NOT EXISTS ${TEST_OUTPUT_DIR}) ++ FILE(MAKE_DIRECTORY ${TEST_OUTPUT_DIR}) ++ ENDIF() ++ + # look for the testRunner script in the test directory + FIND_PROGRAM(TESTRUNNER testRunner PATHS test) + HIDE_VARIABLE(TESTRUNNER) +diff --git a/test/testRunner b/test/testRunner +index f450ec2..f1c8deb 100755 +--- a/test/testRunner ++++ b/test/testRunner +@@ -106,7 +106,8 @@ def main(): + + # create output directory if necessary + if not os.path.exists(outDir): +- os.makedirs(outDir) ++ error("Output directory does not exist, it must be created.", outDir) ++ sys.exit(1) + elif not os.path.isdir(outDir): + error("Output directory exists but is not a directory, it must be deleted.", outDir) + sys.exit(1) diff --git a/nixpkgs/pkgs/development/libraries/taglib/1.9.nix b/nixpkgs/pkgs/development/libraries/taglib/1.9.nix index 8992c7e75c05..401c2562167f 100644 --- a/nixpkgs/pkgs/development/libraries/taglib/1.9.nix +++ b/nixpkgs/pkgs/development/libraries/taglib/1.9.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, zlib, cmake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "taglib-1.9.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/tix/default.nix b/nixpkgs/pkgs/development/libraries/tix/default.nix index 61d9c710801c..507f2fb275b7 100644 --- a/nixpkgs/pkgs/development/libraries/tix/default.nix +++ b/nixpkgs/pkgs/development/libraries/tix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, tcl, tk, fetchpatch } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.4.3"; pname = "tix"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/tk/8.5.nix b/nixpkgs/pkgs/development/libraries/tk/8.5.nix index 141f6da14ce4..3058af46ab57 100644 --- a/nixpkgs/pkgs/development/libraries/tk/8.5.nix +++ b/nixpkgs/pkgs/development/libraries/tk/8.5.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, tcl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/tk/8.6.nix b/nixpkgs/pkgs/development/libraries/tk/8.6.nix index 5013db64bbae..c30f9a819478 100644 --- a/nixpkgs/pkgs/development/libraries/tk/8.6.nix +++ b/nixpkgs/pkgs/development/libraries/tk/8.6.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, tcl, stdenv, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x diff --git a/nixpkgs/pkgs/development/libraries/tnt/default.nix b/nixpkgs/pkgs/development/libraries/tnt/default.nix index d7162067deba..13e8f783915d 100644 --- a/nixpkgs/pkgs/development/libraries/tnt/default.nix +++ b/nixpkgs/pkgs/development/libraries/tnt/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tnt"; version = "3.0.12"; diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index 397184f798a8..db4f620a740f 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" + "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" "-Ddocs=true" diff --git a/nixpkgs/pkgs/development/libraries/tremor/default.nix b/nixpkgs/pkgs/development/libraries/tremor/default.nix index 5609f1d67d17..291336076892 100644 --- a/nixpkgs/pkgs/development/libraries/tremor/default.nix +++ b/nixpkgs/pkgs/development/libraries/tremor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/twolame/default.nix b/nixpkgs/pkgs/development/libraries/twolame/default.nix index 46b65a08eaab..e1284c39aa3b 100644 --- a/nixpkgs/pkgs/development/libraries/twolame/default.nix +++ b/nixpkgs/pkgs/development/libraries/twolame/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, pkgconfig , libsndfile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "twolame"; version = "2017-09-27"; diff --git a/nixpkgs/pkgs/development/libraries/uthash/default.nix b/nixpkgs/pkgs/development/libraries/uthash/default.nix index e1f3c0bd39c2..e6cd08276396 100644 --- a/nixpkgs/pkgs/development/libraries/uthash/default.nix +++ b/nixpkgs/pkgs/development/libraries/uthash/default.nix @@ -3,7 +3,7 @@ let version = "2.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uthash"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/v8/3.14.nix b/nixpkgs/pkgs/development/libraries/v8/3.14.nix index 7f9e8508a657..d62a8524644d 100644 --- a/nixpkgs/pkgs/development/libraries/v8/3.14.nix +++ b/nixpkgs/pkgs/development/libraries/v8/3.14.nix @@ -11,7 +11,7 @@ let arch = if stdenv.is64bit then "x64" else "ia32"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "v8"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/v8/5_x.nix b/nixpkgs/pkgs/development/libraries/v8/5_x.nix index cb53765e394b..050abe9e81bf 100644 --- a/nixpkgs/pkgs/development/libraries/v8/5_x.nix +++ b/nixpkgs/pkgs/development/libraries/v8/5_x.nix @@ -17,7 +17,7 @@ let sharedFlag = if static then "static_library" else "shared_library"; deps = { - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; @@ -32,7 +32,7 @@ let rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; }; - "buildtools" = fetchgit { + buildtools = fetchgit { url = "${git_url}/chromium/buildtools.git"; rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; diff --git a/nixpkgs/pkgs/development/libraries/v8/default.nix b/nixpkgs/pkgs/development/libraries/v8/default.nix index 2d9c5d4b92a3..e367d8242dec 100644 --- a/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -14,7 +14,7 @@ let rev = "936ba8a963284a6b3737cf2f0474a7131073abee"; sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2"; }; - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079"; sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf"; diff --git a/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix b/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix index a72c9473d4ab..782d324c8be0 100644 --- a/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix @@ -26,12 +26,12 @@ let rev = "0e9a47d74970bee1bbfc063c47215406f8918699"; sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c"; }; - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac"; sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh"; }; - "buildtools" = fetchgit { + buildtools = fetchgit { url = "${git_url}/chromium/buildtools.git"; rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8"; sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw"; diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 53d70f4d369d..0d96829b6baf 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ++ optional imwriSupport imagemagick7; configureFlags = [ - "--disable-static" (optionalString (!ocrSupport) "--disable-ocr") (optionalString (!imwriSupport) "--disable-imwri") ]; diff --git a/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/nixpkgs/pkgs/development/libraries/volume-key/default.nix index 77cd3be0cbda..2b0a807bfa75 100644 --- a/nixpkgs/pkgs/development/libraries/volume-key/default.nix +++ b/nixpkgs/pkgs/development/libraries/volume-key/default.nix @@ -6,7 +6,7 @@ let version = "0.3.11"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "volume_key"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/vte/2.90.nix b/nixpkgs/pkgs/development/libraries/vte/2.90.nix index f4e8c128ccbf..e091f6a3917b 100644 --- a/nixpkgs/pkgs/development/libraries/vte/2.90.nix +++ b/nixpkgs/pkgs/development/libraries/vte/2.90.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; + description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is + GTK, and a minimal sample application (vte) using that. Vte is mainly used in gnome-terminal, but can also be used to embed a console/terminal in games, editors, IDEs, etc. VTE supports Unicode and character set conversion, as well as emulating any terminal known to diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix index 273072e93239..35bc881d3d1c 100644 --- a/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; + description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is + GTK, and a minimal sample application (vte) using that. Vte is mainly used in gnome-terminal, but can also be used to embed a console/terminal in games, editors, IDEs, etc. VTE supports Unicode and character set conversion, as well as emulating any terminal known to diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index 5631665a6916..3cdf8f08651f 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -6,7 +6,7 @@ let in assert version == vulkan-headers.version; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vulkan-loader"; inherit version; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww"; }; - nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - postFixup = '' - addOpenGLRunpath $out/lib/libvulkan.so - ''; - meta = with stdenv.lib; { description = "LunarG Vulkan loader"; homepage = https://www.lunarg.com; diff --git a/nixpkgs/pkgs/development/libraries/wavpack/default.nix b/nixpkgs/pkgs/development/libraries/wavpack/default.nix index f3f87b3ba604..cd0b8bdb29dd 100644 --- a/nixpkgs/pkgs/development/libraries/wavpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/wavpack/default.nix @@ -69,6 +69,16 @@ stdenv.mkDerivation rec { name = "CVE-2019-1010319.patch"; sha256 = "011sqdgpykilaj2c4ns298z7aad03yprpva0dqr39nx88ji6jnrb"; }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/36a24c7881427d2e1e4dc1cef58f19eee0d13aec.patch"; + name = "CVE-2018-7253.patch"; + sha256 = "130kvmlpaj6x1pm6qzdzrmf4xzhp0pj29qrardb76zcfinx5pk2n"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/8e3fe45a7bac31d9a3b558ae0079e2d92a04799e.patch"; + name = "CVE-2018-7254.patch"; + sha256 = "06fdzw2cbdj8ajf171z1g53cl6bf1cdh2czswqldrqqvv3jkzk77"; + }) ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index d2af8b084e68..0b367f4a930f 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"; + sha256 = "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix index 25868cdb886e..060109072b49 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "2.4.11"; meta = with stdenv.lib; { - description = "Web content rendering engine, GTK+ port"; + description = "Web content rendering engine, GTK port"; homepage = http://webkitgtk.org/; license = licenses.bsd2; platforms = with platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 71b30960bacd..d2ba7a03955b 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "2.24.3"; meta = { - description = "Web content rendering engine, GTK+ port"; + description = "Web content rendering engine, GTK port"; homepage = https://webkitgtk.org/; license = licenses.bsd2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/wt/default.nix b/nixpkgs/pkgs/development/libraries/wt/default.nix index 60f911765992..958257ffe76d 100644 --- a/nixpkgs/pkgs/development/libraries/wt/default.nix +++ b/nixpkgs/pkgs/development/libraries/wt/default.nix @@ -6,7 +6,7 @@ let generic = { version, sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "wt"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index 362f704a05d8..9d317fe00d29 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -2,7 +2,7 @@ , libuuid, zlib }: let - generic = version: sha256: stdenv.mkDerivation rec { + generic = version: sha256: stdenv.mkDerivation { pname = "xapian"; inherit version; passthru = { inherit version; }; diff --git a/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 705bd6b87fc6..4764c1bdb93c 100644 --- a/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig , xorg, gnum4, libxcb, gperf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xcb-util-cursor-0.1.1-3-unstable"; version = "2017-04-05"; diff --git a/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix index e6ececf8513e..74846c8306dd 100644 --- a/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { "--with-openssl" "--with-xerces" "--with-xalan" - "--disable-static" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 3e54944a3779..25c5bf458887 100644 --- a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -4,7 +4,7 @@ let version = "1.2.28"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xmlsec"; inherit version; diff --git a/nixpkgs/pkgs/development/libraries/xsd/default.nix b/nixpkgs/pkgs/development/libraries/xsd/default.nix index 5a267bbfe767..bd87d306b965 100644 --- a/nixpkgs/pkgs/development/libraries/xsd/default.nix +++ b/nixpkgs/pkgs/development/libraries/xsd/default.nix @@ -3,7 +3,7 @@ let fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xsd"; version = "4.0.0"; diff --git a/nixpkgs/pkgs/development/libraries/yojimbo/default.nix b/nixpkgs/pkgs/development/libraries/yojimbo/default.nix index 6305b6c03a46..d3df30e03e18 100644 --- a/nixpkgs/pkgs/development/libraries/yojimbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/yojimbo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "yojimbo"; version = "1.1"; diff --git a/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix b/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix index c5dc775d0755..9e3b06453bfa 100644 --- a/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix +++ b/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - configureFlags = [ "--with-session-bus-services-dir=${placeholder ''out''}/share/dbus-1/services" ]; + configureFlags = [ "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services" ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix new file mode 100644 index 000000000000..13797f927c1c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 +, darwin, libiconv, Security +, cpp11 ? false +}: + +stdenv.mkDerivation rec { + pname = "zeroc-ice"; + version = "3.6.3"; + + src = fetchFromGitHub { + owner = "zeroc-ice"; + repo = "ice"; + rev = "v${version}"; + sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2"; + }; + + buildInputs = [ mcpp bzip2 expat openssl db5 ] + ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; + + postUnpack = '' + sourceRoot=$sourceRoot/cpp + ''; + + prePatch = lib.optional stdenv.isDarwin '' + substituteInPlace config/Make.rules.Darwin \ + --replace xcrun "" + ''; + + preBuild = '' + makeFlagsArray+=( + "prefix=$out" + "OPTIMIZE=yes" + "USR_DIR_INSTALL=yes" + "CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}" + "SKIP=slice2py" # provided by a separate package + ) + ''; + + # cannot find -lIceXML (linking bin/transformdb) + enableParallelBuilding = false; + + outputs = [ "out" "bin" "dev" ]; + + postInstall = '' + mkdir -p $bin $dev/share + mv $out/bin $bin + mv $out/share/Ice-* $dev/share/ice + rm -rf $out/share/slice + ''; + + meta = with stdenv.lib; { + homepage = http://www.zeroc.com/ice.html; + description = "The internet communications engine"; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index a2e60eacf989..9a69d3168c5d 100644 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -1,41 +1,70 @@ -{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 +{ stdenv, lib, fetchFromGitHub, mcpp, bzip2, expat, openssl, lmdb , darwin, libiconv, Security +, cpp11 ? false }: -stdenv.mkDerivation rec { +let + zeroc_mcpp = mcpp.overrideAttrs (self: rec { + pname = "zeroc-mcpp"; + version = "2.7.2.14"; + + src = fetchFromGitHub { + owner = "zeroc-ice"; + repo = "mcpp"; + rev = "v${version}"; + sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh"; + }; + + installFlags = [ "PREFIX=$(out)" ]; + }); + +in stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.6.3"; + version = "3.7.2"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2"; + sha256 = "0m9lh79dfpcwcp2jhmj0wqdcsw3rl633x2hzfw9n2i34jjv64fvg"; }; - patches = [ ./makefile.patch ]; + buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ] + ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - buildInputs = [ mcpp bzip2 expat openssl db5 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - - postUnpack = '' - sourceRoot=$sourceRoot/cpp + prePatch = lib.optional stdenv.isDarwin '' + substituteInPlace Make.rules.Darwin \ + --replace xcrun "" ''; - prePatch = '' - substituteInPlace config/Make.rules.Darwin \ - --replace xcrun "" + preBuild = '' + makeFlagsArray+=( + "prefix=$out" + "OPTIMIZE=yes" + "USR_DIR_INSTALL=yes" + "LANGUAGES=cpp" + "CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}" + "SKIP=slice2py" # provided by a separate package + ) ''; - makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ]; + buildFlags = [ "srcs" ]; # no tests; they require network + + enableParallelBuilding = true; - # cannot find -lIceXML (linking bin/transformdb) - #enableParallelBuilding = true; + outputs = [ "out" "bin" "dev" ]; + + postInstall = '' + mkdir -p $bin $dev/share + mv $out/bin $bin + mv $out/share/ice $dev/share + ''; meta = with stdenv.lib; { homepage = http://www.zeroc.com/ice.html; description = "The internet communications engine"; license = licenses.gpl2; platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix index 592abea4ea04..b0f8ae503ea4 100644 --- a/nixpkgs/pkgs/development/libraries/zlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix @@ -96,6 +96,9 @@ stdenv.mkDerivation (rec { "LIBRARY_PATH=$(out)/lib" ]; + enableParallelBuilding = true; + doCheck = true; + makeFlags = [ "PREFIX=${stdenv.cc.targetPrefix}" ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ diff --git a/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix b/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix index 58e1940a3ef4..bb5b602b64ac 100644 --- a/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix @@ -1,6 +1,6 @@ { stdenv, zookeeper, bash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}"; src = zookeeper.src; diff --git a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix index 46d417fd2aac..d9478c60db88 100644 --- a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix +++ b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix @@ -36,7 +36,7 @@ let lispPackages = rec { }; }; - quicklisp-to-nix-system-info = stdenv.mkDerivation rec { + quicklisp-to-nix-system-info = stdenv.mkDerivation { pname = "quicklisp-to-nix-system-info"; version = "1.0.0"; src = ./quicklisp-to-nix; @@ -57,7 +57,7 @@ let lispPackages = rec { dontStrip = true; }; - quicklisp-to-nix = stdenv.mkDerivation rec { + quicklisp-to-nix = stdenv.mkDerivation { pname = "quicklisp-to-nix"; version = "1.0.0"; src = ./quicklisp-to-nix; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index a5fddd417fa1..729f5937117e 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''_3bmd''; version = ''20171019-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix index a657159a41f1..cbfcb6f43619 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''abnf''; version = ''cl-20150608-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 48dd57aac54b..586502945ba6 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''alexandria''; version = ''20181210-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index 61a07c61ca07..5921b5f49b12 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''anaphora''; version = ''20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 40d5aed49917..1d64784a0a64 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''array-utils''; version = ''20181018-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix index 68c8a7e087b5..482752f2c7f2 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''asdf-finalizers''; version = ''20170403-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 65df45d95a50..1d1ef41f2d16 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''asdf-system-connections''; version = ''20170124-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix index 4f438eb734a8..5251cbc920fa 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''babel-streams''; version = ''babel-20171227-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index 4cba3e86e068..d8a12f6edbe3 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''babel''; version = ''20171227-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix index a660882f36b1..d7cebabb0adf 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''blackbird''; version = ''20160531-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index c5305587a029..530a3b76d301 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''bordeaux-threads''; version = ''v0.8.6''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix index 5d7f3f2dd10b..71a7a1894a25 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''buildnode-xhtml''; version = ''buildnode-20170403-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix index 0a2e56a9c9b8..26d907c2524c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''buildnode''; version = ''20170403-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 6cf810707343..d159ce49581e 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''caveman''; version = ''20181210-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index a7d22ac129b9..c4e3b9b57340 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi-grovel''; version = ''cffi_0.20.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index 3d2463806073..db85c50a5c1e 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi-toolchain''; version = ''cffi_0.20.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index b83b14611978..08115ea3a3ab 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi''; version = ''cffi_0.20.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index c30c68e53c8d..c9700a9d0091 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''chipz''; version = ''20190202-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 4a533220caf5..3209735adb59 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''chunga''; version = ''20180131-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index 2e387d29833f..ea812b38c954 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''circular-streams''; version = ''20161204-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 531d429df244..9ffc4c0d39ef 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-aa''; version = ''cl-vectors-20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix index 5f93167a1141..5dab19a55319 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-annot''; version = ''20150608-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index a413743eb8d5..8459e32fd045 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-anonfun''; version = ''20111203-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 9b053c920e32..1e61d4e48e75 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ansi-text''; version = ''20150804-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index d84233c43424..e366dc551d60 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async-repl''; version = ''cl-async-20190307-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index c13b8b70647d..d18c95153ff5 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async-ssl''; version = ''cl-async-20190307-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index 363227534a8b..876a24055c21 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async''; version = ''20190307-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index a4a9a9261fd6..8aa43a81f190 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-base64''; version = ''20150923-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix index 36641b73b750..aed744e04338 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-cli''; version = ''20151218-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 0d0337a65cec..9b69bf886c0e 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-colors''; version = ''20180328-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix index ebff2928c3ea..9b558402ce6a 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-containers''; version = ''20170403-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index a3aacd0aa8bd..62f895b20279 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-cookie''; version = ''20150804-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 56ccab7b5cd5..82b63ca088dd 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-csv''; version = ''20180831-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index bdc5fe920cf6..7a1b7d9f8639 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-dbi''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 1510495a4cbc..d6fb845aa386 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-emb''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index d032b4768dd6..f92d9c464cf4 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fad''; version = ''20180430-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index 6a40d0fa8c92..399abebe6e70 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fuse-meta-fs''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index de71e2e299ad..b0e6159e6262 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fuse''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 61a35f2b58c6..365360ba896b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-html-parse''; version = ''20161031-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index dde2cc31dd05..7f20a171734a 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-html5-parser''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index b0be8c775a37..feefecf75bbb 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-interpol''; version = ''20180711-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix index 713aff0ea405..66fb98ee0dec 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-jpeg''; version = ''20170630-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix index d8bc535f3559..9faf2b1b3888 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-json''; version = ''20141217-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index dfabda0428f0..0c276740f90a 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-l10n-cldr''; version = ''20120909-darcs''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index f37e653bc564..1a13df679283 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-l10n''; version = ''20161204-darcs''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index 36d15673427c..cbbc8ccb0b21 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-libuv''; version = ''20190107-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix index d506acf876ee..9c623c2278ec 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''cl-log''; version = ''cl-log.1.0.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix index f52952af3e1a..0f3d0c126ff7 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-markdown''; version = ''20101006-darcs''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index b1916c27bfdd..7b5b7fb3e1ab 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-markup''; version = ''20131003-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index 1590f2536e34..c8460177a244 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-mysql''; version = ''20171019-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index cfca59e3b503..c096c4d2728b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-paths-ttf''; version = ''cl-vectors-20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index e8034b11c237..0f0a22c97e0e 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-paths''; version = ''cl-vectors-20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix index babdf04e3ec2..d54c37c2de1c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-pdf''; version = ''20170830-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 2fad295c7ee5..952a4394ae79 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-postgres''; version = ''postmodern-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 4c97f03870fa..c10a1500563b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre-template''; version = ''cl-unification-20190107-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 27887f12497e..20433b51f877 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre-unicode''; version = ''cl-ppcre-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 8bb8fb2478d8..cfea494fc4bd 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 496a0bd4e567..1e13378b38c4 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-project''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 046f910a8660..81f1455714d9 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-protobufs''; version = ''20180328-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix index 916af5b29727..c16486754db3 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-reexport''; version = ''20150709-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 0d58e11b4d26..16cc2309e645 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-smtp''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index 2aff988dfd24..b639681fd306 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-store''; version = ''20180328-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix index add200b09a1d..4639a66da78f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-annot''; version = ''cl-syntax-20150407-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix index c19a47df6c23..cea65514d4b1 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-anonfun''; version = ''cl-syntax-20150407-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix index cded8dc2d06d..fa08d3b114ce 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-markup''; version = ''cl-syntax-20150407-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix index 353c8210885e..2715cfdf8dac 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax''; version = ''20150407-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 968f2972abfc..b04a6cd83444 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-test-more''; version = ''prove-20171130-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 358666877a6d..38237f6f3b7b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-typesetting''; version = ''20170830-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index 7849acb57c0a..77e2ba0036ce 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-unicode''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index dbdd53a93469..bb8a05b0d6d1 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-unification''; version = ''20190107-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 750da99d5d6a..4999da6d0b69 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-utilities''; version = ''1.2.4''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index f44bd0f22e0c..dbdd6d6b617c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-vectors''; version = ''20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 3be45384d418..19af99826fce 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-who''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index f344dbfa2fe8..5294613b9789 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl_plus_ssl''; version = ''cl+ssl-20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 6cfd7842409c..4b0a4cd176d8 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-handler-hunchentoot''; version = ''clack-20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index 1ac6ccc329c2..5f4a96dbcc4a 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-socket''; version = ''clack-20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 1792d79f1d89..d8c8acf83aa6 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-test''; version = ''clack-20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 749fce006e4e..0234f7644988 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-v1-compat''; version = ''clack-20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 1813844e85fd..ab615e5dc83f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index ca03207fabd8..abbefea70b48 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closer-mop''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index c1b36b6b653c..3448f70f5adb 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closure-common''; version = ''20181018-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index f55ccecadc61..2746ccff6c9c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closure-html''; version = ''20180711-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix index 9f4abb8e4756..8f6760b96247 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-postgresql-socket''; version = ''clsql-20160208-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix index add3a15d27c7..e90cda0f6d93 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-postgresql''; version = ''clsql-20160208-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix index 653adb3d12b3..254a22fbafa5 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-sqlite3''; version = ''clsql-20160208-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix index 8243a3375853..c664c23dd1c5 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-uffi''; version = ''clsql-20160208-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index 74b8442c0c90..e37eecabbca9 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql''; version = ''20160208-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 2f07706a9129..458cb51e6adf 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clss''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix index 303d43a964ee..ba45b3530573 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clx-truetype''; version = ''20160825-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 6b99f99b7ab8..0fe6e115f3f2 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clx''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix index 7375b8dd7094..0a4a40b06841 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''collectors''; version = ''20161204-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index 1d81acba2dc6..25eaf1fa6fa9 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''command-line-arguments''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index f4941aa80cd6..0dd93c46fb2f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-lite''; version = ''20120407-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index 98c565648dcb..a0a6d2d7c2ec 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors-simple-tree''; version = ''css-selectors-20160628-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index fcdb69f3c351..1aff3a5826cb 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors-stp''; version = ''css-selectors-20160628-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix index aa523d6f838b..268eea723ddf 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors''; version = ''20160628-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index ebae32962f10..9bef7fb990c5 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cxml-stp''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 68a019fa027d..667cf93d44f9 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cxml''; version = ''20181018-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix index 7c69878900cd..1f0b4f9f71bc 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''db3''; version = ''cl-20150302-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 173a31e9f31d..9d0f2549f50b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-mysql''; version = ''cl-dbi-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 6668cd4f762b..9f3046eb51ff 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-postgres''; version = ''cl-dbi-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 9b6fde0ea94b..7bc556eaff20 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-sqlite3''; version = ''cl-dbi-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 26c5306c06a3..2e4006dbf3f4 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbi''; version = ''cl-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 4d5bc0a22175..5a84a62ee835 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dexador''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 3dbacdf0f81a..2896ec154ecd 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''do-urlencode''; version = ''20181018-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 7c25ed9a0377..a4196b2d394f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''documentation-utils''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index aa97f8f7cbe3..a3d063ec9bd9 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''drakma''; version = ''v2.0.5''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix index a4a58fd0d0b6..8c3182045720 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dynamic-classes''; version = ''20130128-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix index 91b8db69a36b..aa2b01e6bcd5 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''eos''; version = ''20150608-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix index d68fd839bd16..e94ed40f9e1c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''esrap-peg''; version = ''20170403-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index a024ad3907a3..3ab6e03ab659 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''esrap''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index 0e7f5b79160b..b247ea27298d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''external-program''; version = ''20190307-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index 82c8603d4a45..8d43fa3362cc 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fast-http''; version = ''20180831-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 89bed83acd54..ea006556876e 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fast-io''; version = ''20171023-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 39f2af5430fc..8b5fe1f7de6c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fiasco''; version = ''20190307-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index be9648a0da4a..8ebd9f603816 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fiveam''; version = ''v1.4.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index d9b25bebddc3..4d5524d9d18d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''flexi-streams''; version = ''20190107-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 90ce8b83dde6..a5fe52ec0277 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''form-fiddle''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index d901df215a68..893cec1c72ad 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fset''; version = ''20171019-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix index 76e2a55620cb..e961aecf8540 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''garbage-pools''; version = ''20130720-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 3754829ac37b..775e30e711a9 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''http-body''; version = ''20181210-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index 1f2700608e37..6fc92c088822 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hu_dot_dwim_dot_asdf''; version = ''20190521-darcs''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix index 51f4a2d06980..98a77dad63cd 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hu_dot_dwim_dot_stefil''; version = ''20170403-darcs''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 611ef77256fa..11d0831c96fc 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hunchentoot''; version = ''v1.2.38''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix index 1b948bcf325e..9dfeb3f12062 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''idna''; version = ''20120107-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 4211dfbc9194..675521dcde94 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ieee-floats''; version = ''20170830-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index c4ae44cd6761..bd0e896e1434 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib''; version = ''v0.8.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix index 195b52c08c45..d5e072e5f6a8 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_asdf''; version = ''iolib-v0.8.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix index aa650edde020..445da3b1b179 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_base''; version = ''iolib-v0.8.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix index c0ec72d48695..415e7a598202 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_common-lisp''; version = ''iolib-v0.8.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix index 4ba0cfa1ce2e..58fd95012e82 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_conf''; version = ''iolib-v0.8.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix index 7a1a12243fe2..009e0e278660 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_grovel''; version = ''iolib-v0.8.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 2c56b5964f97..727be89bf446 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ironclad''; version = ''v0.46''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index f276ec72736d..9a91033bb8be 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iterate''; version = ''20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix index 9a4681894818..9d219f4c193c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ixf''; version = ''cl-20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 702eb2d05b55..790638f5954c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''jonathan''; version = ''20190202-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index e44004a9cf7e..88ededf0e73b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''kmrcl''; version = ''20150923-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 96a831147bba..cdac924b4396 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-component''; version = ''lack-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 610633e9af25..68604485c77a 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-middleware-backtrace''; version = ''lack-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 3607cbedf44f..cda7716151ab 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-util''; version = ''lack-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 08095979989b..7740e73c0e5b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index 1f6a0709b0f4..91e28f402b23 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''let-plus''; version = ''20171130-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix index 9dd6baad1bdc..8d52d518e113 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lev''; version = ''20150505-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix index 10977c16f838..6ff0fdb4c829 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-client''; version = ''lfarm-20150608-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix index 4a5fe87982ae..4be971bef065 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-common''; version = ''lfarm-20150608-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix index 354d6c315076..44c8cc01c95f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-server''; version = ''lfarm-20150608-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix index 348c71fe9663..3d917ff2817f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-ssl''; version = ''lfarm-20150608-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index 1edb65596a6c..84f0ca863ec1 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lift''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 7f88beb974b0..802b9eb2b7a9 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lisp-namespace''; version = ''20171130-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 8d21f88cbf82..c623d368a043 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lisp-unit2''; version = ''20180131-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix index 7189a09e20cf..4eb30ef013b0 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''list-of''; version = ''asdf-finalizers-20170403-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 5ffa27fcca53..4695c3dfe0e7 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''local-time''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix index 1a6f217a2f96..a4011b78d4f4 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lparallel''; version = ''20160825-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index f64e9ee6a330..5dbd186e62e7 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lquery''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index 8187c99f94a4..c6445010f544 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''map-set''; version = ''20190307-hg''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 4f6842606b45..531cc1adc1af 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''marshal''; version = ''cl-20180328-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 953dd0a58a4a..b34fdd83ca38 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''md5''; version = ''20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index d72e0839d1e8..cf2c3a1c777b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''metabang-bind''; version = ''20171130-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index 6bbdf5f911e0..c45a3eff384e 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''metatilities-base''; version = ''20170403-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 6334804c4f70..ef0da68cfe4d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''misc-extensions''; version = ''20150608-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix index 1f2dd20ee4be..adb1ad27c45d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''moptilities''; version = ''20170403-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix index 470d2fed738c..974a63c1a730 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''mssql''; version = ''cl-20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index a8cfc070bf99..f1fe0e3c2791 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''mt19937''; version = ''1.1.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 068d0eba69dd..16b1f22ceebb 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''myway''; version = ''20181018-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 82d06b1c93b2..c5f1379f421f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''named-readtables''; version = ''20180131-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 4e7c84566a0a..dcc49aa79937 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''net_dot_didierverna_dot_asdf-flv''; version = ''asdf-flv-version-2.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index ea6adac9e9f8..0a3dba6b8243 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''nibbles''; version = ''20180831-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix index 07b86f58fe7c..b5b6ace2ae94 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''optima''; version = ''20150709-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index bf6216dcaddc..2bf306507858 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''parenscript''; version = ''Parenscript-2.7.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805e7..72bef6f60bf2 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''parse-number''; version = ''v1.7''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index fe9ccae2886a..0c34654b1ae3 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pcall-queue''; version = ''pcall-0.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index 025d160f4602..60385ab59393 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pcall''; version = ''0.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index a913cdbe521c..f0b5fb23d661 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pgloader''; version = ''v3.4.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix index 38fb942c331f..e4fd9f0c4df8 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump-dom''; version = ''plump-20170725-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix index cd0db041c5b2..16cd9d5f062d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''plump-lexer''; version = ''plump-20170725-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix index a9d07b48a9d4..cb06b039abd9 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump-parser''; version = ''plump-20170725-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 8757c704c8f4..53af356f05ac 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index ba7bef260c08..ed09e3805c08 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''postmodern''; version = ''20180430-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix index 8ffcbc784ff7..3afcbf98d505 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''proc-parse''; version = ''20160318-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index a1542dc13cf6..9bbc47275f80 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''prove''; version = ''20171130-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index ffa2e595c26a..b4957d68e883 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ptester''; version = ''20160929-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index 4f6946783939..84b252f93a51 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''puri''; version = ''20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix index 0eb4c0f5b9e6..741929484d84 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''py-configparser''; version = ''20170830-svn''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index de24a5984960..03d96005935e 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''qmynd''; version = ''20180131-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 3666dda9bf87..dbeb5f1d08e0 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''query-fs''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index f6022cb2a1f2..fed624578912 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''quri''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index 25d535176a6a..e6c1477298d4 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''rfc2388''; version = ''20180831-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index d5be4be7daf4..14b327a97364 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''rt''; version = ''20101006-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index c283abd479ed..92fa57794522 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''s-sql''; version = ''postmodern-20180430-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 9056cfbdcca8..26c616ec3922 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''salza2''; version = ''2.0.9''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 33847198bdd9..f3c1dade8219 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''simple-date''; version = ''postmodern-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix index 63adab55741b..a6fc781c3698 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''smart-buffer''; version = ''20160628-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index a22076facd39..be9f59986428 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''split-sequence''; version = ''v2.0.0''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index 57dec7c93cac..cd018a4b9975 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''sqlite''; version = ''cl-20130615-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 1cd4e4c44027..0386a674916b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''static-vectors''; version = ''v1.8.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index df63a5c9836a..7c769e614c14 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''stefil''; version = ''20181210-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 17a56c09b7e8..2b38115aabdd 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''string-case''; version = ''20180711-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index e89eb1971d60..fa0a2ab7944d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''stumpwm''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 50b815425dc6..ec14ffffcba1 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''swank''; version = ''slime-v2.24''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix index f0df3b84f153..89003686df38 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''swap-bytes''; version = ''v1.1''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix index 4bae3cc1ceed..9ec472fa08a1 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''symbol-munger''; version = ''20150407-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 683f87357f56..d10b68b2d2ed 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-backtrace''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 82d0e4513ab1..8db7c603ec88 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-features''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index c629bb3548d4..4d26aa435193 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-garbage''; version = ''20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 2aee236ac0ca..7826a9379924 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-gray-streams''; version = ''20181018-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index 33eedbaa8184..002c75e10212 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-indent''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index f02d9e0dc2c7..960778dc17c1 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-mimes''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 8cc04c2c64ac..6bfaac06f2dd 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-types''; version = ''20120407-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index c925382d81d4..0ac57089e50d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-utf-8''; version = ''20111001-darcs''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 1986f7c88f7a..f5e8677f508f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uffi''; version = ''20180228-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 18f1b74edbd3..ae9c1c6d5ac7 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uiop''; version = ''3.3.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6c4564967320..6a877e5a9646 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''unit-test''; version = ''20120520-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index c3928cf0e4cc..fccce79eb84d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''usocket''; version = ''0.8.2''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix index 0886b1082a88..bfd845146223 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uuid''; version = ''20130813-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 6a4751f799ea..2fb1cdacfac2 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''vom''; version = ''20160825-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 59a41a7cf9ae..7825678c77c5 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''woo''; version = ''20190710-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index f717441068b6..93bcb2072a7b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''wookie''; version = ''20181018-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index 9854567fd5bf..db03e57a663b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xembed''; version = ''clx-20190307-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix index 4bfc0678f0f1..71cd9cfbde6b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xkeyboard''; version = ''clx-20120811-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index 0fd076509c22..ea08214cb6f5 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xmls''; version = ''3.0.2''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index 3e14a5ba9f06..e2a5494c5b4b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xpath''; version = ''plexippus-20190521-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index b9ab71744c3a..92f661f85310 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xsubseq''; version = ''20170830-git''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index c7031f4aa3fc..cf8f3a8ac0fd 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''yacc''; version = ''cl-20101006-darcs''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix index e14a540a1783..ca74dd0e5007 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''yason''; version = ''v0.7.6''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 74e5d7e97e95..3aa695caed6f 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''zpb-ttf''; version = ''1.0.3''; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 2e4ceda31c81..052bfb119498 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -39,7 +39,7 @@ in }; }; hunchentoot = addNativeLibs [pkgs.openssl]; - iolib = x: rec { + iolib = x: { propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with pkgs; [libfixposix gcc]) ; diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 4b8369456b75..5adc23979393 100644 --- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -1106,6 +1106,26 @@ luasystem = buildLuarocksPackage { }; }; }; +luautf8 = buildLuarocksPackage { + pname = "luautf8"; + version = "0.1.1-1"; + + src = fetchurl { + url = https://luarocks.org/luautf8-0.1.1-1.src.rock; + sha256 = "1832ilrlddh4h7ayx4l9j7z1p8c2hk5yr96cpxjjrmirkld23aji"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "http://github.com/starwing/luautf8"; + description = "A UTF-8 support module for Lua"; + maintainers = with maintainers; [ pstn ]; + license = { + fullName = "MIT"; + }; + }; +}; luazip = buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; @@ -1125,6 +1145,26 @@ luazip = buildLuarocksPackage { }; }; }; +lua-yajl = buildLuarocksPackage { + pname = "lua-yajl"; + version = "2.0-1"; + + src = fetchurl { + url = https://luarocks.org/lua-yajl-2.0-1.src.rock; + sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "http://github.com/brimworks/lua-yajl"; + description = "Integrate the yajl JSON library with Lua."; + maintainers = with maintainers; [ pstn ]; + license = { + fullName = "MIT/X11"; + }; + }; +}; luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; diff --git a/nixpkgs/pkgs/development/lua-modules/generic/default.nix b/nixpkgs/pkgs/development/lua-modules/generic/default.nix index 3dae32b5e15d..71e1f7c05e6e 100644 --- a/nixpkgs/pkgs/development/lua-modules/generic/default.nix +++ b/nixpkgs/pkgs/development/lua-modules/generic/default.nix @@ -1,6 +1,6 @@ { lua, writeText, toLuaModule }: -{ buildInputs ? [], disabled ? false, ... } @ attrs: +{ disabled ? false, ... } @ attrs: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" @@ -18,37 +18,8 @@ else // { name = "lua${lua.luaversion}-" + attrs.name; - buildInputs = buildInputs ++ [ lua ]; - - setupHook = writeText "setup-hook.sh" '' - # check for lua/clua modules and don't add duplicates - - addLuaLibPath() { - local package_path="$1/share/lua/${lua.luaversion}" - if [[ ! -d $package_path ]]; then return; fi - if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi - - if [[ -z $LUA_PATH ]]; then - export LUA_PATH="$package_path/?.lua;$package_path/?/init.lua" - else - export LUA_PATH="$LUA_PATH;$package_path/?.lua;$package_path/?/init.lua" - fi - } - - addLuaLibCPath() { - local package_cpath="$1/lib/lua/${lua.luaversion}" - if [[ ! -d $package_cpath ]]; then return; fi - if [[ $LUA_CPATH = *"$package_cpath"* ]]; then return; fi - - if [[ -z $LUA_CPATH ]]; then - export LUA_CPATH="$package_cpath/?.so" - else - export LUA_CPATH="$LUA_CPATH;$package_cpath/?.so" - fi - } - - addEnvHooks "$hostOffset" addLuaLibPath - addEnvHooks "$hostOffset" addLuaLibCPath - ''; + propagatedBuildInputs = [ + lua # propagate it for its setup-hook + ]; } ) ) diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix index a4c1c7fa324e..233503c2eca8 100644 --- a/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -235,6 +235,12 @@ with super; ]; }); + lua-yajl = super.lua-yajl.override({ + buildInputs = [ + pkgs.yajl + ]; + }); + luuid = super.luuid.override(old: { externalDeps = [ { name = "LIBUUID"; dep = pkgs.libuuid; } diff --git a/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix b/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix index d16f63152b84..e93f904b8959 100644 --- a/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix +++ b/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix @@ -1,6 +1,6 @@ { requireFile, stdenv, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "6.0"; pname = "amdadl-sdk"; diff --git a/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix b/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix index ba6d5559f26b..4169b9e4d35d 100644 --- a/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix +++ b/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix @@ -35,7 +35,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "amdapp-sdk"; inherit version; diff --git a/nixpkgs/pkgs/development/misc/google-clasp/default.nix b/nixpkgs/pkgs/development/misc/google-clasp/default.nix index 105104ebd721..db6ade1c85a6 100644 --- a/nixpkgs/pkgs/development/misc/google-clasp/default.nix +++ b/nixpkgs/pkgs/development/misc/google-clasp/default.nix @@ -5,7 +5,7 @@ in (import ./google-clasp.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; -})."@google/clasp-${version}".override rec { +})."@google/clasp-${version}".override { preRebuild = '' patch -p1 <<<"${builtins.readFile ./dotf.patch}" ''; diff --git a/nixpkgs/pkgs/development/misc/loc/default.nix b/nixpkgs/pkgs/development/misc/loc/default.nix index ad1d0e396a91..557d6f176097 100644 --- a/nixpkgs/pkgs/development/misc/loc/default.nix +++ b/nixpkgs/pkgs/development/misc/loc/default.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { version = "0.4.1"; - name = "loc-${version}"; + pname = "loc"; src = fetchFromGitHub { owner = "cgag"; diff --git a/nixpkgs/pkgs/development/misc/rappel/default.nix b/nixpkgs/pkgs/development/misc/rappel/default.nix new file mode 100644 index 000000000000..02c31fd4d690 --- /dev/null +++ b/nixpkgs/pkgs/development/misc/rappel/default.nix @@ -0,0 +1,38 @@ +{ fetchFromGitHub +, libedit +, makeWrapper +, nasm +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "rappel"; + version = "unstable-2019-07-08"; + + src = fetchFromGitHub { + owner = "yrp604"; + repo = "rappel"; + rev = "95a776f850cf6a7c21923a2100b605408ef038de"; + sha256 = "0fmd15xa6hswh3x48av4g1sf6rncbiinbj7gbw1ffvqsbcfnsgcr"; + }; + + buildInputs = [ libedit ]; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin bin/rappel + wrapProgram $out/bin/rappel --prefix PATH : "${nasm}/bin" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/yrp604/rappel"; + description = "A pretty janky assembly REPL"; + license = licenses.bsdOriginal; + maintainers = [ maintainers.pamplemousse ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/mobile/adb-sync/default.nix b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix index 8578e51e939d..ebba63353dab 100644 --- a/nixpkgs/pkgs/development/mobile/adb-sync/default.nix +++ b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, python3, platform-tools, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "adb-sync"; version = "2016-08-31"; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index 6e6a349cccc5..a74736620066 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -101,14 +101,14 @@ rec { platforms = map (version: deployAndroidPackage { inherit os; - package = packages.platforms."${version}"; + package = packages.platforms.${version}; } ) platformVersions; sources = map (version: deployAndroidPackage { inherit os; - package = packages.sources."${version}"; + package = packages.sources.${version}; } ) platformVersions; @@ -151,14 +151,14 @@ rec { google-apis = map (version: deployAndroidPackage { inherit os; - package = addons.addons."${version}".google_apis; + package = addons.addons.${version}.google_apis; } ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default google-tv-addons = map (version: deployAndroidPackage { inherit os; - package = addons.addons."${version}".google_tv_addon; + package = addons.addons.${version}.google_tv_addon; } ) platformVersions; @@ -225,10 +225,10 @@ rec { # Link extras ${lib.concatMapStrings (identifier: let - path = addons.extras."${identifier}".path; + path = addons.extras.${identifier}.path; addon = deployAndroidPackage { inherit os; - package = addons.extras."${identifier}"; + package = addons.extras.${identifier}; }; in '' diff --git a/nixpkgs/pkgs/development/mobile/androidenv/tools.nix b/nixpkgs/pkgs/development/mobile/androidenv/tools.nix index 9957168f7af3..92f53e5a7c20 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/tools.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/tools.nix @@ -19,8 +19,8 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix { }; } else if toolsVersion == "26.1.1" then import ./tools/26.nix { inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = packages.tools."${toolsVersion}"; + package = packages.tools.${toolsVersion}; } else import ./tools/25.nix { inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = packages.tools."${toolsVersion}"; + package = packages.tools.${toolsVersion}; } diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/default.nix b/nixpkgs/pkgs/development/mobile/cocoapods/default.nix index 0b9bb7c5b5fc..c235b9e9a126 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/default.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/default.nix @@ -1,7 +1,7 @@ { lib, bundlerApp, ruby , beta ? false }: -bundlerApp rec { +bundlerApp { inherit ruby; pname = "cocoapods"; gemfile = if beta then ./Gemfile-beta else ./Gemfile; diff --git a/nixpkgs/pkgs/development/node-packages/composition-v10.nix b/nixpkgs/pkgs/development/node-packages/composition-v10.nix index 9f723a6da470..9e2521717efc 100644 --- a/nixpkgs/pkgs/development/node-packages/composition-v10.nix +++ b/nixpkgs/pkgs/development/node-packages/composition-v10.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ./node-env.nix { diff --git a/nixpkgs/pkgs/development/node-packages/composition-v12.nix b/nixpkgs/pkgs/development/node-packages/composition-v12.nix index 4f05009f3efd..4ed0336ec5c4 100644 --- a/nixpkgs/pkgs/development/node-packages/composition-v12.nix +++ b/nixpkgs/pkgs/development/node-packages/composition-v12.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}: let nodeEnv = import ./node-env.nix { diff --git a/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index 38673fb9ddc4..6a98267d89a5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, bisect_ppx, ocamlbuild }: -buildDunePackage rec { +buildDunePackage { minimumOCamlVersion = "4.02"; inherit (bisect_ppx) version src meta; pname = "bisect_ppx-ocamlbuild"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix index a30b574f19bc..eb9cdb78562e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "camomile"; version = "0.8.5"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 64a8f2416ad4..588ba6711cb4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -7,7 +7,7 @@ if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99" then cohttp-lwt else -buildDunePackage rec { +buildDunePackage { pname = "cohttp-lwt-unix"; inherit (cohttp-lwt) version src meta; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix index 93ba084703e5..748b970477ee 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast cohttp.version "0.99" then cohttp else -buildDunePackage rec { +buildDunePackage { pname = "cohttp-lwt"; inherit (cohttp) version src meta; diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index b6d2e24ec551..51fb369e66fe 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,7 +6,7 @@ if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0" then conduit-lwt else -buildDunePackage rec { +buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src meta; diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix index 560600e2fee8..2eb225d88b6e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast conduit.version "1.0" then conduit else -buildDunePackage rec { +buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src meta; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix index 17da11708c60..8d395798979c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -4,7 +4,7 @@ if stdenv.lib.versionAtLeast ocaml.version "4.06" then throw "cryptgps is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocaml-cryptgps"; version = "0.2.1"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix index 1811e21cf58f..8180373a3dd9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -17,7 +17,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cryptokit"; inherit (param) version; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix index 0ddf3cb5995c..567defea7d2f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,6 +1,6 @@ { stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: -buildOcaml rec { +buildOcaml { name = "ctypes"; version = "0.13.1"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix index bff993a4d193..5fb9131ef095 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix @@ -10,7 +10,7 @@ in assert versionAtLeast (getVersion ocaml) "4.01.0"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix index 0869ae659cc3..89a1803b5202 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }: -buildDunePackage rec { +buildDunePackage { pname = "git-http"; inherit (git) version src; diff --git a/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix index 9c8a7c48255f..50e6f1d3bce9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }: -buildDunePackage rec { +buildDunePackage { pname = "git-unix"; inherit (git-http) version src; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix index 19eef7cf1825..ff923bbd467e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -2,7 +2,7 @@ bin_prot, core, ppx_custom_printf, fieldslib, herelib, pipebang, sexplib, async_rpc_kernel}: -buildOcamlJane rec { +buildOcamlJane { name = "async_extra"; hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix index 938f5ccf4474..49f38136c4f5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -2,7 +2,7 @@ bin_prot, fieldslib, sexplib, herelib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_kernel"; hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60"; propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 1f5ff6b9646f..83a7e13a5d01 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -2,7 +2,7 @@ fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, sexplib, typerep, variantslib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_rpc_kernel"; hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw"; propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix index 7db7cae27096..0d0f26134f2f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -2,7 +2,7 @@ bin_prot, comparelib, core, fieldslib, herelib, pipebang, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_unix"; hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7"; propagatedBuildInputs = [ async_kernel core bin_prot comparelib diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async.nix index 4cd67e1af86b..fe01e47426da 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, async_kernel, async_unix, async_extra}: -buildOcamlJane rec { +buildOcamlJane { name = "async"; version = "113.33.03"; hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index 631562159762..e8f42ef71d1e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -2,7 +2,7 @@ , openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis }: -buildOcamlJane rec { +buildOcamlJane { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index 11e6189e6c1e..c47fcd2fea6b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "bin_prot"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.02"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix index 5410167e0a26..c7c69beedb7b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -4,7 +4,7 @@ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, re2, textutils}: -buildOcamlJane rec { +buildOcamlJane { name = "core_extended"; hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix index c2f97badda93..f6a7ba5b0db0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix @@ -3,7 +3,7 @@ bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "core"; hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix index 83e6100f0597..b279318dd935 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -5,7 +5,7 @@ , textutils }: -buildOcamlJane rec { +buildOcamlJane { name = "core_bench"; hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_kernel.nix index e5bbb7800520..53e92a95c236 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_kernel.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -2,7 +2,7 @@ bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "core_kernel"; hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 8823a0c8054d..8ce1ca6c505a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -1,6 +1,6 @@ { stdenv, type_conv, buildOcamlJane }: -buildOcamlJane rec { +buildOcamlJane { name = "fieldslib"; version = "113.33.03"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix index b61874d3a7ea..3ed7106e7b65 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_assert"; hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix index 56a124c5b691..9e5df431e04c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_bench"; minimumSupportedOcamlVersion = "4.02"; hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix index 9dffbed69600..d7f333d4cf4c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, bin_prot}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_bin_prot"; hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix index d70fe6ddd550..0bfdd7bd540c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_compare"; hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix index 4f5bb87b7675..c5789ee9cfb4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_core"; hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix index 3fe78e3e7e2e..c652afa5fbfc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_custom_printf"; hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix index 7844756c7bfb..b4fb9ec7602f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_optcomp}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_driver"; hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix index 8dbf34ed2329..2fdfede0f23d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_enumerate"; hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix index 7e688a1dc1c8..f78f93ee1202 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -3,7 +3,7 @@ ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools, ppx_variants_conv, re, sexplib, variantslib, fieldslib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_expect"; hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix index 187d5db19995..4f55a6c4eacb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_fail"; hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix index a05cf149b268..551738573b36 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_fields_conv"; hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix index 3aa157a68c5b..ea3ac5e8e5ae 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_here"; hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix index cd16d7c32864..d0e4c84158c7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_inline_test"; hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix index 86394f228e9d..1086059b19f3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -5,7 +5,7 @@ ppx_inline_test, ppx_let, ppx_pipebang, ppx_sexp_conv, ppx_sexp_message, ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_jane"; hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix index 3498affeb090..8c8b87d7112e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_let"; hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix index 5dcfc97bfa37..61fa66b77cc5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_optcomp"; hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix index f3f4bcdead59..209638f97b74 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_pipebang"; hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index bf4a7b214dec..00361ee81ebe 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_conv"; hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix index e83aaa2c2723..2a8bf44bfab2 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_message"; hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix index a1a1080d73d7..64fbe4bd9bb9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_value"; hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix index fc6d9ca03459..bf36dfab5cb0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_deriving, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_type_conv"; hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix index e6d23e0dbdd0..472ec19b5588 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, typerep}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_typerep_conv"; hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index 9bc1cbb59e46..1d01b0bc321d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_variants_conv"; hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/re2.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/re2.nix index 6604a8d012c6..9153d336b22a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/re2.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/re2.nix @@ -3,7 +3,7 @@ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, rsync}: -buildOcamlJane rec { +buildOcamlJane { name = "re2"; hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw"; buildInputs = [ rsync ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix index 4a785d199c8c..f4a86f80b04d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { minimumSupportedOcamlVersion = "4.02"; name = "sexplib"; version = "113.33.03"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix index 459743f055ab..6b3dba5aac8e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix @@ -2,7 +2,7 @@ bin_prot, core, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "textutils"; hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb"; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix index 81e6c4be9cbc..2e8fcde1d0da 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "typerep"; version = "113.33.03"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix index d9acadbb6158..7b3af8a080e9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "variantslib"; version = "113.33.03"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 55a4a02f7ffc..581319a0edfe 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (rec { stdenv.lib.maintainers.roconnor ]; homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; - description = "LablGTK is is an Objective Caml interface to gtk+"; + description = "LablGTK is is an Objective Caml interface to GTK"; license = stdenv.lib.licenses.lgpl21Plus; }; }) diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix index e78dd91f00a3..1b1869f991ea 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -3,9 +3,9 @@ let param = let check = stdenv.lib.versionAtLeast ocaml.version; in if check "4.06" then { - version = "2.18.6"; - url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz; - sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d"; + version = "2.18.8"; + url = "https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz"; + sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci"; } else if check "3.12" then { version = "2.18.5"; url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; @@ -13,7 +13,7 @@ let param = } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { z77z roconnor vbgl ]; homepage = http://lablgtk.forge.ocamlcore.org/; - description = "An OCaml interface to gtk+"; + description = "An OCaml interface to GTK"; license = licenses.lgpl21Plus; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix index 8ba27248db6a..d49208ede602 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cairo2 ]; meta = { - description = "OCaml interface to gtk+-3"; + description = "OCaml interface to GTK 3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix index 7e898be74901..be57c7e7146f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -1,6 +1,6 @@ { buildDunePackage, gtkspell3, lablgtk3 }: -buildDunePackage rec { +buildDunePackage { pname = "lablgtk3-gtkspell3"; buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; propagatedBuildInputs = [ lablgtk3 ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index a266e57dd859..0e8ba3ef3ffe 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -1,6 +1,6 @@ { buildDunePackage, gtksourceview, lablgtk3 }: -buildDunePackage rec { +buildDunePackage { pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index b4a4e012560e..d92cf543f803 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -25,7 +25,7 @@ let param = { key = "1764"; sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; }; -}."${builtins.substring 0 4 ocaml.version}"; +}.${builtins.substring 0 4 ocaml.version}; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix index 105104bc308d..4850a853ea04 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix @@ -1,29 +1,33 @@ -{ stdenv, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml +{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml , cppo, ocaml-migrate-parsetree, ppx_tools_versioned, result +, mmap, seq }: -let inherit (stdenv.lib) optional versionAtLeast; in +let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "4.1.0"; + version = "4.2.1"; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "16wnc61kfj54z4q8sn9f5iik37pswz328hcz3z6rkza3kh3s6wmm"; + sha256 = "1hz24fyhpm7d6603v399pgxvdl236srwagqja41ljvjx83y10ysr"; }; + postPatch = '' + substituteInPlace lwt.opam \ + --replace 'version: "dev"' 'version: "${version}"' + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cppo ocaml-migrate-parsetree ppx_tools_versioned ] ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; - propagatedBuildInputs = [ libev result ]; - - configurePhase = "ocaml src/util/configure.ml -use-libev true"; + propagatedBuildInputs = [ libev mmap seq result ]; meta = { homepage = "https://ocsigen.org/lwt/"; description = "A cooperative threads library for OCaml"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix index cd40a5051be9..e6ef82a90088 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix @@ -14,11 +14,11 @@ let sha256 = { "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88"; "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; -}."${version}"; in +}.${version}; in let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in -buildOcaml rec { +buildOcaml { name = "lwt"; inherit version; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix new file mode 100644 index 000000000000..af3341e7e598 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, ocplib-json-typed, js_of_ocaml }: + +buildDunePackage { + pname = "ocplib-json-typed-browser"; + inherit (ocplib-json-typed) version src; + + propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ]; + + meta = { + description = "A Json_repr interface over JavaScript's objects"; + inherit (ocplib-json-typed.meta) homepage license maintainers; + }; +} + diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix new file mode 100644 index 000000000000..350c31a3819d --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, ocplib-json-typed, ocplib-endian }: + +buildDunePackage { + pname = "ocplib-json-typed-bson"; + inherit (ocplib-json-typed) version src; + + propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ]; + + meta = { + description = "A Json_repr compatible implementation of the JSON compatible subset of BSON"; + inherit (ocplib-json-typed.meta) homepage license maintainers; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix index cadb65bcbed9..6a1b906d7f2b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocplib-endian, js_of_ocaml, uri }: +{ lib, buildDunePackage, fetchFromGitHub, uri }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocplib-json-typed-${version}"; - version = "0.5"; +buildDunePackage rec { + pname = "ocplib-json-typed"; + version = "0.7.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocplib-json-typed"; rev = "v${version}"; - sha256 = "02c600wm2wdpzb66pivxzwjhqa2dm7dqyfvw3mbvkv1g2jj7kn2q"; + sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q"; }; - buildInputs = [ ocaml findlib ocplib-endian js_of_ocaml ]; propagatedBuildInputs = [ uri ]; - createFindlibDestdir = true; - meta = { description = "A collection of type-aware JSON utilities for OCaml"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix index 06784b445e3b..cbd3a14541f5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix @@ -13,7 +13,7 @@ , alcotest }: -buildDunePackage rec { +buildDunePackage { pname = "opium"; inherit (opium_kernel) version src meta minimumOCamlVersion; diff --git a/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix index e80b322ffba1..c78adce0ac15 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix @@ -8,7 +8,7 @@ in assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix index 94120f2f8b9d..31408ebe6a4a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix @@ -7,7 +7,7 @@ let version = "1.5.6"; webpage = "http://sawja.inria.fr/"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix b/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix index 69b276db90ec..64f05b26dd81 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildDunePackage, base, stdio, configurator, secp256k1 }: -buildDunePackage rec { +buildDunePackage { pname = "secp256k1"; version = "0.4.0"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix index 9980b3f10830..dec0af5a9c12 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix @@ -19,7 +19,7 @@ if !versionAtLeast ocaml.version "4.03" then throw "vg is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix index 378bcf3acec0..f8fc06791b1b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -1,6 +1,6 @@ { buildDunePackage, zmq, ocaml_lwt }: -buildDunePackage rec { +buildDunePackage { pname = "zmq-lwt"; inherit (zmq) version src meta; diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix index 54df32f3eb20..6eed57c4e7c6 100644 --- a/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,6 +1,6 @@ { fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }: -buildPerlPackage rec { +buildPerlPackage { pname = "DBD-mysql"; version = "4.050"; diff --git a/nixpkgs/pkgs/development/perl-modules/mhonarc.patch b/nixpkgs/pkgs/development/perl-modules/mhonarc.patch new file mode 100644 index 000000000000..12b8cc2931b6 --- /dev/null +++ b/nixpkgs/pkgs/development/perl-modules/mhonarc.patch @@ -0,0 +1,26 @@ +diff --git a/lib/mhamain.pl b/lib/mhamain.pl +index 80980a2..c1259ce 100644 +--- a/lib/mhamain.pl ++++ b/lib/mhamain.pl +@@ -1562,7 +1562,7 @@ sub signal_catch { + ## + sub defineIndex2MsgId { + no warnings qw(deprecated); +- if (!defined(%Index2MsgId)) { ++ unless (%Index2MsgId) { + foreach (keys %MsgId) { + $Index2MsgId{$MsgId{$_}} = $_; + } +diff --git a/lib/mhopt.pl b/lib/mhopt.pl +index 02fb05e..939109b 100644 +--- a/lib/mhopt.pl ++++ b/lib/mhopt.pl +@@ -865,7 +865,7 @@ sub update_data_1_to_2 { + sub update_data_2_1_to_later { + no warnings qw(deprecated); + # we can preserve filter arguments +- if (defined(%main::MIMEFiltersArgs)) { ++ if (%main::MIMEFiltersArgs) { + warn qq/ preserving MIMEARGS...\n/; + %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs; + $IsDefault{'MIMEARGS'} = 0; diff --git a/nixpkgs/pkgs/development/pharo/vm/vms.nix b/nixpkgs/pkgs/development/pharo/vm/vms.nix index 0e65a9b990ed..91cf01847090 100644 --- a/nixpkgs/pkgs/development/pharo/vm/vms.nix +++ b/nixpkgs/pkgs/development/pharo/vm/vms.nix @@ -27,7 +27,7 @@ in let suffix = if stdenv.is64bit then "64" else "32"; in -rec { +{ # Build the latest VM spur = pharo-vm-build rec { name = "pharo-spur${suffix}"; diff --git a/nixpkgs/pkgs/development/pure-modules/gtk/default.nix b/nixpkgs/pkgs/development/pure-modules/gtk/default.nix index 77fae1d0981c..a6a93f9ec95b 100644 --- a/nixpkgs/pkgs/development/pure-modules/gtk/default.nix +++ b/nixpkgs/pkgs/development/pure-modules/gtk/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { setupHook = ../generic-setup-hook.sh; meta = { - description = "A collection of bindings to use the GTK+ GUI toolkit version 2.x with Pure"; + description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure"; homepage = http://puredocs.bitbucket.org/pure-gtk.html; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/development/python-modules/PyLD/default.nix b/nixpkgs/pkgs/development/python-modules/PyLD/default.nix index 48878995bb4e..0862fa63072d 100644 --- a/nixpkgs/pkgs/development/python-modules/PyLD/default.nix +++ b/nixpkgs/pkgs/development/python-modules/PyLD/default.nix @@ -18,7 +18,7 @@ let in -buildPythonPackage rec { +buildPythonPackage { pname = "PyLD"; version = "0.7.2"; diff --git a/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix b/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix index 678141f394f9..b524cb0c6b3c 100644 --- a/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.8"; + version = "1.2.0"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "19qhdcycaiamd3bp8v2z9rpirxsr4c29fgs219k2766fpmfrgx40"; + sha256 = "0w9ggzi887w4z6i5mz24kcy7qbkd4d7gycqi0dhqgaj9lzxh7jjh"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix b/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix index 83dab71e2216..4e37d18a9f3a 100644 --- a/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -7,7 +7,7 @@ , pytest , mock }: -buildPythonPackage rec { +buildPythonPackage { pname = "adb-homeassistant"; version = "1.3.1"; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix index c79f9a5a73e3..73ce99eb7525 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "azure-mgmt-billing"; version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 86e323be1686..ed0cb18aff33 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "azure-mgmt-commerce"; version = "1.0.1"; diff --git a/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index 6a0c04c58cc9..51e1c08e63dc 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -5,7 +5,7 @@ , requests }: -buildPythonPackage rec { +buildPythonPackage { version = "0.20.7"; pname = "azure-servicemanagement-legacy"; diff --git a/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 3cd37617a393..143657479710 100644 --- a/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -5,7 +5,7 @@ , pythonOlder }: -if !(pythonOlder "3.3") then null else buildPythonPackage rec { +if !(pythonOlder "3.3") then null else buildPythonPackage { pname = "backports.shutil_get_terminal_size"; version = "unstable-2016-02-21"; diff --git a/nixpkgs/pkgs/development/python-modules/baselines/default.nix b/nixpkgs/pkgs/development/python-modules/baselines/default.nix index a210b5b44aae..56a60de59793 100644 --- a/nixpkgs/pkgs/development/python-modules/baselines/default.nix +++ b/nixpkgs/pkgs/development/python-modules/baselines/default.nix @@ -15,7 +15,7 @@ , mpi4py }: -buildPythonPackage rec { +buildPythonPackage { pname = "baselines"; version = "0.1.6"; # remember to manually adjust the rev diff --git a/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/nixpkgs/pkgs/development/python-modules/beancount/default.nix index 61080e5e4c46..9405e3489d4f 100644 --- a/nixpkgs/pkgs/development/python-modules/beancount/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beancount/default.nix @@ -1,20 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, bottle, chardet, dateutil -, google_api_python_client, lxml, ply, python_magic -, pytest, requests }: +, google_api_python_client, lxml, oauth2client +, ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.2.1"; + version = "2.2.3"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0xrgmqv0wsc0makm5i6jwng99yp3rvm30v2xqmcah60fgjymkjzb"; + sha256 = "0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m"; }; - # No tests in archive + # Tests require files not included in the PyPI archive. doCheck = false; propagatedBuildInputs = [ @@ -24,6 +24,7 @@ buildPythonPackage rec { dateutil google_api_python_client lxml + oauth2client ply python_magic requests diff --git a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index bd19b8eb33e2..88ef71cabdf1 100644 --- a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -15,7 +15,7 @@ let visualizationSupport = (pyqtgraph != null); in -buildPythonPackage rec { +buildPythonPackage { pname = "binwalk"; version = "2.1.1"; diff --git a/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix index dfd4d8f0cbf1..f998ebca06d9 100644 --- a/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchFromGitHub , pybluez }: -buildPythonPackage rec { +buildPythonPackage { pname = "bt-proximity"; version = "0.0.20180217"; diff --git a/nixpkgs/pkgs/development/python-modules/bugz/default.nix b/nixpkgs/pkgs/development/python-modules/bugz/default.nix index 4af8b247fcf3..57ec37285744 100644 --- a/nixpkgs/pkgs/development/python-modules/bugz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugz/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "bugz-0.9.3"; version = "0.13"; diff --git a/nixpkgs/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/nixpkgs/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix index 7f4857a95319..a12a12547e96 100644 --- a/nixpkgs/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { version = "asynkdev"; pname = "caldavclientlibrary-asynk"; diff --git a/nixpkgs/pkgs/development/python-modules/can/default.nix b/nixpkgs/pkgs/development/python-modules/can/default.nix index 8e6c90441211..b87e526dc452 100644 --- a/nixpkgs/pkgs/development/python-modules/can/default.nix +++ b/nixpkgs/pkgs/development/python-modules/can/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder +, isPy27 +, aenum , wrapt , typing , pyserial @@ -14,21 +16,21 @@ buildPythonPackage rec { pname = "python-can"; - version = "3.1.0"; + version = "3.3.1"; - # PyPI tarball is missing some tests and is missing __init__.py in test - # directory causing the tests to fail. See: - # https://github.com/hardbyte/python-can/issues/518 - src = fetchFromGitHub { - repo = pname; - owner = "hardbyte"; - rev = "v${version}"; - sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis"; + src = fetchPypi { + inherit pname version; + sha256 = "1giv9s6w90lalxsijgnxzynygkckcfyaxnxsldbwv0784vwy1jcd"; }; - propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing; + propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; checkInputs = [ nose mock pytest pytest-timeout hypothesis future ]; + # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in + # that case. This clause can be removed once hypothesis has been upgraded in + # nixpkgs. + doCheck = !(isPy27 && (hypothesis.version == "4.7.3")); + # Add the scripts to PATH checkPhase = '' PATH=$out/bin:$PATH pytest -c /dev/null diff --git a/nixpkgs/pkgs/development/python-modules/canopen/default.nix b/nixpkgs/pkgs/development/python-modules/canopen/default.nix index 1afe23416331..a76e05332f19 100644 --- a/nixpkgs/pkgs/development/python-modules/canopen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canopen/default.nix @@ -5,7 +5,7 @@ , can , canmatrix }: -buildPythonPackage rec { +buildPythonPackage { pname = "canopen"; version = "0.5.1"; diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 75152d39aeb4..6941e1117bdc 100644 --- a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -2,6 +2,7 @@ , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services +, fetchpatch }: buildPythonPackage rec { @@ -16,6 +17,22 @@ buildPythonPackage rec { sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8"; }; + # Remove patches once 96b34df and 14c12d2 + # become part of a release - they're currently only present in master. + # ref: https://github.com/cherrypy/cherrypy/pull/1791 + patches = [ + (fetchpatch { + name = "pytest5-1.patch"; + url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch"; + sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi"; + }) + (fetchpatch { + name = "pytest5-2.patch"; + url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch"; + sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz"; + }) + ]; + propagatedBuildInputs = [ # required cheroot portend more-itertools zc_lockfile diff --git a/nixpkgs/pkgs/development/python-modules/chevron/default.nix b/nixpkgs/pkgs/development/python-modules/chevron/default.nix index c6338fce56bc..7fa3a2b471de 100644 --- a/nixpkgs/pkgs/development/python-modules/chevron/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chevron/default.nix @@ -4,7 +4,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { pname = "chevron"; version = "0.13.1"; diff --git a/nixpkgs/pkgs/development/python-modules/cliapp/default.nix b/nixpkgs/pkgs/development/python-modules/cliapp/default.nix index 3aece4020e6c..c3e6a120ae78 100644 --- a/nixpkgs/pkgs/development/python-modules/cliapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cliapp/default.nix @@ -5,7 +5,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "cliapp"; version = "1.20150305"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix b/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix index f6c94ace1fad..b814455da3ff 100644 --- a/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix @@ -8,7 +8,7 @@ /* There is a project called "closure-linter" on PyPI that is the same as this, but it does not appear to be owned by Google. So we're pulling from Google's GitHub repo instead. */ -buildPythonPackage rec { +buildPythonPackage { pname = "closure-linter"; version = "2.3.19"; diff --git a/nixpkgs/pkgs/development/python-modules/cntk/default.nix b/nixpkgs/pkgs/development/python-modules/cntk/default.nix index 43a7b7646dae..ce388bb1d5d2 100644 --- a/nixpkgs/pkgs/development/python-modules/cntk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cntk/default.nix @@ -14,7 +14,7 @@ let cntk = pkgs.cntk; in -buildPythonPackage rec { +buildPythonPackage { inherit (cntk) name version src; nativeBuildInputs = [ swig openmpi ]; diff --git a/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix index f92f8004ac00..b877c4cabd5f 100644 --- a/nixpkgs/pkgs/development/python-modules/colorcet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix @@ -34,9 +34,9 @@ buildPythonPackage rec { export HOME=$(mktemp -d) mkdir -p $HOME/.config/matplotlib echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + ln -s $HOME/.config/matplotlib $HOME/.matplotlib - # disable matplotlib tests on darwin, because it requires a framework build of Python - pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=colorcet/tests/test_matplotlib.py"} colorcet + pytest colorcet ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix b/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix index 4722b049edf7..46fcc378be9d 100644 --- a/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "contextlib2"; version = "0.5.5"; - src = fetchPypi rec { + src = fetchPypi { inherit pname version; sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; }; diff --git a/nixpkgs/pkgs/development/python-modules/deskcon/default.nix b/nixpkgs/pkgs/development/python-modules/deskcon/default.nix index 05fa3aa835a3..2e205ce69557 100644 --- a/nixpkgs/pkgs/development/python-modules/deskcon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deskcon/default.nix @@ -6,7 +6,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "deskcon-0.3"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/django/1_11.nix b/nixpkgs/pkgs/development/python-modules/django/1_11.nix index 8b60155b50a0..cfe0b89b92bf 100644 --- a/nixpkgs/pkgs/development/python-modules/django/1_11.nix +++ b/nixpkgs/pkgs/development/python-modules/django/1_11.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.23"; + version = "1.11.24"; src = fetchurl { url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "1qb9npkpvyafd1f4yjqyzhj78wp1ifg3awj41bd04v83idznv9jj"; + sha256 = "1qw97zcsnbnn9dqad1kps48vfaifdkvqb8c3vld6nnvp7x2jfp11"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/nixpkgs/pkgs/development/python-modules/django/2_2.nix index efc13e455e57..95fd8a769289 100644 --- a/nixpkgs/pkgs/development/python-modules/django/2_2.nix +++ b/nixpkgs/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.4"; + version = "2.2.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1s5ad5zlmwdn4h5lwn4s4m8mqy0gz4w9nfzyknn815sr252db98n"; + sha256 = "0mpxmckd1mah0yrp6n8vjk6mq7hxf6d5xcbk6rcmi6z572h0mdyy"; }; patches = stdenv.lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix b/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix index 8a51227da0e4..4ce61680f03b 100644 --- a/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix @@ -18,7 +18,7 @@ let version = "1.33"; # first build all binaries and generate setup.py using bazel - bazel-build = buildBazelPackage rec { + bazel-build = buildBazelPackage { name = "dm-sonnet-bazel-${version}"; src = fetchFromGitHub { @@ -60,7 +60,7 @@ let }; # now use pip to install the package prepared by bazel -in buildPythonPackage rec { +in buildPythonPackage { pname = "dm-sonnet"; inherit version; diff --git a/nixpkgs/pkgs/development/python-modules/dogtail/default.nix b/nixpkgs/pkgs/development/python-modules/dogtail/default.nix index deeb8ce06420..a12a63c46f14 100644 --- a/nixpkgs/pkgs/development/python-modules/dogtail/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dogtail/default.nix @@ -15,7 +15,7 @@ # , fetchPypi }: -buildPythonPackage rec { +buildPythonPackage { pname = "dogtail"; version = "0.9.10"; diff --git a/nixpkgs/pkgs/development/python-modules/dopy/default.nix b/nixpkgs/pkgs/development/python-modules/dopy/default.nix index beaca0757507..538a861c9f4c 100644 --- a/nixpkgs/pkgs/development/python-modules/dopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dopy/default.nix @@ -4,7 +4,7 @@ , six }: -buildPythonPackage rec { +buildPythonPackage { version = "2016-01-04"; pname = "dopy"; diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix index d517af949d47..e95d1aaba022 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -45,6 +45,10 @@ buildPythonPackage rec { funcsigs ]; + postPatch = '' + sed -i s/pyyaml==3.12/pyyaml==${pyyaml.version}/ setup.cfg setup.py + ''; + meta = with stdenv.lib; { homepage = https://github.com/elastic/curator; description = "Curate, or manage, your Elasticsearch indices and snapshots"; diff --git a/nixpkgs/pkgs/development/python-modules/elpy/default.nix b/nixpkgs/pkgs/development/python-modules/elpy/default.nix deleted file mode 100644 index f30dc218379c..000000000000 --- a/nixpkgs/pkgs/development/python-modules/elpy/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, rope -, flake8 -, autopep8 -, jedi -, importmagic -, black -, mock -, nose -, yapf -, isPy3k -}: - -buildPythonPackage rec { - pname = "elpy"; - version = "1.29.1"; - - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = pname; - rev = version; - sha256 = "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf"; - }; - - propagatedBuildInputs = [ flake8 autopep8 jedi importmagic rope yapf ] - ++ stdenv.lib.optionals isPy3k [ black ]; - - checkInputs = [ mock nose ]; - - checkPhase = '' - HOME=$(mktemp -d) nosetests -e "test_should_complete_top_level_modules_for_import" - ''; - - meta = with stdenv.lib; { - description = "Backend for the elpy Emacs mode"; - homepage = "https://github.com/jorgenschaefer/elpy"; - license = licenses.gpl3; - maintainers = [ maintainers.costrouc ]; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/filemagic/default.nix b/nixpkgs/pkgs/development/python-modules/filemagic/default.nix index 731b83294a8f..cbb5ca56fed5 100644 --- a/nixpkgs/pkgs/development/python-modules/filemagic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filemagic/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, file , isPy3k, mock, unittest2 }: -buildPythonPackage rec { +buildPythonPackage { pname = "filemagic"; version = "1.6"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix index edc873458a11..653e39b17401 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix @@ -4,7 +4,7 @@ , flask }: -buildPythonPackage rec { +buildPythonPackage { pname = "Flask-Silk"; version = "2018-06-28"; diff --git a/nixpkgs/pkgs/development/python-modules/flask/default.nix b/nixpkgs/pkgs/development/python-modules/flask/default.nix index df39b2ea7253..bc7962d41081 100644 --- a/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -2,12 +2,12 @@ , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { - version = "1.0.3"; + version = "1.0.4"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "ad7c6d841e64296b962296c2c2dabc6543752985727af86a975072dea984b6f3"; + sha256 = "ed1330220a321138de53ec7c534c3d90cf2f7af938c7880fc3da13aa46bf870f"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/gateone/default.nix b/nixpkgs/pkgs/development/python-modules/gateone/default.nix index e0b6b3e49fa4..f9ad118673ac 100644 --- a/nixpkgs/pkgs/development/python-modules/gateone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gateone/default.nix @@ -7,7 +7,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { name = "gateone-1.2-0d57c3"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/geeknote/default.nix b/nixpkgs/pkgs/development/python-modules/geeknote/default.nix index d352d6def24f..c8ff60b318b7 100644 --- a/nixpkgs/pkgs/development/python-modules/geeknote/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geeknote/default.nix @@ -10,7 +10,7 @@ , evernote }: -buildPythonPackage rec { +buildPythonPackage { version = "2015-05-11"; pname = "geeknote"; disabled = ! isPy27; diff --git a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix index b0b6bfaa5ef9..315d4756e0db 100644 --- a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchpatch, fetchPypi , pytest, mock, oauth2client, flask, requests, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa }: buildPythonPackage rec { @@ -9,6 +9,13 @@ buildPythonPackage rec { inherit pname version; sha256 = "0f7c6a64927d34c1a474da92cfc59e552a5d3b940d3266606c6a28b72888b9e4"; }; + patches = [ + (fetchpatch { + name = "use-new-pytest-api-to-keep-building-with-pytest5.patch"; + url = "https://github.com/googleapis/google-auth-library-python/commit/b482417a04dbbc207fcd6baa7a67e16b1a9ffc77.patch"; + sha256 = "07jpa7pa6sffbcwlsg5fgcv2vvngil5qpmv6fhjqp7fnvx0674s0"; + }) + ]; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix index 9c8d6ca93e05..311815ef3313 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -5,7 +5,7 @@ , google_auth }: -buildPythonPackage rec { +buildPythonPackage { pname = "google-cloud-testutils"; version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d"; diff --git a/nixpkgs/pkgs/development/python-modules/greatfet/default.nix b/nixpkgs/pkgs/development/python-modules/greatfet/default.nix index b0e418913b7d..c6fddd1554c2 100644 --- a/nixpkgs/pkgs/development/python-modules/greatfet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/greatfet/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }: -buildPythonPackage rec { +buildPythonPackage { pname = "GreatFET"; version = "2019.5.1.dev0"; diff --git a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix index c729874846da..17dc8dea4f83 100644 --- a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; + description = "A small GTK app for keeping track of your time. It's main goal is to be as unintrusive as possible"; homepage = https://mg.pov.lt/gtimelog/; license = licenses.gpl2Plus; maintainers = with maintainers; [ ocharles ]; diff --git a/nixpkgs/pkgs/development/python-modules/gyp/default.nix b/nixpkgs/pkgs/development/python-modules/gyp/default.nix index 46b0dde636af..3cd89a7d0e1e 100644 --- a/nixpkgs/pkgs/development/python-modules/gyp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gyp/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "gyp"; version = "2015-06-11"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix b/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix new file mode 100644 index 000000000000..6374b882718b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage +, pytest +, numpy +, cython +}: + +buildPythonPackage rec { + pname = "imagecodecs-lite"; + version = "2019.4.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cp88g7g91gdhjhaz6gvb4jzvi5ad817id9f2bnc5r95ag93bqb0"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy cython ]; + + meta = with lib; { + description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions"; + homepage = "https://www.lfd.uci.edu/~gohlke/"; + maintainers = [ maintainers.tbenst ]; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix b/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix index 377ed8549cff..1778e5a81af6 100644 --- a/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix @@ -6,7 +6,7 @@ , requests }: -buildPythonPackage rec { +buildPythonPackage { pname = "ipfsapi"; version = "0.4.2.post1"; disabled = isPy27; diff --git a/nixpkgs/pkgs/development/python-modules/iso3166/default.nix b/nixpkgs/pkgs/development/python-modules/iso3166/default.nix index c65c5f21e567..54d9aff280f6 100644 --- a/nixpkgs/pkgs/development/python-modules/iso3166/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iso3166/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "iso3166"; version = "0.8"; diff --git a/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix b/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix index 177b0d4cfee9..1b859e21e904 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix @@ -5,7 +5,7 @@ , isPyPy }: -buildPythonPackage rec { +buildPythonPackage { pname = "jsonwatch"; version = "0.2.0"; disabled = isPyPy; # doesn't find setuptools diff --git a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 3853d796fcd6..734a51c7be61 100644 --- a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1dj8jh5ccjv7qbydf49cw17py7z3jjkaxk4jj2gx6mq2f4w304wg"; + sha256 = "1spjkw5nxhbawblj5db8izff05kjw425iyydipajb7qh73vm25r0"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix index c456d67ac498..e89b606879bb 100644 --- a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix @@ -7,7 +7,7 @@ , enum34 }: -buildPythonPackage rec { +buildPythonPackage { pname = "libsoundtouch"; version = "0.4.0"; diff --git a/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/nixpkgs/pkgs/development/python-modules/loguru/default.nix index c06f5d6cd088..67134fdfd95a 100644 --- a/nixpkgs/pkgs/development/python-modules/loguru/default.nix +++ b/nixpkgs/pkgs/development/python-modules/loguru/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.3.1"; + version = "0.3.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "14pmxyx4kwyafdifqzal121mpdd89lxbjgn0zzi9z6fmzk6pr5h2"; + sha256 = "0apd3wcjbyhwzgw0fgzzn4dcgy10pqa8f1vf58d4hmszxvyqn4z3"; }; checkInputs = [ pytest colorama ]; diff --git a/nixpkgs/pkgs/development/python-modules/lpod/default.nix b/nixpkgs/pkgs/development/python-modules/lpod/default.nix index dd40ac851865..9b262007706f 100644 --- a/nixpkgs/pkgs/development/python-modules/lpod/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lpod/default.nix @@ -7,7 +7,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { version = "1.1.7"; pname = "python-lpod"; # lpod library currently does not support Python 3.x diff --git a/nixpkgs/pkgs/development/python-modules/lxc/default.nix b/nixpkgs/pkgs/development/python-modules/lxc/default.nix index a078d33a8895..26be7020c666 100644 --- a/nixpkgs/pkgs/development/python-modules/lxc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lxc/default.nix @@ -5,7 +5,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-lxc-unstable"; version = "2016-08-25"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/magic/default.nix b/nixpkgs/pkgs/development/python-modules/magic/default.nix index 41c932ed1117..3022eb52f502 100644 --- a/nixpkgs/pkgs/development/python-modules/magic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic/default.nix @@ -3,7 +3,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { name = "${pkgs.file.name}"; src = pkgs.file.src; diff --git a/nixpkgs/pkgs/development/python-modules/mutag/default.nix b/nixpkgs/pkgs/development/python-modules/mutag/default.nix index 3fbb36a37188..0d5d8d75a368 100644 --- a/nixpkgs/pkgs/development/python-modules/mutag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mutag/default.nix @@ -5,7 +5,7 @@ , pyparsing }: -buildPythonPackage rec { +buildPythonPackage { name = "mutag-0.0.2-2ffa0258ca"; disabled = ! isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/muttils/default.nix b/nixpkgs/pkgs/development/python-modules/muttils/default.nix index 904284e5b332..868700b62237 100644 --- a/nixpkgs/pkgs/development/python-modules/muttils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/muttils/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "muttils"; version = "1.3"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/mxnet/default.nix b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix index f2e38a0e9b3b..65eb2d44ffcc 100644 --- a/nixpkgs/pkgs/development/python-modules/mxnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { inherit (pkgs.mxnet) name version src meta; buildInputs = [ pkgs.mxnet ]; diff --git a/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix b/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix index b6e323ff9c69..31662cd3941a 100644 --- a/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: -buildPythonPackage rec { +buildPythonPackage { pname = "nanomsg-python"; version = "1.0.20190114"; diff --git a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 0b0220d32460..0f84486674e9 100644 --- a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -4,7 +4,7 @@ let pname = "nbxmpp"; version = "0.6.10"; name = "${pname}-${version}"; -in buildPythonPackage rec { +in buildPythonPackage { inherit pname version; # Tests aren't included in PyPI tarball. src = fetchzip { diff --git a/nixpkgs/pkgs/development/python-modules/notify/default.nix b/nixpkgs/pkgs/development/python-modules/notify/default.nix index 6aadd7f4533d..f3a1d6514eb5 100644 --- a/nixpkgs/pkgs/development/python-modules/notify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notify/default.nix @@ -6,7 +6,7 @@ , pkgs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "python-notify"; version = "0.1.1"; diff --git a/nixpkgs/pkgs/development/python-modules/notmuch/default.nix b/nixpkgs/pkgs/development/python-modules/notmuch/default.nix index ec641420f652..567977a84f54 100644 --- a/nixpkgs/pkgs/development/python-modules/notmuch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notmuch/default.nix @@ -4,7 +4,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "python-${pkgs.notmuch.name}"; src = pkgs.notmuch.src; diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 10a1df8876cb..c6e5c2c648ff 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -5,7 +5,7 @@ let cfg = writeTextFile { name = "site.cfg"; text = (lib.generators.toINI {} { - "${blasImplementation}" = { + ${blasImplementation} = { include_dirs = "${blas}/include"; library_dirs = "${blas}/lib"; } // lib.optionalAttrs (blasImplementation == "mkl") { @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.17.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a"; + sha256 = "f11331530f0eff69a758d62c2461cd98cdc2eae0147279d8fc86e0464eb7e8ca"; }; nativeBuildInputs = [ gfortran pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix index c28f22aa5ec9..8e294f290cbd 100644 --- a/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix @@ -8,7 +8,7 @@ , git }: -buildPythonPackage rec { +buildPythonPackage { version = "unstable-20160819"; pname = "nxt-python"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/openant/default.nix b/nixpkgs/pkgs/development/python-modules/openant/default.nix index 116ba717add6..a9598825dd00 100644 --- a/nixpkgs/pkgs/development/python-modules/openant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openant/default.nix @@ -4,7 +4,7 @@ , pyusb }: -buildPythonPackage rec { +buildPythonPackage { pname = "openant-unstable"; version = "2017-02-11"; diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix new file mode 100644 index 000000000000..eac2751ce3e5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix @@ -0,0 +1,17 @@ +{ stdenv +, fetchFromGitHub +}: rec { + version = "2.6.0"; + src = fetchFromGitHub { + owner = "openrazer"; + repo = "openrazer"; + rev = "v${version}"; + sha256 = "1s5irs3avrlp891mxan3z8p55ias9rq26rqp2qrlcc6i4vl29di0"; + }; + meta = with stdenv.lib; { + homepage = https://openrazer.github.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ roelvandijk ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix b/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix new file mode 100644 index 000000000000..6e3ab1e78338 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix @@ -0,0 +1,45 @@ +{ buildPythonApplication +, daemonize +, dbus-python +, fetchFromGitHub +, fetchpatch +, gobject-introspection +, gtk3 +, makeWrapper +, pygobject3 +, pyudev +, setproctitle +, stdenv +, wrapGAppsHook +}: + +let + common = import ./common.nix { inherit stdenv fetchFromGitHub; }; +in +buildPythonApplication (common // rec { + pname = "openrazer_daemon"; + + sourceRoot = "source/daemon"; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + propagatedBuildInputs = [ + daemonize + dbus-python + gobject-introspection + gtk3 + pygobject3 + pyudev + setproctitle + ]; + + postBuild = '' + DESTDIR="$out" PREFIX="" make install manpages + ''; + + meta = common.meta // { + description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux"; + }; +}) diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix new file mode 100644 index 000000000000..2f9ff467b2d9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, dbus-python +, fetchFromGitHub +, numpy +, stdenv +, openrazer-daemon +}: + +let + common = import ./common.nix { inherit stdenv fetchFromGitHub; }; +in +buildPythonPackage (common // rec { + pname = "openrazer"; + + sourceRoot = "source/pylib"; + + propagatedBuildInputs = [ + dbus-python + numpy + openrazer-daemon + ]; + + meta = common.meta // { + description = "An entirely open source Python library that allows you to manage your Razer peripherals on GNU/Linux"; + }; +}) diff --git a/nixpkgs/pkgs/development/python-modules/ovito/default.nix b/nixpkgs/pkgs/development/python-modules/ovito/default.nix index 4c0d4346ee79..694b87581cd6 100644 --- a/nixpkgs/pkgs/development/python-modules/ovito/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ovito/default.nix @@ -4,7 +4,7 @@ , pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 # This is not the "released" 3.0.0 just a commit version = "3.0.0"; diff --git a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index 69dce2723ebb..fcd3d997dcd8 100644 --- a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -buildPythonPackage rec { +buildPythonPackage { inherit (protobuf) name src version; inherit disabled doCheck; diff --git a/nixpkgs/pkgs/development/python-modules/ptable/default.nix b/nixpkgs/pkgs/development/python-modules/ptable/default.nix index 02429f589cfc..f1118325610c 100644 --- a/nixpkgs/pkgs/development/python-modules/ptable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ptable/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, nose }: -buildPythonPackage rec { +buildPythonPackage { pname = "ptable"; version = "unstable-2019-06-14"; diff --git a/nixpkgs/pkgs/development/python-modules/purepng/default.nix b/nixpkgs/pkgs/development/python-modules/purepng/default.nix index ece893874939..fbaa1cfad710 100644 --- a/nixpkgs/pkgs/development/python-modules/purepng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/purepng/default.nix @@ -7,7 +7,7 @@ , numpy ? null }: -buildPythonPackage rec { +buildPythonPackage { pname = "purepng"; version = "0.2.0"; diff --git a/nixpkgs/pkgs/development/python-modules/purl/default.nix b/nixpkgs/pkgs/development/python-modules/purl/default.nix new file mode 100644 index 000000000000..43fd5b71ca6c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/purl/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, nose +, six +}: + +buildPythonPackage rec { + pname = "purl"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "codeinthehole"; + repo = "purl"; + rev = version; + sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ nose ]; + + meta = with lib; { + description = "Immutable URL class for easy URL-building and manipulation"; + homepage = "https://github.com/codeinthehole/purl"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix index 91af07b49be3..cdd6011aba2e 100644 --- a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix @@ -1,27 +1,26 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, pandas, pytz, six -, pytest, mock, pytest-mock }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, numpy, pandas, pytz, six +, pytest, mock, pytest-mock, requests }: buildPythonPackage rec { pname = "pvlib"; - version = "0.6.1"; + version = "0.6.3"; - # Use GitHub because PyPI release tarball doesn't contain the tests. See: - # https://github.com/pvlib/pvlib-python/issues/473 - src = fetchFromGitHub{ - owner = "pvlib"; - repo = "pvlib-python"; - rev = "v${version}"; - sha256 = "17h7vz9s829qxnl4byr8458gzgiismrbrn5gl0klhfhwvc5kkdfh"; + # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019. + disabled = pythonOlder "3.5"; + + src = fetchPypi{ + inherit pname version; + sha256 = "03nvgpmnscd7rh9jwm2h579zvriq5lva6rsdhb6jckpra5wjkn69"; }; checkInputs = [ pytest mock pytest-mock ]; - propagatedBuildInputs = [ numpy pandas pytz six ]; + propagatedBuildInputs = [ numpy pandas pytz six requests ]; # Skip a few tests that try to access some URLs checkPhase = '' runHook preCheck pushd pvlib/test - pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata" + pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3" popd runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/python-modules/pybfd/default.nix b/nixpkgs/pkgs/development/python-modules/pybfd/default.nix index 8f074943dd32..f9737b935833 100644 --- a/nixpkgs/pkgs/development/python-modules/pybfd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybfd/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }: -buildPythonPackage rec { +buildPythonPackage { pname = "pybfd"; version = "-0.1.1.2017-12-31"; diff --git a/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix index 1b89cb5ada7f..25ef662edef9 100644 --- a/nixpkgs/pkgs/development/python-modules/pybind11/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix @@ -1,12 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, python +, pytest +, cmake +, numpy ? null +, eigen ? null +, scipy ? null +}: buildPythonPackage rec { pname = "pybind11"; version = "2.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0923ngd2cvck3lhl7584y08n36pm6zqihfm1s69sbdc11xg936hr"; + src = fetchFromGitHub { + owner = "pybind"; + repo = pname; + rev = "v${version}"; + sha256 = "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf"; }; patches = [ @@ -14,10 +26,21 @@ buildPythonPackage rec { url = https://github.com/pybind/pybind11/commit/44a40dd61e5178985cfb1150cf05e6bfcec73042.patch; sha256 = "047nzyfsihswdva96hwchnp4gj2mlbiqvmkdnhxrfi9sji8x31ka"; }) + (fetchpatch { + name = "pytest-4-excinfo-fix.patch"; + url = https://github.com/pybind/pybind11/commit/9fd4712121fdbb6202a35be4c788525e6c8ab826.patch; + sha256 = "07jjv8jlbszvr2grpm5xqxjac7jb0y68lgb1jcbb93k9vyp1hr33"; + }) ]; - # Current PyPi version does not include test suite - doCheck = false; + checkInputs = [ pytest cmake ] + ++ (lib.optional (numpy != null) numpy) + ++ (lib.optional (eigen != null) eigen) + ++ (lib.optional (scipy != null) scipy); + checkPhase = '' + cmake ${if eigen != null then "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" else ""} + make -j $NIX_BUILD_CORES pytest + ''; meta = { homepage = https://github.com/pybind/pybind11; diff --git a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix index 1cd95c83fa2e..4dcc34340256 100644 --- a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; - src = pkgs.fetchurl rec { + src = pkgs.fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; diff --git a/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix b/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix index 163477a27251..b3e31a9bc788 100644 --- a/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix @@ -4,7 +4,7 @@ let rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; -in buildPythonPackage rec { +in buildPythonPackage { pname = "pycangjie"; version = "1.3_rev_${rev}"; format = "other"; diff --git a/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix b/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix index c441cea5f45d..cfa685c1ac9c 100644 --- a/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix +++ b/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -mkDerivation rec { +mkDerivation { pname = "compyte"; version = "git-20150817"; diff --git a/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix b/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix index 9b04f2b6fcb4..01428d41b7d2 100644 --- a/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix @@ -8,7 +8,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "pycurl2"; version = "7.20.0"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/pyext/default.nix b/nixpkgs/pkgs/development/python-modules/pyext/default.nix index 31a188ed1720..2e4c639465b4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyext/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyext"; version = "0.8"; diff --git a/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix b/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix index 1abf04079880..b9e15d376b5b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix @@ -3,7 +3,7 @@ , fetchgit }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyfantom"; version = "unstable-2013-12-18"; diff --git a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix index 507310b4c51e..c7dfdef4be48 100644 --- a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix @@ -27,7 +27,7 @@ let ''; }); -in buildPythonPackage rec { +in buildPythonPackage { pname = "pygmo"; version = pagmo2WithPython.version; diff --git a/nixpkgs/pkgs/development/python-modules/pygreat/default.nix b/nixpkgs/pkgs/development/python-modules/pygreat/default.nix index 97401f2eb166..103e215f047b 100644 --- a/nixpkgs/pkgs/development/python-modules/pygreat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygreat/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: -buildPythonPackage rec { +buildPythonPackage { pname = "pygreat"; version = "2019.5.1.dev0"; diff --git a/nixpkgs/pkgs/development/python-modules/pygtk/default.nix b/nixpkgs/pkgs/development/python-modules/pygtk/default.nix index c6f939d319ab..09ccb5c3d95f 100644 --- a/nixpkgs/pkgs/development/python-modules/pygtk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygtk/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "GTK+-2 bindings"; + description = "GTK 2 Python bindings"; homepage = "https://gitlab.gnome.org/Archive/pygtk"; platforms = platforms.all; license = with licenses; [ lgpl21Plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix b/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix index 153b5701b267..90d13ae07877 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyinputevent"; version = "2016-10-18"; diff --git a/nixpkgs/pkgs/development/python-modules/pykde4/default.nix b/nixpkgs/pkgs/development/python-modules/pykde4/default.nix index 4a5a5c5e1f97..913453962eb5 100644 --- a/nixpkgs/pkgs/development/python-modules/pykde4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykde4/default.nix @@ -11,7 +11,7 @@ let sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl"; }; }); - pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: rec { + pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: { propagatedBuildInputs = [ sip4_19_3 ]; }); in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix b/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix index bc06a10f9732..27827270fa17 100644 --- a/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "1.99.39"; md5_path = "d249f60aa89b1b4facd63f776925116d"; - src = fetchurl rec { + src = fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; diff --git a/nixpkgs/pkgs/development/python-modules/pylev/default.nix b/nixpkgs/pkgs/development/python-modules/pylev/default.nix index 895171ff7138..f198d214172d 100644 --- a/nixpkgs/pkgs/development/python-modules/pylev/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylev/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pylev"; version = "1.3.0"; diff --git a/nixpkgs/pkgs/development/python-modules/pymaging/default.nix b/nixpkgs/pkgs/development/python-modules/pymaging/default.nix index 234aee8436dc..81100a8e214b 100644 --- a/nixpkgs/pkgs/development/python-modules/pymaging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymaging/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pymaging"; version = "unstable-2016-11-16"; diff --git a/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix b/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix index fb92739776da..61239f1cbe36 100644 --- a/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix @@ -4,7 +4,7 @@ , pymaging }: -buildPythonPackage rec { +buildPythonPackage { pname = "pymaging-png"; version = "unstable-2016-11-16"; diff --git a/nixpkgs/pkgs/development/python-modules/pynac/default.nix b/nixpkgs/pkgs/development/python-modules/pynac/default.nix index 0839cb1aa4a1..755dda341c9d 100644 --- a/nixpkgs/pkgs/development/python-modules/pynac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynac/default.nix @@ -3,7 +3,7 @@ , fetchurl }: -buildPythonPackage rec { +buildPythonPackage { pname = "pynac"; version = "0.2"; diff --git a/nixpkgs/pkgs/development/python-modules/pysc2/default.nix b/nixpkgs/pkgs/development/python-modules/pysc2/default.nix index 280981ab2c24..d02c85fb4ffd 100644 --- a/nixpkgs/pkgs/development/python-modules/pysc2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysc2/default.nix @@ -16,7 +16,7 @@ , sc2-headless }: -buildPythonPackage rec { +buildPythonPackage { pname = "PySC2"; version = "1.2"; diff --git a/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/nixpkgs/pkgs/development/python-modules/pyscard/default.nix index bab8e502b9c8..06e2690c111b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyscard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyscard/default.nix @@ -1,5 +1,13 @@ { stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }: +let + # Package does not support configuring the pcsc library. + withApplePCSC = stdenv.isDarwin; + + inherit (stdenv.lib) getLib getDev optionalString optionals; + inherit (stdenv.hostPlatform.extensions) sharedLibrary; +in + buildPythonPackage rec { version = "1.9.8"; pname = "pyscard"; @@ -9,24 +17,28 @@ buildPythonPackage rec { sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm"; }; - postPatch = '' - sed -e 's!"libpcsclite\.so\.1"!"${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1"!' \ - -i smartcard/scard/winscarddll.c + postPatch = if withApplePCSC then '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' else '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "libpcsclite.so.1" \ + "${getLib pcsclite}/lib/libpcsclite${sharedLibrary}" ''; - NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/"; + NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC) + "-I ${getDev pcsclite}/include/PCSC"; - patches = [ - # Fixes darwin tests - # See: https://github.com/LudovicRousseau/pyscard/issues/77 - (fetchpatch { - url = "https://github.com/LudovicRousseau/pyscard/commit/62e675028086c75656444cc21d563d9f08ebf8e7.patch"; - sha256 = "1lr55npcpc8j750vf7vaisqyk18d5f00l7nii2lvawg4sssjaaf7"; - }) - ]; + # The error message differs depending on the macOS host version. + # Since Nix reports a constant host version, but proxies to the + # underlying library, it's not possible to determine the correct + # expected error message. This patch allows both errors to be + # accepted. + # See: https://github.com/LudovicRousseau/pyscard/issues/77 + patches = optionals withApplePCSC [ ./ignore-macos-bug.patch ]; - propagatedBuildInputs = [ pcsclite ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin PCSC; + propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; nativeBuildInputs = [ swig ]; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch b/nixpkgs/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch new file mode 100644 index 000000000000..62b20477c9f8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch @@ -0,0 +1,22 @@ +diff --git a/test/test_SCardGetErrorMessage.py b/test/test_SCardGetErrorMessage.py +old mode 100644 +new mode 100755 +index c6fe755..c1217f5 +--- a/test/test_SCardGetErrorMessage.py ++++ b/test/test_SCardGetErrorMessage.py +@@ -29,12 +29,10 @@ class TestError(unittest.TestCase): + self.assertEqual(res, expected) + + res = SCardGetErrorMessage(1) ++ expected = "Unknown error: 0x00000001" + # macOS bug not yet fixed +- if get_platform().startswith('macosx-') and get_platform() < 'macosx-10.13': +- expected = "Unkown error: 0x00000001" +- else: +- expected = "Unknown error: 0x00000001" +- self.assertEqual(res, expected) ++ macos_bug_expected = "Unkown error: 0x00000001" ++ self.assertIn(res, [expected, macos_bug_expected]) + + + if __name__ == '__main__': diff --git a/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix index 625eae7b74b9..2dfa1f22962e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyscss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix @@ -9,7 +9,7 @@ , pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyScss"; version = "1.3.5"; diff --git a/nixpkgs/pkgs/development/python-modules/pysensors/default.nix b/nixpkgs/pkgs/development/python-modules/pysensors/default.nix index 5069bbe96484..3f55a015991b 100644 --- a/nixpkgs/pkgs/development/python-modules/pysensors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysensors/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: -buildPythonPackage rec { +buildPythonPackage { version = "2017-07-13"; pname = "pysensors"; diff --git a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix index 0950726172d5..feeeda812f98 100644 --- a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -5,7 +5,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); pname = "pyside-generatorrunner"; version = "0.6.16"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix index 5314a5cc7135..a96ea5d32ff8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5, shiboken2, pyside2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pyside2-tools"; inherit (pyside2) version src; diff --git a/nixpkgs/pkgs/development/python-modules/pysparse/default.nix b/nixpkgs/pkgs/development/python-modules/pysparse/default.nix index 45ff5a9b5b49..5c3a6bb26f86 100644 --- a/nixpkgs/pkgs/development/python-modules/pysparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysparse/default.nix @@ -8,7 +8,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { pname = "pysparse"; version = "1.3-dev"; disabled = !isPy27; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix index 37ba58977e15..edf0450366c5 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix @@ -26,13 +26,11 @@ buildPythonPackage rec { pytest ]; - # disable tests on darwin, because it requires a framework build of Python - doCheck = !stdenv.isDarwin; - checkPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.config/matplotlib echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + ln -s $HOME/.config/matplotlib $HOME/.matplotlib pytest ''; diff --git a/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix b/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix new file mode 100644 index 000000000000..e21f01d5cd6b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +, httplib2 +}: + +buildPythonPackage rec { + pname = "python-pipedrive"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f8qiyl82bpwxwjw2746vdvkps2010mvn1x9b6j6ppmifff2d4pl"; + }; + + propagatedBuildInputs = [ httplib2 ]; + + doCheck = false; # Tests are not provided. + + meta = with stdenv.lib; { + description = "Python library for interacting with the pipedrive.com API"; + homepage = "https://github.com/jscott1989/python-pipedrive"; + license = licenses.unfree; + maintainers = with maintainers; [ mrmebelman ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix index e6425c300478..a7f0bd93b0af 100644 --- a/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-unshare"; # pypi version doesn't support Python 3 and the package didn't update for a long time: # https://github.com/TheTincho/python-unshare/pull/8 diff --git a/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 93fa36fa2fcf..8a160da29648 100644 --- a/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -7,7 +7,7 @@ , stdenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-xmp-toolkit"; version = "2.0.2"; diff --git a/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix b/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix new file mode 100644 index 000000000000..a7fbf3012951 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage rec { + pname = "pyvmomi"; + version = "6.7.1.2018.12"; + + src = fetchFromGitHub { + owner = "vmware"; + repo = pname; + rev = "v${version}"; + sha256 = "1pgl95rbghidbyr8hndjzfzgb1yjchfcknlqgg3qbqvljnz9hfja"; + }; + + # requires old version of vcrpy + doCheck = false; + + propagatedBuildInputs = [ requests ]; + + meta = with lib; { + description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter"; + homepage = "https://github.com/vmware/pyvmomi"; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pywebkitgtk/default.nix b/nixpkgs/pkgs/development/python-modules/pywebkitgtk/default.nix index 5448f5c6951d..c76f1f470773 100644 --- a/nixpkgs/pkgs/development/python-modules/pywebkitgtk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywebkitgtk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = "https://code.google.com/p/pywebkitgtk/"; - description = "Python bindings for the WebKit GTK+ port"; + description = "Python bindings for the WebKit GTK port"; license = licenses.lgpl2Plus; }; diff --git a/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix b/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix index 8a49e8418fd0..00f15f801d16 100644 --- a/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix @@ -11,7 +11,7 @@ , pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "qasm2image"; version = "0.8.0"; diff --git a/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix index 987c1ca90490..e8076db60534 100644 --- a/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -5,7 +5,7 @@ , qtbase }: with pythonPackages; -buildPythonPackage rec { +buildPythonPackage { pname = "qscintilla"; version = qscintilla.version; src = qscintilla.src; diff --git a/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix index 06010b40ed96..e44f6205d39f 100644 --- a/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix @@ -9,7 +9,7 @@ }: disabledIf (isPy3k || isPyPy) - (buildPythonPackage rec { + (buildPythonPackage { # TODO: Qt5 support pname = "qscintilla"; version = pkgs.qscintilla.version; diff --git a/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix b/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix index 4d80a4075646..08d4a8f36a34 100644 --- a/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage }: -buildPythonPackage rec { +buildPythonPackage { pname = "radicale_infcloud"; version = "2017-07-27"; diff --git a/nixpkgs/pkgs/development/python-modules/rarfile/default.nix b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix index 83edfa4f1d27..a2da451905a1 100644 --- a/nixpkgs/pkgs/development/python-modules/rarfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix @@ -6,7 +6,7 @@ assert useUnrar -> unrar != null; assert !useUnrar -> libarchive != null; -buildPythonPackage rec { +buildPythonPackage { pname = "rarfile"; version = "3.0"; diff --git a/nixpkgs/pkgs/development/python-modules/rbtools/default.nix b/nixpkgs/pkgs/development/python-modules/rbtools/default.nix index e394b9646430..2bd421729178 100644 --- a/nixpkgs/pkgs/development/python-modules/rbtools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rbtools/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "rbtools"; version = "0.7.2"; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix index 9644055b0071..c49f891ec1de 100644 --- a/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "python-recursive-pth-loader"; version = "1.0"; diff --git a/nixpkgs/pkgs/development/python-modules/rencode/default.nix b/nixpkgs/pkgs/development/python-modules/rencode/default.nix index ac041d664ae4..46f562ee5d6d 100644 --- a/nixpkgs/pkgs/development/python-modules/rencode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rencode/default.nix @@ -5,7 +5,7 @@ , cython }: -buildPythonPackage rec { +buildPythonPackage { pname = "rencode"; version = "git20150810"; disabled = isPy33; diff --git a/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix b/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix index 3ea1bf58d8af..9728639e0ef7 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix @@ -1,21 +1,33 @@ -{ buildPythonPackage, fetchPypi, python -, mock, testrepository, testtools -, requests, six }: +{ lib, buildPythonPackage, fetchPypi, python +, mock +, purl +, requests +, six +, testrepository +, testtools +}: buildPythonPackage rec { pname = "requests-mock"; - version = "1.5.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb"; + sha256 = "0ij6ir5cy0gpy5xw4sykxz320ndi26np6flx9yg9mimkv0nl1lw8"; }; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; - checkInputs = [ mock testrepository testtools ]; - propagatedBuildInputs = [ requests six ]; + + checkInputs = [ mock purl testrepository testtools ]; + + meta = with lib; { + description = "Mock out responses from the requests package"; + homepage = "https://requests-mock.readthedocs.io"; + license = licenses.asl20; + maintainers = [ ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix b/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix new file mode 100644 index 000000000000..0bd7b0ca686c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonPackages }: + +buildPythonPackage rec { + pname = "rfc6555"; + version = "0.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "05sjrd6jc0sdvx0z7d3llk82rx366jlmc7ijam0nalsv66hbn70r"; + }; + + propagatedBuildInputs = with pythonPackages; [ selectors2 ]; + + checkInputs = with pythonPackages; [ mock pytest ]; + # disabling tests that require a functional DNS IPv{4,6} stack to pass. + patches = [ ./disable_network_tests.patch ]; + # default doCheck = true; is not enough, apparently + postCheck = '' + py.test tests/ + ''; + + meta = { + description = "Python implementation of the Happy Eyeballs Algorithm"; + homepage = "https://pypi.org/project/rfc6555"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ endocrimes ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rfc6555/disable_network_tests.patch b/nixpkgs/pkgs/development/python-modules/rfc6555/disable_network_tests.patch new file mode 100644 index 000000000000..dc59111ac43f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rfc6555/disable_network_tests.patch @@ -0,0 +1,31 @@ +diff --git a/tests/test_create_connection.py b/tests/test_create_connection.py +index fe38026..cdb26b4 100644 +--- a/tests/test_create_connection.py ++++ b/tests/test_create_connection.py +@@ -6,10 +6,12 @@ from .test_utils import requires_network + + + class _BasicCreateConnectionTests(object): ++ + @requires_network + def test_create_connection_google(self): + sock = rfc6555.create_connection(('www.google.com', 80)) + ++ @requires_network + @pytest.mark.parametrize('timeout', [None, 5.0]) + def test_create_connection_has_proper_timeout(self, timeout): + sock = rfc6555.create_connection(('www.google.com', 80), timeout=timeout) +diff --git a/tests/test_ipv6.py b/tests/test_ipv6.py +index 3ee8564..f0db28e 100644 +--- a/tests/test_ipv6.py ++++ b/tests/test_ipv6.py +@@ -2,7 +2,9 @@ import socket + import mock + import rfc6555 + ++from .test_utils import requires_network + ++@requires_network + def test_ipv6_available(): + assert rfc6555._detect_ipv6() + diff --git a/nixpkgs/pkgs/development/python-modules/rhpl/default.nix b/nixpkgs/pkgs/development/python-modules/rhpl/default.nix index 1a40f61cc50e..577c21d6e0b4 100644 --- a/nixpkgs/pkgs/development/python-modules/rhpl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rhpl/default.nix @@ -1,6 +1,6 @@ {buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: -buildPythonPackage rec { +buildPythonPackage { pname = "rhpl"; version = "0.218"; format = "other"; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index d0e5b13ddbe8..b5ca464938b6 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.3.0"; + version = "3.4.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "fc5b5db63cf63a937bd4ada1a8b7508ec8a75d9454fa75e6410cbe72fd718de9"; + sha256 = "21fa0183776e6061366f517765db479aaa634b707f3dd9d90ef6972adae6a755"; }; # unit tests are impure diff --git a/nixpkgs/pkgs/development/python-modules/samplerate/default.nix b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix index b5952e6ee156..8de675d4ea16 100644 --- a/nixpkgs/pkgs/development/python-modules/samplerate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix @@ -4,7 +4,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "scikits.samplerate"; version = "0.3.3"; diff --git a/nixpkgs/pkgs/development/python-modules/scandir/default.nix b/nixpkgs/pkgs/development/python-modules/scandir/default.nix index 2736eb2ee9a3..bc71fde5cedb 100644 --- a/nixpkgs/pkgs/development/python-modules/scandir/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scandir/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, python, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "scandir"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; }; - checkPhase = "python test/run_tests.py"; + checkPhase = "${python.interpreter} test/run_tests.py"; meta = with lib; { description = "A better directory iterator and faster os.walk()"; diff --git a/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix new file mode 100644 index 000000000000..89ffe334e7ff --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, fetchurl +, cython +, enum34 +, gfortran +, isPy3k +, numpy +, pytest +, python +, scipy +, sundials_3 +}: + +buildPythonPackage rec { + pname = "scikits.odes"; + version = "2.4.0-9-g93075ae"; + + # we fetch github instead of Pypi, as we want #104 and #105, which don't apply cleanly on 2.4.0 + src = fetchFromGitHub { + owner = "bmcage"; + repo = "odes"; + rev = "93075ae25c409f572f13ca7207fada5706f73c73"; + sha256 = "161rab7hy6r1a9xw1zby9xhnnmxi0zwdpzxfpjkw9651xn2k5xyw"; + }; + + nativeBuildInputs = [ + gfortran + cython + ]; + + propagatedBuildInputs = [ + numpy + sundials_3 + scipy + ] ++ lib.optionals (!isPy3k) [ enum34 ]; + + doCheck = true; + checkInputs = [ pytest ]; + + checkPhase = '' + cd $out/${python.sitePackages}/scikits/odes/tests + pytest + ''; + + meta = with stdenv.lib; { + description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; + homepage = https://github.com/bmcage/odes; + license = licenses.bsd3; + maintainers = with maintainers; [ flokli idontgetoutmuch ]; + platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix b/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix index e3c92a0e40fc..4fcc19e57fc1 100644 --- a/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix +++ b/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "semantic_version"; - version = "2.6.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra"; + sha256 = "1lnnpxmf3z1rcfr5n562vbraq236s13wlj8fmw2kwr2mrq7lqb8r"; }; # ModuleNotFoundError: No module named 'tests' diff --git a/nixpkgs/pkgs/development/python-modules/semver/default.nix b/nixpkgs/pkgs/development/python-modules/semver/default.nix index 4072268609d2..3201de0ba46c 100644 --- a/nixpkgs/pkgs/development/python-modules/semver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/semver/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "semver"; version = "2.8.1"; diff --git a/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix b/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix index 82dfa3c4ea2a..0a0a3d8a9b2f 100644 --- a/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, python, fetchurl, stdenv, pyside2, cmake, qt5, llvmPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shiboken2"; inherit (pyside2) version src; diff --git a/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix index ee9444fd38ec..312f58bf9fa9 100644 --- a/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "simple-websocket-server"; version = "20180414"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix b/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix index 705b75593725..57f7df73c21d 100644 --- a/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "simplebayes"; version = "1.5.8"; diff --git a/nixpkgs/pkgs/development/python-modules/slob/default.nix b/nixpkgs/pkgs/development/python-modules/slob/default.nix index 490113d6952a..8a6971ceb8f8 100644 --- a/nixpkgs/pkgs/development/python-modules/slob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slob/default.nix @@ -6,7 +6,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "slob"; verison = "unstable-2016-11-03"; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/snappergui/default.nix b/nixpkgs/pkgs/development/python-modules/snappergui/default.nix index db1a75ab7f27..6b31145d519a 100644 --- a/nixpkgs/pkgs/development/python-modules/snappergui/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snappergui/default.nix @@ -5,7 +5,7 @@ , dbus-python }: -buildPythonPackage rec { +buildPythonPackage { pname = "Snapper-GUI"; version = "0.1"; diff --git a/nixpkgs/pkgs/development/python-modules/spacy/models.nix b/nixpkgs/pkgs/development/python-modules/spacy/models.nix index d9a67454fe6a..b091c3b7d56c 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/models.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/models.nix @@ -13,7 +13,7 @@ let meta = with stdenv.lib; { description = "Models for the spaCy NLP library"; homepage = "https://github.com/explosion/spacy-models"; - license = licenses."${license}"; + license = licenses.${license}; maintainers = with maintainers; [ rvl ]; }; }; diff --git a/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix b/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix index 36816f6133d6..3c7a1c8d8397 100644 --- a/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix @@ -7,11 +7,11 @@ # required for home-assistant buildPythonPackage rec { pname = "speedtest-cli"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1s3ylvkclzdsyqmpjnsd6ixrbmj7vd4bfsdplkjaz1c2czyy3j9p"; + sha256 = "0m1fpsb318mrpliw026a7nhx8iky306rmfi565734k7r49i3h7fg"; }; # tests require working internet connection diff --git a/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix index 967e365dde0c..71b643e5cb58 100644 --- a/nixpkgs/pkgs/development/python-modules/stumpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix @@ -14,7 +14,7 @@ , codecov }: -buildPythonPackage rec { +buildPythonPackage { pname = "stumpy"; version = "1.0"; diff --git a/nixpkgs/pkgs/development/python-modules/subunit/default.nix b/nixpkgs/pkgs/development/python-modules/subunit/default.nix index 024fd136c403..eeef94e6c765 100644 --- a/nixpkgs/pkgs/development/python-modules/subunit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/subunit/default.nix @@ -4,7 +4,7 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { name = pkgs.subunit.name; src = pkgs.subunit.src; diff --git a/nixpkgs/pkgs/development/python-modules/tempita/default.nix b/nixpkgs/pkgs/development/python-modules/tempita/default.nix index 4eff644a1616..a903aae104ef 100644 --- a/nixpkgs/pkgs/development/python-modules/tempita/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tempita/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, nose }: -buildPythonPackage rec { +buildPythonPackage { version = "0.5.3-2016-09-28"; pname = "tempita"; diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix index 0f03adfccf5c..b585ab4f81b5 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -63,7 +63,7 @@ let ''; }; }; -in buildPythonPackage rec { +in buildPythonPackage { inherit version pname; format = "wheel"; diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix index a562ba8f2fad..f7e3906ee1fb 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix @@ -45,7 +45,7 @@ let variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; -in buildPythonPackage rec { +in buildPythonPackage { inherit pname; inherit (packages) version; format = "wheel"; diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 5f808bafe6f1..7f6952e8fe54 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -76,7 +76,7 @@ let mock ]); - bazel-build = buildBazelPackage rec { + bazel-build = buildBazelPackage { name = "${pname}-${version}"; src = fetchFromGitHub { @@ -298,7 +298,7 @@ let }; }; -in buildPythonPackage rec { +in buildPythonPackage { inherit version pname; src = bazel-build.python; diff --git a/nixpkgs/pkgs/development/python-modules/tess/default.nix b/nixpkgs/pkgs/development/python-modules/tess/default.nix index 987fbf010197..c168492be721 100644 --- a/nixpkgs/pkgs/development/python-modules/tess/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tess/default.nix @@ -6,7 +6,7 @@ , scipy }: -buildPythonPackage rec { +buildPythonPackage { pname = "tess"; version = "unstable-2019-05-07"; diff --git a/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/nixpkgs/pkgs/development/python-modules/textacy/default.nix index 086218b84396..454cff5e4a87 100644 --- a/nixpkgs/pkgs/development/python-modules/textacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textacy/default.nix @@ -1,69 +1,59 @@ -{ stdenv -, buildPythonPackage -, isPy27 -, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy27 , cachetools -, cld2-cffi , cytoolz -, ftfy -, ijson +, jellyfish , matplotlib , networkx , numpy , pyemd , pyphen -, python-Levenshtein +, pytest , requests , scikitlearn , scipy , spacy -, tqdm -, unidecode +, srsly }: buildPythonPackage rec { pname = "textacy"; - version = "0.6.3"; + version = "0.9.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "50402545ac92b1a931c2365e341cb35c4ebe5575525f1dcc5265901ff3895a5f"; + sha256 = "1jhj02g6kh5vc0z4az7n547siav3gj5571bqpzdryskj6bsma2z1"; }; propagatedBuildInputs = [ cachetools - cld2-cffi cytoolz - ftfy - ijson + jellyfish matplotlib networkx numpy pyemd pyphen - python-Levenshtein requests scikitlearn scipy spacy - tqdm - unidecode + srsly ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'ftfy>=4.2.0,<5.0.0'," "'ftfy>=5.0.0'," + checkInputs = [ pytest ]; + # almost all tests have to deal with downloading a dataset, only test pure tests + checkPhase = '' + pytest tests/test_text_utils.py \ + tests/test_utils.py \ + tests/preprocessing \ + tests/datasets/test_base_dataset.py ''; - doCheck = false; # tests want to download data files - - meta = with stdenv.lib; { + meta = with lib; { description = "Higher-level text processing, built on spaCy"; homepage = "http://textacy.readthedocs.io/"; license = licenses.asl20; maintainers = with maintainers; [ rvl ]; - # ftfy and jellyfish no longer support python2 - # latest scikitlearn not supported for this: https://github.com/chartbeat-labs/textacy/issues/260 - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tkinter/default.nix b/nixpkgs/pkgs/development/python-modules/tkinter/default.nix index bd242c62ab8d..ba910f75e199 100644 --- a/nixpkgs/pkgs/development/python-modules/tkinter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tkinter/default.nix @@ -5,7 +5,7 @@ , isPyPy }: -buildPythonPackage rec { +buildPythonPackage { name = "tkinter-${python.version}"; src = py; format = "other"; diff --git a/nixpkgs/pkgs/development/python-modules/tlsh/default.nix b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix index 848c114543d2..27c4ac2468ff 100644 --- a/nixpkgs/pkgs/development/python-modules/tlsh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix @@ -4,7 +4,7 @@ , cmake }: -buildPythonPackage rec { +buildPythonPackage { pname = "tlsh"; version = "3.4.5"; diff --git a/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix index e0c5329d23fc..17ecd369136e 100644 --- a/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix @@ -8,6 +8,8 @@ , mnemonic , keepkey , semver +, wheel +, pinentry }: buildPythonPackage rec{ @@ -19,13 +21,13 @@ buildPythonPackage rec{ sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690"; }; - propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ]; + propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; meta = with stdenv.lib; { description = "Using Trezor as hardware SSH agent"; - homepage = https://github.com/romanz/trezor-agent; + homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; - maintainers = with maintainers; [ np ]; + maintainers = with maintainers; [ np mmahut ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/typesentry/default.nix b/nixpkgs/pkgs/development/python-modules/typesentry/default.nix index 3aeb84113c2d..ef3b1c78c399 100644 --- a/nixpkgs/pkgs/development/python-modules/typesentry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typesentry/default.nix @@ -6,7 +6,7 @@ , pytestcov }: -buildPythonPackage rec { +buildPythonPackage { pname = "typesentry"; version = "0.2.7"; diff --git a/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix b/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix index c230cd9cfa6e..6b3ca778ead1 100644 --- a/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, django_1_8, waitress }: -buildPythonPackage rec { +buildPythonPackage { pname = "waitress-django"; version = "0.0.0"; diff --git a/nixpkgs/pkgs/development/python-modules/warrant/default.nix b/nixpkgs/pkgs/development/python-modules/warrant/default.nix index ef6089baa507..7cf69fdb614d 100644 --- a/nixpkgs/pkgs/development/python-modules/warrant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/warrant/default.nix @@ -2,7 +2,7 @@ , mock , boto3, envs, python-jose, requests }: -buildPythonPackage rec { +buildPythonPackage { pname = "warrant"; version = "0.6.1"; diff --git a/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix b/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix index d672cb8bae90..97530989a382 100644 --- a/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix @@ -11,7 +11,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "wordfreq"; version = "2.2.0"; diff --git a/nixpkgs/pkgs/development/python-modules/xgboost/default.nix b/nixpkgs/pkgs/development/python-modules/xgboost/default.nix index c75362436e4a..81a8d05f5bf0 100644 --- a/nixpkgs/pkgs/development/python-modules/xgboost/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xgboost/default.nix @@ -12,7 +12,7 @@ , datatable }: -buildPythonPackage rec { +buildPythonPackage { pname = "xgboost"; inherit (xgboost) version src meta; diff --git a/nixpkgs/pkgs/development/python-modules/zerobin/default.nix b/nixpkgs/pkgs/development/python-modules/zerobin/default.nix index d1cab88b45b8..ce993d3d41a6 100644 --- a/nixpkgs/pkgs/development/python-modules/zerobin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zerobin/default.nix @@ -7,7 +7,7 @@ , clize }: -buildPythonPackage rec { +buildPythonPackage { pname = "zerobin"; version = "20160108"; diff --git a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix new file mode 100644 index 000000000000..978f8749d3b3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }: + +buildPythonPackage rec { + pname = "zeroc-ice"; + version = "3.7.2"; + + src = fetchPypi { + inherit version pname; + sha256 = "1bs7h3k9nd1gls2azgp8gz9407cslxbi2x1gspab8p87a61pjim8"; + }; + + buildInputs = [ openssl bzip2 ]; + + meta = with stdenv.lib; { + homepage = https://zeroc.com/; + license = licenses.gpl2; + description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more."; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix b/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix index 8c9a0af142cb..67f48f34731d 100644 --- a/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "zxcvbn"; version = "4.4.28"; diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix index e813e550f6e2..995f13853a23 100644 --- a/nixpkgs/pkgs/development/r-modules/default.nix +++ b/nixpkgs/pkgs/development/r-modules/default.nix @@ -308,7 +308,7 @@ let RcppGSL = [ pkgs.gsl_1 ]; RcppZiggurat = [ pkgs.gsl_1 ]; reprex = [ pkgs.which ]; - rgdal = [ pkgs.proj pkgs.gdal ]; + rgdal = [ pkgs.proj.dev pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ]; rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ]; @@ -420,7 +420,7 @@ let odbc = [ pkgs.pkgconfig ]; openssl = [ pkgs.pkgconfig ]; pdftools = [ pkgs.pkgconfig ]; - sf = [ pkgs.pkgconfig ]; + sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ]; showtext = [ pkgs.pkgconfig ]; spate = [ pkgs.pkgconfig ]; stringi = [ pkgs.pkgconfig ]; diff --git a/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix index d6a8f3ddbc66..353adbcea6ff 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix @@ -6,13 +6,13 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { - owner = "manveru"; + owner = "nix-community"; repo = "bundix"; rev = version; - sha256 = "03jhj1dy0ljrymjnpi6mcxn36a29qxr835l1lc11879jjzvnr2ax"; + sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8"; }; buildInputs = [ ruby bundler ]; diff --git a/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix index c31dfb63b3cd..0812ff590a50 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix @@ -52,7 +52,7 @@ let name else let - gem = gems."${pname}"; + gem = gems.${pname}; version = gem.version; in "${pname}-${version}"; @@ -70,7 +70,7 @@ let maybeCopyAll = pkgname: if pkgname == null then "" else let - mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found"); + mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found"); in copyIfBundledByPath mainGem; diff --git a/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix index 6324f27e9faf..a093cc4dc95c 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -42,21 +42,21 @@ in rec { converge expandDependencies directlyMatchingGems; platformMatches = {rubyEngine, version, ...}: attrs: ( - !(attrs ? "platforms") || + !(attrs ? platforms) || builtins.length attrs.platforms == 0 || builtins.any (platform: platform.engine == rubyEngine && - (!(platform ? "version") || platform.version == version.majMin) + (!(platform ? version) || platform.version == version.majMin) ) attrs.platforms ); groupMatches = groups: attrs: - groups == null || !(attrs ? "groups") || + groups == null || !(attrs ? groups) || (intersectLists (groups ++ [ "default" ]) attrs.groups) != []; applyGemConfigs = attrs: - (if gemConfig ? "${attrs.gemName}" - then attrs // gemConfig."${attrs.gemName}" attrs + (if gemConfig ? ${attrs.gemName} + then attrs // gemConfig.${attrs.gemName} attrs else attrs); genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: '' @@ -88,6 +88,6 @@ in rec { inherit (attrs.source) type; source = removeAttrs attrs.source ["type"]; gemName = name; - gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []); + gemPath = map (gemName: gems.${gemName}) (attrs.dependencies or []); }); } diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix index b3f91b678c44..9e9ccb128cf9 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix @@ -49,7 +49,7 @@ in postBuild = genStubsScript { inherit lib ruby bundler groups; confFiles = basicEnv.confFiles; - binPaths = [ basicEnv.gems."${pname}" ]; + binPaths = [ basicEnv.gems.${pname} ]; } + lib.optionalString (postBuild != null) postBuild; meta = { platforms = ruby.meta.platforms; } // meta; diff --git a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index a14ef4adb9a0..7f6ca505fc11 100644 --- a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -147,12 +147,12 @@ in }; fog-dnsimple = attrs: - if lib.versionOlder attrs.version "1.0.1" then { + lib.optionalAttrs (lib.versionOlder attrs.version "1.0.1") { postInstall = '' cd $(cat $out/nix-support/gem-meta/install-path) rm {$out/bin,bin,../../bin}/{setup,console} ''; - } else {}; + }; redis-rack = attrs: { dontBuild = false; diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix index f5854a6533d1..ff9b1bac321c 100644 --- a/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "solargraph"; exes = ["solargraph" "solargraph-runtime"]; gemdir = ./.; diff --git a/nixpkgs/pkgs/development/ruby-modules/with-packages/test.rb b/nixpkgs/pkgs/development/ruby-modules/with-packages/test.rb index 4ec6898193f2..760402d070c9 100755 --- a/nixpkgs/pkgs/development/ruby-modules/with-packages/test.rb +++ b/nixpkgs/pkgs/development/ruby-modules/with-packages/test.rb @@ -41,14 +41,14 @@ test_cases.merge!( 'libxml-ruby' => "require 'libxml'", 'ruby-terminfo' => "require 'terminfo'", 'ovirt-engine-sdk' => "require 'ovirtsdk4'", - 'fog-dnsimple' => "require 'fog/dnsimple'", + 'fog-dnsimple' => "require 'fog/dnsimple'" ) -test_cases['sequel_pg'] = <<-TEST -require 'pg' -require 'sequel' -require 'sequel/adapters/postgresql' -require 'sequel_pg' +test_cases['sequel_pg'] = <<~TEST + require 'pg' + require 'sequel' + require 'sequel/adapters/postgresql' + require 'sequel_pg' TEST tmpdir = File.expand_path(File.join(__dir__, 'tests')) @@ -56,10 +56,10 @@ FileUtils.rm_rf(tmpdir) FileUtils.mkdir_p(tmpdir) failing = test_cases.reject do |name, test_case| - test_case = <<-SHELL -#!/usr/bin/env nix-shell -#!nix-shell -i ruby -E "(import ../../../.. {}).ruby.withPackages (r: [ r.#{name} ] )" -#{test_case} + test_case = <<~SHELL + #!/usr/bin/env nix-shell + #!nix-shell -i ruby -E "(import ../../../.. {}).ruby.withPackages (r: [ r.#{name} ] )" + #{test_case} SHELL file = File.join(tmpdir, "#{name}_test.rb") diff --git a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix index 36fa7bb1f161..c250f442a0eb 100644 --- a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "evmdis-unstable"; version = "2018-03-23"; goPackagePath = "github.com/Arachnid/evmdis"; diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index fb351f4adfd8..f4c7047e8de2 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.106.0"; + version = "0.107.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0da32j8s3avxa84g2gn9sr4nakibllz1kq5i3bgqbndrgcgsdvgw"; + sha256 = "1in7a006lgw4v2p0gn5sx41cn3p259vncpq0l3rz52lyfpn7ai3b"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix b/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix index 7afa71429a75..20fe74ecb74d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "makefile2graph-2018-01-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix index 300feb9a41b5..250002a16b76 100644 --- a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix @@ -4,7 +4,6 @@ rustPlatform.buildRustPackage rec { pname = "panopticon"; version = "unstable-20171202"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "das-labor"; diff --git a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix index fb0f7414841c..d9f39667ceff 100644 --- a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -3,7 +3,7 @@ let name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name; src = kcachegrind.src; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix index a528a849ad7d..84c56a9b5691 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix @@ -5,7 +5,8 @@ , qtbase, qtsvg, qtwebengine # buildInputs , r2-for-cutter -, python3 }: +, python3 +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "radare2-cutter"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; + buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 wrapQtAppsHook ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 2db6b821b4e1..cd8ae42f20b1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -31,7 +31,7 @@ let cs_ver, cs_sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "radare2"; inherit version; @@ -110,12 +110,12 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "22465"; - gittap = "3.7.0"; - gittip = "cb2648cbbde3cd63cb1b2a9b1d4269c97bd653b8"; - rev = "3.7.0"; - version = "3.7.0"; - sha256 = "1kinf51sb1zyy8nlq9yig02z42izih7kz8ff0gqm8all0hrzclxc"; + version_commit = "22646"; + gittap = "3.8.0"; + gittip = "b4860e4eecad2053202965926f16296864b2f1e5"; + rev = "3.8.0"; + version = "3.8.0"; + sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix b/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix index 86e4d6ef5f69..922a73a4be09 100644 --- a/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "swarm-2019-03-11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 5099505cc5b0..7dca029d557e 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "1p4w1ddgb4nqibbrvix0p0gdlj6ann5lkyvlcsbkn25z8ha3qa39"; + sha256 = "0aff7ckl245cyjs2rbgczkqlp2x6g4g458p4li0k1agk3m9bbq35"; }; - modSha256 = "1snanz4cpqkfgxp8k52w3x4i49k6d5jffcffrcx8xya8yvx2wxy3"; + modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh"; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix index 898640a84fe6..cd0c5f6c081b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix @@ -1,4 +1,4 @@ -{ writeText, bazel, runLocal, bazelTest }: +{ writeText, bazel, runLocal, bazelTest, distDir }: # Tests that certain executables are available in bazel-executed bash shells. @@ -35,7 +35,7 @@ let inherit workspaceDir; bazelScript = '' - ${bazel}/bin/bazel build :tool_usage + ${bazel}/bin/bazel build :tool_usage --distdir=${distDir} cp bazel-genfiles/output.txt $out echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK" ''; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 2b59bd3c4338..f4e03abdbc94 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -8,6 +8,7 @@ , runtimeShell , writeScript , writeText +, distDir }: let @@ -42,6 +43,7 @@ let bazelScript = '' ${bazel}/bin/bazel \ build --verbose_failures \ + --distdir=${distDir} \ //... ''; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix index 908fc35c688b..01619e0cb117 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix @@ -22,11 +22,11 @@ }: let - version = "0.28.1"; + version = "0.29.0"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0503fax70w7h6v00mkrrrgf1m5n0vkjqs76lyg95alhzc4yldsic"; + sha256 = "01cb6f2e808bd016cf0e217e12373c9efb808123e58b37885be8364458d3a40a"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -46,11 +46,15 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs.${"java_tools_javac11_darwin-v2.0.zip"} - else srcs.${"java_tools_javac11_linux-v2.0.zip"}) - srcs.${"coverage_output_generator-v1.0.zip"} + then srcs."java_tools_javac11_darwin-v4.0.zip" + else srcs."java_tools_javac11_linux-v4.0.zip") + srcs."coverage_output_generator-v1.0.zip" srcs.build_bazel_rules_nodejs - srcs.${"android_tools_pkg-0.7.tar.gz"} + srcs."android_tools_pkg-0.8.tar.gz" + srcs."0.27.1.tar.gz" + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java ]); distDir = runCommand "bazel-deps" {} '' @@ -102,7 +106,7 @@ let remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v2.0.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v4.0.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; @@ -218,18 +222,18 @@ stdenv.mkDerivation rec { }; in { - bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; }; - cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; }; - java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; }; - protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; }; - pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; }; + bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; # downstream packages using buildBazelPackage # fixed-output hashes of the fetch phase need to be spot-checked manually @@ -463,6 +467,7 @@ stdenv.mkDerivation rec { # the reference to .name mkdir $out/etc echo "build --override_repository=${remote_java_tools.name}=${remote_java_tools}" > $out/etc/bazelrc + echo "build --distdir=${distDir}" >> $out/etc/bazelrc # shell completion files mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix index 5f780a795e31..30b957eb5e30 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -9,6 +9,7 @@ , runtimeShell , writeScript , writeText +, distDir }: let @@ -44,6 +45,7 @@ let bazelScript = '' ${bazel}/bin/bazel \ run \ + --distdir=${distDir} \ --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 90065be67bc7..0784de4cfd39 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -10,6 +10,7 @@ , runtimeShell , writeScript , writeText +, distDir }: let @@ -141,6 +142,7 @@ let bazelScript = '' ${bazel}/bin/bazel \ build \ + --distdir=${distDir} \ --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index ff921b395da7..c02547c08e06 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -1,4 +1,4 @@ -{ writeText, bazel, bazelTest, runLocal }: +{ writeText, bazel, bazelTest, runLocal, distDir }: let WORKSPACE = writeText "WORKSPACE" '' @@ -45,6 +45,7 @@ let bazelScript = '' ${bazel}/bin/bazel \ run \ + --distdir=${distDir} \ //python:bin ''; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json b/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json index fc3fe13f5809..f93794249ec7 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json @@ -7,12 +7,28 @@ "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" ] }, - "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz": { - "name": "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", - "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534", + "0.27.1.tar.gz": { + "name": "0.27.1.tar.gz", + "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" + ] + }, + "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": { + "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz": { + "name": "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" ] }, "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { @@ -23,6 +39,14 @@ "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" ] }, + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { + "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", @@ -31,29 +55,28 @@ "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" ] }, - "android_tools_pkg-0.7.tar.gz": { - "name": "android_tools_pkg-0.7.tar.gz", - "sha256": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718", + "android_tools_pkg-0.8.tar.gz": { + "name": "android_tools_pkg-0.8.tar.gz", + "sha256": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz" ] }, - "bazel_j2objc": { - "name": "bazel_j2objc", - "sha256": "a36bac432d0dbd8c98249e484b2b69dd5720afa4abb58711a3c3def1c0bfa21d", - "strip_prefix": "j2objc-2.0.3", + "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": { + "name": "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", "urls": [ - "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip", - "https://github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip" + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" ] }, - "bazel_rbe_toolchains": { - "name": "bazel_rbe_toolchains", - "sha256": "e2b8644caa15235a488e831264e5dcb014e2cdf3b697319bc1e9d6b0fff0b4b9", - "strip_prefix": "bazel_rbe_toolchains-01529a65d21abdf71635ff0c2472043a567ecded", + "bazel_j2objc": { + "name": "bazel_j2objc", + "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", + "strip_prefix": "j2objc-2.5", "urls": [ - "https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz", - "https://github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz" + "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", + "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" ] }, "bazel_skylib": { @@ -67,11 +90,11 @@ }, "bazel_toolchains": { "name": "bazel_toolchains", - "sha256": "67335b3563d9b67dc2550b8f27cc689b64fadac491e69ce78763d9ba894cc5cc", - "strip_prefix": "bazel-toolchains-cddc376d428ada2927ad359211c3e356bd9c9fbb", + "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", + "strip_prefix": "bazel-toolchains-0.27.1", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" ] }, "build_bazel_rules_nodejs": { @@ -135,46 +158,46 @@ }, "io_bazel_skydoc": { "name": "io_bazel_skydoc", - "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534", - "strip_prefix": "skydoc-1ca560df1cf6e280f987af2f8d08a5edc7ac6b54", + "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", + "strip_prefix": "skydoc-41c28e43dffbae39c52dd4b91932d1209e5a8893", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" ] }, - "java_tools_javac11_darwin-v2.0.zip": { - "name": "java_tools_javac11_darwin-v2.0.zip", - "sha256": "0ceb0c9ff91256fe33508306bc9cd9e188dcca38df78e70839d426bdaef67a38", + "java_tools_javac11_darwin-v4.0.zip": { + "name": "java_tools_javac11_darwin-v4.0.zip", + "sha256": "fbf5bf22e9aab9c622e4c8c59314a1eef5ea09eafc5672b4f3250dc0b971bbcc", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_darwin-v2.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_darwin-v4.0.zip" ] }, - "java_tools_javac11_linux-v2.0.zip": { - "name": "java_tools_javac11_linux-v2.0.zip", - "sha256": "074d624fb34441df369afdfd454e75dba821d5d54932fcfee5ba598d17dc1b99", + "java_tools_javac11_linux-v4.0.zip": { + "name": "java_tools_javac11_linux-v4.0.zip", + "sha256": "96e223094a12c842a66db0bb7bb6866e88e26e678f045842911f9bd6b47161f5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_linux-v2.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_linux-v4.0.zip" ] }, - "java_tools_javac11_windows-v2.0.zip": { - "name": "java_tools_javac11_windows-v2.0.zip", - "sha256": "2c3fc0ce7d30d60e26f4b8a36e2eadcf9e6a9d5a51b667d3d13b78db53b24251", + "java_tools_javac11_windows-v4.0.zip": { + "name": "java_tools_javac11_windows-v4.0.zip", + "sha256": "a1de51447b2ba2eab923d589ba6c72c289c16e6091e6a3bb3e67a05ef4ad200c", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_windows-v2.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_windows-v4.0.zip" ] }, "java_tools_langtools_javac10": { "name": "java_tools_langtools_javac10", - "sha256": "e379c71e051eb83e3fc9a08c9b404712707d8920ffcf1e8fd59c844965f0b0dd", + "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10.zip" + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip" ] }, "java_tools_langtools_javac11": { "name": "java_tools_langtools_javac11", - "sha256": "128a63f39d3f828a761f6afcfe3c6115279336a72ea77f60d7b3acf1841c9acb", + "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11.zip" + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" ] }, "java_tools_langtools_javac12": { @@ -186,9 +209,9 @@ }, "java_tools_langtools_javac9": { "name": "java_tools_langtools_javac9", - "sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864", + "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9.zip" + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip" ] }, "jdk10-server-release-1804.tar.xz": { @@ -346,6 +369,49 @@ "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" ] }, + "rules_cc": { + "name": "rules_cc", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "rules_java": { + "name": "rules_java", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "rules_pkg": { + "name": "rules_pkg", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_pkg-0.2.0.tar.gz": { + "name": "rules_pkg-0.2.0.tar.gz", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_proto": { + "name": "rules_proto", + "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", + "strip_prefix": "rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" + ] + }, "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py index 7fd1e5e2b048..504a227b9582 100755 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py @@ -40,6 +40,11 @@ def rules_sass_dependencies(**kw): pass def node_repositories(**kw): pass def sass_repositories(**kw): pass def register_execution_platforms(*args): pass +def rbe_autoconfig(*args, **kw): pass +def rules_pkg_dependencies(*args, **kw): pass +def winsdk_configure(*args, **kw): pass +def register_local_rc_exe_toolchains(*args, **kw): pass +def register_toolchains(*args, **kw): pass # execute the WORKSPACE like it was python code in this module, # using all the function stubs from above. diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index c095f8c695c4..ec1577c51079 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "rizsotto"; - repo = "Bear"; + repo = pname; rev = version; - sha256 = "0fqhhavyz9ddjc3wgb2ng47bfgk1q4w5bwah74nsa02k8r22pbch"; + sha256 = "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index ba842289dba4..23ffe2868241 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -49,7 +49,7 @@ let installPhase = ''cp $src $out''; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix index 60a011a49d07..f14aa4eea6e2 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchgit, perl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "colormake"; version = "2.1.0"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix index 24df6fa6ff3b..7b29e7d02dc6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix @@ -16,7 +16,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gn"; version = "20190403"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 902c74a08b4a..5e01438844c6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: rec { - gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec { + gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation { inherit name src nativeVersion; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index b5ee5d758170..fad5bc9e630d 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -3,20 +3,20 @@ let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamilies = { - "aarch64" = "aarch64"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "x86"; - "x86_64" = "x86_64"; + aarch64 = "aarch64"; + armv6l = "arm"; + armv7l = "arm"; + i686 = "x86"; + x86_64 = "x86_64"; }; in python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.50.1"; + version = "0.51.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "05k3wsxjcnnq7a8n5kzxh2cdh5jdkh13xagigz5axs48j36zfai4"; + sha256 = "0cqhkjbab1mbvxmbjvyfrbjfkm7bh436svqpjapca36c2k9h1vwr"; }; postFixup = '' @@ -60,6 +60,7 @@ python3Packages.buildPythonApplication rec { # pass it `-Wl,-O1` flag but optimizations are not recognized by # Mac linker. # https://github.com/mesonbuild/meson/issues/4784 + # Should be fixed in 0.52 ./fix-objc-linking.patch ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch index 60a205828f5d..996e0c3420e2 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch @@ -1,20 +1,22 @@ +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index dc8f099b..d8581fcf 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -795,7 +795,7 @@ +@@ -944,7 +944,7 @@ compiler_type = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) - return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) -- if out.startswith('Apple LLVM'): -+ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self): - return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) - if out.startswith('clang'): - return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) -@@ -822,7 +822,7 @@ + return GnuObjCCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines) +- if out.startswith('Apple LLVM') or out.startswith('Apple clang'): ++ if out.startswith('Apple LLVM') or out.startswith('Apple clang') or self.machines.build.is_darwin(): + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap) + if 'windows' in out: + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap) +@@ -974,7 +974,7 @@ compiler_type = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) - return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) -- if out.startswith('Apple LLVM'): -+ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self): - return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) - if out.startswith('clang'): - return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) + return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines) +- if out.startswith('Apple LLVM') or out.startswith('Apple clang'): ++ if out.startswith('Apple LLVM') or out.startswith('Apple clang') or self.machines.build.is_darwin(): + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap) + if 'windows' in out: + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap) diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index b7e6e08cb04a..a07fc2643f6c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "ecf83db96a32024f14b031ce458b1b3eed01e713265e16c42eb4a894a1a0d654"; + sha256 = "1y5044m0qlwa1wlg7xkhg76agmfn7bgcf040wf56fvxhf0w78zjw"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index 28697f4c69cd..7d08bbf6df2c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, python2, which}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "redo-apenwarr"; version = "unstable-2019-06-21"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix index 612dd5c7810d..19ce0b44bf72 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.0.3"; pname = "redo-sh"; diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 317186ea3e0e..3e6d66048851 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,7 +14,7 @@ let goPackagePath = "github.com/containers/buildah"; -in buildGoPackage rec { +in buildGoPackage { pname = "buildah"; inherit version; inherit src; diff --git a/nixpkgs/pkgs/development/tools/casperjs/default.nix b/nixpkgs/pkgs/development/tools/casperjs/default.nix index 001f87b3b279..8a1d81acaaa7 100644 --- a/nixpkgs/pkgs/development/tools/casperjs/default.nix +++ b/nixpkgs/pkgs/development/tools/casperjs/default.nix @@ -2,7 +2,7 @@ let version = "1.1.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "casperjs"; inherit version; diff --git a/nixpkgs/pkgs/development/tools/chefdk/default.nix b/nixpkgs/pkgs/development/tools/chefdk/default.nix index 921448855a64..d5c742014189 100644 --- a/nixpkgs/pkgs/development/tools/chefdk/default.nix +++ b/nixpkgs/pkgs/development/tools/chefdk/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }: -bundlerEnv rec { +bundlerEnv { pname = "chef-dk"; ruby = ruby_2_4; diff --git a/nixpkgs/pkgs/development/tools/clog-cli/default.nix b/nixpkgs/pkgs/development/tools/clog-cli/default.nix index 0c8e6ff591bf..12289cbb68aa 100644 --- a/nixpkgs/pkgs/development/tools/clog-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/clog-cli/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "clog-cli-${version}"; + pname = "clog-cli"; version = "0.9.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix index 0390e7b86bbc..a83b5a219440 100644 --- a/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix +++ b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix @@ -1,7 +1,7 @@ { stdenv, pythonPackages, fetchFromGitHub }: let - pgdbconn = pythonPackages.buildPythonPackage rec { + pgdbconn = pythonPackages.buildPythonPackage { pname = "pgdbconn"; version = "0.8.0"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ let }; in -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "pyrseas"; version = "0.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix index ca87395b9179..070c7c81c403 100644 --- a/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix +++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix @@ -13,7 +13,7 @@ let categories = "Application;Development;"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit version; pname = "sqldeveloper"; diff --git a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix index 461acacf4e99..9e75088aa5cb 100644 --- a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix @@ -13,7 +13,7 @@ let categories = "Application;Development;"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit version; pname = "sqldeveloper"; diff --git a/nixpkgs/pkgs/development/tools/dep/default.nix b/nixpkgs/pkgs/development/tools/dep/default.nix index 456948a97955..d807e79f9edf 100644 --- a/nixpkgs/pkgs/development/tools/dep/default.nix +++ b/nixpkgs/pkgs/development/tools/dep/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dep"; - version = "0.5.1"; + version = "0.5.4"; rev = "v${version}"; goPackagePath = "github.com/golang/dep"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "golang"; repo = "dep"; - sha256 = "1a5vq5v3ikg6iysbywxr5hcjnbv76nzhk50rd3iq3v2fnyq38dv2"; + sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd"; }; buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); diff --git a/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix index d883af1b0686..d42152882674 100644 --- a/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-server/default.nix @@ -1,20 +1,21 @@ - { stdenv, python3Packages, nginx }: +{ stdenv, python3Packages, nginx }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "devpi-server"; - version = "4.9.0"; + version = "5.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0cx0nv1qqv8lg6p1v8dv5val0dxnc3229c15imibl9wrhrffjbg9"; + sha256 = "254fceee846532a5fec4e6bf52a59eb8f236efc657678a542b5200da4bb3abbc"; }; propagatedBuildInputs = with python3Packages; [ + py appdirs devpi-common execnet itsdangerous + repoze_lru passlib pluggy pyramid @@ -24,13 +25,12 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ beautifulsoup4 - mock nginx pytest - pytest-flakes + pytest-flake8 pytestpep8 webtest - ]; + ] ++ stdenv.lib.optionals isPy27 [ mock ]; # test_genconfig.py needs devpi-server on PATH checkPhase = '' diff --git a/nixpkgs/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix index b599ccf1364a..5ce57ee80556 100644 --- a/nixpkgs/pkgs/development/tools/dive/default.nix +++ b/nixpkgs/pkgs/development/tools/dive/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dive"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "wagoodman"; repo = pname; rev = "v${version}"; - sha256 = "0az9b800zwk5sd90s8ssg8amf0a4dl7nrglkirp51d8hh3rs6nzl"; + sha256 = "1pyrdff5qqc0l3h4nssa9a7qnfqwy2p6ywc8nbwyc7wvzgdiczb8"; }; - modSha256 = "1rc9nqri66kgjpxqcgwllyd0qmk46gs3wmsfdj1w43p6ybnaf3qw"; + modSha256 = "1fk9z7a6wghrs15pc28g5ri7rkbb1ifjb91rscwqsmh10r2wik4w"; meta = with lib; { description = "A tool for exploring each layer in a docker image"; diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix index 44b5384106ea..7792d14775c9 100644 --- a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; + description = "Tools to extract documentation embedded in GTK and GNOME source code"; homepage = "https://www.gtk.org/gtk-doc"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix index af25f3f75952..a88963c6e2cd 100644 --- a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "mdsh-${version}"; + pname = "mdsh"; version = "0.1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/easyjson/default.nix b/nixpkgs/pkgs/development/tools/easyjson/default.nix index 9dff0cc3ebed..4f3d89c07881 100644 --- a/nixpkgs/pkgs/development/tools/easyjson/default.nix +++ b/nixpkgs/pkgs/development/tools/easyjson/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "easyjson"; version = "unstable-2019-06-26"; goPackagePath = "github.com/mailru/easyjson"; diff --git a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix index eb6f937800aa..4fb05da30678 100644 --- a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix +++ b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix @@ -6,7 +6,7 @@ , makeWrapper } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fusee-launcher"; version = "unstable-2018-07-14"; diff --git a/nixpkgs/pkgs/development/tools/geckodriver/default.nix b/nixpkgs/pkgs/development/tools/geckodriver/default.nix index 17560f55ec4a..68d1a74b2777 100644 --- a/nixpkgs/pkgs/development/tools/geckodriver/default.nix +++ b/nixpkgs/pkgs/development/tools/geckodriver/default.nix @@ -9,7 +9,7 @@ with rustPlatform; buildRustPackage rec { version = "0.22.0"; - name = "geckodriver-${version}"; + pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/nixpkgs/pkgs/development/tools/git-series/default.nix b/nixpkgs/pkgs/development/tools/git-series/default.nix index 70fa18ceddb5..5faceca57166 100644 --- a/nixpkgs/pkgs/development/tools/git-series/default.nix +++ b/nixpkgs/pkgs/development/tools/git-series/default.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { version = "0.9.1"; - name = "git-series-${version}"; + pname = "git-series"; src = fetchFromGitHub { owner = "git-series"; diff --git a/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix b/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix index 39aab9cfa278..9a14cc7f6e21 100644 --- a/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix +++ b/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "github_changelog_generator"; gemdir = ./.; exes = [ "github_changelog_generator" ]; diff --git a/nixpkgs/pkgs/development/tools/glslviewer/default.nix b/nixpkgs/pkgs/development/tools/glslviewer/default.nix index 20d1f7c0f1e3..fd22295540d0 100644 --- a/nixpkgs/pkgs/development/tools/glslviewer/default.nix +++ b/nixpkgs/pkgs/development/tools/glslviewer/default.nix @@ -4,7 +4,7 @@ , Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "glslviewer"; version = "2019-04-22"; diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix index be7db5e8b8a6..4c662f9b5c0e 100644 --- a/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotools-unstable"; - version = "2019-07-06"; - rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e"; + version = "2019-09-05"; + rev = "6b3d1c9ba8bf7ce410f6b490852ec54953383362"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0c0s5aiwj807vxfzwrah32spwq8cnxvy0j117i5cbsqw2df80pgv"; + sha256 = "0a2xjx9hqkash7fd2qv9hd93wcqdbfrmsdzjd91dwvnk48j61daf"; }; # Build of golang.org/x/tools/gopls fails with: @@ -21,7 +21,7 @@ buildGoModule rec { rm -rf gopls ''; - modSha256 = "16nkrpki9fnxsrxxxs9ljz49plcz393z0sqq2knkk30pmncpwd3q"; + modSha256 = "16cfzmfr9jv8wz0whl433xdm614dk63fzjxv6l1xvkagjmki49iy"; postConfigure = '' # Make the builtin tools available here diff --git a/nixpkgs/pkgs/development/tools/gox/default.nix b/nixpkgs/pkgs/development/tools/gox/default.nix index 25b80d9cf697..6caa32c16f2b 100644 --- a/nixpkgs/pkgs/development/tools/gox/default.nix +++ b/nixpkgs/pkgs/development/tools/gox/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "gox"; version = "20181025"; diff --git a/nixpkgs/pkgs/development/tools/gpp/default.nix b/nixpkgs/pkgs/development/tools/gpp/default.nix index 009f475bb7dd..ee15df1a9f6f 100644 --- a/nixpkgs/pkgs/development/tools/gpp/default.nix +++ b/nixpkgs/pkgs/development/tools/gpp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpp"; version = "2.25"; diff --git a/nixpkgs/pkgs/development/tools/grabserial/default.nix b/nixpkgs/pkgs/development/tools/grabserial/default.nix index c86c2e275ed1..d17093695114 100644 --- a/nixpkgs/pkgs/development/tools/grabserial/default.nix +++ b/nixpkgs/pkgs/development/tools/grabserial/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pythonPackages }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { name = "grabserial-1.9.3"; namePrefix = ""; diff --git a/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix index 27ca714b73ab..02d5ad87dc47 100644 --- a/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "a helper script that creates application bundles form GTK+ executables for macOS"; + description = "a helper script that creates application bundles form GTK executables for macOS"; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; - homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling; + homepage = https://wiki.gnome.org/Projects/GTK/OSX/Bundling; license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/development/tools/icestorm/default.nix b/nixpkgs/pkgs/development/tools/icestorm/default.nix index 2bac15403038..b3ce4f8f6a71 100644 --- a/nixpkgs/pkgs/development/tools/icestorm/default.nix +++ b/nixpkgs/pkgs/development/tools/icestorm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, libftdi +, pkgconfig, libftdi1 , python3, pypy3 # PyPy yields large improvements in build time and runtime performance, @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "icestorm"; - version = "2019.08.15"; + version = "2019.08.31"; pythonPkg = if usePyPy then pypy3 else python3; pythonInterp = pythonPkg.interpreter; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "95949315364f8d9b0c693386aefadf44b28e2cf6"; - sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2"; + rev = "04f1eb78ed8fd50516aee50102675041a8fd40cd"; + sha256 = "10jdiw4mw0afcjq7xl3xs8z733mlrx927x620vs2yz91p757jxbd"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pythonPkg libftdi ]; + buildInputs = [ pythonPkg libftdi1 ]; makeFlags = [ "PREFIX=$(out)" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix index b394e9e71fbf..549a4d1b8266 100644 --- a/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix +++ b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pcre } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imatix_gsl"; version = "4.1"; diff --git a/nixpkgs/pkgs/development/tools/irony-server/default.nix b/nixpkgs/pkgs/development/tools/irony-server/default.nix index 035964dafc01..f2c926a6f391 100644 --- a/nixpkgs/pkgs/development/tools/irony-server/default.nix +++ b/nixpkgs/pkgs/development/tools/irony-server/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, llvmPackages, irony }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "irony-server"; inherit (irony) version; diff --git a/nixpkgs/pkgs/development/tools/jazzy/default.nix b/nixpkgs/pkgs/development/tools/jazzy/default.nix index ad71dfb22a8f..a6cb7a92b639 100644 --- a/nixpkgs/pkgs/development/tools/jazzy/default.nix +++ b/nixpkgs/pkgs/development/tools/jazzy/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "jazzy"; gemdir = ./.; exes = [ "jazzy" ]; diff --git a/nixpkgs/pkgs/development/tools/kexpand/default.nix b/nixpkgs/pkgs/development/tools/kexpand/default.nix index a82c21b72e9e..e6c562721c28 100644 --- a/nixpkgs/pkgs/development/tools/kexpand/default.nix +++ b/nixpkgs/pkgs/development/tools/kexpand/default.nix @@ -1,6 +1,6 @@ { buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { name = "kexpand-unstable-2017-05-12"; goPackagePath = "github.com/kopeio/kexpand"; diff --git a/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix index 1691f09e6e41..1dea14401138 100644 --- a/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix +++ b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix @@ -1,7 +1,7 @@ { stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, freetype, fontconfig, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "diamond-3.10"; nativeBuildInputs = [ rpmextract patchelf makeWrapper file ]; diff --git a/nixpkgs/pkgs/development/tools/manul/default.nix b/nixpkgs/pkgs/development/tools/manul/default.nix index a5dd0a882728..f921e900e56b 100644 --- a/nixpkgs/pkgs/development/tools/manul/default.nix +++ b/nixpkgs/pkgs/development/tools/manul/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { name = "manul-unstable-2016-09-30"; goPackagePath = "github.com/kovetskiy/manul"; diff --git a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix index 664e7d28d791..b3d380b0a0ad 100644 --- a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix @@ -14,7 +14,7 @@ let sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arcanist"; version = "20180916"; diff --git a/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix index ea9b340fb0b7..c246ddb9d905 100644 --- a/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libelf, txt2man }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bin_replace_string"; version = "0.2"; diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index c33741740adc..210659289d1e 100644 --- a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -22,7 +22,7 @@ let "${stdenv.targetPlatform.config}-"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = targetPrefix + basename; # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM diff --git a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix index 0d78cfbbab8c..6548e9643971 100644 --- a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix @@ -13,7 +13,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bossa-1.8"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 0577165bcff4..4eeb61a7edd9 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -30,7 +30,7 @@ let ccache = stdenv.mkDerivation rec { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = {unwrappedCC, extraConfig}: stdenv.mkDerivation rec { + links = {unwrappedCC, extraConfig}: stdenv.mkDerivation { name = "ccache-links"; passthru = { isClang = unwrappedCC.isClang or false; diff --git a/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix index 4170570e08aa..956a8df69cea 100644 --- a/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "chrpath-0.16"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index daf39318432a..e1b89d07cdfd 100644 --- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -5,7 +5,7 @@ let pname = "circleci-cli"; version = "0.1.2569"; in -buildGoPackage rec { +buildGoPackage { name = "${pname}-${version}"; inherit version; diff --git a/nixpkgs/pkgs/development/tools/misc/cquery/default.nix b/nixpkgs/pkgs/development/tools/misc/cquery/default.nix index 02d480cf2cd5..c43509a4f43b 100644 --- a/nixpkgs/pkgs/development/tools/misc/cquery/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cquery/default.nix @@ -14,7 +14,7 @@ let stdenv = llvmPackages.stdenv; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cquery"; version = "2018-10-14"; diff --git a/nixpkgs/pkgs/development/tools/misc/dbench/default.nix b/nixpkgs/pkgs/development/tools/misc/dbench/default.nix index a1c9e85a83ab..5bccea9ced88 100644 --- a/nixpkgs/pkgs/development/tools/misc/dbench/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dbench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoconf, popt, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dbench-2013-01-01"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix index afe9b59e012d..ab2ab0de9cf9 100644 --- a/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnum4-1.4.18"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix b/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix index 5280b69cdcec..5b47ce0bc247 100644 --- a/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./bench.patch ]; meta = with stdenv.lib; { - description = "Application designed to test GTK+ performance"; + description = "Application designed to test GTK performance"; homepage = http://gtkperf.sourceforge.net/; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ dtzWill ]; diff --git a/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix index 264f2aec44d4..c4cba5ffc69c 100644 --- a/nixpkgs/pkgs/development/tools/misc/help2man/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, gettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.10"; + name = "help2man-1.47.11"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk"; + sha256 = "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar"; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix deleted file mode 100644 index 7d824fd81fbe..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, makeWrapper, fetchurl, elk5Version, nodejs, coreutils, which }: - -with stdenv.lib; -let - inherit (builtins) elemAt; - archOverrides = { - "i686" = "x86"; - }; - info = splitString "-" stdenv.hostPlatform.system; - arch = (elemAt info 0); - elasticArch = archOverrides."${arch}" or arch; - plat = elemAt info 1; - shas = { - "x86_64-linux" = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa"; - "i686-linux" = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn"; - "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; - }; -in stdenv.mkDerivation rec { - pname = "kibana"; - version = elk5Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); - }; - - buildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - ''; - - meta = { - description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; - license = licenses.asl20; - maintainers = with maintainers; [ offline ]; - platforms = with platforms; unix; - }; -} diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix index 46a72a32722e..f7da3521aa1e 100644 --- a/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn"; - "x86_64-darwin" = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c"; + "x86_64-linux" = "1xwklhqxk5rmdrgy2simwvijzq29kyq5w2w3hy53xh2i1zlnyvq3"; + "x86_64-darwin" = "1qpdn28mrpggd55khzqqld6r89l0hb870rigxcw2i8p2yx3jv106"; } else { - "x86_64-linux" = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk"; - "x86_64-darwin" = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk"; + "x86_64-linux" = "1wpnwal2rq5v2bsp5qil9j6dplif7ql5394sy4ia5ghp2fzifxmf"; + "x86_64-darwin" = "12z8i0wbw10c097glbpdy350p0h3957433f51qfx2p0ghgkzkhzv"; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix index 9fba3b43e11c..fb4dca8d5490 100644 --- a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8"; - "x86_64-darwin" = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7"; + "x86_64-linux" = "0sc5709k3z7lb8qcjpj49s6vfv69ds2wc8319ag9x776nyz1pqxi"; + "x86_64-darwin" = "0zh4q46vfdwaihs838ck8fap92i3b4x10wbpmx8mcwyfk5v0fkch"; } else { - "x86_64-linux" = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38"; - "x86_64-darwin" = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2"; + "x86_64-linux" = "1pq17fasryharvw4byybvmcf5172hcmy6cp0m8bxhkxagwilprba"; + "x86_64-darwin" = "11crpx2qs2nzkzv6fvs1gqn9v4zalxkzsc5br0fy1y02lzm26zbm"; }; in stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just # disable the version check. - ./disable-nodejs-version-check.patch + ./disable-nodejs-version-check-7.patch ]; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch b/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch new file mode 100644 index 000000000000..ef4c207764c1 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch @@ -0,0 +1,19 @@ +diff --git a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js +index 3f611e5a..f5c60c85 100644 +--- a/src/setup_node_env/node_version_validator.js ++++ b/src/setup_node_env/node_version_validator.js +@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This is written in ES5 so we c + var currentVersion = process && process.version || null; + var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null; + var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion; +-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. ++var isVersionValid = !!currentVersion && !!requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. + + if (!isVersionValid) { + var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit. + + console.error(errorMessage); + process.exit(1); +-} +\ No newline at end of file ++} diff --git a/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix b/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix index 77d4c5771f90..b8fa02306c4d 100644 --- a/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, elfutils, libunwind }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ltrace-0.7.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix index 2e0eec5ae57d..fa19b2494076 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv, fetchFromGitHub , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { pname = "luarocks"; - version = "3.1.3"; + version = "3.2.1"; - src = fetchurl { - url="http://luarocks.org/releases/luarocks-${version}.tar.gz"; - sha256="04q5k6drypsnbp1wspr9ns72k8kjf62a787a6jg1bb2s95gl6wy5"; + src = fetchFromGitHub { + owner = "luarocks"; + repo = "luarocks"; + rev = "v${version}"; + sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2"; }; patches = [ ./darwin-3.1.3.patch ]; diff --git a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix index ce62634e7d7a..518d128890a9 100644 --- a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "macdylibbundler"; version = "20180825"; diff --git a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix index af3b45a8e62c..8af121707986 100644 --- a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix @@ -2,7 +2,7 @@ assert stdenv ? glibc; -perlPackages.buildPerlPackage rec { +perlPackages.buildPerlPackage { pname = "ninka"; version = "2.0-pre"; diff --git a/nixpkgs/pkgs/development/tools/misc/prelink/default.nix b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix index c0e7a3653a86..7bfff6328269 100644 --- a/nixpkgs/pkgs/development/tools/misc/prelink/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix @@ -3,7 +3,7 @@ let version = "20130503"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "prelink"; inherit version; diff --git a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index 0c994e88e23f..b9a4658d3dee 100644 --- a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { version = "0.2.10"; - name = "sccache-${version}"; + pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix index 7b6048eb475d..e2d507ab8013 100644 --- a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql , libaio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "sysbench-1.0.17"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/misc/tet/default.nix b/nixpkgs/pkgs/development/tools/misc/tet/default.nix index 29d809b5f05e..fb38d096ab43 100644 --- a/nixpkgs/pkgs/development/tools/misc/tet/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tet/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ version = "3.8"; pname = "tet"; diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index 613fd2673d56..7741f2d4ffbc 100644 --- a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -8,7 +8,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "texinfo-${optionalString interactive "interactive-"}${version}"; inherit version; diff --git a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix index 68409a59f371..bad3ecd92413 100644 --- a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "universal-ctags"; version = "unstable-2019-07-30"; diff --git a/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix index e2ea96cd590b..e1726efc40c1 100644 --- a/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; - env = bundlerEnv rec { + env = bundlerEnv { name = "watson-ruby-gems-${version}"; inherit ruby; # expects Gemfile, Gemfile.lock and gemset.nix in the same directory diff --git a/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix index 6edf6551b068..caecad4b678a 100644 --- a/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "787"; pname = "xc3sprog"; - src = fetchsvn rec { + src = fetchsvn { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx"; rev = "${version}"; diff --git a/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix b/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix index 1424b8fe1974..04827fade70d 100644 --- a/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xxdiff-5.0b1"; src = fetchFromBitbucket { diff --git a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix index b409009b524e..12f0b13a6602 100644 --- a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix @@ -5,7 +5,7 @@ , fixDarwinDylibNames, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ycmd"; version = "2018-09-20"; diff --git a/nixpkgs/pkgs/development/tools/nailgun/default.nix b/nixpkgs/pkgs/development/tools/nailgun/default.nix index 689b7da88021..6e0014b37732 100644 --- a/nixpkgs/pkgs/development/tools/nailgun/default.nix +++ b/nixpkgs/pkgs/development/tools/nailgun/default.nix @@ -9,7 +9,7 @@ let sha256 = "1mk8pv0g2xg9m0gsb96plbh6mc24xrlyrmnqac5mlbl4637l4q95"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nailgun"; inherit version; diff --git a/nixpkgs/pkgs/development/tools/neoload/default.nix b/nixpkgs/pkgs/development/tools/neoload/default.nix index 06945f10eb23..b07ab21fdf10 100644 --- a/nixpkgs/pkgs/development/tools/neoload/default.nix +++ b/nixpkgs/pkgs/development/tools/neoload/default.nix @@ -30,7 +30,7 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = '' sys.symlinkDir=INSTALLDIR/bin ''; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "neoload-4.1.4"; src = fetchurl ( diff --git a/nixpkgs/pkgs/development/tools/nrpl/default.nix b/nixpkgs/pkgs/development/tools/nrpl/default.nix index 081e86c44dde..068028c7da91 100644 --- a/nixpkgs/pkgs/development/tools/nrpl/default.nix +++ b/nixpkgs/pkgs/development/tools/nrpl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nrpl"; version = "20150522"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix index 4a4203a2f59d..a7ef6d7bedd3 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix @@ -22,7 +22,7 @@ let param = { "4.08" = { version = "4.08+1"; sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; }; - }."${ocaml.meta.branch}"; + }.${ocaml.meta.branch}; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix b/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix index 159260750a25..90d74414308e 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix @@ -26,7 +26,7 @@ let param = } ; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "${pname}-${param.version}"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix index 90e88979de40..d1ff9eee8179 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix @@ -2,7 +2,7 @@ , ocaml-migrate-parsetree, ppx_tools_versioned, uchar }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index e6fb1b353d2a..e535ba29aeb4 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = { "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl"; - }."${version}"; + }.${version}; }; buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 65afee16afbd..5c8f4377e8d7 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -3,7 +3,7 @@ , js_of_ocaml, ocaml_lwt, lwt_log }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-lwt"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 4b2b14d317b4..344352467e9b 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -2,7 +2,7 @@ , ocamlbuild }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ocamlbuild"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 277973afba8a..3adad22bd9c3 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -3,7 +3,7 @@ , js_of_ocaml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ppx"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 5b5f7d18f797..2ff9ddbcf9e1 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -2,7 +2,7 @@ , js_of_ocaml, ppx_deriving }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ppx_deriving_json"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index c24162cccf75..c39c985183ad 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -3,7 +3,7 @@ , js_of_ocaml, reactivedata, tyxml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-tyxml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix index 90b092f0e4b6..04aeab5f4319 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4.10"; pname = "ocaml-oasis"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index dbf33424439d..91e2e67eaf1b 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocamlmod"; version = "0.0.9"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix index 0ed7312660a1..cf5372bdc202 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -2,7 +2,7 @@ let version = "1.99.19-beta"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocp-build-${version}"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix index 87490bcb617f..53482598f134 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -43,7 +43,7 @@ let sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index 763642e5da1b..df4c0f2d12c2 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -59,7 +59,7 @@ let sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "opam"; version = "2.0.5"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix index 8b7354ae48ab..28ad85b42e94 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # derivation of just runtime deps so env vars created by # setup-hooks can be saved for use at runtime - runtime = stdenv.mkDerivation rec { + runtime = stdenv.mkDerivation { pname = "utop-runtime-env"; inherit version; diff --git a/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix index 137f56bee59e..cc33b675954a 100644 --- a/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix +++ b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix @@ -7,7 +7,7 @@ , qtscript }: -mkDerivation rec { +mkDerivation { pname = "ofono-phonesim"; version = "unstable-2014-04-22"; diff --git a/nixpkgs/pkgs/development/tools/omniorb/default.nix b/nixpkgs/pkgs/development/tools/omniorb/default.nix index f29153334273..af295eb242f6 100644 --- a/nixpkgs/pkgs/development/tools/omniorb/default.nix +++ b/nixpkgs/pkgs/development/tools/omniorb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.2.3"; - src = fetchurl rec { + src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96"; }; diff --git a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix index 6f96b81e7a46..fac5b8e58309 100644 --- a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix +++ b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "parinfer-rust-${version}"; + pname = "parinfer-rust"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix b/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix index 7e09b0a8cd38..e555f1d59854 100644 --- a/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flex-2.5.35"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix b/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix index 3a46c6c8f01e..fc2c76995839 100644 --- a/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, bison, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flex-2.6.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix index d41c113821ad..e10fe49b1e45 100644 --- a/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, glib, pkgconfig, python, scons }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hammer"; version = "e7aa734"; diff --git a/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix index aa7b63dafea9..009ebe8e2ff0 100644 --- a/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix @@ -15,7 +15,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "lemon"; version = "1.69"; diff --git a/nixpkgs/pkgs/development/tools/pax-rs/default.nix b/nixpkgs/pkgs/development/tools/pax-rs/default.nix index ee6a7ec78c20..f1bda9997ac6 100644 --- a/nixpkgs/pkgs/development/tools/pax-rs/default.nix +++ b/nixpkgs/pkgs/development/tools/pax-rs/default.nix @@ -2,7 +2,7 @@ with rustPlatform; buildRustPackage rec { - name = "pax-rs-${version}"; + pname = "pax-rs"; version = "0.4.0"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/profiling/pyflame/default.nix b/nixpkgs/pkgs/development/tools/profiling/pyflame/default.nix index acb5d9d943cb..2467769ad3de 100644 --- a/nixpkgs/pkgs/development/tools/profiling/pyflame/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/pyflame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, coreutils, fetchFromGitHub, fetchpatch, pkgconfig +{ stdenv, autoreconfHook, coreutils, fetchFromGitHub, fetchpatch, pkgconfig, procps # pyflame needs one python version per ABI # are currently supported # * 2.6 or 2.7 for 2.x ABI @@ -67,11 +67,12 @@ stdenv.mkDerivation rec { full-ptrace-seize-errors ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig procps ]; buildInputs = [ python37 python36 python2 python35 ]; postPatch = '' patchShebangs . + # some tests will fail in the sandbox substituteInPlace tests/test_end_to_end.py \ --replace 'skipif(IS_DOCKER' 'skipif(True' @@ -79,6 +80,32 @@ stdenv.mkDerivation rec { # don't use patchShebangs here to be explicit about the python version substituteInPlace utils/flame-chart-json \ --replace '#!usr/bin/env python' '#!${python3.interpreter}' + + # Many tests require the build machine to have kernel.yama.ptrace_scope = 0, + # but hardened machines have it set to 1. On build machines that cannot run + # these tests, skip them to avoid breaking the build. + if [[ $(sysctl -n kernel.yama.ptrace_scope || echo 0) != "0" ]]; then + for test in \ + test_monitor \ + test_non_gil \ + test_threaded \ + test_unthreaded \ + test_legacy_pid_handling \ + test_exclude_idle \ + test_exit_early \ + test_sample_not_python \ + test_include_ts \ + test_include_ts_exclude_idle \ + test_thread_dump \ + test_no_line_numbers \ + test_utf8_output; do + + substituteInPlace tests/test_end_to_end.py \ + --replace "def $test(" "\ +@pytest.mark.skip('build machine had kernel.yama.ptrace_scope != 0') +def $test(" + done + fi ''; postInstall = '' @@ -94,7 +121,7 @@ stdenv.mkDerivation rec { PYMAJORVERSION=${lib.substring 0 1 python.version} \ PATH=${lib.makeBinPath [ coreutils ]}\ PYTHONPATH= \ - ${python.pkgs.pytest}/bin/pytest tests/ + ${python.pkgs.pytest}/bin/pytest -v tests/ set +x '') (lib.filter (x: x != null) buildInputs); diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix index 6d6a02ab49f4..77c1df6f43e3 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,6 +1,6 @@ { buildGoModule, fetchFromGitHub, lib }: -buildGoModule rec { +buildGoModule { pname = "protoc-gen-doc-unstable"; version = "2019-04-22"; diff --git a/nixpkgs/pkgs/development/tools/pyre/default.nix b/nixpkgs/pkgs/development/tools/pyre/default.nix index b5dfe3c8bfd9..060875924d80 100644 --- a/nixpkgs/pkgs/development/tools/pyre/default.nix +++ b/nixpkgs/pkgs/development/tools/pyre/default.nix @@ -91,7 +91,7 @@ typeshed = stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = "cp -r $src $out"; }; -in python3.pkgs.buildPythonApplication rec { +in python3.pkgs.buildPythonApplication { pname = "pyre-check"; version = pyre-version; src = pyre-src; diff --git a/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 1b3bc7a21626..c8f7ccb18d59 100644 --- a/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -11,7 +11,7 @@ let # Fetch clang from qt vendor, this contains submodules like this: # clang<-clang-tools-extra<-clazy. - clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: rec { + clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { src = fetchgit { url = "https://code.qt.io/clang/clang.git"; rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; diff --git a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix index 6af444c7ce04..d9433f535dad 100644 --- a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix +++ b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "quicktemplate"; version = "unstable-2019-07-08"; goPackagePath = "github.com/valyala/quicktemplate"; diff --git a/nixpkgs/pkgs/development/tools/rdocker/default.nix b/nixpkgs/pkgs/development/tools/rdocker/default.nix index a2ab9a47a79a..d92003a575e1 100644 --- a/nixpkgs/pkgs/development/tools/rdocker/default.nix +++ b/nixpkgs/pkgs/development/tools/rdocker/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, openssh }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rdocker"; version = "unstable-2018-07-17"; diff --git a/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix index 44654e052d1b..acf9d03843d0 100644 --- a/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.16.1-02"; + version = "3.18.1-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln"; + sha256 = "0z3hb1ha0yvi09hrndrzzh95g3m42pfsi0gzw7hfx9r0n8r2qgkd"; }; sourceRoot = "${pname}-${version}"; diff --git a/nixpkgs/pkgs/development/tools/ronn/default.nix b/nixpkgs/pkgs/development/tools/ronn/default.nix index 51801864796e..e4762796c18a 100644 --- a/nixpkgs/pkgs/development/tools/ronn/default.nix +++ b/nixpkgs/pkgs/development/tools/ronn/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ronn"; version = env.gems.ronn.version; - env = bundlerEnv rec { + env = bundlerEnv { name = "ronn-gems"; gemdir = ./.; }; diff --git a/nixpkgs/pkgs/development/tools/rq/default.nix b/nixpkgs/pkgs/development/tools/rq/default.nix index 72b9406211cb..e00f0ae7dd04 100644 --- a/nixpkgs/pkgs/development/tools/rq/default.nix +++ b/nixpkgs/pkgs/development/tools/rq/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "rq-${version}"; + pname = "rq"; version = "0.10.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/rubocop/default.nix b/nixpkgs/pkgs/development/tools/rubocop/default.nix index 5d965fc87a7e..9a6393977d7f 100644 --- a/nixpkgs/pkgs/development/tools/rubocop/default.nix +++ b/nixpkgs/pkgs/development/tools/rubocop/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { pname = "rubocop"; inherit ruby; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix index 8fb0b63727a2..17103bae50a6 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "cargo-asm-${version}"; + pname = "cargo-asm"; version = "0.1.17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index f19aabae7a18..7ccc85283599 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "cargo-fuzz-${version}"; + pname = "cargo-fuzz"; version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock src = diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index 0ca12bd7bf4f..144e1d71a110 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: rustPlatform.buildRustPackage rec { - name = "cargo-generate-${version}"; + pname = "cargo-generate"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 945b78caccc7..d58b848c87e9 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "rust-cbindgen-${version}"; + pname = "rust-cbindgen"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 7bd49132d0ef..b152be414dac 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "0srsb305gld6zmz7qm5zk4gawqqlywdpray04z8xcij146mccci2"; + sha256 = "180dynm9qy3mliqai4jfwxbg01jdz2a95bfyar880qmp75f35wi8"; }; - cargoSha256 = "0bscwbrzjaps4yqcrqhan56kdmh0n014w4ldsbv3sbhpw5izz335"; + cargoSha256 = "1x61kxmbk5mazi3lmzfnixjl584cxkfv16si2smh8d9xhhz6gvpw"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/rust/racer/default.nix b/nixpkgs/pkgs/development/tools/rust/racer/default.nix index b2f6701be876..a06723fc28c8 100644 --- a/nixpkgs/pkgs/development/tools/rust/racer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/racer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }: rustPlatform.buildRustPackage rec { - name = "racer-${version}"; + pname = "racer"; version = "2.1.22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/rust/racerd/default.nix b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix index aa33f04123f5..bfc30193eeda 100644 --- a/nixpkgs/pkgs/development/tools/rust/racerd/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "racerd-${version}"; + pname = "racerd"; version = "2019-03-20"; src = fetchFromGitHub { owner = "jwilm"; diff --git a/nixpkgs/pkgs/development/tools/rust/rainicorn/default.nix b/nixpkgs/pkgs/development/tools/rust/rainicorn/default.nix index fd5bc6978310..8a87bf5cf4df 100644 --- a/nixpkgs/pkgs/development/tools/rust/rainicorn/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rainicorn/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "rainicorn-${version}"; + pname = "rainicorn"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index 4e7032025c3d..32cc66f76e92 100644 --- a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "svd2rust-${version}"; + pname = "svd2rust"; version = "0.14.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/scalafix/default.nix b/nixpkgs/pkgs/development/tools/scalafix/default.nix index bd8a013fe2d0..ab70552c2e8c 100644 --- a/nixpkgs/pkgs/development/tools/scalafix/default.nix +++ b/nixpkgs/pkgs/development/tools/scalafix/default.nix @@ -16,7 +16,7 @@ let outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; buildInputs = [ jdk makeWrapper deps ]; diff --git a/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/nixpkgs/pkgs/development/tools/scalafmt/default.nix index 79afb54bfb70..1f789a6ade5d 100644 --- a/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -16,7 +16,7 @@ let outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/scry/default.nix b/nixpkgs/pkgs/development/tools/scry/default.nix index 05f7805a55ac..9a87f5f93694 100644 --- a/nixpkgs/pkgs/development/tools/scry/default.nix +++ b/nixpkgs/pkgs/development/tools/scry/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, crystal, shards, llvm, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "scry"; version = "0.8.0"; diff --git a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index 5937b00f4594..eff06daac064 100644 --- a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -4,18 +4,18 @@ }: let allSpecs = { - "x86_64-linux" = { + x86_64-linux = { system = "linux64"; sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv"; }; - "x86_64-darwin" = { + x86_64-darwin = { system = "mac64"; sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09"; }; }; - spec = allSpecs."${stdenv.hostPlatform.system}" + spec = allSpecs.${stdenv.hostPlatform.system} or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); libs = stdenv.lib.makeLibraryPath [ diff --git a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix index 82b6d7e1161a..27e87d212e68 100644 --- a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix @@ -16,7 +16,7 @@ let }; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name; inherit version; diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix index 786cac68425a..e7b21c40f17b 100644 --- a/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -19,7 +19,7 @@ let goPackagePath = "github.com/containers/skopeo"; in -buildGoPackage rec { +buildGoPackage { pname = "skopeo"; inherit version; inherit src goPackagePath; diff --git a/nixpkgs/pkgs/development/tools/statik/default.nix b/nixpkgs/pkgs/development/tools/statik/default.nix index d24c3e88b8cb..e26431b26875 100644 --- a/nixpkgs/pkgs/development/tools/statik/default.nix +++ b/nixpkgs/pkgs/development/tools/statik/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "statik"; version = "unstable-2019-07-31"; goPackagePath = "github.com/rakyll/statik"; diff --git a/nixpkgs/pkgs/development/tools/tora/default.nix b/nixpkgs/pkgs/development/tools/tora/default.nix index 7f35d3c438d1..74f1f22426f9 100644 --- a/nixpkgs/pkgs/development/tools/tora/default.nix +++ b/nixpkgs/pkgs/development/tools/tora/default.nix @@ -1,41 +1,37 @@ { mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper -, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }: +, boost, doxygen, openssl, mysql, postgresql, graphviz, loki +, qscintilla, qtbase, qttools }: -let - qscintillaLib = (qscintilla.override { withQt5 = true; }); - -in mkDerivation rec { +mkDerivation { pname = "tora"; - version = "3.1"; + version = "3.2.176"; src = fetchFromGitHub { owner = "tora-tool"; repo = "tora"; - rev = "v${version}"; - sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7"; + rev = "39bf2837779bf458fc72a9f0e49271152e57829f"; + sha256 = "0fr9b542i8r6shgnz33lc3cz333fnxgmac033yxfrdjfglzk0j2k"; }; - nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ]; + buildInputs = [ - boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase + boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase ]; preConfigure = '' - sed -i \ - 's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \ - src/widgets/toglobalsetting.cpp - - sed -i \ - 's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \ - extlibs/libermodel/dotgraph.cpp + substituteInPlace src/widgets/toglobalsetting.cpp \ + --replace 'defaultGvHome = "/usr/bin"' 'defaultGvHome = "${lib.getBin graphviz}/bin"' + substituteInPlace extlibs/libermodel/dotgraph.cpp \ + --replace /usr/bin/dot ${lib.getBin graphviz}/bin/dot ''; cmakeFlags = [ "-DWANT_INTERNAL_LOKI=0" "-DWANT_INTERNAL_QSCINTILLA=0" # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name - "-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include" - "-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so" + "-DQSCINTILLA_INCLUDE_DIR=${qscintilla}/include" + "-DQSCINTILLA_LIBRARY=${qscintilla}/lib/libqscintilla2.so" "-DENABLE_DB2=0" "-DENABLE_ORACLE=0" "-DENABLE_TERADATA=0" diff --git a/nixpkgs/pkgs/development/tools/unity3d/default.nix b/nixpkgs/pkgs/development/tools/unity3d/default.nix index 0ca7e37ef706..895cedd70108 100644 --- a/nixpkgs/pkgs/development/tools/unity3d/default.nix +++ b/nixpkgs/pkgs/development/tools/unity3d/default.nix @@ -22,7 +22,7 @@ let ver = "2018.3.0"; build = "f2"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "unity-editor"; version = "${ver}x${build}"; diff --git a/nixpkgs/pkgs/development/tools/vgo2nix/default.nix b/nixpkgs/pkgs/development/tools/vgo2nix/default.nix index e8173a6b5b0d..df0c360f75c3 100644 --- a/nixpkgs/pkgs/development/tools/vgo2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/vgo2nix/default.nix @@ -7,7 +7,7 @@ , fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "vgo2nix"; version = "unstable-2019-02-06"; goPackagePath = "github.com/adisbladis/vgo2nix"; diff --git a/nixpkgs/pkgs/development/tools/vogl/default.nix b/nixpkgs/pkgs/development/tools/vogl/default.nix index b0768ca4b7e5..e6dccbd332e1 100644 --- a/nixpkgs/pkgs/development/tools/vogl/default.nix +++ b/nixpkgs/pkgs/development/tools/vogl/default.nix @@ -7,7 +7,7 @@ , fetchpatch }: -mkDerivation rec { +mkDerivation { pname = "vogl"; version = "2016-05-13"; diff --git a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix index d9ff6f673d87..3f721eaee2a9 100644 --- a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix +++ b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix @@ -8,7 +8,7 @@ }: rustPlatform.buildRustPackage rec { - name = "wasm-pack-${version}"; + pname = "wasm-pack"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/xcbuild/default.nix b/nixpkgs/pkgs/development/tools/xcbuild/default.nix index 0874c9e55155..8090aca5ff30 100644 --- a/nixpkgs/pkgs/development/tools/xcbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/xcbuild/default.nix @@ -15,7 +15,7 @@ let rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3"; sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "xcbuild"; # Once a version is released that includes diff --git a/nixpkgs/pkgs/development/tools/yaml2json/default.nix b/nixpkgs/pkgs/development/tools/yaml2json/default.nix index ece440c692f7..f31a119bb657 100644 --- a/nixpkgs/pkgs/development/tools/yaml2json/default.nix +++ b/nixpkgs/pkgs/development/tools/yaml2json/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "yaml2json"; version = "unstable-2017-05-03"; goPackagePath = "github.com/bronze1man/yaml2json"; diff --git a/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 82e4402361d9..f5989390c4b0 100644 --- a/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -406,7 +406,7 @@ in rec { ''; }; - fixup_yarn_lock = stdenv.mkDerivation rec { + fixup_yarn_lock = stdenv.mkDerivation { name = "fixup_yarn_lock"; buildInputs = [ nodejs ]; diff --git a/nixpkgs/pkgs/development/web/postman/default.nix b/nixpkgs/pkgs/development/web/postman/default.nix index 1767eaab8bce..07bb13377456 100644 --- a/nixpkgs/pkgs/development/web/postman/default.nix +++ b/nixpkgs/pkgs/development/web/postman/default.nix @@ -1,20 +1,22 @@ -{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook +, atk, at-spi2-atk, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 +, freetype, fontconfig, nss, nspr, pango, udev, libX11, libxcb, libXi +, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes +, libXrender, libXtst, libXScrnSaver +}: stdenv.mkDerivation rec { pname = "postman"; - version = "7.0.7"; + version = "7.6.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a"; - name = "${pname}-${version}.tar.gz"; + sha256 = "sha256:03y82ydkj46l7dn35y944gnghbrrhc75y3yxdyidbh8fl3xvmlfv"; + name = "${pname}.tar.gz"; }; - nativeBuildInputs = [ makeWrapper ]; - - dontPatchELF = true; - - buildPhase = ":"; # nothing to build + dontBuild = true; # nothing to build + dontConfigure = true; desktopItem = makeDesktopItem { name = "postman"; @@ -26,12 +28,48 @@ stdenv.mkDerivation rec { categories = "Application;Development;"; }; + buildInputs = [ + stdenv.cc.cc.lib + atk + at-spi2-atk + alsaLib + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + freetype + fontconfig + nss + nspr + pango + udev + libX11 + libxcb + libXi + libXcursor + libXdamage + libXrandr + libXcomposite + libXext + libXfixes + libXrender + libXtst + libXScrnSaver + ]; + + nativeBuildInputs = [ wrapGAppsHook ]; + + installPhase = '' mkdir -p $out/share/postman cp -R app/* $out/share/postman + rm $out/share/postman/Postman mkdir -p $out/bin - ln -s $out/share/postman/Postman $out/bin/postman + ln -s $out/share/postman/_Postman $out/bin/postman mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ @@ -43,55 +81,21 @@ stdenv.mkDerivation rec { ln -s $out/share/postman/resources/app/assets/icon.png $iconSizeDir/postman.png ''; - preFixup = let - libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib - gnome2.pango - gnome2.GConf - pkgs.atk - pkgs.alsaLib - pkgs.cairo - pkgs.cups - pkgs.dbus.daemon.lib - pkgs.expat - pkgs.gdk-pixbuf - pkgs.glib - pkgs.gtk2-x11 - pkgs.freetype - pkgs.fontconfig - pkgs.nss - pkgs.nspr - pkgs.udev.lib - xorg.libX11 - xorg.libxcb - xorg.libXi - xorg.libXcursor - xorg.libXdamage - xorg.libXrandr - xorg.libXcomposite - xorg.libXext - xorg.libXfixes - xorg.libXrender - xorg.libX11 - xorg.libXtst - xorg.libXScrnSaver - ]; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/share/postman" \ - $out/share/postman/Postman - patchelf --set-rpath "${libPath}" $out/share/postman/libnode.so - patchelf --set-rpath "${libPath}" $out/share/postman/libffmpeg.so - - wrapProgram $out/share/postman/Postman --prefix LD_LIBRARY_PATH : ${libPath} + postFixup = '' + pushd $out/share/postman + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" _Postman + for file in $(find . -type f \( -name \*.node -o -name _Postman -o -name \*.so\* \) ); do + ORIGIN=$(patchelf --print-rpath $file); \ + patchelf --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$ORIGIN" $file + done + popd ''; meta = with stdenv.lib; { homepage = https://www.getpostman.com; description = "API Development Environment"; - license = stdenv.lib.licenses.postman; + license = licenses.postman; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ xurei ]; + maintainers = with maintainers; [ xurei evanjs ]; }; } diff --git a/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix index 10fbc98d51ab..bbdaeb5d2926 100644 --- a/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/development/web/wml/default.nix b/nixpkgs/pkgs/development/web/wml/default.nix index 82faf32a3210..57fedb78407e 100644 --- a/nixpkgs/pkgs/development/web/wml/default.nix +++ b/nixpkgs/pkgs/development/web/wml/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: -perlPackages.buildPerlPackage rec { +perlPackages.buildPerlPackage { pname = "wml"; version = "2.0.11"; diff --git a/nixpkgs/pkgs/games/90secondportraits/default.nix b/nixpkgs/pkgs/games/90secondportraits/default.nix index f2be128fd998..0b0cea703662 100644 --- a/nixpkgs/pkgs/games/90secondportraits/default.nix +++ b/nixpkgs/pkgs/games/90secondportraits/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/alienarena/default.nix b/nixpkgs/pkgs/games/alienarena/default.nix index 628a521126f5..89c74d83b490 100644 --- a/nixpkgs/pkgs/games/alienarena/default.nix +++ b/nixpkgs/pkgs/games/alienarena/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "alienarena-7.65"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/andyetitmoves/default.nix b/nixpkgs/pkgs/games/andyetitmoves/default.nix index d4ff86c424b1..943f9eb881c5 100644 --- a/nixpkgs/pkgs/games/andyetitmoves/default.nix +++ b/nixpkgs/pkgs/games/andyetitmoves/default.nix @@ -4,7 +4,7 @@ let plainName = "andyetitmoves"; version = "1.2.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${plainName}-${version}"; src = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" diff --git a/nixpkgs/pkgs/games/arx-libertatis/default.nix b/nixpkgs/pkgs/games/arx-libertatis/default.nix index 5b1f240e7b5f..c224784e8f24 100644 --- a/nixpkgs/pkgs/games/arx-libertatis/default.nix +++ b/nixpkgs/pkgs/games/arx-libertatis/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arx-libertatis"; version = "2019-02-16"; diff --git a/nixpkgs/pkgs/games/blackshades/default.nix b/nixpkgs/pkgs/games/blackshades/default.nix index bf58b523e76e..a35b449f92fd 100644 --- a/nixpkgs/pkgs/games/blackshades/default.nix +++ b/nixpkgs/pkgs/games/blackshades/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "blackshades-svn-110"; src = fetchsvn { url = svn://svn.icculus.org/blackshades/trunk; diff --git a/nixpkgs/pkgs/games/cuyo/default.nix b/nixpkgs/pkgs/games/cuyo/default.nix index f4e5290df27b..24e45719f516 100644 --- a/nixpkgs/pkgs/games/cuyo/default.nix +++ b/nixpkgs/pkgs/games/cuyo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, SDL, SDL_mixer, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cuyo"; version = "2.1.0"; diff --git a/nixpkgs/pkgs/games/devilutionx/default.nix b/nixpkgs/pkgs/games/devilutionx/default.nix index 52d3bdd5b79f..117ebcc1ac18 100644 --- a/nixpkgs/pkgs/games/devilutionx/default.nix +++ b/nixpkgs/pkgs/games/devilutionx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2019-07-28"; pname = "devilutionx"; diff --git a/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix index 0b25af645cfa..71024f3d5c91 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -83,7 +83,7 @@ let fi ''; - dfhack = stdenv.mkDerivation rec { + dfhack = stdenv.mkDerivation { pname = "dfhack-base"; inherit version; diff --git a/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index e3005373b95f..6871a611784c 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -7,7 +7,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dwarf-therapist-${dwarf-therapist.version}"; wrapper = ./dwarf-therapist.in; diff --git a/nixpkgs/pkgs/games/dwarf-fortress/game.nix b/nixpkgs/pkgs/games/dwarf-fortress/game.nix index b5c80a0a56dc..291e32b6406c 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/game.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/game.nix @@ -18,12 +18,12 @@ let # Other srcs are avilable like 32-bit mac & win, but I have only # included the ones most likely to be needed by Nixpkgs users. platforms = { - "x86_64-linux" = "linux"; - "i686-linux" = "linux32"; - "x86_64-darwin" = "osx"; - "i686-darwin" = "osx32"; - "x86_64-cygwin" = "win"; - "i686-cygwin" = "win32"; + x86_64-linux = "linux"; + i686-linux = "linux32"; + x86_64-darwin = "osx"; + i686-darwin = "osx32"; + x86_64-cygwin = "win"; + i686-cygwin = "win32"; }; dfVersionTriple = splitString "." dfVersion; diff --git a/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix index e1f8e8abab80..e191d372704b 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix @@ -44,7 +44,7 @@ let in stdenvNoCC.mkDerivation rec { - name = "twbt-${version}"; + pname = "twbt"; version = release.twbtRelease; src = fetchurl { diff --git a/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix index 06bc6ca1fe51..31b21c5a4351 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -80,7 +80,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dwarf-fortress-${dwarf-fortress.dfVersion}"; dfInit = substituteAll { diff --git a/nixpkgs/pkgs/games/dxx-rebirth/full.nix b/nixpkgs/pkgs/games/dxx-rebirth/full.nix index 020a4593de24..7a1e690c39df 100644 --- a/nixpkgs/pkgs/games/dxx-rebirth/full.nix +++ b/nixpkgs/pkgs/games/dxx-rebirth/full.nix @@ -2,7 +2,7 @@ , dxx-rebirth, descent1-assets, descent2-assets }: let - generic = ver: assets: stdenv.mkDerivation rec { + generic = ver: assets: stdenv.mkDerivation { name = "d${toString ver}x-rebirth-full-${assets.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/games/empty-epsilon/default.nix b/nixpkgs/pkgs/games/empty-epsilon/default.nix index 18c83b8c5a4c..cee9be00a3ab 100644 --- a/nixpkgs/pkgs/games/empty-epsilon/default.nix +++ b/nixpkgs/pkgs/games/empty-epsilon/default.nix @@ -8,7 +8,7 @@ let version = "${major}.${minor}.${patch}"; - serious-proton = stdenv.mkDerivation rec { + serious-proton = stdenv.mkDerivation { pname = "serious-proton"; inherit version; @@ -34,7 +34,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "empty-epsilon"; inherit version; diff --git a/nixpkgs/pkgs/games/endless-sky/default.nix b/nixpkgs/pkgs/games/endless-sky/default.nix index a138b46f81bd..14bea8185c6f 100644 --- a/nixpkgs/pkgs/games/endless-sky/default.nix +++ b/nixpkgs/pkgs/games/endless-sky/default.nix @@ -6,7 +6,7 @@ let version = "0.9.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "endless-sky"; inherit version; diff --git a/nixpkgs/pkgs/games/freedroidrpg/default.nix b/nixpkgs/pkgs/games/freedroidrpg/default.nix index b269a5d12d6d..281691d283d7 100644 --- a/nixpkgs/pkgs/games/freedroidrpg/default.nix +++ b/nixpkgs/pkgs/games/freedroidrpg/default.nix @@ -2,7 +2,7 @@ let version = "0.16.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "freedroidrpg"; inherit version; diff --git a/nixpkgs/pkgs/games/frogatto/data.nix b/nixpkgs/pkgs/games/frogatto/data.nix index ec2cb9416661..6531d407d219 100644 --- a/nixpkgs/pkgs/games/frogatto/data.nix +++ b/nixpkgs/pkgs/games/frogatto/data.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "frogatto-data"; version = "unstable-2018-12-18"; diff --git a/nixpkgs/pkgs/games/frogatto/default.nix b/nixpkgs/pkgs/games/frogatto/default.nix index 51975c17a8ee..4c5f1af8a9be 100644 --- a/nixpkgs/pkgs/games/frogatto/default.nix +++ b/nixpkgs/pkgs/games/frogatto/default.nix @@ -15,7 +15,7 @@ let categories = "Application;Game;ArcadeGame;"; }; version = "unstable-2018-12-18"; -in buildEnv rec { +in buildEnv { name = "frogatto-${version}"; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/games/frogatto/engine.nix b/nixpkgs/pkgs/games/frogatto/engine.nix index 5a01d2512c42..5254ff25b025 100644 --- a/nixpkgs/pkgs/games/frogatto/engine.nix +++ b/nixpkgs/pkgs/games/frogatto/engine.nix @@ -2,7 +2,7 @@ , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf , glew, zlib, icu, pkgconfig, cairo, libvpx }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "anura-engine"; version = "unstable-2018-11-28"; diff --git a/nixpkgs/pkgs/games/gambatte/default.nix b/nixpkgs/pkgs/games/gambatte/default.nix index de4a89eac07f..6d8d14d8de0d 100644 --- a/nixpkgs/pkgs/games/gambatte/default.nix +++ b/nixpkgs/pkgs/games/gambatte/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, scons, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gambatte"; version = "2016-05-03"; diff --git a/nixpkgs/pkgs/games/gnome-hexgl/default.nix b/nixpkgs/pkgs/games/gnome-hexgl/default.nix index 7a720239182d..340dd20aaafe 100644 --- a/nixpkgs/pkgs/games/gnome-hexgl/default.nix +++ b/nixpkgs/pkgs/games/gnome-hexgl/default.nix @@ -9,7 +9,7 @@ , gtk3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-hexgl"; version = "unstable-2019-08-21"; diff --git a/nixpkgs/pkgs/games/gnuchess/default.nix b/nixpkgs/pkgs/games/gnuchess/default.nix index 62c5ee803047..43c60c667305 100644 --- a/nixpkgs/pkgs/games/gnuchess/default.nix +++ b/nixpkgs/pkgs/games/gnuchess/default.nix @@ -12,7 +12,7 @@ let flex ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (s) name version; src = fetchurl { inherit (s) url sha256; diff --git a/nixpkgs/pkgs/games/gscrabble/default.nix b/nixpkgs/pkgs/games/gscrabble/default.nix index fc73f89f66c0..f9dd851af8e9 100644 --- a/nixpkgs/pkgs/games/gscrabble/default.nix +++ b/nixpkgs/pkgs/games/gscrabble/default.nix @@ -2,7 +2,7 @@ , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection , python3Packages, gnome3, hicolor-icon-theme }: -buildPythonApplication rec { +buildPythonApplication { pname = "gscrabble"; version = "unstable-2019-03-11"; diff --git a/nixpkgs/pkgs/games/hawkthorne/default.nix b/nixpkgs/pkgs/games/hawkthorne/default.nix index 97aee425fd16..a770e452ae4c 100644 --- a/nixpkgs/pkgs/games/hawkthorne/default.nix +++ b/nixpkgs/pkgs/games/hawkthorne/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, love, curl, zip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.12.1"; pname = "hawkthorne"; diff --git a/nixpkgs/pkgs/games/hedgewars/default.nix b/nixpkgs/pkgs/games/hedgewars/default.nix index 7ef5c6a49b3e..b3764ea1efc8 100644 --- a/nixpkgs/pkgs/games/hedgewars/default.nix +++ b/nixpkgs/pkgs/games/hedgewars/default.nix @@ -9,7 +9,7 @@ let SHA entropy pkgs.zlib sandi regex-tdfa ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.0.0-beta1"; pname = "hedgewars"; src = fetchhg { diff --git a/nixpkgs/pkgs/games/instead/default.nix b/nixpkgs/pkgs/games/instead/default.nix index b0acd789afee..b25341da01d8 100644 --- a/nixpkgs/pkgs/games/instead/default.nix +++ b/nixpkgs/pkgs/games/instead/default.nix @@ -28,7 +28,7 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "instead-" + version; src = fetchurl { diff --git a/nixpkgs/pkgs/games/ja2-stracciatella/default.nix b/nixpkgs/pkgs/games/ja2-stracciatella/default.nix index 94c614598bfe..fa0720e51fd9 100644 --- a/nixpkgs/pkgs/games/ja2-stracciatella/default.nix +++ b/nixpkgs/pkgs/games/ja2-stracciatella/default.nix @@ -26,7 +26,7 @@ let doCheck = false; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ja2-stracciatella"; inherit src; inherit version; diff --git a/nixpkgs/pkgs/games/liberal-crime-squad/default.nix b/nixpkgs/pkgs/games/liberal-crime-squad/default.nix index 0e819278dc39..0811c01aa791 100644 --- a/nixpkgs/pkgs/games/liberal-crime-squad/default.nix +++ b/nixpkgs/pkgs/games/liberal-crime-squad/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2016-07-06"; pname = "liberal-crime-squad"; diff --git a/nixpkgs/pkgs/games/lincity/ng.nix b/nixpkgs/pkgs/games/lincity/ng.nix index cfc06e11e191..3ec508040e7a 100644 --- a/nixpkgs/pkgs/games/lincity/ng.nix +++ b/nixpkgs/pkgs/games/lincity/ng.nix @@ -3,7 +3,7 @@ , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lincity-ng"; version = "2.9beta.20170715"; diff --git a/nixpkgs/pkgs/games/linux-steam-integration/default.nix b/nixpkgs/pkgs/games/linux-steam-integration/default.nix index f57571b2a2c4..a3c9599e7b1d 100644 --- a/nixpkgs/pkgs/games/linux-steam-integration/default.nix +++ b/nixpkgs/pkgs/games/linux-steam-integration/default.nix @@ -4,7 +4,7 @@ let version = "0.7.3"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "linux-steam-integration"; inherit version; diff --git a/nixpkgs/pkgs/games/meritous/default.nix b/nixpkgs/pkgs/games/meritous/default.nix index 8b0808d8e8cc..4a37fc8f6767 100644 --- a/nixpkgs/pkgs/games/meritous/default.nix +++ b/nixpkgs/pkgs/games/meritous/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "meritous"; version = "1.4"; diff --git a/nixpkgs/pkgs/games/minecraft-server/default.nix b/nixpkgs/pkgs/games/minecraft-server/default.nix index 9ddae8b65bf3..2fde729e935e 100644 --- a/nixpkgs/pkgs/games/minecraft-server/default.nix +++ b/nixpkgs/pkgs/games/minecraft-server/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, jre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "minecraft-server"; version = "1.14.4"; diff --git a/nixpkgs/pkgs/games/mrrescue/default.nix b/nixpkgs/pkgs/games/mrrescue/default.nix index aa4a06bc7d2b..c75fbbb1ca92 100644 --- a/nixpkgs/pkgs/games/mrrescue/default.nix +++ b/nixpkgs/pkgs/games/mrrescue/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/mudlet/default.nix b/nixpkgs/pkgs/games/mudlet/default.nix index 4dcc7a6262f0..dc29c3d5f744 100644 --- a/nixpkgs/pkgs/games/mudlet/default.nix +++ b/nixpkgs/pkgs/games/mudlet/default.nix @@ -1,46 +1,62 @@ -{ fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell -, boost, lua5_1, luafilesystem, luazip, lrexlib-pcre, luasql-sqlite3, qmake }: +{ fetchFromGitHub, fetchpatch, stdenv, wrapQtAppsHook, pcre, pugixml, qtbase, qtmultimedia, qttools, yajl, libzip, hunspell +, boost, libGLU, lua, cmake, which, }: +let + luaEnv = lua.withPackages(ps: with ps; [ luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 ]); +in stdenv.mkDerivation rec { pname = "mudlet"; - version = "3.0.0-delta"; - - src = fetchurl { - url = "https://github.com/Mudlet/Mudlet/archive/Mudlet-${version}.tar.gz"; - sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7"; + version = "4.0.3"; + + src = fetchFromGitHub { + owner = "Mudlet"; + repo = "Mudlet"; + rev = "Mudlet-${version}"; + fetchSubmodules = true; + sha256 = "18bl4k0qgh47d9k5ipfvypfj1il678c0ws64a8adn8k21jajzkik"; }; - nativeBuildInputs = [ makeWrapper qmake ]; + patches = [ + ( fetchpatch { + url = "https://github.com/Mudlet/Mudlet/commit/3c8f12b6d757894d92ec2e2c9b12b91f69e8a3b6.patch"; + name = "hunspell-1.7"; + sha256 = "09qggls4pzpd8h9h10fbpfd7x3kr7fjp9axdwz98igpwy714n98j"; + }) + ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook qttools which ]; buildInputs = [ - unzip qtbase lua5_1 hunspell libzip yajl boost - luafilesystem luazip lrexlib-pcre luasql-sqlite3 + pcre pugixml qtbase qtmultimedia luaEnv libzip libGLU yajl boost hunspell ]; - preConfigure = "cd src"; + WITH_FONTS = "NO"; + WITH_UPDATER = "NO"; + + enableParallelBuilding = true; - installPhase = let - luaZipPath = "${luazip}/lib/lua/5.1/?.so"; - luaFileSystemPath = "${luafilesystem}/lib/lua/5.1/?.so"; - lrexlibPath = "${lrexlib-pcre}/lib/lua/5.1/?.so"; - luasqlitePath = "${luasql-sqlite3}/lib/lua/5.1/?.so"; - in '' + installPhase = '' mkdir -pv $out/bin - cp mudlet $out - cp -r mudlet-lua $out + cp src/mudlet $out + mkdir -pv $out/share/mudlet + cp -r ../src/mudlet-lua/lua $out/share/mudlet/ - makeWrapper $out/mudlet $out/bin/mudlet \ - --set LUA_CPATH "${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}" \ + mkdir -pv $out/share/applications + cp ../mudlet.desktop $out/share/applications/ + + mkdir -pv $out/share/pixmaps + cp -r ../mudlet.png $out/share/pixmaps/ + + makeQtWrapper $out/mudlet $out/bin/mudlet \ + --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH : "$NIX_LUA_PATH" \ --run "cd $out"; ''; - patches = [ ./libs.patch ]; - - meta = { + meta = with stdenv.lib; { description = "Crossplatform mud client"; homepage = http://mudlet.org/; - maintainers = [ stdenv.lib.maintainers.wyvie ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - broken = true; + maintainers = [ maintainers.wyvie maintainers.pstn ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/games/mudlet/libs.patch b/nixpkgs/pkgs/games/mudlet/libs.patch deleted file mode 100644 index 45b693828ff2..000000000000 --- a/nixpkgs/pkgs/games/mudlet/libs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/src.pro 2014-09-05 12:51:09.000000000 +0400 -+++ b/src/src.pro 2014-09-15 16:54:34.812560065 +0400 -@@ -85,8 +85,8 @@ - # Again according to FHS /usr/local/share/games is the corresponding place for locally built games documentation: - isEmpty( DOCDIR ) DOCDIR = $${DATAROOTDIR}/doc/mudlet - LIBS += -lpcre \ -- -llua5.1 \ -- -lhunspell \ -+ -llua \ -+ -lhunspell-1.6 \ - -L/usr/local/lib/ \ - -lyajl \ - -lGLU \ diff --git a/nixpkgs/pkgs/games/newtonwars/default.nix b/nixpkgs/pkgs/games/newtonwars/default.nix index c465b413db12..a0ae03cefb75 100644 --- a/nixpkgs/pkgs/games/newtonwars/default.nix +++ b/nixpkgs/pkgs/games/newtonwars/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "newtonwars"; version = "20150609"; diff --git a/nixpkgs/pkgs/games/njam/default.nix b/nixpkgs/pkgs/games/njam/default.nix index bcbbc9e7756b..6f700ad32045 100644 --- a/nixpkgs/pkgs/games/njam/default.nix +++ b/nixpkgs/pkgs/games/njam/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "njam-1.25"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/odamex/default.nix b/nixpkgs/pkgs/games/odamex/default.nix index c70744ea2991..6c6bb9f78bab 100644 --- a/nixpkgs/pkgs/games/odamex/default.nix +++ b/nixpkgs/pkgs/games/odamex/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "odamex-0.7.0"; src = fetchurl { url = mirror://sourceforge/odamex/odamex-src-0.7.0.tar.bz2; diff --git a/nixpkgs/pkgs/games/onscripter-en/default.nix b/nixpkgs/pkgs/games/onscripter-en/default.nix index 921ed8a72f33..618e78553a54 100644 --- a/nixpkgs/pkgs/games/onscripter-en/default.nix +++ b/nixpkgs/pkgs/games/onscripter-en/default.nix @@ -3,7 +3,7 @@ , SDL, SDL_image, SDL_mixer, SDL_ttf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "onscripter-en-20110930"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/openarena/default.nix b/nixpkgs/pkgs/games/openarena/default.nix index b39519193e77..141e0151cfbd 100644 --- a/nixpkgs/pkgs/games/openarena/default.nix +++ b/nixpkgs/pkgs/games/openarena/default.nix @@ -1,6 +1,6 @@ { fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openarena"; version = "0.8.8"; diff --git a/nixpkgs/pkgs/games/openjk/default.nix b/nixpkgs/pkgs/games/openjk/default.nix index 1da23a98f71f..9109d2667c3f 100644 --- a/nixpkgs/pkgs/games/openjk/default.nix +++ b/nixpkgs/pkgs/games/openjk/default.nix @@ -19,7 +19,7 @@ let genericName = "Jedi Academy"; categories = "Game;"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "OpenJK"; version = "2019-06-24"; diff --git a/nixpkgs/pkgs/games/openrct2/default.nix b/nixpkgs/pkgs/games/openrct2/default.nix index e7636e8320e7..d546ff8481e4 100644 --- a/nixpkgs/pkgs/games/openrct2/default.nix +++ b/nixpkgs/pkgs/games/openrct2/default.nix @@ -28,7 +28,7 @@ let sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name; src = openrct2-src; diff --git a/nixpkgs/pkgs/games/openrw/default.nix b/nixpkgs/pkgs/games/openrw/default.nix index fab4de64ee2c..f35077c084aa 100644 --- a/nixpkgs/pkgs/games/openrw/default.nix +++ b/nixpkgs/pkgs/games/openrw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal , SDL2, boost, ffmpeg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2017-09-17"; pname = "openrw"; diff --git a/nixpkgs/pkgs/games/orthorobot/default.nix b/nixpkgs/pkgs/games/orthorobot/default.nix index 377dc8652292..461d70085775 100644 --- a/nixpkgs/pkgs/games/orthorobot/default.nix +++ b/nixpkgs/pkgs/games/orthorobot/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/pacvim/default.nix b/nixpkgs/pkgs/games/pacvim/default.nix index a0169debfef8..d7805ad66fb5 100644 --- a/nixpkgs/pkgs/games/pacvim/default.nix +++ b/nixpkgs/pkgs/games/pacvim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pacvim"; version = "2018-05-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/pingus/default.nix b/nixpkgs/pkgs/games/pingus/default.nix index 6beb68b97abc..dc47e5aa58e8 100644 --- a/nixpkgs/pkgs/games/pingus/default.nix +++ b/nixpkgs/pkgs/games/pingus/default.nix @@ -2,7 +2,7 @@ , pkgconfig, libGLU_combined}: let s = # Generated upstream information - rec { + { baseName="pingus"; version="0.7.6"; name="pingus-0.7.6"; @@ -11,7 +11,7 @@ let sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (s) name version; nativeBuildInputs = [ pkgconfig ]; buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU_combined]; diff --git a/nixpkgs/pkgs/games/qgo/default.nix b/nixpkgs/pkgs/games/qgo/default.nix index 924292181789..610be7efdce9 100644 --- a/nixpkgs/pkgs/games/qgo/default.nix +++ b/nixpkgs/pkgs/games/qgo/default.nix @@ -7,7 +7,7 @@ , qttranslations }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qgo"; version = "unstable-2017-12-18"; diff --git a/nixpkgs/pkgs/games/quake2/yquake2/default.nix b/nixpkgs/pkgs/games/quake2/yquake2/default.nix index 0602aace319a..c831163be970 100644 --- a/nixpkgs/pkgs/games/quake2/yquake2/default.nix +++ b/nixpkgs/pkgs/games/quake2/yquake2/default.nix @@ -66,7 +66,7 @@ let }; }; -in rec { +in { inherit yquake2; yquake2-ctf = wrapper { diff --git a/nixpkgs/pkgs/games/quake3/ioquake/default.nix b/nixpkgs/pkgs/games/quake3/ioquake/default.nix index 7f0fb6fd0623..a592455486b2 100644 --- a/nixpkgs/pkgs/games/quake3/ioquake/default.nix +++ b/nixpkgs/pkgs/games/quake3/ioquake/default.nix @@ -2,7 +2,7 @@ , curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ioquake3-git"; version = "2019-05-29"; diff --git a/nixpkgs/pkgs/games/racer/default.nix b/nixpkgs/pkgs/games/racer/default.nix index d11315cd6dfa..1347f88cc2cb 100644 --- a/nixpkgs/pkgs/games/racer/default.nix +++ b/nixpkgs/pkgs/games/racer/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, allegro, libjpeg, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "racer-1.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { diff --git a/nixpkgs/pkgs/games/riko4/default.nix b/nixpkgs/pkgs/games/riko4/default.nix index 780025f52226..1ddca346fbb7 100644 --- a/nixpkgs/pkgs/games/riko4/default.nix +++ b/nixpkgs/pkgs/games/riko4/default.nix @@ -4,7 +4,7 @@ let # Newer versions of sdl-gpu don't work with Riko4 (corrupted graphics), # and this library does not have a proper release version, so let the # derivation for this stay next to the Riko4 derivation for now. - sdl-gpu = stdenv.mkDerivation rec { + sdl-gpu = stdenv.mkDerivation { pname = "sdl-gpu"; version = "2018-11-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/rimshot/default.nix b/nixpkgs/pkgs/games/rimshot/default.nix index ac6fdee1f6b5..2813bbf88692 100644 --- a/nixpkgs/pkgs/games/rimshot/default.nix +++ b/nixpkgs/pkgs/games/rimshot/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/scid/default.nix b/nixpkgs/pkgs/games/scid/default.nix index 040902ffd73d..048a8fdc09b4 100644 --- a/nixpkgs/pkgs/games/scid/default.nix +++ b/nixpkgs/pkgs/games/scid/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "scid"; version = "4.3"; diff --git a/nixpkgs/pkgs/games/sienna/default.nix b/nixpkgs/pkgs/games/sienna/default.nix index 58ed85c79fdb..aa96a5a8ae50 100644 --- a/nixpkgs/pkgs/games/sienna/default.nix +++ b/nixpkgs/pkgs/games/sienna/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/simutrans/default.nix b/nixpkgs/pkgs/games/simutrans/default.nix index e6889731619f..d8ab792bb62a 100644 --- a/nixpkgs/pkgs/games/simutrans/default.nix +++ b/nixpkgs/pkgs/games/simutrans/default.nix @@ -106,7 +106,7 @@ let passthru.binaries = binaries; }; - binaries = stdenv.mkDerivation rec { + binaries = stdenv.mkDerivation { pname = "simutrans"; inherit version; diff --git a/nixpkgs/pkgs/games/snipes/default.nix b/nixpkgs/pkgs/games/snipes/default.nix index 1334f555bbde..e035bc436cc1 100644 --- a/nixpkgs/pkgs/games/snipes/default.nix +++ b/nixpkgs/pkgs/games/snipes/default.nix @@ -6,7 +6,7 @@ let sha256 = "06n8gq18js0bv4svx84ljzhs9zmi81wy0zqcqj3b4g0rsrkr20a7"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "snipes"; version = "20180930"; diff --git a/nixpkgs/pkgs/games/steam/runtime-wrapped.nix b/nixpkgs/pkgs/games/steam/runtime-wrapped.nix index a851b5b8d978..8e4f5b866bbc 100644 --- a/nixpkgs/pkgs/games/steam/runtime-wrapped.nix +++ b/nixpkgs/pkgs/games/steam/runtime-wrapped.nix @@ -26,7 +26,7 @@ let libs = [ "lib/${gnuArch}" "lib" "usr/lib/${gnuArch}" "usr/lib" ]; bins = [ "bin" "usr/bin" ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "steam-runtime-wrapped"; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/games/steam/steam.nix b/nixpkgs/pkgs/games/steam/steam.nix index 1d1912d97a15..0276122655fe 100644 --- a/nixpkgs/pkgs/games/steam/steam.nix +++ b/nixpkgs/pkgs/games/steam/steam.nix @@ -4,7 +4,7 @@ let traceLog = "/tmp/steam-trace-dependencies.log"; version = "1.0.0.61"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "steam-original"; inherit version; diff --git a/nixpkgs/pkgs/games/steam/steamcmd.nix b/nixpkgs/pkgs/games/steam/steamcmd.nix index be865d20f2f4..a38122702f25 100644 --- a/nixpkgs/pkgs/games/steam/steamcmd.nix +++ b/nixpkgs/pkgs/games/steam/steamcmd.nix @@ -2,7 +2,7 @@ , steamRoot ? "~/.local/share/Steam" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "steamcmd"; version = "20180104"; # According to steamcmd_linux.tar.gz mtime diff --git a/nixpkgs/pkgs/games/ue4demos/default.nix b/nixpkgs/pkgs/games/ue4demos/default.nix index b9cc8a6cd6dd..2020066ee651 100644 --- a/nixpkgs/pkgs/games/ue4demos/default.nix +++ b/nixpkgs/pkgs/games/ue4demos/default.nix @@ -57,7 +57,7 @@ let }; in { - tappy_chicken = buildDemo rec { + tappy_chicken = buildDemo { name = "ue4demos-tappy_chicken"; src = fetchurl { urls = urls "tappy_chicken.zip"; @@ -65,7 +65,7 @@ in { }; }; - swing_ninja = buildDemo rec { + swing_ninja = buildDemo { name = "ue4demos-swing_ninja"; src = fetchurl { urls = urls "swing_ninja.zip"; @@ -73,7 +73,7 @@ in { }; }; - card_game = buildDemo rec { + card_game = buildDemo { name = "ue4demos-card_game"; src = fetchurl { urls = urls "card_game.zip"; @@ -81,7 +81,7 @@ in { }; }; - vehicle_game = buildDemo rec { + vehicle_game = buildDemo { name = "ue4demos-vehicle_game"; src = fetchurl { urls = urls "vehicle_game.zip"; @@ -89,7 +89,7 @@ in { }; }; - shooter_game = buildDemo rec { + shooter_game = buildDemo { name = "ue4demos-shooter_game"; src = fetchurl { urls = urls "shooter_game.zip"; @@ -97,7 +97,7 @@ in { }; }; - strategy_game = buildDemo rec { + strategy_game = buildDemo { name = "ue4demos-strategy_game"; src = fetchurl { urls = urls "strategy_game.zip"; @@ -105,7 +105,7 @@ in { }; }; - black_jack = buildDemo rec { + black_jack = buildDemo { name = "ue4demos-black_jack"; src = fetchurl { urls = urls "black_jack.zip"; @@ -113,7 +113,7 @@ in { }; }; - landscape_mountains = buildDemo rec { + landscape_mountains = buildDemo { name = "ue4demos-landscape_mountains"; src = fetchurl { urls = urls "landscape_mountains.zip"; @@ -121,7 +121,7 @@ in { }; }; - matinee_demo = buildDemo rec { + matinee_demo = buildDemo { name = "ue4demos-matinee_demo"; src = fetchurl { urls = urls "matinee_demo.zip"; @@ -129,7 +129,7 @@ in { }; }; - elemental_demo = buildDemo rec { + elemental_demo = buildDemo { name = "ue4demos-elemental_demo"; src = fetchurl { urls = urls "elemental_demo.zip"; @@ -137,7 +137,7 @@ in { }; }; - effects_cave_demo = buildDemo rec { + effects_cave_demo = buildDemo { name = "ue4demos-effects_cave_demo"; src = fetchurl { urls = urls "effects_cave_demo.zip"; @@ -145,7 +145,7 @@ in { }; }; - realistic_rendering = buildDemo rec { + realistic_rendering = buildDemo { name = "ue4demos-realistic_rendering"; src = fetchurl { urls = urls "realistic_rendering_demo.zip"; @@ -153,7 +153,7 @@ in { }; }; - reflections_subway = buildDemo rec { + reflections_subway = buildDemo { name = "ue4demos-reflections_subway"; src = fetchurl { urls = urls "reflections_subway_demo.zip"; @@ -161,7 +161,7 @@ in { }; }; - scifi_hallway_demo = buildDemo rec { + scifi_hallway_demo = buildDemo { name = "ue4demos-scifi_hallway_demo"; src = fetchurl { urls = urls "sci-fi_hallway_demo.zip"; @@ -169,7 +169,7 @@ in { }; }; - mobile_temple_demo = buildDemo rec { + mobile_temple_demo = buildDemo { name = "ue4demos-mobile_temple_demo"; src = fetchurl { urls = urls "mobile_temple_demo.zip"; @@ -177,7 +177,7 @@ in { }; }; - stylized_demo = buildDemo rec { + stylized_demo = buildDemo { name = "ue4demos-stylized_demo"; src = fetchurl { urls = urls "stylized_demo.zip"; @@ -185,7 +185,7 @@ in { }; }; - blueprint_examples_demo = buildDemo rec { + blueprint_examples_demo = buildDemo { name = "ue4demos-blueprint_examples_demo"; src = fetchurl { urls = urls "blueprint_examples_demo.zip"; diff --git a/nixpkgs/pkgs/games/ultimatestunts/default.nix b/nixpkgs/pkgs/games/ultimatestunts/default.nix index 63da46854857..a7ad366aa195 100644 --- a/nixpkgs/pkgs/games/ultimatestunts/default.nix +++ b/nixpkgs/pkgs/games/ultimatestunts/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, SDL, libGLU_combined, SDL_image, freealut, openal, libvorbis, pkgconfig}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ultimate-stunts-0.7.6.1"; src = fetchurl { url = mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz; diff --git a/nixpkgs/pkgs/games/vapor/default.nix b/nixpkgs/pkgs/games/vapor/default.nix index 0209fd83b1c6..7d965dee1c70 100644 --- a/nixpkgs/pkgs/games/vapor/default.nix +++ b/nixpkgs/pkgs/games/vapor/default.nix @@ -22,7 +22,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/warmux/default.nix b/nixpkgs/pkgs/games/warmux/default.nix index a861e3725a2d..c3896f6cf71e 100644 --- a/nixpkgs/pkgs/games/warmux/default.nix +++ b/nixpkgs/pkgs/games/warmux/default.nix @@ -4,7 +4,7 @@ , gettext, intltool, libtool, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "warmux"; version = "unstable-2017-10-20"; diff --git a/nixpkgs/pkgs/games/xjump/default.nix b/nixpkgs/pkgs/games/xjump/default.nix index dd59ebbedd94..afac2de9fcec 100644 --- a/nixpkgs/pkgs/games/xjump/default.nix +++ b/nixpkgs/pkgs/games/xjump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xjump"; version = "2.9.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/zod/default.nix b/nixpkgs/pkgs/games/zod/default.nix index da2f256aeb71..c14eda2968e0 100644 --- a/nixpkgs/pkgs/games/zod/default.nix +++ b/nixpkgs/pkgs/games/zod/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer , mysql, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zod-engine-2011-03-18"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix index 01c35d99ae7e..5ff131dad9dd 100644 --- a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix +++ b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix @@ -8,7 +8,7 @@ let , extraMeta ? {} , version ? "2.1" , ... } @ args: - stdenv.mkDerivation (rec { + stdenv.mkDerivation ({ name = "arm-trusted-firmware-${platform}-${version}"; inherit version; @@ -53,7 +53,7 @@ let } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); -in rec { +in { inherit buildArmTrustedFirmware; armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { diff --git a/nixpkgs/pkgs/misc/base16-builder/node-packages.nix b/nixpkgs/pkgs/misc/base16-builder/node-packages.nix index e7b4f81f7e04..735ea6232471 100644 --- a/nixpkgs/pkgs/misc/base16-builder/node-packages.nix +++ b/nixpkgs/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix b/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix index 9c5ef1d02836..b6219e1c749e 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix @@ -13,7 +13,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "canon-cups-ufr2-2.90"; src = src_canon; diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix index abd50850b182..13e3013267bf 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool , withDebug ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cnijfilter2"; version = "5.30"; diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index 15e3a1d97a90..a09311a8292d 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -6,7 +6,7 @@ /* this derivation is basically just a transcription of the rpm .spec file included in the tarball */ -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cnijfilter"; /* important note about versions: cnijfilter packages seem to use diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index ba8cffc0e654..8866b425ca8f 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -11,7 +11,7 @@ let arch = else if stdenv.hostPlatform.system == "i686-linux" then "32" else throw "Unsupported system ${stdenv.hostPlatform.system}"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "cnijfilter"; /* important note about versions: cnijfilter packages seem to use diff --git a/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix b/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix index a2fdd1abc192..ad8b0089a871 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cups-toshiba-estudio"; version = "7.89"; diff --git a/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix b/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix index 21a276f9d142..cd4c049e67f7 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix @@ -9,7 +9,7 @@ let libPath = lib.makeLibraryPath [ cups ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cups-kyocera"; version = "1.1203"; diff --git a/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix b/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix index b70b5daa7662..87a023af1ca7 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, cups}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cups-zj-58"; version = "2018-02-22"; diff --git a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index a232552712d6..5c9db63a63d9 100644 --- a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -27,29 +27,22 @@ in let plugins = { v330 = stdenv.mkDerivation rec { name = "iscan-v330-bundle"; - version = "1.0.1"; - pluginVersion = "0.2.0"; + version = "2.30.4"; src = fetchurl { url = "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"; - sha256 = "f6fa455f04cdfbc3d38526573260746e9546830de93ba182d0365f557d2f7df9"; + sha256 = "16iq5gmfcgkvcx5hixggxgb8lwin5gjdhnq0zabgpfqg11n2w21q"; }; - buildInputs = [ patchelf rpm ]; + nativeBuildInputs = [ autoPatchelfHook rpm ]; installPhase = '' - ${rpm}/bin/rpm2cpio "plugins/esci-interpreter-perfection-v330-${pluginVersion}-1.x86_64.rpm" | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv mkdir $out{,/share,/lib} cp -r ./usr/share/{iscan-data,esci}/ $out/share/ cp -r ./usr/lib64/esci $out/lib ''; - preFixup = '' - lib=$out/lib/esci/libesci-interpreter-perfection-v330.so - rpath=${gcc.cc.lib}/lib/ - patchelf --set-rpath $rpath $lib - ''; - passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" @@ -60,28 +53,22 @@ let plugins = { }; x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; - version = "1.0.1"; - pluginVersion = "2.1.2-1"; + version = "2.30.4"; - nativeBuildInputs = [ patchelf rpm ]; + nativeBuildInputs = [ autoPatchelfHook rpm ]; src = fetchurl { url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"; - sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r"; + sha256 = "1cz4z3wz216s77z185m665jcgdslil5gn4dsi118nv1fm17z3jik"; }; installPhase = '' cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv mkdir $out cp -r usr/share $out cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci ''; - preFixup = '' - lib=$out/lib/esci/libesint7C.so - rpath=${gcc.cc.lib}/lib/ - patchelf --set-rpath $rpath $lib - ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" @@ -92,26 +79,22 @@ let plugins = { }; f720 = stdenv.mkDerivation rec { pname = "iscan-gt-f720-bundle"; - version = "1.0.1"; - pluginVersion = "0.1.1-2"; + version = "2.30.4"; - buildInputs = [ patchelf ]; + nativeBuildInputs= [ autoPatchelfHook ]; + buildInputs = [ gcc.cc.lib ]; src = fetchurl { url = "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"; - sha256 = "0dvikq5ad6wid3lxw1amar8lsbr50g39g6zlmcjxdcsg0wb1qspp"; + sha256 = "12rivh00n9mhagy5yjl1m0bv7ypbig6brqkxm0a12xy0mjq7yv8y"; }; installPhase = '' cd plugins - ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv mkdir $out cp -r usr/share $out cp -r usr/lib64 $out/lib ''; - preFixup = '' - lib=$out/lib/esci/libesci-interpreter-gt-f720.so - rpath=${gcc.cc.lib}/lib/ - patchelf --set-rpath $rpath $lib - ''; + passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin" @@ -123,32 +106,24 @@ let plugins = { }; s80 = stdenv.mkDerivation rec { pname = "iscan-gt-s80-bundle"; - version = "1.0.1"; - esciPluginVersion = "0.2.1-1"; - esdipPluginVersion = "1.0.0-5"; + version = "2.30.4"; - buildInputs = [ patchelf ]; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ gcc.cc.lib libtool ]; src = fetchurl { url = "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"; - sha256 = "14j11znx5ga2ykpyg6kjg7lbrddyr9pwxrsa82dmdishd1j7zji9"; + sha256 = "1ran75zsxcdci00jakngkz6p9lj4q483hjapmf80p68rzhpmdr5y"; }; installPhase = '' cd plugins - ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-${esciPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv - ${rpm}/bin/rpm2cpio iscan-plugin-esdip-${esdipPluginVersion}.ltdl7.x86_64.rpm | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv mkdir $out cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci ''; - preFixup = '' - rpath=${gcc.cc.lib}/lib/ - patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s80.so - patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s50.so - patchelf --set-rpath $rpath $out/lib/iscan/esdip - patchelf --set-rpath $rpath $out/lib/iscan/libesdtr.so.0 - patchelf --set-rpath $rpath $out/lib/iscan/libesdtr2.so.0 - ''; + passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" @@ -163,19 +138,19 @@ let plugins = { }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; - version = "1.0.0"; - ntPluginVersion = "1.1.1-1"; + # for the version, look for the driver of XP-750 in the search page + version = "2.30.4"; buildInputs = [ stdenv.cc.cc.lib ]; nativeBuildInputs = [ autoPatchelfHook ]; src = fetchurl { url = "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"; - sha256 = "1k3dmv4ml21k6mafvcvgfymb1acpcdxpvyrbfh2yf07jzmn5if4f"; + sha256 = "1l0y4dy88y91jdq66pxrxqmiwsxwy0rd7x4bh0cw08r4iyhjqprz"; }; installPhase = '' cd plugins - ${rpm}/bin/rpm2cpio iscan-network-nt-${ntPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv mkdir $out cp -r usr/share $out @@ -201,11 +176,11 @@ let fwdir = symlinkJoin { in let iscan-data = stdenv.mkDerivation rec { pname = "iscan-data"; - version = "1.39.0-1"; + version = "1.39.1-2"; src = fetchurl { url = "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz"; - sha256 = "0pvm67gqyvzhnv5qyfbaz802l4sbgvaf0zb8wz60k1wcasb99vv1"; + sha256 = "04zrvbnxf1k6zinrd13hwnbzscc3qhmwlvx3k2jhjys2lginw7w4"; }; buildInputs = [ @@ -217,11 +192,11 @@ let iscan-data = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { pname = "iscan"; - version = "2.30.3-1"; + version = "2.30.4-2"; src = fetchurl { url = "http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz"; - sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li"; + sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr"; }; nativeBuildInputs = [ pkgconfig ]; @@ -243,7 +218,7 @@ stdenv.mkDerivation rec { ]; patchFlags = "-p0"; - configureFlags = [ "--disable-static" "--enable-dependency-reduction" "--disable-frontend"]; + configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; postConfigure = '' echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h diff --git a/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix b/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix index c65c13e886ff..3d6fb8f081ab 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cups }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "epson-escpr"; version = "1.6.16"; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix b/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix index ebea49d9540a..779325c99b0b 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix @@ -28,14 +28,14 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - "aarch64-linux" = "arm64"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; + aarch64-linux = "arm64"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix b/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix index 68220392fd00..d95eb85168e2 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix @@ -30,14 +30,14 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - "aarch64-linux" = "arm64"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; + aarch64-linux = "arm64"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/nixpkgs/pkgs/misc/drivers/hplip/default.nix index 851aa9f3f882..978fd9b9e039 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -30,13 +30,13 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" ]; diff --git a/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix b/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix index fb6b4956ef17..2dd32a93219d 100644 --- a/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix +++ b/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, udev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "moltengamepad-git"; version = "2016-05-04"; diff --git a/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix index 366535b51c65..4b19932450ec 100644 --- a/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix +++ b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix @@ -4,7 +4,7 @@ with python3Packages; -buildPythonApplication rec { +buildPythonApplication { pname = "steamcontroller"; version = "2017-08-11"; diff --git a/nixpkgs/pkgs/misc/emulators/blastem/default.nix b/nixpkgs/pkgs/misc/emulators/blastem/default.nix index 88e8556ec6c3..39a7e38e0346 100644 --- a/nixpkgs/pkgs/misc/emulators/blastem/default.nix +++ b/nixpkgs/pkgs/misc/emulators/blastem/default.nix @@ -2,7 +2,7 @@ let vasm = - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "vasm"; version = "1.8c"; src = fetchFromGitHub { @@ -18,7 +18,7 @@ let ''; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "blastem"; version = "0.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix index efa1a881f4ab..d8717b46eef4 100644 --- a/nixpkgs/pkgs/misc/emulators/citra/default.nix +++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "citra"; version = "2019-05-25"; diff --git a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix index 7312ad41ada5..d8f5f1cbdb03 100644 --- a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix +++ b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen , freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "emulationstation"; version = "2.0.1a"; diff --git a/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix b/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix index 418d6440b694..da53b4f8c557 100644 --- a/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix +++ b/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ]; - # Work around build failures on recent GTK+. + # Work around build failures on recent GTK. # See http://ubuntuforums.org/showthread.php?p=10535837 NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; diff --git a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix index c2494d702708..da6a7c8bf2f3 100644 --- a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix +++ b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix @@ -3,7 +3,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "kega-fusion"; version = "3.63x"; diff --git a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix index 8a95d6f28837..6ac6f93750e5 100644 --- a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix @@ -6,7 +6,7 @@ , freetype, tcl, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openmsx"; version = "git-2017-11-02"; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix index 3f20390fba73..fbde2ff54c9e 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix @@ -67,7 +67,7 @@ in with stdenv.lib.licenses; buildPhase = "make"; }; - beetle-pce-fast = let der = (mkLibRetroCore rec { + beetle-pce-fast = let der = (mkLibRetroCore { core = "mednafen-pce-fast"; src = fetchRetro { repo = "beetle-pce-fast-libretro"; @@ -81,7 +81,7 @@ in with stdenv.lib.licenses; name = "beetle-pce-fast-${der.version}"; }; - beetle-psx = let der = (mkLibRetroCore rec { + beetle-psx = let der = (mkLibRetroCore { core = "mednafen-psx"; src = fetchRetro { repo = "beetle-psx-libretro"; @@ -95,7 +95,7 @@ in with stdenv.lib.licenses; name = "beetle-psx-${der.version}"; }; - beetle-saturn = let der = (mkLibRetroCore rec { + beetle-saturn = let der = (mkLibRetroCore { core = "mednafen-saturn"; src = fetchRetro { repo = "beetle-saturn-libretro"; @@ -110,7 +110,7 @@ in with stdenv.lib.licenses; meta.platforms = [ "x86_64-linux" ]; }; - bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec { + bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore { core = bname + "-accuracy"; src = fetchRetro { repo = bname; @@ -204,7 +204,7 @@ in with stdenv.lib.licenses; license = gpl2; }; - genesis-plus-gx = mkLibRetroCore rec { + genesis-plus-gx = mkLibRetroCore { core = "genesis-plus-gx"; src = fetchRetro { repo = "Genesis-Plus-GX"; @@ -215,7 +215,7 @@ in with stdenv.lib.licenses; license = "Non-commercial"; }; - higan-sfc = (mkLibRetroCore rec { + higan-sfc = (mkLibRetroCore { core = "higan-sfc"; src = fetchFromGitLab { owner = "higan"; @@ -346,7 +346,7 @@ in with stdenv.lib.licenses; buildPhase = "make"; }; - quicknes = (mkLibRetroCore rec { + quicknes = (mkLibRetroCore { core = "quicknes"; src = fetchRetro { repo = "QuickNES_Core"; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 8bdc79f2d8ec..d751c4f7fc43 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -17,7 +17,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kodi-retroarch-advanced-launchers"; version = "0.2"; diff --git a/nixpkgs/pkgs/misc/emulators/retrofe/default.nix b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix index 25af4f8d50a7..44571de3489d 100644 --- a/nixpkgs/pkgs/misc/emulators/retrofe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix @@ -2,7 +2,7 @@ , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "retrofe"; version = "0.6.169"; diff --git a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix index ae1b1bf6bda2..674222dc3555 100644 --- a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix +++ b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix @@ -9,7 +9,7 @@ let majorVersion = "0.0.6"; gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; diff --git a/nixpkgs/pkgs/misc/gnash/default.nix b/nixpkgs/pkgs/misc/gnash/default.nix index 0f2abedd3b53..e866a1937d69 100644 --- a/nixpkgs/pkgs/misc/gnash/default.nix +++ b/nixpkgs/pkgs/misc/gnash/default.nix @@ -64,7 +64,7 @@ assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled" assert length renderers == 0 -> throw "at least one renderer must be enabled"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnash"; version = "0.8.11-2019-30-01"; diff --git a/nixpkgs/pkgs/misc/gnuk/default.nix b/nixpkgs/pkgs/misc/gnuk/default.nix index f3d5450c94ba..4597fa40390d 100644 --- a/nixpkgs/pkgs/misc/gnuk/default.nix +++ b/nixpkgs/pkgs/misc/gnuk/default.nix @@ -1,6 +1,6 @@ { callPackage, fetchgit, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.0.4"; src = fetchgit { diff --git a/nixpkgs/pkgs/misc/logging/beats/5.x.nix b/nixpkgs/pkgs/misc/logging/beats/5.x.nix deleted file mode 100644 index fb8bb5a85c8b..000000000000 --- a/nixpkgs/pkgs/misc/logging/beats/5.x.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchFromGitHub, elk5Version, buildGoPackage, libpcap }: - -let beat = package : extraArgs : buildGoPackage (rec { - name = "${package}-${version}"; - version = elk5Version; - - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "0sslcwjdf7zb9xj2c98jid3rb09l96m22k3af48gppimxg1lkh9b"; - }; - - goPackagePath = "github.com/elastic/beats"; - - subPackages = [ package ]; - - meta = with stdenv.lib; { - homepage = https://www.elastic.co/products/beats; - license = licenses.asl20; - maintainers = with maintainers; [ fadenb basvandijk ]; - platforms = platforms.linux; - }; - } // extraArgs); -in { - filebeat5 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat5 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat5 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; - packetbeat5 = beat "packetbeat" { - buildInputs = [ libpcap ]; - meta.description = "Network packet analyzer that ships data to Elasticsearch"; - meta.longDescription = '' - Packetbeat is an open source network packet analyzer that ships the - data to Elasticsearch. - - Think of it like a distributed real-time Wireshark with a lot more - analytics features. The Packetbeat shippers sniff the traffic between - your application processes, parse on the fly protocols like HTTP, MySQL, - PostgreSQL, Redis or Thrift and correlate the messages into transactions. - ''; - }; -} diff --git a/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix index 2f7e38692eb1..fe1f655246ef 100644 --- a/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0if08dxibdnqpsxs8f6hvw147j0j8bavhcm11scn28j9id65absq"; + sha256 = "0jkiz5dfdi9zsji04ipcmcj7pml9294v455y7s2c22k24gyzbaw8"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/nixpkgs/pkgs/misc/logging/beats/7.x.nix index 12e08dfeec69..7d0feef38682 100644 --- a/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "1ca6a4zm062jpqwhmd8ivvzha1cvrw7mg5342vnmn99xdlr1pk9j"; + sha256 = "0715fgqw6mqms4zld8wyf6appvvpfb1hglcmcn852c66a8zwr2r2"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/nixpkgs/pkgs/misc/mnemonicode/default.nix b/nixpkgs/pkgs/misc/mnemonicode/default.nix index 06a6a7e65505..ec0dd0b1fd52 100644 --- a/nixpkgs/pkgs/misc/mnemonicode/default.nix +++ b/nixpkgs/pkgs/misc/mnemonicode/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mnemonicode"; version = "2015-11-30"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/screensavers/physlock/default.nix b/nixpkgs/pkgs/misc/screensavers/physlock/default.nix index 5cfddaaea571..f69b0794ce3a 100644 --- a/nixpkgs/pkgs/misc/screensavers/physlock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/physlock/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pam, systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "11-dev"; pname = "physlock"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index c3cfbaf23b3f..c08b16a0a1d3 100644 --- a/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { curlOpts = "--user-agent 'Mozilla/5.0'"; }; - # Optionally, it can use GTK+. + # Optionally, it can use GTK. buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ]; # Don't try to install `xlock' setuid. Password authentication works diff --git a/nixpkgs/pkgs/misc/sound-of-sorting/default.nix b/nixpkgs/pkgs/misc/sound-of-sorting/default.nix index f61c9f5e1b9b..1072bac7816a 100644 --- a/nixpkgs/pkgs/misc/sound-of-sorting/default.nix +++ b/nixpkgs/pkgs/misc/sound-of-sorting/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit , SDL2, wxGTK }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sound-of-sorting"; version = "unstable-2015-07-21"; diff --git a/nixpkgs/pkgs/misc/stabber/default.nix b/nixpkgs/pkgs/misc/stabber/default.nix index b5dc7a13f183..d0d3fbdf2d73 100644 --- a/nixpkgs/pkgs/misc/stabber/default.nix +++ b/nixpkgs/pkgs/misc/stabber/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stabber-unstable"; version = "2016-11-09"; diff --git a/nixpkgs/pkgs/misc/themes/adapta/default.nix b/nixpkgs/pkgs/misc/themes/adapta/default.nix index 5fd8f1a594ea..02812b1f9397 100644 --- a/nixpkgs/pkgs/misc/themes/adapta/default.nix +++ b/nixpkgs/pkgs/misc/themes/adapta/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "An adaptive Gtk+ theme based on Material Design Guidelines"; + description = "An adaptive GTK theme based on Material Design Guidelines"; homepage = https://github.com/adapta-project/adapta-gtk-theme; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/themes/arc-kde/default.nix b/nixpkgs/pkgs/misc/themes/arc-kde/default.nix index 054cd1aeffc3..decdbdfac2dc 100644 --- a/nixpkgs/pkgs/misc/themes/arc-kde/default.nix +++ b/nixpkgs/pkgs/misc/themes/arc-kde/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arc-kde-theme"; version = "2017-11-09"; diff --git a/nixpkgs/pkgs/misc/themes/e17gtk/default.nix b/nixpkgs/pkgs/misc/themes/e17gtk/default.nix index 9cdefb9bb54b..74f0a54ccef3 100644 --- a/nixpkgs/pkgs/misc/themes/e17gtk/default.nix +++ b/nixpkgs/pkgs/misc/themes/e17gtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "An Enlightenment-like GTK+ theme with sharp corners"; + description = "An Enlightenment-like GTK theme with sharp corners"; homepage = https://github.com/tsujan/E17gtk; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix b/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix index 1a4241be8654..f24524eb6b97 100644 --- a/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix +++ b/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = "A Material Design theme for GNOME/GTK+ based desktop environments"; + description = "A Material Design theme for GNOME/GTK based desktop environments"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.fpletz ]; diff --git a/nixpkgs/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/nixpkgs/pkgs/misc/themes/gtk2/gtk-engines/default.nix index 966190a5e768..2f56f6eb4c5c 100644 --- a/nixpkgs/pkgs/misc/themes/gtk2/gtk-engines/default.nix +++ b/nixpkgs/pkgs/misc/themes/gtk2/gtk-engines/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ intltool gtk2 ]; meta = { - description = "Theme engines for GTK+ 2"; + description = "Theme engines for GTK 2"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/misc/themes/numix-sx/default.nix b/nixpkgs/pkgs/misc/themes/numix-sx/default.nix index dfa788f6ea7b..72e87e2e2740 100644 --- a/nixpkgs/pkgs/misc/themes/numix-sx/default.nix +++ b/nixpkgs/pkgs/misc/themes/numix-sx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gtk-engine-murrine }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2017-04-24"; pname = "numix-sx-gtk-theme"; diff --git a/nixpkgs/pkgs/misc/themes/paper/default.nix b/nixpkgs/pkgs/misc/themes/paper/default.nix index 2f7a53dc2d43..e7235a900cf9 100644 --- a/nixpkgs/pkgs/misc/themes/paper/default.nix +++ b/nixpkgs/pkgs/misc/themes/paper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2016-08-16"; pname = "paper-gtk-theme"; diff --git a/nixpkgs/pkgs/misc/themes/solarc/default.nix b/nixpkgs/pkgs/misc/themes/solarc/default.nix index 3d9403b84f46..96843e8d78b4 100644 --- a/nixpkgs/pkgs/misc/themes/solarc/default.nix +++ b/nixpkgs/pkgs/misc/themes/solarc/default.nix @@ -2,7 +2,7 @@ gtk-engine-murrine, gtk3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "solarc-gtk-theme"; version = "1.0.2"; diff --git a/nixpkgs/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix index 6fe1a2081d22..6f1c8af390c8 100644 --- a/nixpkgs/pkgs/misc/uboot/default.nix +++ b/nixpkgs/pkgs/misc/uboot/default.nix @@ -13,7 +13,7 @@ let , extraMakeFlags ? [] , extraMeta ? {} , ... } @ args: - stdenv.mkDerivation (rec { + stdenv.mkDerivation ({ pname = "uboot-${defconfig}"; inherit version; @@ -86,10 +86,10 @@ let } // extraMeta; } // removeAttrs args [ "extraMeta" ]); -in rec { +in { inherit buildUBoot; - ubootTools = buildUBoot rec { + ubootTools = buildUBoot { defconfig = "allnoconfig"; installDir = "$out/bin"; hardeningDisable = []; @@ -108,45 +108,45 @@ in rec { ]; }; - ubootA20OlinuxinoLime = buildUBoot rec { + ubootA20OlinuxinoLime = buildUBoot { defconfig = "A20-OLinuXino-Lime_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootBananaPi = buildUBoot rec { + ubootBananaPi = buildUBoot { defconfig = "Bananapi_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootBananaPim64 = buildUBoot rec { + ubootBananaPim64 = buildUBoot { defconfig = "bananapi_m64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootBeagleboneBlack = buildUBoot rec { + ubootBeagleboneBlack = buildUBoot { defconfig = "am335x_boneblack_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["MLO" "u-boot.img"]; }; # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master - ubootClearfog = buildUBoot rec { + ubootClearfog = buildUBoot { defconfig = "clearfog_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-spl.kwb"]; }; - ubootGuruplug = buildUBoot rec { + ubootGuruplug = buildUBoot { defconfig = "guruplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootJetsonTK1 = buildUBoot rec { + ubootJetsonTK1 = buildUBoot { defconfig = "jetson-tk1_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; @@ -157,114 +157,114 @@ in rec { ''; }; - ubootNovena = buildUBoot rec { + ubootNovena = buildUBoot { defconfig = "novena_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin" "SPL"]; }; - ubootOdroidXU3 = buildUBoot rec { + ubootOdroidXU3 = buildUBoot { defconfig = "odroid-xu3_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-dtb.bin"]; }; - ubootOrangePiPc = buildUBoot rec { + ubootOrangePiPc = buildUBoot { defconfig = "orangepi_pc_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootOrangePiZeroPlus2H5 = buildUBoot rec { + ubootOrangePiZeroPlus2H5 = buildUBoot { defconfig = "orangepi_zero_plus2_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootPcduino3Nano = buildUBoot rec { + ubootPcduino3Nano = buildUBoot { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootPine64 = buildUBoot rec { + ubootPine64 = buildUBoot { defconfig = "pine64_plus_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootPine64LTS = buildUBoot rec { + ubootPine64LTS = buildUBoot { defconfig = "pine64-lts_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootPinebook = buildUBoot rec { + ubootPinebook = buildUBoot { defconfig = "pinebook_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootQemuAarch64 = buildUBoot rec { + ubootQemuAarch64 = buildUBoot { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootQemuArm = buildUBoot rec { + ubootQemuArm = buildUBoot { defconfig = "qemu_arm_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi = buildUBoot rec { + ubootRaspberryPi = buildUBoot { defconfig = "rpi_defconfig"; extraMeta.platforms = ["armv6l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi2 = buildUBoot rec { + ubootRaspberryPi2 = buildUBoot { defconfig = "rpi_2_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi3_32bit = buildUBoot rec { + ubootRaspberryPi3_32bit = buildUBoot { defconfig = "rpi_3_32b_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi3_64bit = buildUBoot rec { + ubootRaspberryPi3_64bit = buildUBoot { defconfig = "rpi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPiZero = buildUBoot rec { + ubootRaspberryPiZero = buildUBoot { defconfig = "rpi_0_w_defconfig"; extraMeta.platforms = ["armv6l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootSheevaplug = buildUBoot rec { + ubootSheevaplug = buildUBoot { defconfig = "sheevaplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootSopine = buildUBoot rec { + ubootSopine = buildUBoot { defconfig = "sopine_baseboard_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootUtilite = buildUBoot rec { + ubootUtilite = buildUBoot { defconfig = "cm_fx6_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-with-nand-spl.imx"]; @@ -276,7 +276,7 @@ in rec { # sf probe; sf update $loadaddr 0 80000 }; - ubootWandboard = buildUBoot rec { + ubootWandboard = buildUBoot { defconfig = "wandboard_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.img" "SPL"]; diff --git a/nixpkgs/pkgs/misc/uboot/rock64.nix b/nixpkgs/pkgs/misc/uboot/rock64.nix index e49b4b519f1c..9dd43f5fe7e0 100644 --- a/nixpkgs/pkgs/misc/uboot/rock64.nix +++ b/nixpkgs/pkgs/misc/uboot/rock64.nix @@ -5,7 +5,7 @@ rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; -in buildUBoot rec { +in buildUBoot { version = "2017.09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/uboot/rockpro64.nix b/nixpkgs/pkgs/misc/uboot/rockpro64.nix index 45f6d5de2a9a..436e1bcdf878 100644 --- a/nixpkgs/pkgs/misc/uboot/rockpro64.nix +++ b/nixpkgs/pkgs/misc/uboot/rockpro64.nix @@ -5,7 +5,7 @@ rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; -in buildUBoot rec { +in buildUBoot { version = "2017.09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index 44bc7ec3ced1..c7b618323fc1 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix @@ -264,7 +264,7 @@ let ${lib.concatMapStrings (plugin: '' let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}" '') plugins} - let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}" + let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins.vim-addon-manager.rtp}" let g:vim_addon_manager = {} @@ -316,7 +316,7 @@ let ++ (builtins.map (link packageName "opt") opt) ); packDir = (packages: - stdenv.mkDerivation rec { + stdenv.mkDerivation { name = "vim-pack-dir"; src = ./.; installPhase = lib.concatStringsSep @@ -513,7 +513,7 @@ rec { name = "vim_with_custom_plugin"; vimrcConfig.vam.knownPlugins = vimPlugins // ({ - "vim-trailing-whitespace" = buildVimPluginFrom2Nix { + vim-trailing-whitespace = buildVimPluginFrom2Nix { name = "vim-trailing-whitespace"; src = fetchFromGitHub { owner = "bronson"; diff --git a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix index 73b533f368ef..bd9eeae92810 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.25.0"; - sha256 = "0vqqc0j9ahhb9a8wrhjjb34rfdj7msqsza3443bi4206gkiwpp3n"; + version = "0.25.1"; + sha256 = "1i66m6l4q8vkygn24v5s06kxaxm9gdd8y75fjyzz189pnmijj1as"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/default.nix index c47422531206..e1b928b13731 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -10,7 +10,7 @@ in # So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # -rec { +{ alanz.vscode-hie-server = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix index 423f39f9bbcc..f4ebea8e4383 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix @@ -23,9 +23,9 @@ let else throw "Only x86_64 Linux and Darwin are supported."; languageServerSha256 = { - "linux-x64" = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2"; - "osx-x64" = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa"; - }."${arch}"; + linux-x64 = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2"; + osx-x64 = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa"; + }.${arch}; # version is languageServerVersion in the package.json languageServer = extractNuGet rec { diff --git a/nixpkgs/pkgs/os-specific/bsd/default.nix b/nixpkgs/pkgs/os-specific/bsd/default.nix index a75c132b55a2..ee7158e2a8c5 100644 --- a/nixpkgs/pkgs/os-specific/bsd/default.nix +++ b/nixpkgs/pkgs/os-specific/bsd/default.nix @@ -1,5 +1,5 @@ { callPackages, recurseIntoAttrs }: -rec { +{ netbsd = recurseIntoAttrs (callPackages ./netbsd {}); } diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index 93b6f4a62097..7370901f3193 100644 --- a/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -38,14 +38,14 @@ let HOST_SH = "${buildPackages.bash}/bin/sh"; MACHINE_ARCH = { - "i686" = "i386"; + i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; MACHINE = { - "x86_64" = "amd64"; - "aarch64" = "evbarm64"; - "i686" = "i386"; + x86_64 = "amd64"; + aarch64 = "evbarm64"; + i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; @@ -79,7 +79,7 @@ let ## ## START BOOTSTRAPPING ## - makeMinimal = mkDerivation rec { + makeMinimal = mkDerivation { path = "tools/make"; sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; version = "8.0"; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index 7002f82fe561..a7b2bd7d981d 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, developer_cmds }: -appleDerivation rec { +appleDerivation { buildInputs = [ developer_cmds ]; installPhase = '' diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 7b19194be96e..99d670028032 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -3,7 +3,7 @@ , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread , mDNSResponder, launchd, libutil, hfs, darling }: -appleDerivation rec { +appleDerivation { dontBuild = true; dontFixup = true; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 4a0180dda7ae..eadf18e028ee 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; # These PBXcp calls should be patched in xcbuild to allow them to diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index b2d8522f3264..21971ea2e284 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; patchPhase = '' diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index f0394a20c2cc..5de84d2a6e5d 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ zlib bzip2 lzma ncurses libutil ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 9ca0f3b4e56d..82be7dc860ec 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, xcbuildHook , openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index 5b2322915dc9..b87dadd391d2 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; patchPhase = '' diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 39c903a2e7b9..03556296ca1d 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, lib , Librpcsvc, apple_sdk, pam, CF, openbsm }: -appleDerivation rec { +appleDerivation { # xcbuild fails with: # /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build # see issue facebook/xcbuild#188 diff --git a/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix b/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix index cb81c2e81495..02821fe61ef9 100644 --- a/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.0"; pname = "lsusb"; diff --git a/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix b/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix index 77e63c779b9c..e1a00c71cb85 100644 --- a/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix @@ -16,7 +16,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osxfuse"; inherit version; diff --git a/nixpkgs/pkgs/os-specific/darwin/qes/default.nix b/nixpkgs/pkgs/os-specific/darwin/qes/default.nix index 19ab34145e80..21b0d605021d 100644 --- a/nixpkgs/pkgs/os-specific/darwin/qes/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/qes/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, Carbon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qes"; version = "0.0.2"; diff --git a/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index bb9dc0a03b5f..d25edff49560 100644 --- a/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -14,9 +14,9 @@ let minSdkVersion = "9.0"; iosPlatformArch = { parsed, ... }: { - "armv7a" = "armv7"; - "aarch64" = "arm64"; - "x86_64" = "x86_64"; + armv7a = "armv7"; + aarch64 = "arm64"; + x86_64 = "x86_64"; }.${parsed.cpu.name}; in diff --git a/nixpkgs/pkgs/os-specific/linux/acpid/default.nix b/nixpkgs/pkgs/os-specific/linux/acpid/default.nix index 99d1cf38f0ac..d58aec4a97c9 100644 --- a/nixpkgs/pkgs/os-specific/linux/acpid/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "acpid-2.0.31"; + name = "acpid-2.0.32"; src = fetchurl { url = "mirror://sourceforge/acpid2/${name}.tar.xz"; - sha256 = "1hrc0xm6q12knbgzhq0i8g2rfrkwcvh1asd7k9rs3nc5xmlwd7gw"; + sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix b/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix index 2f5c392c1730..fee8d1e7a420 100644 --- a/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix +++ b/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix @@ -1,6 +1,6 @@ { stdenv, kernel, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "anbox-modules"; version = "2019-07-13-" + kernel.version; diff --git a/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix index d7d25e696642..456872cdbd48 100644 --- a/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,7 +2,7 @@ let base = "batman-adv-2019.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${base}-${kernel.version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix b/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix index 205d788da6e5..7ce2fea69245 100644 --- a/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix @@ -26,7 +26,7 @@ let "upgrade/beegfs_mirror_md/build" ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "beegfs"; inherit version; diff --git a/nixpkgs/pkgs/os-specific/linux/bpftool/default.nix b/nixpkgs/pkgs/os-specific/linux/bpftool/default.nix index ac444c28d75d..c54e3e38e9b5 100644 --- a/nixpkgs/pkgs/os-specific/linux/bpftool/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/bpftool/default.nix @@ -3,7 +3,7 @@ , linuxPackages_latest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bpftool"; inherit (linuxPackages_latest.kernel) version src; diff --git a/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix b/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix index 0149398bfa3e..7f16ecb9e6d4 100644 --- a/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "can-isotp"; version = "20180629"; diff --git a/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix index 7913c703b5bc..6e26ef4bbce8 100644 --- a/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "can-utils"; # There are no releases (source archives or git tags), so use the date of the # latest commit in git master as version number. diff --git a/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix b/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix index b724112af886..fc2faa5b8f57 100644 --- a/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "checkpolicy"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz"; - sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl"; + sha256 = "13jz6f8zdrijvn5w1j102b36fs41z0q8ii74axw48cj550mw6im9"; }; nativeBuildInputs = [ bison flex ]; diff --git a/nixpkgs/pkgs/os-specific/linux/chromium-xorg-conf/default.nix b/nixpkgs/pkgs/os-specific/linux/chromium-xorg-conf/default.nix new file mode 100644 index 000000000000..58038923890b --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/chromium-xorg-conf/default.nix @@ -0,0 +1,8 @@ +{fetchgit }: + +fetchgit { + name = "chromium-xorg-conf"; + url = "https://chromium.googlesource.com/chromiumos/platform/xorg-conf"; + rev = "26fb9d57e195c7e467616b35b17e2b5d279c1514"; + sha256 = "0643y3l3hjk4mv4lm3h9z56h990q6k11hcr10lcqppgsii0d3zcf"; +} diff --git a/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix b/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix index cd1400b41fc2..77fa7fe3b1b6 100644 --- a/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "devmem2-2004-08-05"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix b/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix index 5896262ac217..a880f699b699 100644 --- a/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "directvnc"; version = "0.7.7.2015-04-16"; diff --git a/nixpkgs/pkgs/os-specific/linux/dstat/default.nix b/nixpkgs/pkgs/os-specific/linux/dstat/default.nix index 63b766b21a5c..25d0eb1fd029 100644 --- a/nixpkgs/pkgs/os-specific/linux/dstat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/dstat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "dstat-${version}"; + pname = "dstat"; format = "other"; version = "0.7.3"; diff --git a/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix b/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix index defb45d7a861..c8fc633f8bd3 100644 --- a/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: let s = # Generated upstream information - rec { + { baseName="fbterm"; version="1.7.0"; name="fbterm-1.7.0"; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index b4d5d54137cd..c688d8c6ab39 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,18 +1,68 @@ -{ stdenv, fetchurl, substituteAll, gtk-doc, pkgconfig, gobject-introspection, intltool -, libgudev, polkit, libxmlb, gusb, sqlite, libarchive, glib-networking -, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, gnu-efi -, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl -, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion -, shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf -, cairo, freetype, fontconfig, pango -, bubblewrap, efibootmgr, flashrom, tpm2-tools -}: - # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc +{ stdenv +, fetchurl +, substituteAll +, gtk-doc +, pkgconfig +, gobject-introspection +, intltool +, libgudev +, polkit +, libxmlb +, gusb +, sqlite +, libarchive +, glib-networking +, libsoup +, help2man +, gpgme +, libxslt +, elfutils +, libsmbios +, efivar +, gnu-efi +, libyaml +, valgrind +, meson +, libuuid +, colord +, docbook_xml_dtd_43 +, docbook_xsl +, ninja +, gcab +, gnutls +, python3 +, wrapGAppsHook +, json-glib +, bash-completion +, shared-mime-info +, umockdev +, vala +, makeFontsConf +, freefont_ttf +, cairo +, freetype +, fontconfig +, pango +, bubblewrap +, efibootmgr +, flashrom +, tpm2-tools +, nixosTests +}: + let - python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); - installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); + python = python3.withPackages (p: with p; [ + pygobject3 + pycairo + pillow + ]); + + installedTestsPython = python3.withPackages (p: with p; [ + pygobject3 + requests + ]); fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; @@ -26,30 +76,70 @@ let # only redfish for x86_64 haveRedfish = stdenv.isx86_64; - # Currently broken on Aarch64 - haveFlashrom = isx86; + # # Currently broken on Aarch64 + # haveFlashrom = isx86; + # Experimental in 1.2.10 + haveFlashrom = false; -in stdenv.mkDerivation rec { +in + +stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.2.8"; + version = "1.2.10"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0qbvq52c0scn1h99i1rf2la6rrhckin6gb02k7l0v3g07mxs20wc"; + sha256 = "0inngs7i48akm9c7fmdsf9zjif595rkaba69rl76jfwfv8r21vjb"; }; outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; nativeBuildInputs = [ - meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info - valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala + meson + ninja + gtk-doc + pkgconfig + gobject-introspection + intltool + shared-mime-info + valgrind + gcab + docbook_xml_dtd_43 + docbook_xsl + help2man + libxslt + python + wrapGAppsHook + vala ]; buildInputs = [ - polkit libxmlb gusb sqlite libarchive libsoup elfutils gnu-efi libyaml - libgudev colord gpgme libuuid gnutls glib-networking json-glib umockdev - bash-completion cairo freetype fontconfig pango efivar - ] ++ stdenv.lib.optionals haveDell [ libsmbios ]; + polkit + libxmlb + gusb + sqlite + libarchive + libsoup + elfutils + gnu-efi + libyaml + libgudev + colord + gpgme + libuuid + gnutls + glib-networking + json-glib + umockdev + bash-completion + cairo + freetype + fontconfig + pango + efivar + ] ++ stdenv.lib.optionals haveDell [ + libsmbios + ]; patches = [ ./fix-paths.patch @@ -65,7 +155,12 @@ in stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + patchShebangs \ + libfwupd/generate-version-script.py \ + meson_post_install.sh \ + po/make-images \ + po/make-images.sh \ + po/test-deps # we cannot use placeholder in substituteAll # https://github.com/NixOS/nix/issues/1846 @@ -85,9 +180,12 @@ in stdenv.mkDerivation rec { # doCheck = true; preFixup = let - binPath = [ efibootmgr bubblewrap tpm2-tools ] ++ stdenv.lib.optional haveFlashrom flashrom; - in - '' + binPath = [ + efibootmgr + bubblewrap + tpm2-tools + ] ++ stdenv.lib.optional haveFlashrom flashrom; + in '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" # See programs reached with fu_common_find_program_in_path in source @@ -128,6 +226,10 @@ in stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + # error: “PolicyKit files are missing” + # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 + PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; + # TODO: wrapGAppsHook wraps efi capsule even though it is not elf dontWrapGApps = true; # so we need to wrap the executables manually @@ -157,11 +259,15 @@ in stdenv.mkDerivation rec { "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/LVFS-CA.pem" ]; + + tests = { + installedTests = nixosTests.fwupd; + }; }; meta = with stdenv.lib; { homepage = https://fwupd.org/; - maintainers = with maintainers; []; + maintainers = with maintainers; [ jtojnar ]; license = [ licenses.gpl2 ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 26ed20206359..e9ee91a2de7b 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; version = "2018-08-20"; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 321ce8ffc06d..1ea2b5e4e3d4 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "raspberrypi-tools"; version = "2018-10-03"; diff --git a/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix b/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix index 0abd458aa8f3..bf3d2ef8d6db 100644 --- a/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flashbench"; version = "2012-06-06"; diff --git a/nixpkgs/pkgs/os-specific/linux/freefall/default.nix b/nixpkgs/pkgs/os-specific/linux/freefall/default.nix index 09774016ef26..a6c5a6593d1c 100644 --- a/nixpkgs/pkgs/os-specific/linux/freefall/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/freefall/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (kernel) version src; pname = "freefall"; diff --git a/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index 35e1972b574b..cdd42e98f06b 100644 --- a/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,15 +4,17 @@ buildGoPackage rec { pname = "fscrypt"; - version = "0.2.4"; + version = "unstable-2019-08-29"; goPackagePath = "github.com/google/fscrypt"; + goDeps = ./deps.nix; + src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; - rev = "v${version}"; - sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8"; + rev = "8a3acda2011e9a080ee792c1e11646e6118a4930"; + sha256 = "17h6r5lqiz0cw9vsixv48a1p78nd7bs1kncg6p4lfagl7kr5hpls"; }; buildInputs = [ pam ]; diff --git a/nixpkgs/pkgs/os-specific/linux/fscrypt/deps.nix b/nixpkgs/pkgs/os-specific/linux/fscrypt/deps.nix new file mode 100644 index 000000000000..5d3e8a89a91f --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/fscrypt/deps.nix @@ -0,0 +1,66 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "614d502a4dac"; + sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "8a410e7b638d"; + sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6f"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d99a578cf41b"; + sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm"; + }; + } +] diff --git a/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index 07252b8bc31f..b5df553a97c3 100644 --- a/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "19.07.00"; + version = "19.08.00"; src = fetchzip { - url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "04h99ri3nzhxr2js2a04bcj6zm17zlybqzv528j6hr6v0pv5wn4p"; + url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; + sha256 = "14v4vxvfsl008xalsmlhl9wh89xlrfffh3pky9m90flaizdzwyp4"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix b/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix index 0325461763a2..ea1051c5f058 100644 --- a/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpu-switch-unstable"; version = "2017-04-28"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/hdapsd/default.nix b/nixpkgs/pkgs/os-specific/linux/hdapsd/default.nix index 53924a782df7..893eb4fdd999 100644 --- a/nixpkgs/pkgs/os-specific/linux/hdapsd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hdapsd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let version = "20141203"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "hdapsd-"+version; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix b/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix index d2319fdcf5c7..3d759001d01c 100644 --- a/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix @@ -2,7 +2,7 @@ let version = "2.0"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "hibernate"; inherit version; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix b/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix index 36ca1eb16b49..a209f1ab4bb9 100644 --- a/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python, kernel, makeWrapper, writeText }: let - daemons = stdenv.mkDerivation rec { + daemons = stdenv.mkDerivation { pname = "hyperv-daemons-bin"; inherit (kernel) src version; @@ -54,7 +54,7 @@ let WantedBy=hyperv-daemons.target ''; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "hyperv-daemons"; inherit (kernel) version; diff --git a/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix b/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix index e6e898118944..b3d5fe1b63cc 100644 --- a/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix +++ b/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix @@ -18,7 +18,7 @@ ''; }; - neo = stdenv.mkDerivation rec { + neo = stdenv.mkDerivation { pname = "neo"; version = "2476"; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index 1e9b1c276d0c..1699324546d1 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -7,7 +7,8 @@ let makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation { inherit src; - name = "linux-headers-${version}"; + pname = "linux-headers"; + inherit version; ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index a3b77ee8d96c..ae39047a9d3d 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.141"; + version = "4.14.142"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b"; + sha256 = "1wwhnm1n1b6yzsd2zzzf9i3n4hlvgnph70p67cwahw0ik4ssayz6"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index fb25fbb7ddcd..56d254c1ecb8 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.69"; + version = "4.19.71"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0"; + sha256 = "1bjwkb7k82l646ryyy0jbwsnygm2qsxgcwli8bdrj844skzynlqz"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0d3ce63325f6..2889dc34aba7 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.190"; + version = "4.4.191"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y"; + sha256 = "0x3lnq4xyj5v6r1cz4jizm4vdspws1nb806f5qczwi3yil5nm6bh"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 0008219efb9a..d494c7bb6235 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.190"; + version = "4.9.191"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py"; + sha256 = "1g5p736p8zx5rmxaj56yw93jp768npl868jsn8973dny0rsbim6y"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix index bf28ac53df09..dfce0f303987 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.11"; + version = "5.2.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc"; + sha256 = "12hpph3iynr22mfwz7745lp01waf2kg579hr56d4pvhx4iahzdhp"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix index d2e1a35cb2e6..1b4700a2e392 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -4,7 +4,7 @@ let modDirVersion = "4.14.98"; tag = "1.20190215"; in -lib.overrideDerivation (buildLinux (args // rec { +lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; inherit modDirVersion; @@ -16,9 +16,9 @@ lib.overrideDerivation (buildLinux (args // rec { }; defconfig = { - "armv6l-linux" = "bcmrpi_defconfig"; - "armv7l-linux" = "bcm2709_defconfig"; - "aarch64-linux" = "bcmrpi3_defconfig"; + armv6l-linux = "bcmrpi_defconfig"; + armv7l-linux = "bcm2709_defconfig"; + aarch64-linux = "bcmrpi3_defconfig"; }.${stdenv.hostPlatform.system} or (throw "linux_rpi not supported on '${stdenv.hostPlatform.system}'"); features = { diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 4516af19a4e7..0b2ed76a4b4b 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: -buildLinux (args // rec { +buildLinux (args // { version = "5.1.2019.08.21"; modDirVersion = "5.1.0"; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix b/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix index edca017b3c70..b80320db282e 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -1,6 +1,6 @@ { fetchpatch }: -rec { +{ bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -23,7 +23,7 @@ rec { cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - tag_hardened = rec { + tag_hardened = { name = "tag-hardened"; patch = ./tag-hardened.patch; }; @@ -58,7 +58,7 @@ rec { }; }; - export_kernel_fpu_functions = rec { + export_kernel_fpu_functions = { name = "export_kernel_fpu_functions"; patch = ./export_kernel_fpu_functions.patch; }; diff --git a/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix b/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix index f738b9f6da5f..12463c736a62 100644 --- a/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kmscube-2018-06-17"; src = fetchgit { diff --git a/nixpkgs/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/ledger-udev-rules/default.nix index 28027fd4510a..96c60f6ea56e 100644 --- a/nixpkgs/pkgs/os-specific/linux/ledger-udev-rules/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ledger-udev-rules"; version = "unstable-2019-02-13"; diff --git a/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix b/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix new file mode 100644 index 000000000000..e3dfbd3d6c22 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coreutils, pkgconfig, glib, jsoncpp }: + +stdenv.mkDerivation rec { + name = "libevdevc"; + version = "2.0.1"; + src = fetchFromGitHub { + owner = "hugegreenbug"; + repo = "libevdevc"; + rev = "v${version}"; + sha256 = "0ry30krfizh87yckmmv8n082ad91mqhhbbynx1lfidqzb6gdy2dd"; + }; + + postPatch = '' + substituteInPlace common.mk \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace include/module.mk \ + --replace /usr/include /include + ''; + + makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; + + meta = with stdenv.lib; { + description = "ChromiumOS libevdev. Renamed to avoid conflicts with the standard libevdev found in Linux distros."; + license = licenses.bsd3; + platforms = platforms.linux; + homepage = "https://chromium.googlesource.com/chromiumos/platform/libevdev/"; + maintainers = with maintainers; [ kcalvinalvin ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix b/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix new file mode 100644 index 000000000000..4c51525727af --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, pkgconfig, glib, jsoncpp }: + +stdenv.mkDerivation rec { + name = "libgestures-${version}"; + version = "2.0.1"; + src = fetchFromGitHub { + owner = "hugegreenbug"; + repo = "libgestures"; + rev = "v${version}"; + sha256 = "0dfvads2adzx4k8cqc1rbwrk1jm2wn9wl2jk51m26xxpmh1g0zab"; + }; + patches = [ ./include-fix.patch ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace -Werror -Wno-error \ + --replace '$(DESTDIR)/usr/include' '$(DESTDIR)/include' + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib jsoncpp ]; + + + makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; + + meta = with stdenv.lib; { + description = "ChromiumOS libgestures modified to compile for Linux."; + license = licenses.bsd3; + platforms = platforms.linux; + homepage = "https://chromium.googlesource.com/chromiumos/platform/gestures"; + maintainers = with maintainers; [ kcalvinalvin ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/libgestures/include-fix.patch b/nixpkgs/pkgs/os-specific/linux/libgestures/include-fix.patch new file mode 100644 index 000000000000..851be4771434 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/libgestures/include-fix.patch @@ -0,0 +1,12 @@ +diff -ur a/include/gestures/include/finger_metrics.h b/include/gestures/include/finger_metrics.h +--- a/include/gestures/include/finger_metrics.h 1970-01-01 09:00:01.000000000 +0900 ++++ b/include/gestures/include/finger_metrics.h 2018-12-01 16:58:51.590718511 +0900 +@@ -5,6 +5,8 @@ + #ifndef GESTURES_FINGER_METRICS_H_ + #define GESTURES_FINGER_METRICS_H_ + ++#include <math.h> ++ + #include "gestures/include/gestures.h" + #include "gestures/include/prop_registry.h" +#include "gestures/include/vector.h" diff --git a/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix b/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix index 028c008eccf6..d8a2298f3d3f 100644 --- a/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix @@ -9,14 +9,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libselinux"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; - outputs = [ "bin" "out" "dev" "man" "py" ]; + outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py"; src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; - sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh"; + sha256 = "14r69mgmz7najf9wbizvp68q56mqx4yjbkxjlbcqg5a47s3wik0v"; }; nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python ]; @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" - "PYSITEDIR=$(py)/${python.sitePackages}" + "PYTHON=python" + "PYTHONLIBDIR=$(py)/${python.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" diff --git a/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix b/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix index 4fe323ee23de..70b2508451bb 100644 --- a/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix @@ -6,25 +6,29 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libsemanage"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz"; - sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87"; - }; + sha256 = "075w6y3l9hiy5hicgwrmijyxmhfyd1r7cnc08qxyg4j46jfk8xi5"; + }; + + outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; nativeBuildInputs = [ bison flex pkgconfig ]; buildInputs = [ libsepol libselinux bzip2 audit ] ++ optionals enablePython [ swig python ]; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("MAN3DIR=$out/share/man/man3") - makeFlagsArray+=("MAN5DIR=$out/share/man/man5") - makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages") - ''; + makeFlags = [ + "PREFIX=$(out)" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN5DIR=$(man)/share/man/man5" + "PYTHON=python" + "PYTHONLIBDIR=$(py)/${python.sitePackages}" + "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf" + ]; installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix b/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix index e96ea01cce42..03bd0252c5ca 100644 --- a/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "2.7"; - se_release = "20170804"; - se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; + version = "2.9"; + se_release = "20190315"; + se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn"; + sha256 = "0p8x7w73jn1nysx1d7416wqrhbi0r6isrjxib7jf68fi72q14jx3"; }; nativeBuildInputs = [ flex ]; diff --git a/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix index 9aa1698b7665..369f412fbfc5 100644 --- a/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -3,7 +3,7 @@ # ltunifi and solaar both provide udev rules but solaar's rules are more # up-to-date so we simply use that instead of having to maintain our own rules -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "logitech-udev-rules"; inherit (solaar) version; diff --git a/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix b/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix index b2d1ca4791a6..63155e66678a 100644 --- a/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix @@ -12,7 +12,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lsiutils"; inherit version; diff --git a/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix b/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix index 0a6fc3c977c8..7c72c8a2dbf5 100644 --- a/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, kernel, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mba6x_bl-2016-12-08"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix b/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix index 34f19db524ce..1a24ae3b9a26 100644 --- a/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix +++ b/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix @@ -1,6 +1,6 @@ { stdenv, firmwareLinuxNonfree, libarchive }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "amd-ucode-${firmwareLinuxNonfree.version}"; src = firmwareLinuxNonfree; diff --git a/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix b/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix index 0edf322cce54..6b67401b9b23 100644 --- a/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , glib, readline, pcre, systemd, udev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "miraclecast"; version = "1.0-20190403"; diff --git a/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix index a7f0a332bebd..e0b87f2010ac 100644 --- a/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mmc-utils"; version = "2018-03-27"; diff --git a/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index 843676b9ccac..9b4f2f1c544a 100644 --- a/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "1kjg3dykf2aw76d76viz1hm0rav57nfbdwlngawgn2slxmlbplza"; + sha256 = "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index 467d930aaf58..2b1b37db344d 100755 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -62,7 +62,10 @@ installPhase() { sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd if [ -e nvidia_icd.json.template ]; then + # template patching for version < 435 sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json + fi + if [ -e nvidia_icd.json ]; then install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json fi if [ "$useGLVND" = "1" ]; then diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index cfe79d4c0b79..4f8a0b686640 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -2,7 +2,7 @@ nvidia_x11: sha256: { stdenv, fetchFromGitHub, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nvidia-persistenced"; inherit (nvidia_x11) version; diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix index 1867c1a133af..101f61f30207 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -40,7 +40,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nvidia-settings"; inherit (nvidia_x11) version; inherit src; diff --git a/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix b/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix new file mode 100644 index 000000000000..355108f56e46 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix @@ -0,0 +1,39 @@ +{ coreutils +, fetchFromGitHub +, kernel +, stdenv +, utillinux +}: + +let + common = import ../../../development/python-modules/openrazer/common.nix { inherit stdenv fetchFromGitHub; }; +in +stdenv.mkDerivation (common // { + name = "openrazer-${common.version}-${kernel.version}"; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildFlags = [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.version}/build" + ]; + + installPhase = '' + binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hid" + mkdir -p "$binDir" + cp -v driver/*.ko "$binDir" + RAZER_MOUNT_OUT="$out/bin/razer_mount" + RAZER_RULES_OUT="$out/etc/udev/rules.d/99-razer.rules" + install -m 644 -v -D install_files/udev/99-razer.rules $RAZER_RULES_OUT + install -m 755 -v -D install_files/udev/razer_mount $RAZER_MOUNT_OUT + substituteInPlace $RAZER_RULES_OUT \ + --replace razer_mount $RAZER_MOUNT_OUT + substituteInPlace $RAZER_MOUNT_OUT \ + --replace /usr/bin/logger ${utillinux}/bin/logger \ + --replace chgrp ${coreutils}/bin/chgrp \ + --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" "" + ''; + + meta = common.meta // { + description = "An entirely open source Linux driver that allows you to manage your Razer peripherals on GNU/Linux"; + }; +}) diff --git a/nixpkgs/pkgs/os-specific/linux/pipework/default.nix b/nixpkgs/pkgs/os-specific/linux/pipework/default.nix index 62aa18fa643e..044f75cbd6fb 100644 --- a/nixpkgs/pkgs/os-specific/linux/pipework/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pipework/default.nix @@ -2,7 +2,7 @@ , bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pipework"; version = "2017-08-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix b/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix index fb507d4da485..9d229c50000e 100644 --- a/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "policycoreutils"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; - sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa"; + sha256 = "0yqg5ws5gbl1cbn8msxdk1c3ilmmx58qg5dx883kqyq0517k8g65"; }; postPatch = '' @@ -20,13 +20,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; buildInputs = [ libsepol libselinux libsemanage ]; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions") - makeFlagsArray+=("LOCALEDIR=$out/share/locale") - makeFlagsArray+=("MAN5DIR=$out/share/man/man5") - ''; + makeFlags = [ + "PREFIX=$(out)" + "SBINDIR=$(out)/sbin" + "ETCDIR=$(out)/etc" + "BASHCOMPLETIONDIR=$out/share/bash-completion/completions" + "LOCALEDIR=$(out)/share/locale" + "MAN5DIR=$(out)/share/man/man5" + ]; meta = with stdenv.lib; { description = "SELinux policy core utilities"; diff --git a/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix b/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix index b1afbfea0de2..710eba642cb0 100644 --- a/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rewritefs"; version = "2017-08-14"; diff --git a/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix b/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix index b8f80a0124c2..2ca88c32f13f 100644 --- a/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; stdenv.mkDerivation rec { pname = "selinux-python"; - version = "2.7"; - se_release = "20170804"; - se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; + version = "2.9"; + + inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz"; - sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2"; + sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n"; }; nativeBuildInputs = [ wrapPython ]; @@ -23,17 +23,19 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix" + substituteInPlace sepolgen/src/share/Makefile --replace "/var/lib/sepolgen" \ + "\$PREFIX/var/lib/sepolgen" ''; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("LOCALEDIR=$out/share/locale") - makeFlagsArray+=("LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a") - makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions") - makeFlagsArray+=("PYTHON=${python3}/bin/python") - makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages") - ''; + makeFlags = [ + "PREFIX=$(out)" + "LOCALEDIR=$(out)/share/locale" + "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions" + "PYTHON=python" + "PYTHONLIBDIR=$(out)/${python.sitePackages}" + "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + ]; + postFixup = '' wrapPythonPrograms diff --git a/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix b/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix index 99bbfbe7287a..5343c5fae1a9 100644 --- a/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -9,12 +9,12 @@ with python3.pkgs; stdenv.mkDerivation rec { pname = "selinux-sandbox"; - version = "2.7"; - se_release = "20170804"; + version = "2.9"; + inherit (policycoreutils) se_release se_url; src = fetchurl { - url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz"; - sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l"; + url = "${se_url}/${se_release}/selinux-sandbox-${version}.tar.gz"; + sha256 = "0qj20jyi8v1653xdqj5yak3wwbvg5bw8f2jmx8fpahl6y1bmz481"; }; nativeBuildInputs = [ wrapPython ]; @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { --replace "/usr/bin/test" "${coreutils}/bin/test" \ ''; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - ''; + makeFlags = [ + "PREFIX=$(out)" + "SYSCONFDIR=$(out)/etc/sysconfig" + ]; postFixup = '' wrapPythonPrograms diff --git a/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix index 178d102381e0..bf1f36835b47 100644 --- a/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semodule-utils"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/${pname}-${version}.tar.gz"; - sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch"; + sha256 = "01yrwnd3calmw6r8kdh8ld7i7fb250n2yqqqk9p0ymrlwsg6g0w0"; }; buildInputs = [ libsepol ]; diff --git a/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix b/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix index db362613d374..ef13e5ded024 100644 --- a/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -5,7 +5,7 @@ , which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "syscall_limiter"; version = "2017-01-23"; diff --git a/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix index ce2bd1fa99f3..399244e47ee1 100644 --- a/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.26.2"; + version = "0.26.4"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1a74cvvy3lhilibc3lzcsvs6pwrdvdx2580qgckp1lrra9gf5hga"; + sha256 = "1v2j1ns17wyj7xl91p6wy1iwfx2fnn8af9nm939skc6229m87zzn"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix b/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix index 8965b5da4f49..8631ddf01d08 100644 --- a/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "syslinux-2015-11-09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 45f4d60e4e31..4117df8cf13c 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, libmicrohttpd, pcre2 @@ -15,7 +15,7 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "242"; pname = "systemd"; @@ -28,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "0pyjvzzh8nnxv4z58n82lz1mjnzv44sylcjgkvw8sp35vx1ryxfh"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-15718.patch"; + url = https://github.com/systemd/systemd/pull/13457/commits/35e528018f315798d3bffcb592b32a0d8f5162bd.patch; + sha256 = "0m0ypnnllx4r6a2qy1586as15i2qrzxwi1sqdp14rzdwajz1rvnv"; + }) + ]; + outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = diff --git a/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix index e6571b46ee05..567dcd1068c5 100644 --- a/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "trace-cmd"; version = "2.8.3"; diff --git a/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 8e49af771394..b73de3193d22 100644 --- a/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: -mkDerivation rec { +mkDerivation { pname = "kernelshark"; version = "0.9.8"; diff --git a/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/nixpkgs/pkgs/os-specific/linux/upower/default.nix index 14458356a790..d787acae61b4 100644 --- a/nixpkgs/pkgs/os-specific/linux/upower/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/upower/default.nix @@ -1,53 +1,58 @@ { stdenv , fetchurl , pkgconfig -, dbus-glib -, intltool , libxslt , docbook_xsl , udev , libgudev , libusb1 +, glib , gobject-introspection -, useSystemd ? true, systemd +, gettext +, systemd +, useIMobileDevice ? true +, libimobiledevice }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "upower"; - version = "0.99.10"; + version = "0.99.11"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz; - sha256 = "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4"; + url = https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz; + sha256 = "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4"; }; nativeBuildInputs = [ + docbook_xsl + gettext + gobject-introspection + libxslt pkgconfig ]; buildInputs = [ - dbus-glib - intltool - libxslt - docbook_xsl - udev libgudev libusb1 - gobject-introspection + udev + systemd ] - ++ stdenv.lib.optional useSystemd systemd + ++ stdenv.lib.optional useIMobileDevice libimobiledevice ; + propagatedBuildInputs = [ + glib + ]; + configureFlags = [ - "--with-backend=linux" "--localstatedir=/var" - ] - ++ stdenv.lib.optional useSystemd [ - "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" - "--with-systemdutildir=${placeholder ''out''}/lib/systemd" - "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" - ] - ; + "--with-backend=linux" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "--with-systemdutildir=${placeholder "out"}/lib/systemd" + "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" + ]; doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" diff --git a/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix b/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix index efc7406cc194..a9983561345e 100644 --- a/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, lib, - pkgconfig, libxml2, libxslt, - dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, audit, - withGui ? true, - qtbase ? null, - qttools ? null, - qtsvg ? null, + pkgconfig, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl, asciidoc, + dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, + audit, libgcrypt ? null, libsodium ? null }: @@ -15,20 +12,23 @@ with stdenv.lib; assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; pname = "usbguard"; repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k"; + sha256 = "0jj56sls13ryfgz6vajq8p4dm3grgb6rf2cmga6sckmzd4chk65b"; }; nativeBuildInputs = [ + asciidoc pkgconfig libxslt # xsltproc libxml2 # xmllint + docbook_xml_dtd_45 + docbook_xsl ]; buildInputs = [ @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { audit ] ++ (lib.optional (libgcrypt != null) libgcrypt) - ++ (lib.optional (libsodium != null) libsodium) - ++ (lib.optionals withGui [ qtbase qtsvg qttools ]); + ++ (lib.optional (libsodium != null) libsodium); configureFlags = [ "--with-bundled-catch" @@ -51,8 +50,7 @@ stdenv.mkDerivation rec { "--with-polkit" ] ++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt") - ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium") - ++ (lib.optional withGui "--with-gui-qt=qt5"); + ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium"); enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/os-specific/linux/usbip/default.nix b/nixpkgs/pkgs/os-specific/linux/usbip/default.nix index 497b5c191669..1bb92d7dce1b 100644 --- a/nixpkgs/pkgs/os-specific/linux/usbip/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/usbip/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel, udev, autoconf, automake, libtool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "usbip-${kernel.name}"; src = kernel.src; diff --git a/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix b/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix index 19f59d006806..cfb93684f3bd 100644 --- a/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.3.0"; pname = "uvcdynctrl"; diff --git a/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix index 9bb6fcdd0a00..a688f60492a8 100644 --- a/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,18 +1,22 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl, mkDerivation +{ stdenv, lib, fetchurl, pkgconfig, perl , libjpeg, udev , withUtils ? true -, withGUI ? true, alsaLib, libX11, qtbase, libGLU +, withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) -mkDerivation rec { +let + withQt = withUtils && withGUI; + +# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt +in stdenv.mkDerivation rec { pname = "v4l-utils"; - version = "1.16.6"; + version = "1.16.7"; src = fetchurl { - url = "https://linuxtv.org/downloads/v4l-utils/${pname}-${version}.tar.bz2"; - sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr"; + url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "1ng0x3wj3a1ckfd00yxa4za43xms92gdp7rdag060b7p39z7m4gf"; }; outputs = [ "out" "dev" ]; @@ -29,13 +33,13 @@ mkDerivation rec { ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional withQt wrapQtAppsHook; - buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ]; + buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ]; propagatedBuildInputs = [ libjpeg ]; - NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11"; + NIX_CFLAGS_COMPILE = lib.optional withQt "-std=c++11"; postPatch = '' patchShebangs . diff --git a/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index 570eb4ca4ef3..c2dca6696165 100644 --- a/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -3,7 +3,7 @@ # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wireguard"; inherit (wireguard-tools) src version; diff --git a/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix new file mode 100644 index 000000000000..2422b70b0685 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xorgserver, xorgproto, + utilmacros, libgestures, libevdevc }: + +stdenv.mkDerivation rec { + name = "xf86-input-cmt-${version}"; + version = "2.0.2"; + src = fetchFromGitHub { + owner = "hugegreenbug"; + repo = "xf86-input-cmt"; + rev = "v${version}"; + sha256 = "1cnwf518nc0ybc1r3rsgc1gcql1k3785khffv0i4v3akrm9wdw98"; + }; + + postPatch = '' + patchShebangs ./apply_patches.sh + ./apply_patches.sh + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + xorgserver xorgproto utilmacros + libgestures libevdevc + ]; + + configureFlags = [ + "--with-sdkdir=${placeholder "out"}" + ]; + + meta = with stdenv.lib; { + description = "Chromebook touchpad driver."; + license = licenses.bsd3; + platforms = platforms.linux; + homepage = "www.github.com/hugegreenbug/xf86-input-cmt"; + maintainers = with maintainers; [ kcalvinalvin ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 03e11d1a8ed9..1b9b5a3ba515 100644 --- a/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -30,7 +30,7 @@ let Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} '' - else stdenv.mkDerivation rec { + else stdenv.mkDerivation { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; src = fetchFromGitHub { @@ -163,7 +163,7 @@ in { ]; }; - zfsUnstable = common rec { + zfsUnstable = common { # comment/uncomment if breaking kernel versions are known # incompatibleKernelVersion = "4.19"; diff --git a/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix b/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix index 286f4a0d41fb..257067339674 100644 --- a/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pthreads-w32"; version = "2.9.1"; diff --git a/nixpkgs/pkgs/servers/asterisk/default.nix b/nixpkgs/pkgs/servers/asterisk/default.nix index 6e47fce3e486..1e5ba46d3823 100644 --- a/nixpkgs/pkgs/servers/asterisk/default.nix +++ b/nixpkgs/pkgs/servers/asterisk/default.nix @@ -6,7 +6,7 @@ }: let - common = {version, sha256, externals}: stdenv.mkDerivation rec { + common = {version, sha256, externals}: stdenv.mkDerivation { inherit version; pname = "asterisk"; diff --git a/nixpkgs/pkgs/servers/brickd/default.nix b/nixpkgs/pkgs/servers/brickd/default.nix index e21ad5723b01..ee8925e11709 100644 --- a/nixpkgs/pkgs/servers/brickd/default.nix +++ b/nixpkgs/pkgs/servers/brickd/default.nix @@ -11,7 +11,7 @@ daemonlib = fetchgit { in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "brickd"; inherit version; diff --git a/nixpkgs/pkgs/servers/demoit/default.nix b/nixpkgs/pkgs/servers/demoit/default.nix index 93db472270e2..29d00caa0236 100644 --- a/nixpkgs/pkgs/servers/demoit/default.nix +++ b/nixpkgs/pkgs/servers/demoit/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "demoit"; version = "unstable-2019-05-10"; goPackagePath = "github.com/dgageot/demoit"; diff --git a/nixpkgs/pkgs/servers/dict/dictd-db.nix b/nixpkgs/pkgs/servers/dict/dictd-db.nix index c611f87346c7..2dd3d7c4ee23 100644 --- a/nixpkgs/pkgs/servers/dict/dictd-db.nix +++ b/nixpkgs/pkgs/servers/dict/dictd-db.nix @@ -7,7 +7,7 @@ let makeDictdDB src name "{.,bin}" locale; makeDictdDB = src: _name: _subdir: _locale: - stdenv.mkDerivation rec { + stdenv.mkDerivation { name = "dictd-db-${_name}"; inherit src; locale = _locale; diff --git a/nixpkgs/pkgs/servers/dns/powerdns/default.nix b/nixpkgs/pkgs/servers/dns/powerdns/default.nix index 76c346180cdb..1b23f6520215 100644 --- a/nixpkgs/pkgs/servers/dns/powerdns/default.nix +++ b/nixpkgs/pkgs/servers/dns/powerdns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, libressl +, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, openssl , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl opendbx unixODBC botan2 libressl + libyamlcpp libsodium curl opendbx unixODBC botan2 openssl ]; # nix destroy with-modules arguments, when using configureFlags @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote" --with-sqlite3 --with-socketdir=/var/lib/powerdns - --with-libcrypto=${libressl.dev} + --with-libcrypto=${openssl.dev} --enable-libsodium --enable-botan --enable-tools diff --git a/nixpkgs/pkgs/servers/echoip/default.nix b/nixpkgs/pkgs/servers/echoip/default.nix index 0a0b6c0e1d1a..d55eb1d0bbdf 100644 --- a/nixpkgs/pkgs/servers/echoip/default.nix +++ b/nixpkgs/pkgs/servers/echoip/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "echoip"; version = "unstable-2018-11-20"; diff --git a/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/default.nix b/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/default.nix index d5671921abad..999718160215 100644 --- a/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -2,7 +2,7 @@ # !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bsd-fingerd-0.17"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/firebird/default.nix b/nixpkgs/pkgs/servers/firebird/default.nix index 31de59259161..40780c9a97b2 100644 --- a/nixpkgs/pkgs/servers/firebird/default.nix +++ b/nixpkgs/pkgs/servers/firebird/default.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-serivec-port=${builtins.toString port}" "--with-service-name=${serviceName}" - # "--disable-static" "--with-system-editline" "--with-fblog=/var/log/firebird" "--with-fbconf=/etc/firebird" diff --git a/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/nixpkgs/pkgs/servers/foundationdb/cmake.nix index e8a1a633e4db..ac7733986ce6 100644 --- a/nixpkgs/pkgs/servers/foundationdb/cmake.nix +++ b/nixpkgs/pkgs/servers/foundationdb/cmake.nix @@ -21,7 +21,7 @@ let , rev ? "refs/tags/${version}" , officialRelease ? true , patches ? [] - }: stdenv.mkDerivation rec { + }: stdenv.mkDerivation { pname = "foundationdb"; inherit version; diff --git a/nixpkgs/pkgs/servers/foundationdb/default.nix b/nixpkgs/pkgs/servers/foundationdb/default.nix index b29c5298b77d..b3ca7038ebeb 100644 --- a/nixpkgs/pkgs/servers/foundationdb/default.nix +++ b/nixpkgs/pkgs/servers/foundationdb/default.nix @@ -29,7 +29,7 @@ in with builtins; { # Older versions use the bespoke 'vsmake' build system # ------------------------------------------------------ - foundationdb51 = vsmakeBuild rec { + foundationdb51 = vsmakeBuild { version = "5.1.7"; branch = "release-5.1"; sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; @@ -42,7 +42,7 @@ in with builtins; { ]; }; - foundationdb52 = vsmakeBuild rec { + foundationdb52 = vsmakeBuild { version = "5.2.8"; branch = "release-5.2"; sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb"; @@ -55,7 +55,7 @@ in with builtins; { ]; }; - foundationdb60 = vsmakeBuild rec { + foundationdb60 = vsmakeBuild { version = "6.0.18"; branch = "release-6.0"; sha256 = "0q1mscailad0z7zf1nypv4g7gx3damfp45nf8nzyq47nsw5gz69p"; @@ -68,7 +68,7 @@ in with builtins; { # 6.1 and later versions should always use CMake # ------------------------------------------------------ - foundationdb61 = cmakeBuild rec { + foundationdb61 = cmakeBuild { version = "6.1.10"; branch = "release-6.1"; sha256 = "1v278zlrki3da2i2258j2b4rk4fq6d9bj623z01bjrvmaqxc2gry"; diff --git a/nixpkgs/pkgs/servers/foundationdb/python.nix b/nixpkgs/pkgs/servers/foundationdb/python.nix index 55b834c54369..e4256fab0fa9 100644 --- a/nixpkgs/pkgs/servers/foundationdb/python.nix +++ b/nixpkgs/pkgs/servers/foundationdb/python.nix @@ -1,6 +1,6 @@ { buildPythonPackage, lib, foundationdb }: -buildPythonPackage rec { +buildPythonPackage { pname = "foundationdb"; version = foundationdb.version; diff --git a/nixpkgs/pkgs/servers/foundationdb/vsmake.nix b/nixpkgs/pkgs/servers/foundationdb/vsmake.nix index 34b9f6ecaf0d..0265e18861e0 100644 --- a/nixpkgs/pkgs/servers/foundationdb/vsmake.nix +++ b/nixpkgs/pkgs/servers/foundationdb/vsmake.nix @@ -12,7 +12,7 @@ let # hysterical raisins dictate a version of boost this old. however, # we luckily do not need to build anything, we just need the header # files. - boost152 = stdenv49.mkDerivation rec { + boost152 = stdenv49.mkDerivation { name = "boost-headers-1.52.0"; src = fetchurl { @@ -45,7 +45,7 @@ let , officialRelease ? true , patches ? [] - }: stdenv.mkDerivation rec { + }: stdenv.mkDerivation { pname = "foundationdb"; inherit version; diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 8a2c8d0e7195..104a11ad2817 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,11 +2,12 @@ # Do not edit! { - version = "0.93.2"; + version = "0.96.2"; components = { "abode" = ps: with ps; [ ]; "acer_projector" = ps: with ps; [ pyserial ]; "actiontec" = ps: with ps; [ ]; + "adguard" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; "aftership" = ps: with ps; [ ]; "air_quality" = ps: with ps; [ ]; @@ -31,8 +32,10 @@ "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; "apple_tv" = ps: with ps; [ pyatv ]; + "aprs" = ps: with ps; [ ]; "aqualogic" = ps: with ps; [ ]; "aquostv" = ps: with ps; [ ]; + "arcam_fmj" = ps: with ps; [ ]; "arduino" = ps: with ps; [ ]; "arest" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ha-ffmpeg ]; @@ -43,6 +46,7 @@ "asuswrt" = ps: with ps; [ ]; "august" = ps: with ps; [ ]; "aurora" = ps: with ps; [ ]; + "aurora_abb_powerone" = ps: with ps; [ ]; "auth" = ps: with ps; [ aiohttp-cors ]; "automatic" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; @@ -50,6 +54,7 @@ "awair" = ps: with ps; [ ]; "aws" = ps: with ps; [ ]; "axis" = ps: with ps; [ ]; + "azure_event_hub" = ps: with ps; [ ]; "baidu" = ps: with ps; [ ]; "bayesian" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; @@ -125,12 +130,13 @@ "deconz" = ps: with ps; [ ]; "decora" = ps: with ps; [ ]; "decora_wifi" = ps: with ps; [ ]; - "default_config" = ps: with ps; [ pynacl aiohttp-cors distro sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy zeroconf ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; "denonavr" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ ]; + "device_automation" = ps: with ps; [ aiohttp-cors ]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; "dht" = ps: with ps; [ ]; @@ -174,6 +180,7 @@ "eight_sleep" = ps: with ps; [ ]; "eliqonline" = ps: with ps; [ ]; "elkm1" = ps: with ps; [ ]; + "elv" = ps: with ps; [ ]; "emby" = ps: with ps; [ ]; "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; @@ -183,6 +190,7 @@ "enocean" = ps: with ps; [ ]; "enphase_envoy" = ps: with ps; [ ]; "entur_public_transport" = ps: with ps; [ ]; + "environment_canada" = ps: with ps; [ ]; "envirophat" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; "ephember" = ps: with ps; [ ]; @@ -233,6 +241,7 @@ "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fritzdect" = ps: with ps; [ ]; + "fronius" = ps: with ps; [ ]; "frontend" = ps: with ps; [ aiohttp-cors ]; "frontier_silicon" = ps: with ps; [ ]; "futurenow" = ps: with ps; [ ]; @@ -256,6 +265,7 @@ "gogogate2" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; + "google_cloud" = ps: with ps; [ google_cloud_texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ ]; "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; @@ -364,6 +374,7 @@ "lcn" = ps: with ps; [ ]; "lg_netcast" = ps: with ps; [ ]; "lg_soundbar" = ps: with ps; [ ]; + "life360" = ps: with ps; [ ]; "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; "lifx_legacy" = ps: with ps; [ ]; @@ -408,6 +419,7 @@ "mastodon" = ps: with ps; [ ]; "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; + "mcp23017" = ps: with ps; [ ]; "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; "mediaroom" = ps: with ps; [ ]; @@ -478,6 +490,7 @@ "noaa_tides" = ps: with ps; [ ]; "norway_air" = ps: with ps; [ ]; "notify" = ps: with ps; [ ]; + "notion" = ps: with ps; [ ]; "nsw_fuel_station" = ps: with ps; [ ]; "nsw_rural_fire_service_feed" = ps: with ps; [ ]; "nuheat" = ps: with ps; [ ]; @@ -530,6 +543,7 @@ "ping" = ps: with ps; [ ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; + "plaato" = ps: with ps; [ aiohttp-cors ]; "plant" = ps: with ps; [ ]; "plex" = ps: with ps; [ ]; "plum_lightpad" = ps: with ps; [ ]; @@ -554,6 +568,7 @@ "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ ]; "qbittorrent" = ps: with ps; [ ]; + "qld_bushfire" = ps: with ps; [ ]; "qnap" = ps: with ps; [ ]; "qrcode" = ps: with ps; [ pillow ]; "quantum_gateway" = ps: with ps; [ ]; @@ -574,6 +589,8 @@ "rejseplanen" = ps: with ps; [ ]; "remember_the_milk" = ps: with ps; [ httplib2 ]; "remote" = ps: with ps; [ ]; + "remote_rpi_gpio" = ps: with ps; [ ]; + "repetier" = ps: with ps; [ ]; "rest" = ps: with ps; [ ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; @@ -632,7 +649,9 @@ "sleepiq" = ps: with ps; [ ]; "sma" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; + "smarthab" = ps: with ps; [ ]; "smartthings" = ps: with ps; [ aiohttp-cors ]; + "smarty" = ps: with ps; [ ]; "smhi" = ps: with ps; [ ]; "smtp" = ps: with ps; [ ]; "snapcast" = ps: with ps; [ snapcast ]; @@ -640,7 +659,10 @@ "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; "socialblade" = ps: with ps; [ ]; - "solaredge" = ps: with ps; [ ]; + "solaredge" = ps: with ps; [ stringcase ]; + "solaredge_local" = ps: with ps; [ ]; + "solax" = ps: with ps; [ ]; + "somfy" = ps: with ps; [ ]; "somfy_mylink" = ps: with ps; [ ]; "sonarr" = ps: with ps; [ ]; "songpal" = ps: with ps; [ ]; @@ -657,6 +679,7 @@ "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ ]; "srp_energy" = ps: with ps; [ ]; + "ssdp" = ps: with ps; [ netdisco ]; "starlingbank" = ps: with ps; [ ]; "startca" = ps: with ps; [ xmltodict ]; "statistics" = ps: with ps; [ ]; @@ -664,6 +687,7 @@ "steam_online" = ps: with ps; [ ]; "stiebel_eltron" = ps: with ps; [ ]; "stream" = ps: with ps; [ aiohttp-cors av ]; + "streamlabswater" = ps: with ps; [ ]; "stride" = ps: with ps; [ ]; "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; @@ -703,7 +727,7 @@ "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; "tesla" = ps: with ps; [ ]; "tfiac" = ps: with ps; [ ]; - "thermoworks_smoke" = ps: with ps; [ ]; + "thermoworks_smoke" = ps: with ps; [ stringcase ]; "thethingsnetwork" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; "thinkingcleaner" = ps: with ps; [ ]; @@ -724,9 +748,10 @@ "touchline" = ps: with ps; [ ]; "tplink" = ps: with ps; [ ]; "tplink_lte" = ps: with ps; [ ]; - "traccar" = ps: with ps; [ ]; + "traccar" = ps: with ps; [ stringcase ]; "trackr" = ps: with ps; [ ]; "tradfri" = ps: with ps; [ ]; + "trafikverket_train" = ps: with ps; [ ]; "trafikverket_weatherstation" = ps: with ps; [ ]; "transmission" = ps: with ps; [ transmissionrpc ]; "transport_nsw" = ps: with ps; [ ]; @@ -740,11 +765,10 @@ "twitch" = ps: with ps; [ ]; "twitter" = ps: with ps; [ ]; "ubee" = ps: with ps; [ ]; - "uber" = ps: with ps; [ ]; "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ]; - "unifi" = ps: with ps; [ aiounifi pyunifi ]; + "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; "universal" = ps: with ps; [ ]; "upc_connect" = ps: with ps; [ defusedxml ]; @@ -760,6 +784,7 @@ "utility_meter" = ps: with ps; [ ]; "uvc" = ps: with ps; [ ]; "vacuum" = ps: with ps; [ ]; + "vallox" = ps: with ps; [ ]; "vasttrafik" = ps: with ps; [ ]; "velbus" = ps: with ps; [ ]; "velux" = ps: with ps; [ ]; @@ -771,6 +796,7 @@ "viaggiatreno" = ps: with ps; [ ]; "vizio" = ps: with ps; [ ]; "vlc" = ps: with ps; [ ]; + "vlc_telnet" = ps: with ps; [ ]; "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ ]; "volumio" = ps: with ps; [ ]; @@ -782,6 +808,7 @@ "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; "watson_iot" = ps: with ps; [ ]; + "watson_tts" = ps: with ps; [ ]; "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -799,6 +826,7 @@ "wsdot" = ps: with ps; [ ]; "wunderground" = ps: with ps; [ ]; "wunderlist" = ps: with ps; [ ]; + "wwlln" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; "xbox_live" = ps: with ps; [ ]; "xeoma" = ps: with ps; [ ]; @@ -816,7 +844,7 @@ "yeelight" = ps: with ps; [ ]; "yeelightsunflower" = ps: with ps; [ ]; "yessssms" = ps: with ps; [ ]; - "yi" = ps: with ps; [ ha-ffmpeg ]; + "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; "yr" = ps: with ps; [ xmltodict ]; "yweather" = ps: with ps; [ yahooweather ]; "zabbix" = ps: with ps; [ ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 03f247e3bc5f..43633b07818f 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, protobuf3_6 +{ lib, fetchurl, fetchFromGitHub, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] @@ -26,20 +26,24 @@ let "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "19.1.0" "f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399") - (mkOverride "bcrypt" "3.1.6" - "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea") + (mkOverride "bcrypt" "3.1.7" + "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42") (mkOverride "pyjwt" "1.7.1" "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96") - (mkOverride "cryptography" "2.6.1" - "26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6") - (mkOverride "cryptography_vectors" "2.6.1" # required by cryptography==2.6.1 - "03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af") + (mkOverride "cryptography" "2.7" + "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6") + (mkOverride "cryptography_vectors" "2.7" # required by cryptography==2.7 + "f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc") + (mkOverride "importlib-metadata" "0.18" + "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db") (mkOverride "python-slugify" "3.0.2" "57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758") - (mkOverride "requests" "2.21.0" - "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") - (mkOverride "ruamel_yaml" "0.15.94" - "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8") + (mkOverride "pyyaml" "5.1.1" + "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955") + (mkOverride "requests" "2.22.0" + "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4") + (mkOverride "ruamel_yaml" "0.15.97" + "17dbf6b7362e7aee8494f7a0f5cffd44902a6331fe89ef0853b855a7930ab845") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.1.0" @@ -98,7 +102,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.93.2"; + hassVersion = "0.96.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -113,13 +117,14 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "01zdg6yfj6qal8jpr9bskmq25crrvz7w3vifrfxmlqws6hv35gc8"; + sha256 = "0qxdsr7zh2yqzignbhi8gcp67ba6gcp2yiyr1rww33a42r4fi0g5"; }; propagatedBuildInputs = [ # From setup.py - aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip - python-slugify pytz pyyaml requests ruamel_yaml voluptuous voluptuous-serialize + aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2 + pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml + voluptuous voluptuous-serialize # From http, frontend and recorder components and auth.mfa_modules.totp sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ] ++ componentBuildInputs ++ extraBuildInputs; @@ -144,6 +149,6 @@ in with py.pkgs; buildPythonApplication rec { homepage = https://home-assistant.io/; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; - maintainers = with maintainers; [ f-breidenstein dotlambda globin ]; + maintainers = with maintainers; [ fleaz dotlambda globin ]; }; } diff --git a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 4ffbb0100167..638617141457 100644 --- a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.39"; + version = "2.4.41"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml"; + sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k"; }; # FIXME: -dev depends on -doc diff --git a/nixpkgs/pkgs/servers/http/micro-httpd/default.nix b/nixpkgs/pkgs/servers/http/micro-httpd/default.nix index b636f79e6c60..d99af7a81aef 100644 --- a/nixpkgs/pkgs/servers/http/micro-httpd/default.nix +++ b/nixpkgs/pkgs/servers/http/micro-httpd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "micro-httpd-20140814"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index 0c0f118d0b91..1dbf7eb2388b 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/pkgs/servers/http/unit/default.nix @@ -4,7 +4,6 @@ , withPHP73 ? false, php73 , withPerl ? true, perl , withPerldevel ? false, perldevel -, withRuby_2_3 ? false, ruby_2_3 , withRuby_2_4 ? false, ruby_2_4 , withRuby ? true, ruby , withSSL ? true, openssl ? null @@ -33,7 +32,6 @@ stdenv.mkDerivation rec { ++ optional withPHP73 php73 ++ optional withPerl perl ++ optional withPerldevel perldevel - ++ optional withRuby_2_3 ruby_2_3 ++ optional withRuby_2_4 ruby_2_4 ++ optional withRuby ruby ++ optional withSSL openssl; @@ -53,7 +51,6 @@ stdenv.mkDerivation rec { ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"} ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perl529 --perl=${perldevel}/bin/perl"} - ${optionalString withRuby_2_3 "./configure ruby --module=ruby23 --ruby=${ruby_2_3}/bin/ruby"} ${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"} ${optionalString withRuby "./configure ruby --module=ruby --ruby=${ruby}/bin/ruby"} ''; diff --git a/nixpkgs/pkgs/servers/hydron/default.nix b/nixpkgs/pkgs/servers/hydron/default.nix index 075226f36078..6ac37a98deea 100644 --- a/nixpkgs/pkgs/servers/hydron/default.nix +++ b/nixpkgs/pkgs/servers/hydron/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick , quicktemplate, go-bindata, easyjson }: -buildGoPackage rec { +buildGoPackage { pname = "hydron-unstable"; version = "2019-02-17"; goPackagePath = "github.com/bakape/hydron"; diff --git a/nixpkgs/pkgs/servers/irker/default.nix b/nixpkgs/pkgs/servers/irker/default.nix index e7d6d9ac52a5..c056a543aa1d 100644 --- a/nixpkgs/pkgs/servers/irker/default.nix +++ b/nixpkgs/pkgs/servers/irker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, python, pkgconfig , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "irker"; version = "2017-02-12"; diff --git a/nixpkgs/pkgs/servers/kwakd/default.nix b/nixpkgs/pkgs/servers/kwakd/default.nix index 4eb0b26c3066..e65e6b5ab59a 100644 --- a/nixpkgs/pkgs/servers/kwakd/default.nix +++ b/nixpkgs/pkgs/servers/kwakd/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kwakd"; version = "0.5"; diff --git a/nixpkgs/pkgs/servers/mail/exim/default.nix b/nixpkgs/pkgs/servers/mail/exim/default.nix index 25a94cd27bfa..fcafd5817d4e 100644 --- a/nixpkgs/pkgs/servers/mail/exim/default.nix +++ b/nixpkgs/pkgs/servers/mail/exim/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "exim-4.92.1"; + name = "exim-4.92.2"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "1d14vs6jdw2bm9m33w2szxpv8rppbk7hvszq9p0n9i3svmqshr1c"; + sha256 = "0m56jsh2fzvwj4rdpcc3pkd5vsi40cjrpzalis7l1zq33m4axmq1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index 3d79d8421dd2..cdce369bbf96 100644 --- a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,24 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule { pname = "mautrix-unstable"; - version = "2019-07-04"; - - goPackagePath = "maunium.net/go/mautrix-whatsapp"; + version = "2019-09-03"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "29f5ae45c4b22f463003b23e355b951831f08b3e"; - sha256 = "12209m3x01i7bnnkg57ag1ivsk6n6pqaqfin7y02irgi3i3rm31r"; + rev = "22fb5c125db1a0a3a8be8e8e09e92bb38718e6bf"; + sha256 = "03wd6mn9jr1hr3qxg1r707ibi1s9511y97bfrmzka4mrsymgamxa"; }; - goDeps = ./deps.nix; + modSha256 = "14bqxx2hcr8yhcd5hi087pyc1hzqmr13p2fqb3nnsx12j7n07gww"; meta = with stdenv.lib; { homepage = https://github.com/tulir/mautrix-whatsapp; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; license = licenses.agpl3; - maintainers = with maintainers; [ vskilet ]; + maintainers = with maintainers; [ vskilet ma27 ]; }; } diff --git a/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix deleted file mode 100644 index 2dd35846bf5d..000000000000 --- a/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix +++ /dev/null @@ -1,211 +0,0 @@ -# NOTE: this file isn't entirely generated, while performing the bump -# from 2019-02-24 to 2019-06-01, a lot of stuff broke during `vgo2nix` as the -# tool is unable to parse `replace` statements atm. -# -# The following sources were altered manually: -# * github.com/Rhymen/go-whatsapp -> github.com/tulir/go-whatsapp (at 36ed380bdc18) -# * github.com/golang/protobuf: v1.2.0 -> v1.3.1 -# * maunium.net/go/mautrix: v0.1.0-alpha3 -> ca5d9535b6cc -# * maunium.net/go/mautrix-appservice: v0.1.0-alpha3 -> 6e6c9bb47548 - -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/Rhymen/go-whatsapp"; - fetch = { - type = "git"; - url = "https://github.com/tulir/go-whatsapp"; - rev = "36ed380bdc188e35fe804d6dd4809ee170136670"; - sha256 = "1ida4j5hgqc5djwfsaqp8g6iynn150rwj42kqk9q2srwz5075n4p"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.6.2"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.1.1"; - sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "v1.10.0"; - sha256 = "1zmz6asplixfihxhj11spgfs0v3xzb3nv0hlq6n6zsg781ni31xx"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "gopkg.in/russross/blackfriday.v2"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/skip2/go-qrcode"; - fetch = { - type = "git"; - url = "https://github.com/skip2/go-qrcode"; - rev = "dc11ecdae0a9"; - sha256 = "0mc70hsn5x2a66a9sbwlq51cng2s1aq7rw4pr9pif4xdzflkl057"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "b8fe1690c613"; - sha256 = "1mbfpbrirsz8fsdkibm9l4sccpm774p9201mpmfh4hxshz3girq3"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "915654e7eabc"; - sha256 = "0fzd7n2yc4qnnf2wk21zxy6gb01xviq2z1dzrbqcn8p1s4fjsqw5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "maunium.net/go/mauflag"; - fetch = { - type = "git"; - url = "https://github.com/tulir/mauflag.git"; - rev = "v1.0.0"; - sha256 = "09jv1819jwq5i29y6ngf4j4ii6qwlshydvprfvsfplc419dkz1vx"; - }; - } - { - goPackagePath = "maunium.net/go/maulogger"; - fetch = { - type = "git"; - url = "https://github.com/tulir/maulogger.git"; - rev = "v2.0.0"; - sha256 = "0qz4cpaqvcmrj3fb2bb6yrhw3k5h51crskricyqgg1b7aklphan5"; - }; - } - { - goPackagePath = "maunium.net/go/mautrix"; - fetch = { - type = "git"; - url = "https://github.com/tulir/mautrix-go.git"; - rev = "ca5d9535b6ccee8fdf473f9cc935932ef3e53ae7"; - sha256 = "1qrh77c8vh2k6ffwf0cymjmhcp7d0rdad1ixqx5r1xig27f7v0qg"; - }; - } - { - goPackagePath = "maunium.net/go/mautrix-appservice"; - fetch = { - type = "git"; - url = "https://github.com/tulir/mautrix-appservice-go.git"; - rev = "6e6c9bb4754849443cb3c64d9510f8d2eb3e668d"; - sha256 = "1zwsfvgxs2zbc6yvgnk16w2wkh891kihrzar3qzz9cvsgjznlyvy"; - }; - } -] diff --git a/nixpkgs/pkgs/servers/meguca/default.nix b/nixpkgs/pkgs/servers/meguca/default.nix index 326fae6bcf7a..47530ba9db60 100644 --- a/nixpkgs/pkgs/servers/meguca/default.nix +++ b/nixpkgs/pkgs/servers/meguca/default.nix @@ -2,7 +2,7 @@ , ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson , nodePackages, emscripten, opencv, statik }: -buildGoPackage rec { +buildGoPackage { pname = "meguca-unstable"; version = "2019-03-12"; goPackagePath = "github.com/bakape/meguca"; diff --git a/nixpkgs/pkgs/servers/meteor/default.nix b/nixpkgs/pkgs/servers/meteor/default.nix index d367bcfd2e31..6f9c22ebecf0 100644 --- a/nixpkgs/pkgs/servers/meteor/default.nix +++ b/nixpkgs/pkgs/servers/meteor/default.nix @@ -4,7 +4,7 @@ let version = "1.8.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "meteor"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 557a4b4842db..615edeb81ec1 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.3.4"; + version = "6.3.5"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "06xbz6y1vmj44ppm2gbb71qiv8myd5ysygi3s06d6dia07ngw3v2"; + sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0lhfy3crwis6464icxq0h3hgxvk2dgk6w7k6z2mmaxqm0j15scc8"; + sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/default.nix b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix index cb12fe819a95..9f23cc3e54c3 100644 --- a/nixpkgs/pkgs/servers/monitoring/plugins/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix @@ -11,7 +11,7 @@ let binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp procps ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "monitoring-plugins-${majorVersion}${minorVersion}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix index 79303849156a..9b4f3144a372 100644 --- a/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix +++ b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "check-uptime"; version = "20161112"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix new file mode 100644 index 000000000000..21c469694c83 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "aws-s3-exporter"; + version = "0.3.0"; + + goPackagePath = "github.com/ribbybibby/s3_exporter"; + + goDeps = ./aws-s3-exporter_deps.nix; + + src = fetchFromGitHub { + owner = "ribbybibby"; + repo = "s3_exporter"; + rev = "v${version}"; + sha256 = "062qi4rfqkxwknncwcvx4g132bxhkn2bhbxi4l90wl93v6sdp9l2"; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Exports Prometheus metrics about S3 buckets and objects"; + homepage = "https://github.com/ribbybibby/s3_exporter"; + license = licenses.asl20; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix new file mode 100644 index 000000000000..5ca160cb16f9 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix @@ -0,0 +1,336 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "v1.20.1"; + sha256 = "0nhdkkcm11d2n2974kph6jjhddkp1fjbcpfgmalabc798gmqfg54"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.1"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e8439af"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.9.4"; + sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "b47fdc937951"; + sha256 = "17k4qwql2zizrxwjd0qv0gccwgyyv2axiha1vh5lrjfps1h5kli7"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "90fa682c2a6e"; + sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 627186e47ac3..e55d0018b882 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -1,54 +1,46 @@ -{ stdenv, go, buildGoPackage, fetchFromGitHub }: +{ lib, go, buildGoPackage, fetchFromGitHub }: let goPackagePath = "github.com/prometheus/prometheus"; -in rec { - buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in - buildGoPackage ({ - name = "prometheus-${version}"; +in +buildGoPackage rec { + pname = "prometheus"; + version = "2.12.0"; - inherit goPackagePath; + inherit goPackagePath; - src = fetchFromGitHub { - rev = "v${version}"; - owner = "prometheus"; - repo = "prometheus"; - inherit sha256; - }; - - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${stdenv.lib.getVersion go} - ''; - - preInstall = '' - mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" - cp -a $src/documentation/* $bin/share/doc/prometheus - cp -a $src/console_libraries $src/consoles $bin/etc/prometheus - ''; - - meta = with stdenv.lib; { - description = "Service monitoring system and time series database"; - homepage = https://prometheus.io; - license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz globin ]; - platforms = platforms.unix; - }; - } // attrs'); - - prometheus_1 = buildPrometheus { - version = "1.8.2"; - sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv"; + src = fetchFromGitHub { + rev = "v${version}"; + owner = "prometheus"; + repo = "prometheus"; + sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs"; }; - prometheus_2 = buildPrometheus { - version = "2.12.0"; - sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs"; + buildFlagsArray = let + t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; + in '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.Revision=unknown + -X ${t}.Branch=unknown + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=unknown + -X ${t}.GoVersion=${lib.getVersion go} + ''; + + preInstall = '' + mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" + cp -a $src/documentation/* $bin/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + ''; + + doCheck = true; + + meta = with lib; { + description = "Service monitoring system and time series database"; + homepage = "https://prometheus.io"; + license = licenses.asl20; + maintainers = with maintainers; [ benley fpletz globin willibutz ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix index f126b8a7da1c..4d92532c90e1 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,7 +1,7 @@ # This file was generated by go2nix. { buildGoPackage, fetchFromGitHub, fetchpatch, lib }: -buildGoPackage rec { +buildGoPackage { pname = "prometheus-json-exporter"; version = "unstable-2017-10-06"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 947dfc2b70c3..1e29eefba2b2 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "mailexporter"; version = "2019-07-14"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix new file mode 100644 index 000000000000..a29ab6496332 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "process-exporter"; + version = "0.5.0"; + + goPackagePath = "github.com/ncabatoff/process-exporter"; + + goDeps = ./process-exporter_deps.nix; + + src = fetchFromGitHub { + owner = "ncabatoff"; + repo = pname; + rev = "v${version}"; + sha256 = "129vqry3l8waxcyvx83wg0dvh3qg4pr3rl5fw7vmhgdzygbaq3bq"; + }; + + postPatch = '' + substituteInPlace proc/read_test.go --replace /bin/cat cat + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Prometheus exporter that mines /proc to report on selected processes"; + homepage = "https://github.com/ncabatoff/process-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ maintainers."1000101" ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix new file mode 100644 index 000000000000..c8880119207b --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix @@ -0,0 +1,156 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.1.0"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/ncabatoff/fakescraper"; + fetch = { + type = "git"; + url = "https://github.com/ncabatoff/fakescraper"; + rev = "15938421d91a"; + sha256 = "1in2iakq6xly9r8gk0mfim8n0glbjzpa07hkaj1rlrm0i11jlc6f"; + }; + } + { + goPackagePath = "github.com/ncabatoff/go-seq"; + fetch = { + type = "git"; + url = "https://github.com/ncabatoff/go-seq"; + rev = "b08ef85ed833"; + sha256 = "1x88x285n4wf221pp7ccmh2ai7rgcnwz764gn8k861qg30jl1ky6"; + }; + } + { + goPackagePath = "github.com/ncabatoff/procfs"; + fetch = { + type = "git"; + url = "https://github.com/ncabatoff/procfs"; + rev = "9ced60d7b905"; + sha256 = "19756h4lw5v8f0xr70cl8gd0wfqcnszrhhgawqhyinnir82rz728"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.8.0"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "c7de2306084e"; + sha256 = "11dqfm2d0m4sjjgyrnayman96g59x2apmvvqby9qmww2qj2k83ig"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "ea9eea638872"; + sha256 = "1j99qszynx2asac82bhzhk0g1nav87nfgkb1cz5a2iywj81liirj"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 331503dfe7d4..c6af09743ce9 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,7 +1,7 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "rabbitmq_exporter"; version = "0.25.2"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index cbafabb18b52..dfa81d4da832 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "snmp_exporter"; - version = "0.13.0"; + version = "0.15.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "071v9qqhp2hcbgml94dm1l212qi18by88r9755npq9ycrsmawkll"; + sha256 = "1cnz1wapxs3fkghzy6v90s56vd0ngynypyapcpbmx5y66rlpdxx6"; }; buildInputs = [ net_snmp ]; diff --git a/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix b/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix index c1f4746fadfe..fafe8ad3046e 100644 --- a/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix @@ -27,7 +27,7 @@ let inherit src; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "uchiwa"; inherit version; diff --git a/nixpkgs/pkgs/servers/mumsi/default.nix b/nixpkgs/pkgs/servers/mumsi/default.nix index 4465febf39a9..3cc3f338f2f6 100644 --- a/nixpkgs/pkgs/servers/mumsi/default.nix +++ b/nixpkgs/pkgs/servers/mumsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost , log4cpp, pjsip, openssl, alsaLib, mumlib }: -with lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation { pname = "mumsi"; version = "unstable-2018-12-12"; diff --git a/nixpkgs/pkgs/servers/news/leafnode/default.nix b/nixpkgs/pkgs/servers/news/leafnode/default.nix index 955547289bc6..0f1a8e120f65 100644 --- a/nixpkgs/pkgs/servers/news/leafnode/default.nix +++ b/nixpkgs/pkgs/servers/news/leafnode/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "leafnode-2.0.0.alpha20121101a.12"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/nosql/arangodb/default.nix b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix index 11695d753e28..871e335628ce 100644 --- a/nixpkgs/pkgs/servers/nosql/arangodb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix @@ -33,13 +33,13 @@ let "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" # also avoid using builder's /proc/cpuinfo ] ++ - { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/default.nix b/nixpkgs/pkgs/servers/nosql/mongodb/default.nix index 2864449267a6..4c4ac4c5cb63 100644 --- a/nixpkgs/pkgs/servers/nosql/mongodb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/mongodb/default.nix @@ -20,7 +20,7 @@ let version = "3.4.10"; "yaml" ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "mongodb"; inherit version; diff --git a/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix b/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix index 36b29b57bf97..4ebcbafde5dc 100644 --- a/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "riak_cs-2.1.1"; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix b/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix index 1524ca207009..5fe4ce45f84b 100644 --- a/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "stanchion-2.1.1"; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix b/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix index 170b0d5f22f9..efa43f7a844f 100644 --- a/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix +++ b/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix @@ -25,7 +25,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "riak-2.2.0"; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/openafs/1.6/default.nix b/nixpkgs/pkgs/servers/openafs/1.6/default.nix index 6fbabc3d0030..8155a9510613 100644 --- a/nixpkgs/pkgs/servers/openafs/1.6/default.nix +++ b/nixpkgs/pkgs/servers/openafs/1.6/default.nix @@ -6,7 +6,7 @@ with (import ./srcs.nix { inherit fetchurl; }); -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openafs"; inherit version srcs; diff --git a/nixpkgs/pkgs/servers/openafs/1.6/module.nix b/nixpkgs/pkgs/servers/openafs/1.6/module.nix index 6f771e2bf33a..d410a4e55e57 100644 --- a/nixpkgs/pkgs/servers/openafs/1.6/module.nix +++ b/nixpkgs/pkgs/servers/openafs/1.6/module.nix @@ -7,7 +7,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; diff --git a/nixpkgs/pkgs/servers/openafs/1.8/default.nix b/nixpkgs/pkgs/servers/openafs/1.8/default.nix index 23e1cfae47ce..fca872a4a2b5 100644 --- a/nixpkgs/pkgs/servers/openafs/1.8/default.nix +++ b/nixpkgs/pkgs/servers/openafs/1.8/default.nix @@ -7,7 +7,7 @@ with (import ./srcs.nix { inherit fetchurl; }); -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openafs"; inherit version srcs; diff --git a/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/nixpkgs/pkgs/servers/openafs/1.8/module.nix index 958fcd578c2b..95084458f47f 100644 --- a/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -7,7 +7,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; diff --git a/nixpkgs/pkgs/servers/plex/default.nix b/nixpkgs/pkgs/servers/plex/default.nix index 2f2b1195cf32..267bd4c2600f 100644 --- a/nixpkgs/pkgs/servers/plex/default.nix +++ b/nixpkgs/pkgs/servers/plex/default.nix @@ -9,7 +9,7 @@ , dataDir ? "/var/lib/plex" }: -buildFHSUserEnv rec { +buildFHSUserEnv { name = "plexmediaserver"; inherit (plexRaw) meta; diff --git a/nixpkgs/pkgs/servers/ps3netsrv/default.nix b/nixpkgs/pkgs/servers/ps3netsrv/default.nix index 86a96dde5406..7e6b92a03764 100644 --- a/nixpkgs/pkgs/servers/ps3netsrv/default.nix +++ b/nixpkgs/pkgs/servers/ps3netsrv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ps3netsrv"; version = "1.1.0"; diff --git a/nixpkgs/pkgs/servers/rippled/default.nix b/nixpkgs/pkgs/servers/rippled/default.nix index 4000c25aceae..840f63f3e058 100644 --- a/nixpkgs/pkgs/servers/rippled/default.nix +++ b/nixpkgs/pkgs/servers/rippled/default.nix @@ -49,7 +49,7 @@ let postFetch = "cd $out && git tag ${rev}"; }; - soci = fetchgit rec { + soci = fetchgit { url = "https://github.com/SOCI/soci.git"; rev = "3a1f602b3021b925d38828e3ff95f9e7f8887ff7"; sha256 = "0lnps42cidlrn43h13b9yc8cs3fwgz7wb6a1kfc9rnw7swkh757f"; @@ -84,7 +84,7 @@ let postFetch = "cd $out && git tag ${rev}"; }; - google-test = fetchgit rec { + google-test = fetchgit { url = "https://github.com/google/googletest.git"; rev = "c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2"; sha256 = "0pj5b6jnrj5lrccz2disr8hklbnzd8hwmrwbfqmvhiwb9q9p0k2k"; @@ -92,7 +92,7 @@ let fetchSubmodules = false; }; - google-benchmark = fetchgit rec { + google-benchmark = fetchgit { url = "https://github.com/google/benchmark.git"; rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8"; sha256 = "0qg70j47zqnrbszlgrzmxpr4g88kq0gyq6v16bhaggfm83c6mg6i"; diff --git a/nixpkgs/pkgs/servers/rpcbind/default.nix b/nixpkgs/pkgs/servers/rpcbind/default.nix index c8fd5c059a88..00d01b01efee 100644 --- a/nixpkgs/pkgs/servers/rpcbind/default.nix +++ b/nixpkgs/pkgs/servers/rpcbind/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook , useSystemd ? true, systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rpcbind"; version = "1.2.5"; diff --git a/nixpkgs/pkgs/servers/scylladb/default.nix b/nixpkgs/pkgs/servers/scylladb/default.nix index 1a168608bec2..f48ace22f8fb 100644 --- a/nixpkgs/pkgs/servers/scylladb/default.nix +++ b/nixpkgs/pkgs/servers/scylladb/default.nix @@ -30,7 +30,7 @@ libtool, thrift }: -gcc8Stdenv.mkDerivation rec { +gcc8Stdenv.mkDerivation { pname = "scylladb"; version = "3.0.5"; diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/5.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/5.x.nix deleted file mode 100644 index c64687054ab5..000000000000 --- a/nixpkgs/pkgs/servers/search/elasticsearch/5.x.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless -, utillinux, gnugrep, coreutils }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - version = elk5Version; - pname = "elasticsearch"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz"; - sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb"; - }; - - patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; - - buildInputs = [ makeWrapper jre_headless utillinux ]; - - installPhase = '' - mkdir -p $out - cp -R bin config lib modules plugins $out - - chmod -x $out/bin/*.* - - wrapProgram $out/bin/elasticsearch \ - --prefix ES_CLASSPATH : "$out/lib/*" \ - --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \ - --set JAVA_HOME "${jre_headless}" \ - --set ES_JVM_OPTIONS "$out/config/jvm.options" - - wrapProgram $out/bin/elasticsearch-plugin \ - --prefix ES_CLASSPATH : "$out/lib/*" \ - --set JAVA_HOME "${jre_headless}" - ''; - - meta = { - description = "Open Source, Distributed, RESTful Search Engine"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ - maintainers.apeschar - ]; - }; -} diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix index fffc84b2d281..04e81fe150a9 100644 --- a/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix +++ b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation (rec { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; sha256 = if enableUnfree - then "1a88yyl0x4bsx92m3wjsz1fgm76gbfdzcd4bzp2x652rha667vfh" - else "04fa0fk25d5yxcjdj0bwqvdrswgwj31fwjvbq4gpg66c6bqwzcn6"; + then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42" + else "0s04xz3j4psyhawvy503sp2nl5s0gswmpd9wfvwnavgcrr23wk39"; }; patches = [ ./es-home-6.x.patch ]; diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix index ddb1d2299cbb..34494c76dedb 100644 --- a/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix +++ b/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,12 +17,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik"; - "x86_64-darwin" = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18"; + "x86_64-linux" = "0x1ws6iqflvzphg2srvdrn4xrr5wd5fnykkc9h006mj9rb5lp1k9"; + "x86_64-darwin" = "0yjzgsbsgwa6gbp270fqfm1klm6f8n4s2xmay62gdgvnsj543cxz"; } else { - "x86_64-linux" = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10"; - "x86_64-darwin" = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2"; + "x86_64-linux" = "1nl6yic1j422l2c7mf8wv0ylfx6marrwm7d181z9nzdswq509kpg"; + "x86_64-darwin" = "1sy4an9d1faifr3n2y45kalrd22yb68dnpjhi9h8q73c21gp8pzf"; }; in stdenv.mkDerivation (rec { diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch b/nixpkgs/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch deleted file mode 100644 index ccdca1e53afc..000000000000 --- a/nixpkgs/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200 -+++ b/bin/elasticsearch 2017-05-17 10:55:52.755081523 +0200 -@@ -129,12 +129,7 @@ ES_JAVA_OPTS="$(parse_jvm_options "$ES_J - # If an include wasn't specified in the environment, then search for one... - if [ "x$ES_INCLUDE" = "x" ]; then - # Locations (in order) to use when searching for an include file. -- for include in /usr/share/elasticsearch/elasticsearch.in.sh \ -- /usr/local/share/elasticsearch/elasticsearch.in.sh \ -- /opt/elasticsearch/elasticsearch.in.sh \ -- ~/.elasticsearch.in.sh \ -- "$ES_HOME/bin/elasticsearch.in.sh" \ -- "`dirname "$0"`"/elasticsearch.in.sh; do -+ for include in "`dirname "$0"`"/elasticsearch.in.sh; do - if [ -r "$include" ]; then - . "$include" - break -diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh ---- a/bin/elasticsearch.in.sh 2017-04-28 19:41:47.000000000 +0200 -+++ b/bin/elasticsearch.in.sh 2017-05-17 10:56:49.303519788 +0200 -@@ -1,13 +1 @@ - #!/bin/bash -- --# check in case a user was using this mechanism --if [ "x$ES_CLASSPATH" != "x" ]; then -- cat >&2 << EOF --Error: Don't modify the classpath with ES_CLASSPATH. Best is to add --additional elements via the plugin mechanism, or if code must really be --added to the main classpath, add jars to lib/ (unsupported). --EOF -- exit 1 --fi -- --ES_CLASSPATH="$ES_HOME/lib/*" -diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin ---- a/bin/elasticsearch-plugin 2018-04-13 01:21:55.000000000 +0900 -+++ b/bin/elasticsearch-plugin 2018-06-28 19:08:54.700969245 +0900 -@@ -88,4 +88,4 @@ if [ -e "$CONF_DIR" ]; then - path_props=("${path_props[@]}" -Des.path.conf="$CONF_DIR") - fi - --exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginCli "${args[@]}" -+exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_CLASSPATH" org.elasticsearch.plugins.PluginCli "${args[@]}" diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/es-home-5.x.patch b/nixpkgs/pkgs/servers/search/elasticsearch/es-home-5.x.patch deleted file mode 100644 index cee0137312f1..000000000000 --- a/nixpkgs/pkgs/servers/search/elasticsearch/es-home-5.x.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2017-05-17 10:53:42.214686741 +0200 -+++ b/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200 -@@ -105,7 +105,11 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+ -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin ---- a/bin/elasticsearch-plugin 2017-05-17 10:53:42.214686741 +0200 -+++ b/bin/elasticsearch-plugin 2017-05-17 10:53:49.445487044 +0200 -@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` diff --git a/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix index 1238778658a4..6241380ea0c6 100644 --- a/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix +++ b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix @@ -6,7 +6,7 @@ } }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sphinxsearch"; inherit version; src = mainSrc; diff --git a/nixpkgs/pkgs/servers/sickbeard/default.nix b/nixpkgs/pkgs/servers/sickbeard/default.nix index 6dc044092ad5..6cca58a175e8 100644 --- a/nixpkgs/pkgs/servers/sickbeard/default.nix +++ b/nixpkgs/pkgs/servers/sickbeard/default.nix @@ -2,7 +2,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "sickbeard"; version = "2016-03-21"; diff --git a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix index a34b7f03be88..ba395c5e7f6b 100644 --- a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix +++ b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "19.1.1"; + version = "19.1.4"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1vbz5j0y9ri8c99k8fc5rnwigay478p1mac5g402639ilkqd41fc"; + sha256 = "1bqzs844ildvyh4332vapsqhfkwcvjmgkkmn3i8ndd89q5yic6fq"; }; inherit nativeBuildInputs buildInputs; diff --git a/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/nixpkgs/pkgs/servers/sql/monetdb/default.nix index 0770191c1b9f..245bd811c1a2 100644 --- a/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -4,7 +4,7 @@ let version = "11.33.3"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "monetdb"; inherit version; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 5dcbe5106d65..0ca6f35ae7ad 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -168,14 +168,6 @@ let in self: { - postgresql_9_4 = self.callPackage generic { - version = "9.4.24"; - psqlSchema = "9.4"; - sha256 = "0acl1wmah3r1a0qjjmpc256glccrjnzq4pkwklx4d9s6vmkks9aj"; - this = self.postgresql_9_4; - inherit self; - }; - postgresql_9_5 = self.callPackage generic { version = "9.5.19"; psqlSchema = "9.5"; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 15d670171899..1e5824d60d85 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.1.4"; + version = "1.2.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0wkqgrm3v999hjcc82h24jv1pib6f6bw8jsv83hgk6g3iv6xsjg9"; + sha256 = "1hkrk6jxl20k2b0ngchblwkrzigl77jaq1gvininp4yhjdlgaks8"; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix index ac79c1b3b381..7dcaac07d877 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pgjwt"; version = "unstable-2017-04-24"; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index 33d050497da5..88090636ff21 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "2.5.2"; + version = "2.5.3"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn"; + sha256 = "16jm9v9y25dhfwd4hvhnynj6k3ikjbr3z3dpn8py50gr82fjds3j"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Geographic Objects for PostgreSQL"; homepage = https://postgis.net/; + changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; inherit (postgresql.meta) platforms; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 9e3fe74aa6ce..9bc556c700dc 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, postgresql }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tsearch-extras"; version = "0.4"; diff --git a/nixpkgs/pkgs/servers/tacacs+/default.nix b/nixpkgs/pkgs/servers/tacacsplus/default.nix index 01d8affd1e85..400298d15d58 100644 --- a/nixpkgs/pkgs/servers/tacacs+/default.nix +++ b/nixpkgs/pkgs/servers/tacacsplus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcp_wrappers, flex, bison, perl }: stdenv.mkDerivation rec { - pname = "tacacs+"; + pname = "tacacsplus"; version = "4.0.4.28"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/teleport/default.nix b/nixpkgs/pkgs/servers/teleport/default.nix index 121983e70315..3a83f1a08c25 100644 --- a/nixpkgs/pkgs/servers/teleport/default.nix +++ b/nixpkgs/pkgs/servers/teleport/default.nix @@ -3,14 +3,14 @@ buildGoPackage rec { pname = "teleport"; - version = "4.0.2"; + version = "4.0.4"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "0rnjw297pkkhpqisrs5ghgvzlklk7kbhrz7rhr91b5rx3lr9c1ny"; + sha256 = "1ady9nh1mi1lb9a868w6ylncz2r6x7mk33ajiymn2frpcwk9m2l9"; }; goPackagePath = "github.com/gravitational/teleport"; diff --git a/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 7ddc3abb0b4e..fd6ca9909470 100644 --- a/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { pname = "tt-rss-plugin-ff-instagram"; version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 diff --git a/nixpkgs/pkgs/servers/tvheadend/default.nix b/nixpkgs/pkgs/servers/tvheadend/default.nix index c996d7c0c8b4..dd66259eed6f 100644 --- a/nixpkgs/pkgs/servers/tvheadend/default.nix +++ b/nixpkgs/pkgs/servers/tvheadend/default.nix @@ -5,7 +5,7 @@ let version = "4.2.8"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "tvheadend"; inherit version; diff --git a/nixpkgs/pkgs/servers/udpt/default.nix b/nixpkgs/pkgs/servers/udpt/default.nix index 12f2a08c7f48..cddfdf9f48f6 100644 --- a/nixpkgs/pkgs/servers/udpt/default.nix +++ b/nixpkgs/pkgs/servers/udpt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "udpt"; version = "2017-09-27"; diff --git a/nixpkgs/pkgs/servers/unifi/default.nix b/nixpkgs/pkgs/servers/unifi/default.nix index eb7a072799dc..3ca91cfd6256 100644 --- a/nixpkgs/pkgs/servers/unifi/default.nix +++ b/nixpkgs/pkgs/servers/unifi/default.nix @@ -2,7 +2,7 @@ let generic = { version, sha256, suffix ? "" }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "unifi-controller"; inherit version; @@ -19,8 +19,6 @@ let runHook postUnpack ''; - doConfigure = false; - installPhase = '' runHook preInstall @@ -40,7 +38,7 @@ let }; }; -in rec { +in { # https://community.ui.com/releases / https://www.ui.com/download/unifi # Outdated FAQ: https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions @@ -54,11 +52,4 @@ in rec { version = "5.11.39"; sha256 = "0v1gnvdazxa3bcbq8hl6796yw0mxzki2xn4s5im5k5ngmfmnswyj"; }; - - # TODO: update as it is outdated - unifiTesting = generic { - version = "5.11.18"; - suffix = "-996baf2ca5"; - sha256 = "14yyfn39ix8bnn0cb6bn0ly6pqxg81lvy83y40bk0y8vxfg6maqc"; - }; } diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh b/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh index fd3c93368912..8abf47409d4e 100755 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix nodePackages.bower2nix +#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix set -euo pipefail node2nix -6 \ diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index 6189bfdf4cb8..9fb93c020854 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -49,13 +49,13 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "chainpad-server-3.0.3" = { + "chainpad-server-3.0.5" = { name = "chainpad-server"; packageName = "chainpad-server"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.3.tgz"; - sha512 = "NRfV7FFBEYy4ZVX7h0P5znu55X8v5K4iGWeMGihkfWZLKu70GmCPUTwpBCP79dUvnCToKEa4/e8aoSPcvZC8pA=="; + url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.5.tgz"; + sha512 = "USKOMSHsNjnme81Qy3nQ+ji9eCkBPokYH4T82LVHAI0aayTSCXcTPUDLVGDBCRqe8NsXU4io1WPXn1KiZwB8fA=="; }; }; "content-disposition-0.5.2" = { @@ -619,14 +619,14 @@ let }; in { - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" = nodeEnv.buildNodePackage { + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.0.1" = nodeEnv.buildNodePackage { name = "cryptpad"; packageName = "cryptpad"; - version = "3.0.0"; + version = "3.0.1"; src = fetchgit { url = "https://github.com/xwiki-labs/cryptpad.git"; - rev = "166ab65cd47a64e020528089244ed5be34f6e3c8"; - sha256 = "35a3b733b5c128b7c7e1c0e7473f4a6a446d663f4c787745b36b1071205c1fd7"; + rev = "4e5f6edac4f9a3a7a4756eb543d29dc9d1eef32a"; + sha256 = "f32a93316b717246d1563baec70f9e1e7e5ec1be4f325a473cc37e656afa13cd"; }; dependencies = [ sources."accepts-1.3.7" @@ -634,7 +634,7 @@ in sources."async-limiter-1.0.1" sources."body-parser-1.18.3" sources."bytes-3.0.0" - sources."chainpad-server-3.0.3" + sources."chainpad-server-3.0.5" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json index b370e09931b6..c0c86f9848a6 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -1,3 +1,3 @@ [ - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" } + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.0.1" } ] diff --git a/nixpkgs/pkgs/servers/web-apps/frab/default.nix b/nixpkgs/pkgs/servers/web-apps/frab/default.nix index d6a5128b8130..0b0583f1fb6f 100644 --- a/nixpkgs/pkgs/servers/web-apps/frab/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/frab/default.nix @@ -11,7 +11,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "frab-2016-12-28"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index e3adeb0fe660..1b61632824f2 100644 --- a/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pgpkeyserver-lite"; version = "2017-07-18"; diff --git a/nixpkgs/pkgs/servers/webmetro/default.nix b/nixpkgs/pkgs/servers/webmetro/default.nix index 30ab9374cba0..352c5a80e1f4 100644 --- a/nixpkgs/pkgs/servers/webmetro/default.nix +++ b/nixpkgs/pkgs/servers/webmetro/default.nix @@ -2,7 +2,6 @@ rustPlatform.buildRustPackage rec { pname = "webmetro"; - name = "${pname}-${version}"; version = "unstable-20180426"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix index 66d4643de39f..bd8bba93b4e6 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -1132,11 +1132,11 @@ lib.makeScope newScope (self: with self; { }) {}; libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation { - name = "libpciaccess-0.14"; + name = "libpciaccess-0.16"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2; - sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x"; + url = mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2; + sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 80b0addd6ec8..b581b7e8a4c2 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -340,7 +340,7 @@ self: super: installFlags = "sdkdir=\${out}/include/xorg"; }); - xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec { + xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; installFlags = "sdkdir=\${dev}/include/xorg"; }); diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index beeffc21e562..fc8f2ee46bc5 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 diff --git a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 7bf21cbf22f2..549b55705c49 100644 --- a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ '') (withCommunityModules ++ withOnlyInstalledCommunityModules)} wrapProgram $out/bin/prosody \ - --prefix LUA_PATH ';' "$NIX_LUA_PATH" \ - --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" wrapProgram $out/bin/prosodyctl \ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ - --prefix LUA_PATH ';' "$NIX_LUA_PATH" \ - --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" ''; passthru.communityModules = withCommunityModules; diff --git a/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix index f5bdfd9fe853..7db8ec3b6049 100644 --- a/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { xmpppy pythonIRClib ]; - /* doConfigure should be removed if not needed */ # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; installPhase = '' diff --git a/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix index 719acfd3a66e..0c85f322f487 100644 --- a/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { pythonPath = [ xmpppy ]; buildInputs = [ pythonPackages.wrapPython ]; - /* doConfigure should be removed if not needed */ installPhase = '' cd mail-transport mkdir -p $out/bin $out/share/${pname}-${version} diff --git a/nixpkgs/pkgs/shells/dgsh/default.nix b/nixpkgs/pkgs/shells/dgsh/default.nix index 4fd88d3261b3..e2fd845c286e 100644 --- a/nixpkgs/pkgs/shells/dgsh/default.nix +++ b/nixpkgs/pkgs/shells/dgsh/default.nix @@ -3,7 +3,7 @@ perl, texinfo, help2man, gettext, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dgsh-unstable"; version = "2017-02-05"; diff --git a/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix b/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix index b2aecdf6c14e..a5f429ed3732 100644 --- a/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix +++ b/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gnused, bash, coreutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fish-foreign-env"; version = "git-20170324"; diff --git a/nixpkgs/pkgs/shells/ion/default.nix b/nixpkgs/pkgs/shells/ion/default.nix index 383387b4056c..2bd376593879 100644 --- a/nixpkgs/pkgs/shells/ion/default.nix +++ b/nixpkgs/pkgs/shells/ion/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "ion-${version}"; + pname = "ion"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/ksh/default.nix b/nixpkgs/pkgs/shells/ksh/default.nix index 74e70feaa8d7..80059e448c9e 100644 --- a/nixpkgs/pkgs/shells/ksh/default.nix +++ b/nixpkgs/pkgs/shells/ksh/default.nix @@ -1,6 +1,6 @@ { stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ksh"; version = "93v"; diff --git a/nixpkgs/pkgs/shells/pash/default.nix b/nixpkgs/pkgs/shells/pash/default.nix index 78d508840ba8..8b8601e326cc 100644 --- a/nixpkgs/pkgs/shells/pash/default.nix +++ b/nixpkgs/pkgs/shells/pash/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildDotnetPackage }: -buildDotnetPackage rec { +buildDotnetPackage { baseName = "pash"; version = "git-2016-07-06"; diff --git a/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix index 3ce32a5e4362..b1e403e7de34 100644 --- a/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -4,7 +4,7 @@ let version = "0.4.3"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nix-zsh-completions"; inherit version; diff --git a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index 4e089dd4d73c..ad7b46a907e4 100644 --- a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation { pname = "spaceship-prompt"; version = "3.7.1"; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix index 3e403b623222..6228b97685ab 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix @@ -8,7 +8,7 @@ # ZSH_COMMAND_TIME_ECHO=1 # ''; -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-04-30"; pname = "zsh-command-time"; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 00e7612b17be..c80ff0da60af 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -3,7 +3,7 @@ # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "powerlevel9k"; version = "2017-11-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix index efb62c2a0fd8..383d19675314 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zsh-prezto-2019-03-18"; src = fetchgit { url = "https://github.com/sorin-ionescu/prezto"; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix index c44483d3744f..39e1cedc7d0f 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-you-should-use"; - version = "1.1.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "MichaelAquilina"; repo = pname; rev = version; - sha256 = "0fig5ralagi5jajk7gdm52jvwql17qk9cd6j98qsndvckb26a753"; + sha256 = "1n0mcgahx40acqjj617k0rhqpzjqjaa9xfs4b1xrjp3qdy9s0ns0"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/stdenv/darwin/default.nix b/nixpkgs/pkgs/stdenv/darwin/default.nix index b6a488ed2f23..86a6e33c9424 100644 --- a/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -39,7 +39,7 @@ in rec { export gl_cv_func_getcwd_abort_bug=no ''; - bootstrapTools = derivation rec { + bootstrapTools = derivation { inherit system; name = "bootstrap-tools"; @@ -142,7 +142,7 @@ in rec { }; stage0 = stageFun 0 null { - overrides = self: super: with stage0; rec { + overrides = self: super: with stage0; { darwin = super.darwin // { Libsystem = stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; diff --git a/nixpkgs/pkgs/stdenv/default.nix b/nixpkgs/pkgs/stdenv/default.nix index 1f752f021524..b0db1be5f446 100644 --- a/nixpkgs/pkgs/stdenv/default.nix +++ b/nixpkgs/pkgs/stdenv/default.nix @@ -39,25 +39,25 @@ in if crossSystem != localSystem || crossOverlays != [] then stagesCross else if config ? replaceStdenv then stagesCustom else { # switch - "i686-linux" = stagesLinux; - "x86_64-linux" = stagesLinux; - "armv5tel-linux" = stagesLinux; - "armv6l-linux" = stagesLinux; - "armv6m-linux" = stagesLinux; - "armv7a-linux" = stagesLinux; - "armv7l-linux" = stagesLinux; - "armv7r-linux" = stagesLinux; - "armv7m-linux" = stagesLinux; - "armv8a-linux" = stagesLinux; - "armv8r-linux" = stagesLinux; - "armv8m-linux" = stagesLinux; - "aarch64-linux" = stagesLinux; - "mipsel-linux" = stagesLinux; - "powerpc-linux" = /* stagesLinux */ stagesNative; - "powerpc64le-linux" = stagesLinux; - "x86_64-darwin" = stagesDarwin; - "x86_64-solaris" = stagesNix; - "i686-cygwin" = stagesNative; - "x86_64-cygwin" = stagesNative; - "x86_64-freebsd" = stagesFreeBSD; + i686-linux = stagesLinux; + x86_64-linux = stagesLinux; + armv5tel-linux = stagesLinux; + armv6l-linux = stagesLinux; + armv6m-linux = stagesLinux; + armv7a-linux = stagesLinux; + armv7l-linux = stagesLinux; + armv7r-linux = stagesLinux; + armv7m-linux = stagesLinux; + armv8a-linux = stagesLinux; + armv8r-linux = stagesLinux; + armv8m-linux = stagesLinux; + aarch64-linux = stagesLinux; + mipsel-linux = stagesLinux; + powerpc-linux = /* stagesLinux */ stagesNative; + powerpc64le-linux = stagesLinux; + x86_64-darwin = stagesDarwin; + x86_64-solaris = stagesNix; + i686-cygwin = stagesNative; + x86_64-cygwin = stagesNative; + x86_64-freebsd = stagesFreeBSD; }.${localSystem.system} or stagesNative diff --git a/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/nixpkgs/pkgs/stdenv/generic/check-meta.nix index 1a96d9b3acf7..b754230b0be9 100644 --- a/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -153,7 +153,7 @@ let '' + (builtins.getAttr reason remediation) attrs; - handler = if config ? "handleEvalIssue" + handler = if config ? handleEvalIssue then config.handleEvalIssue reason else throw; in handler msg; diff --git a/nixpkgs/pkgs/stdenv/generic/default.nix b/nixpkgs/pkgs/stdenv/generic/default.nix index 1ef2ab52029b..2f43db9cfc24 100644 --- a/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/nixpkgs/pkgs/stdenv/generic/default.nix @@ -108,7 +108,7 @@ let __impureHostDeps = __stdenvImpureHostDeps; }) - // rec { + // { meta = { description = "The default build environment for Unix packages in Nixpkgs"; diff --git a/nixpkgs/pkgs/stdenv/generic/setup.sh b/nixpkgs/pkgs/stdenv/generic/setup.sh index ebcedce60b87..311292169ecd 100644 --- a/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -212,6 +212,18 @@ isELF() { if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi } +# Return success if the specified file is an ELF object +# and its e_type is ET_EXEC (executable file) +isELFExec() { + grep -ao -P '^\177ELF.{11}\x00\x02' "$1" >/dev/null +} + +# Return success if the specified file is an ELF object +# and its e_type is ET_DYN (shared object file) +isELFDyn() { + grep -ao -P '^\177ELF.{11}\x00\x03' "$1" >/dev/null +} + # Return success if the specified file is a script (i.e. starts with # "#!"). isScript() { diff --git a/nixpkgs/pkgs/stdenv/linux/default.nix b/nixpkgs/pkgs/stdenv/linux/default.nix index 390c7f1123ec..8344c9dfb2b8 100644 --- a/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/nixpkgs/pkgs/stdenv/linux/default.nix @@ -8,21 +8,21 @@ , bootstrapFiles ? let table = { - "glibc" = { - "i686-linux" = import ./bootstrap-files/i686.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64.nix; - "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l.nix; - "armv7l-linux" = import ./bootstrap-files/armv7l.nix; - "aarch64-linux" = import ./bootstrap-files/aarch64.nix; - "mipsel-linux" = import ./bootstrap-files/loongson2f.nix; - "powerpc64le-linux" = import ./bootstrap-files/ppc64le.nix; + glibc = { + i686-linux = import ./bootstrap-files/i686.nix; + x86_64-linux = import ./bootstrap-files/x86_64.nix; + armv5tel-linux = import ./bootstrap-files/armv5tel.nix; + armv6l-linux = import ./bootstrap-files/armv6l.nix; + armv7l-linux = import ./bootstrap-files/armv7l.nix; + aarch64-linux = import ./bootstrap-files/aarch64.nix; + mipsel-linux = import ./bootstrap-files/loongson2f.nix; + powerpc64le-linux = import ./bootstrap-files/ppc64le.nix; }; - "musl" = { - "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix; - "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix; + musl = { + aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; + armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; + x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; + powerpc64le-linux = import ./bootstrap-files/ppc64le-musl.nix; }; }; diff --git a/nixpkgs/pkgs/stdenv/native/default.nix b/nixpkgs/pkgs/stdenv/native/default.nix index ba53a6f1d142..f6e0df161ad0 100644 --- a/nixpkgs/pkgs/stdenv/native/default.nix +++ b/nixpkgs/pkgs/stdenv/native/default.nix @@ -121,8 +121,8 @@ in cc = let nativePrefix = { # switch - "i686-solaris" = "/usr/gnu"; - "x86_64-solaris" = "/opt/local/gcc47"; + i686-solaris = "/usr/gnu"; + x86_64-solaris = "/opt/local/gcc47"; }.${system} or "/usr"; in import ../../build-support/cc-wrapper { diff --git a/nixpkgs/pkgs/test/macos-sierra-shared/default.nix b/nixpkgs/pkgs/test/macos-sierra-shared/default.nix index 73b359ffe6a4..810d5d97829b 100644 --- a/nixpkgs/pkgs/test/macos-sierra-shared/default.nix +++ b/nixpkgs/pkgs/test/macos-sierra-shared/default.nix @@ -25,7 +25,7 @@ let meta.platforms = lib.platforms.darwin; }) count; - finalExe = stdenv.mkDerivation rec { + finalExe = stdenv.mkDerivation { name = "${prefix}-final-asdf"; unpackPhase = '' src=$PWD diff --git a/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix b/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix index 57f32ed82250..b54a7303ff87 100644 --- a/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix +++ b/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix @@ -1,23 +1,28 @@ { gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify, - pythonPackages, wrapGAppsHook + python3Packages, wrapGAppsHook }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "caffeine-ng"; version = "3.4.2"; - src = pythonPackages.fetchPypi{ + src = python3Packages.fetchPypi{ inherit pname version; sha256="05k8smjlfjcccgmp8qi04l7106k46fs4p8fl5bdqqjwv6pwl7y4w"; }; nativeBuildInputs = [ wrapGAppsHook glib ]; - buildInputs = [ gdk-pixbuf gobject-introspection libnotify gtk3 ]; - pythonPath = with pythonPackages; [ + buildInputs = [ + gdk-pixbuf gobject-introspection libnotify gtk3 + python3Packages.setuptools_scm + ]; + pythonPath = with python3Packages; [ dbus-python docopt ewmh pygobject3 pyxdg - setproctitle setuptools setuptools_scm wheel + setproctitle ]; + doCheck = false; # There are no tests. + postBuild = '' mkdir -p $out/share cp -r share $out/ diff --git a/nixpkgs/pkgs/tools/X11/grobi/default.nix b/nixpkgs/pkgs/tools/X11/grobi/default.nix index f917bda6f71b..976cabc33f8b 100644 --- a/nixpkgs/pkgs/tools/X11/grobi/default.nix +++ b/nixpkgs/pkgs/tools/X11/grobi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec { +buildGoPackage { version = "0.5.1"; pname = "grobi"; diff --git a/nixpkgs/pkgs/tools/X11/keynav/default.nix b/nixpkgs/pkgs/tools/X11/keynav/default.nix index 7863542d1900..5eb74a267983 100644 --- a/nixpkgs/pkgs/tools/X11/keynav/default.nix +++ b/nixpkgs/pkgs/tools/X11/keynav/default.nix @@ -2,7 +2,7 @@ , libXinerama, libXrandr, glib, cairo, xdotool }: let release = "20180821"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "keynav-0.${release}.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix b/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix index f7d8914722a9..1472e39c83c2 100644 --- a/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix +++ b/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ksuperkey-git-2015-07-21"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/X11/oblogout/default.nix b/nixpkgs/pkgs/tools/X11/oblogout/default.nix index ad2ee549a6d7..9acd113d0ab3 100644 --- a/nixpkgs/pkgs/tools/X11/oblogout/default.nix +++ b/nixpkgs/pkgs/tools/X11/oblogout/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "oblogout-unstable"; version = "2009-11-18"; diff --git a/nixpkgs/pkgs/tools/X11/run-scaled/default.nix b/nixpkgs/pkgs/tools/X11/run-scaled/default.nix index ae4dc08770dd..fc0068e6e278 100644 --- a/nixpkgs/pkgs/tools/X11/run-scaled/default.nix +++ b/nixpkgs/pkgs/tools/X11/run-scaled/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2018-06-03"; pname = "run-scaled"; diff --git a/nixpkgs/pkgs/tools/X11/runningx/default.nix b/nixpkgs/pkgs/tools/X11/runningx/default.nix index 479617b6b93a..31e2320e1b9f 100644 --- a/nixpkgs/pkgs/tools/X11/runningx/default.nix +++ b/nixpkgs/pkgs/tools/X11/runningx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "runningx"; version = "1.0"; diff --git a/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix index 496fa422877a..1a6e99f0393d 100644 --- a/nixpkgs/pkgs/tools/X11/wpgtk/default.nix +++ b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { longDescription = '' In short, wpgtk is a colorscheme/wallpaper manager with a template system attached which lets you create templates from any textfile and will replace keywords on it on the fly, allowing for great styling and theming possibilities. - wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK+ theme made specifically for wpgtk and custom keywords and values to replace in templates. + wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK theme made specifically for wpgtk and custom keywords and values to replace in templates. INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf. ''; diff --git a/nixpkgs/pkgs/tools/X11/x2vnc/default.nix b/nixpkgs/pkgs/tools/X11/x2vnc/default.nix index cb01d0a4d4a4..6075f0070f90 100644 --- a/nixpkgs/pkgs/tools/X11/x2vnc/default.nix +++ b/nixpkgs/pkgs/tools/X11/x2vnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "x2vnc-1.7.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/xcwd/default.nix b/nixpkgs/pkgs/tools/X11/xcwd/default.nix index c36334d478df..48cab6529ccb 100644 --- a/nixpkgs/pkgs/tools/X11/xcwd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xcwd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2016-09-30"; pname = "xcwd"; diff --git a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix index edafbf5525bf..b1770af2406e 100644 --- a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix +++ b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix @@ -2,7 +2,7 @@ , xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }: rustPlatform.buildRustPackage rec { - name = "xidlehook-${version}"; + pname = "xidlehook"; version = "0.7.0"; doCheck = false; diff --git a/nixpkgs/pkgs/tools/X11/xmagnify/default.nix b/nixpkgs/pkgs/tools/X11/xmagnify/default.nix index 463df6ad9351..dfd28e317718 100644 --- a/nixpkgs/pkgs/tools/X11/xmagnify/default.nix +++ b/nixpkgs/pkgs/tools/X11/xmagnify/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, libX11, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xmagnify-0.1.0"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/X11/xrestop/default.nix b/nixpkgs/pkgs/tools/X11/xrestop/default.nix index 70b471c795ef..6f75d2360cf4 100644 --- a/nixpkgs/pkgs/tools/X11/xrestop/default.nix +++ b/nixpkgs/pkgs/tools/X11/xrestop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xorg, pkgconfig, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xrestop"; version = "0.4"; diff --git a/nixpkgs/pkgs/tools/X11/xtrace/default.nix b/nixpkgs/pkgs/tools/X11/xtrace/default.nix index 8db15a8f0334..aae31d649f44 100644 --- a/nixpkgs/pkgs/tools/X11/xtrace/default.nix +++ b/nixpkgs/pkgs/tools/X11/xtrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "xtrace"; version = "1.4.0"; - src = fetchFromGitLab rec { + src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = pname; diff --git a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix index 5f789a0151f4..3c1dc3de2b42 100644 --- a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, imake, libXt, libXaw, libXtst , libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xvkbd"; version = "3.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix index 70f1c64c7f27..830dcee26e43 100644 --- a/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-rotate-key"; - version = "1.0.4"; + version = "1.0.6"; goPackagePath = "github.com/Fullscreen/aws-rotate-key"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "Fullscreen"; repo = "aws-rotate-key"; - sha256 = "14bcs434646qdywws55r1a1v8ncwz8n0yljaa8zb5796pv4445wf"; + sha256 = "sha256:1w9704g1l2b0y6g6mk79g28kk0yaswpgljkk85d0i10wyxq4icby"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/admin/clair/default.nix b/nixpkgs/pkgs/tools/admin/clair/default.nix index a6d8a046907f..25c147120947 100644 --- a/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "clair"; - version = "2.0.8"; + version = "2.0.9"; goPackagePath = "github.com/coreos/clair"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "coreos"; repo = pname; rev = "v${version}"; - sha256 = "1gwn533fdz8daz1db7w7g7mhls7d5a4vndn47blkpbx2yxdwdh62"; + sha256 = "1lcrqka4daqqjagx2mbfzg3z8wxg669mw1lb450nrlc33ji2iwdm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/admin/cli53/default.nix b/nixpkgs/pkgs/tools/admin/cli53/default.nix index 61f284cf85f1..8195207ef60a 100644 --- a/nixpkgs/pkgs/tools/admin/cli53/default.nix +++ b/nixpkgs/pkgs/tools/admin/cli53/default.nix @@ -1,7 +1,7 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "cli53"; version = "0.8.12"; diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 4a4d738f04d1..253306586532 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.4.3"; + version = "0.5.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1h7fyxlwa9f9r08rpl05r62ap7h7viaqchldbnv7j3vs2j23k127"; + sha256 = "1aw69kcb2wx832hdfbx0944wwvdn5jbpr164pv6z0bxqzc0yi2kv"; }; - modSha256 = "17bb1k18x1xfq9bi9qbm8pln6h6pkhaqzy07qdvnhinmspll1695"; + modSha256 = "0c8hbb73w1922qh895lsk0m9i7lk9kzrvxjc4crwsfpn9pv0qgd3"; subPackages = [ "cmd/eksctl" ]; diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index b35fe709f95a..7c81e861ddbc 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -36,8 +36,6 @@ in stdenv.mkDerivation rec { buildInputs = [ python makeWrapper ]; - doBuild = false; - patches = [ ./gcloud-path.patch ]; diff --git a/nixpkgs/pkgs/tools/admin/intecture/agent.nix b/nixpkgs/pkgs/tools/admin/intecture/agent.nix index 1225441392c4..f0945d7d778b 100644 --- a/nixpkgs/pkgs/tools/admin/intecture/agent.nix +++ b/nixpkgs/pkgs/tools/admin/intecture/agent.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "intecture-agent-${version}"; + pname = "intecture-agent"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/admin/intecture/auth.nix b/nixpkgs/pkgs/tools/admin/intecture/auth.nix index 577d439c805a..a3208bddabe9 100644 --- a/nixpkgs/pkgs/tools/admin/intecture/auth.nix +++ b/nixpkgs/pkgs/tools/admin/intecture/auth.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "intecture-auth-${version}"; + pname = "intecture-auth"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/admin/intecture/cli.nix b/nixpkgs/pkgs/tools/admin/intecture/cli.nix index b0bb63984f0d..90d65a3f2951 100644 --- a/nixpkgs/pkgs/tools/admin/intecture/cli.nix +++ b/nixpkgs/pkgs/tools/admin/intecture/cli.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "intecture-cli-${version}"; + pname = "intecture-cli"; version = "0.3.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/admin/oxidized/default.nix b/nixpkgs/pkgs/tools/admin/oxidized/default.nix index e49d39576591..a11906e80f04 100644 --- a/nixpkgs/pkgs/tools/admin/oxidized/default.nix +++ b/nixpkgs/pkgs/tools/admin/oxidized/default.nix @@ -1,6 +1,6 @@ { lib, ruby, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "oxidized"; gemdir = ./.; diff --git a/nixpkgs/pkgs/tools/admin/procs/default.nix b/nixpkgs/pkgs/tools/admin/procs/default.nix index 7c1e743a06e2..85333ca78f87 100644 --- a/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.8.5"; + version = "0.8.9"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0ihww2sm9hnh748723lr1cxw9zyi9nfxbbiij5a465mypa2p7w0v"; + sha256 = "0gqbdk4gaxkpval52fsravjgvqz6c9zh1ahry57a2p6kszw96n13"; }; - cargoSha256 = "1aq2nhspb9kp9mzj5550xph09qvd0ahlw246hcx2mqkr4frh64x0"; + cargoSha256 = "1k0yl03rxbv009gb2jkc0f7mjq3pzc9bf8hppk2w9xicxpq6l55c"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 2df63ea1e15a..de09931e7c10 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -8,17 +8,17 @@ let # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { - "x86_64-linux" = { + x86_64-linux = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; pname = "pulumi"; diff --git a/nixpkgs/pkgs/tools/admin/vncdo/default.nix b/nixpkgs/pkgs/tools/admin/vncdo/default.nix index 538464499fa6..a126a430e52c 100644 --- a/nixpkgs/pkgs/tools/admin/vncdo/default.nix +++ b/nixpkgs/pkgs/tools/admin/vncdo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonPackage { pname = "vncdo"; version = "0.11.2"; diff --git a/nixpkgs/pkgs/tools/archivers/atool/default.nix b/nixpkgs/pkgs/tools/archivers/atool/default.nix index e305a1739f7c..64a606a4cb50 100644 --- a/nixpkgs/pkgs/tools/archivers/atool/default.nix +++ b/nixpkgs/pkgs/tools/archivers/atool/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, perl, bash}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "atool-0.39.0"; src = fetchurl { url = mirror://savannah/atool/atool-0.39.0.tar.gz; diff --git a/nixpkgs/pkgs/tools/archivers/pxattr/default.nix b/nixpkgs/pkgs/tools/archivers/pxattr/default.nix index 7f813dd76c89..b507b60287c9 100644 --- a/nixpkgs/pkgs/tools/archivers/pxattr/default.nix +++ b/nixpkgs/pkgs/tools/archivers/pxattr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gcc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pxattr-2.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix b/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix index 3c515b8c195d..59ff67e3eefb 100644 --- a/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix +++ b/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix @@ -1,6 +1,6 @@ { stdenv, rpm, cpio, substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rpmextract"; buildCommand = '' diff --git a/nixpkgs/pkgs/tools/archivers/unp/default.nix b/nixpkgs/pkgs/tools/archivers/unp/default.nix index e1cac4fc61f7..82e83a8c6a38 100644 --- a/nixpkgs/pkgs/tools/archivers/unp/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unp/default.nix @@ -7,7 +7,7 @@ let runtime_bins = [ file unzip gzip ] ++ extraBackends; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "unp"; version = "2.0-pre7"; buildInputs = [ perl makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/archivers/xarchive/default.nix b/nixpkgs/pkgs/tools/archivers/xarchive/default.nix index ff98e96655fa..53da140b7fda 100644 --- a/nixpkgs/pkgs/tools/archivers/xarchive/default.nix +++ b/nixpkgs/pkgs/tools/archivers/xarchive/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - description = "A GTK+ front-end for command line archiving tools"; + description = "A GTK front-end for command line archiving tools"; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix index 07684155a7e8..2a110c4cc83b 100644 --- a/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix +++ b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ]; meta = { - description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; + description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = https://github.com/ib/xarchiver; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/audio/aucdtect/default.nix b/nixpkgs/pkgs/tools/audio/aucdtect/default.nix index 21adf3b972a5..ad9d5fb86905 100644 --- a/nixpkgs/pkgs/tools/audio/aucdtect/default.nix +++ b/nixpkgs/pkgs/tools/audio/aucdtect/default.nix @@ -3,26 +3,29 @@ with lib; stdenv.mkDerivation rec { - pname = "aucdtext"; + pname = "aucdtect"; version = "0.8-2"; src = fetchurl { - url = "http://www.true-audio.com/ftp/aucdtect-${version}.i586.rpm"; + url = "http://www.true-audio.com/ftp/${pname}-${version}.i586.rpm"; sha256 = "1lp5f0rq5b5n5il0c64m00gcfskarvgqslpryms9443d200y6mmd"; }; unpackCmd = "${rpmextract}/bin/rpmextract $src"; installPhase = '' - mkdir -p $out/bin - install -m755 local/bin/auCDtect $out/bin/aucdtect + runHook preInstall + + install -Dm755 local/bin/auCDtect $out/bin/aucdtect + + runHook postInstall ''; dontStrip = true; meta = with stdenv.lib; { description = "Verify authenticity of lossless audio files"; - homepage = http://tausoft.org; + homepage = "http://tausoft.org"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix index 3c9cc5639a8f..fac37962f3cf 100644 --- a/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix +++ b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { name = "beets-copyartifacts"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/audio/mididings/default.nix b/nixpkgs/pkgs/tools/audio/mididings/default.nix index fb3d0e51341c..35d1af1e7676 100644 --- a/nixpkgs/pkgs/tools/audio/mididings/default.nix +++ b/nixpkgs/pkgs/tools/audio/mididings/default.nix @@ -1,6 +1,6 @@ { stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { version = "20151117"; pname = "mididings"; diff --git a/nixpkgs/pkgs/tools/audio/mp3cat/default.nix b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix index 19f670793ba2..acd11bc75e6f 100644 --- a/nixpkgs/pkgs/tools/audio/mp3cat/default.nix +++ b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; installTargets = [ diff --git a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix index 3b59d5aceb05..a791a81db351 100644 --- a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix @@ -6,7 +6,7 @@ let name = "mpdcron-bundle"; gemdir = ./.; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { version = "20161228"; pname = "mpdcron"; diff --git a/nixpkgs/pkgs/tools/audio/pa-applet/default.nix b/nixpkgs/pkgs/tools/audio/pa-applet/default.nix index 239e4b3fcca3..69e5976e6d5e 100644 --- a/nixpkgs/pkgs/tools/audio/pa-applet/default.nix +++ b/nixpkgs/pkgs/tools/audio/pa-applet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pa-applet-2012-04-11"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/audio/trx/default.nix b/nixpkgs/pkgs/tools/audio/trx/default.nix index d72cb8564373..5d31193ee8d4 100644 --- a/nixpkgs/pkgs/tools/audio/trx/default.nix +++ b/nixpkgs/pkgs/tools/audio/trx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "trx-unstable"; version = "2018-01-23"; diff --git a/nixpkgs/pkgs/tools/audio/volumeicon/default.nix b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix index 36afd11aa2c3..3871bbd39a16 100644 --- a/nixpkgs/pkgs/tools/audio/volumeicon/default.nix +++ b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix @@ -1,6 +1,6 @@ { pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "volumeicon"; version = "0.5.1"; diff --git a/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix index 472b4a6508f2..3d219eed012c 100644 --- a/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix +++ b/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "amazon-glacier-cmd-interface-${version}"; + pname = "amazon-glacier-cmd-interface"; version = "2016-09-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/backup/bup/default.nix b/nixpkgs/pkgs/tools/backup/bup/default.nix index 8f4cd60e1ee0..3097756ddf8e 100644 --- a/nixpkgs/pkgs/tools/backup/bup/default.nix +++ b/nixpkgs/pkgs/tools/backup/bup/default.nix @@ -9,7 +9,7 @@ let version = "0.29.2"; in with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bup"; inherit version; diff --git a/nixpkgs/pkgs/tools/backup/diskrsync/default.nix b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix index 97d876da1279..b2ef04dcffc7 100644 --- a/nixpkgs/pkgs/tools/backup/diskrsync/default.nix +++ b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "diskrsync"; - version = "unstable-2018-02-03"; + version = "unstable-2019-01-02"; src = fetchFromGitHub { owner = "dop251"; repo = pname; - rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730"; - sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn"; + rev = "e8598ef71038527a8a77d1a6cf2a73cfd96d9139"; + sha256 = "1dqpmc4hp81knhdk3mrmwdr66xiibsvj5lagbm5ciajg9by45mcs"; }; goPackagePath = "github.com/dop251/diskrsync"; diff --git a/nixpkgs/pkgs/tools/backup/diskrsync/deps.nix b/nixpkgs/pkgs/tools/backup/diskrsync/deps.nix index 684100968e88..8045737164b1 100644 --- a/nixpkgs/pkgs/tools/backup/diskrsync/deps.nix +++ b/nixpkgs/pkgs/tools/backup/diskrsync/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { goPackagePath = "github.com/dop251/spgz"; fetch = { type = "git"; url = "https://github.com/dop251/spgz"; - rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5"; - sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx"; + rev = "b86304a2b188"; + sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7"; }; } { @@ -14,8 +14,35 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "1875d0a70c90e57f11972aefd42276df65e895b9"; - sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q"; + rev = "9756ffdc2472"; + sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "eb5bcb51f2a3"; + sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "97732733099d"; + sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } ] diff --git a/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/nixpkgs/pkgs/tools/backup/duplicity/default.nix index b090da852638..1cf7a19014e4 100644 --- a/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -5,11 +5,11 @@ , rsync, makeWrapper }: python2Packages.buildPythonApplication rec { - name = "duplicity-${version}"; + pname = "duplicity"; version = "0.7.19"; src = fetchurl { - url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; + url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/backup/easysnap/default.nix b/nixpkgs/pkgs/tools/backup/easysnap/default.nix index 412c9696d02a..a56d1274f92e 100644 --- a/nixpkgs/pkgs/tools/backup/easysnap/default.nix +++ b/nixpkgs/pkgs/tools/backup/easysnap/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, zfs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "easysnap"; version = "unstable-2019-02-17"; diff --git a/nixpkgs/pkgs/tools/backup/flockit/default.nix b/nixpkgs/pkgs/tools/backup/flockit/default.nix index 739f14ca1a61..8d71671f6fec 100644 --- a/nixpkgs/pkgs/tools/backup/flockit/default.nix +++ b/nixpkgs/pkgs/tools/backup/flockit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flockit"; version = "2012-08-11"; diff --git a/nixpkgs/pkgs/tools/backup/lvmsync/default.nix b/nixpkgs/pkgs/tools/backup/lvmsync/default.nix index 0ed70ade8295..814c02267ba9 100644 --- a/nixpkgs/pkgs/tools/backup/lvmsync/default.nix +++ b/nixpkgs/pkgs/tools/backup/lvmsync/default.nix @@ -3,7 +3,7 @@ let pname = "lvmsync"; - version = (import ./gemset.nix)."${pname}".version; + version = (import ./gemset.nix).${pname}.version; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/tools/backup/ori/default.nix b/nixpkgs/pkgs/tools/backup/ori/default.nix index e07eb33abb58..30ee0041c7cc 100644 --- a/nixpkgs/pkgs/tools/backup/ori/default.nix +++ b/nixpkgs/pkgs/tools/backup/ori/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.8.1"; pname = "ori"; diff --git a/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/nixpkgs/pkgs/tools/backup/rdedup/default.nix index e0ac2c3f2328..bd5c10ea122c 100644 --- a/nixpkgs/pkgs/tools/backup/rdedup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdedup/default.nix @@ -3,7 +3,7 @@ , Security }: rustPlatform.buildRustPackage rec { - name = "rdedup-${version}"; + pname = "rdedup"; version = "3.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/backup/rdup/default.nix b/nixpkgs/pkgs/tools/backup/rdup/default.nix index 56f9c4f9dafe..0df4ecda89ef 100644 --- a/nixpkgs/pkgs/tools/backup/rdup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rdup"; version = "1.1.15"; diff --git a/nixpkgs/pkgs/tools/backup/rsbep/default.nix b/nixpkgs/pkgs/tools/backup/rsbep/default.nix index 4c13c831ba94..90a8c665cd43 100644 --- a/nixpkgs/pkgs/tools/backup/rsbep/default.nix +++ b/nixpkgs/pkgs/tools/backup/rsbep/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, coreutils, gnused, gawk, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rsbep"; version = "0.1.0"; diff --git a/nixpkgs/pkgs/tools/backup/zbackup/default.nix b/nixpkgs/pkgs/tools/backup/zbackup/default.nix index 928ba9842b25..d7a160328ed1 100644 --- a/nixpkgs/pkgs/tools/backup/zbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/zbackup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zbackup"; version = "1.4.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/backup/znapzend/default.nix b/nixpkgs/pkgs/tools/backup/znapzend/default.nix index 973e92176443..b44564efb827 100644 --- a/nixpkgs/pkgs/tools/backup/znapzend/default.nix +++ b/nixpkgs/pkgs/tools/backup/znapzend/default.nix @@ -23,7 +23,7 @@ let version = "0.18.0"; checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "znapzend"; inherit version; diff --git a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index b28e50d54b07..8e393ac3f13e 100644 --- a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -1,19 +1,21 @@ { config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 -, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp -, hicolor-icon-theme, librsvg, wrapGAppsHook, gobject-introspection +, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute +, gnome3, librsvg, wrapGAppsHook, gobject-introspection +, withNetworkManager ? + config.networking.networkmanager.enable or false, networkmanager , withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: let pythonPackages = python3Packages; - binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; + binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp iproute ]; in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.0.8"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4"; + sha256 = "1hyvc5x97j8b4kvwzh58zzlc454d0h0hk440zbg8f5as9qrv5spi"; }; nativeBuildInputs = [ @@ -21,19 +23,25 @@ in stdenv.mkDerivation rec { pythonPackages.wrapPython wrapGAppsHook ]; - buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor-icon-theme ] + buildInputs = [ bluez gtk3 pythonPackages.python librsvg + gnome3.adwaita-icon-theme iproute libappindicator ] ++ pythonPath - ++ lib.optional withPulseAudio libpulseaudio; + ++ lib.optional withPulseAudio libpulseaudio + ++ lib.optional withNetworkManager networkmanager; postPatch = lib.optionalString withPulseAudio '' sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py ''; - pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ]; + pythonPath = with pythonPackages; [ pygobject3 pycairo ]; propagatedUserEnvPkgs = [ obex_data_server ]; - configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ]; + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" + (lib.enableFeature withPulseAudio "pulseaudio") + ]; postFixup = '' makeWrapperArgs="--prefix PATH ':' ${binPath}" @@ -44,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = https://github.com/blueman-project/blueman; - description = "GTK+-based Bluetooth Manager"; + description = "GTK-based Bluetooth Manager"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix index 4ddc75542945..cf0ad78d1d7e 100644 --- a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix +++ b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix @@ -2,9 +2,9 @@ let archids = { - "x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; }; - "i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; }; - "aarch64-linux" = rec { hostarch = "aarch64"; efiPlatform = "aa64"; }; + x86_64-linux = { hostarch = "x86_64"; efiPlatform = "x64"; }; + i686-linux = rec { hostarch = "ia32"; efiPlatform = hostarch; }; + aarch64-linux = { hostarch = "aarch64"; efiPlatform = "aa64"; }; }; inherit diff --git a/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix index d617a9a6c542..ece45944c5c0 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cdimgtools"; version = "0.3"; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix index 970b32eb08fb..2ee69682a1d5 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cue2pops"; version = "git-2018-01-04"; diff --git a/nixpkgs/pkgs/tools/compression/lzfse/default.nix b/nixpkgs/pkgs/tools/compression/lzfse/default.nix index ef185f706dce..0c54c3b452b6 100644 --- a/nixpkgs/pkgs/tools/compression/lzfse/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzfse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lzfse"; version = "2017-03-08"; diff --git a/nixpkgs/pkgs/tools/compression/lzham/default.nix b/nixpkgs/pkgs/tools/compression/lzham/default.nix index cdc155474a78..0aa30ceb6632 100644 --- a/nixpkgs/pkgs/tools/compression/lzham/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzham/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "lzham-1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix b/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix index 2e34c9dd4857..b9c5c55a8e47 100644 --- a/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fuse }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "9pfs-20150918"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix index 137b00802dfd..7f8a8c4f931f 100644 --- a/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "afpfs-ng"; version = "0.8.2"; diff --git a/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix index 9ee0b8133260..2c7b1c271569 100644 --- a/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "apfs-fuse-unstable"; version = "2019-07-23"; diff --git a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index b95a9ad68a82..b66d67fbc9f2 100644 --- a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-library" "--enable-fuse" - "--disable-static" ]; meta = { diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index 95923f202cf4..98dab6278b01 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils , liburcu, zlib, libaio, zstd, lz4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bcachefs-tools"; version = "2019-08-21"; diff --git a/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/nixpkgs/pkgs/tools/filesystems/bees/default.nix index 842ef6712ac9..94573bcd2010 100644 --- a/nixpkgs/pkgs/tools/filesystems/bees/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bees/default.nix @@ -5,7 +5,7 @@ let version = "0.6.1"; sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh"; - bees = stdenv.mkDerivation rec { + bees = stdenv.mkDerivation { pname = "bees"; inherit version; diff --git a/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix index a0983004fccd..3ddc95273972 100644 --- a/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix @@ -21,7 +21,7 @@ let owner = "vincenthz"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "boxfs"; version = "2-20150109"; diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-dedupe/default.nix index ebab6c5b16ba..e2538387d450 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "btrfs-dedupe-${version}"; + pname = "btrfs-dedupe"; version = "1.1.0"; diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch new file mode 100644 index 000000000000..9604da87fb50 --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch @@ -0,0 +1,70 @@ +diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py +index a8a3ec07c1..bcc9b86c37 100644 +--- a/src/pybind/mgr/dashboard/module.py ++++ b/src/pybind/mgr/dashboard/module.py +@@ -25,40 +25,6 @@ except ImportError: + + from .services.sso import load_sso_db + +-# The SSL code in CherryPy 3.5.0 is buggy. It was fixed long ago, +-# but 3.5.0 is still shipping in major linux distributions +-# (Fedora 27, Ubuntu Xenial), so we must monkey patch it to get SSL working. +-if cherrypy is not None: +- v = StrictVersion(cherrypy.__version__) +- # It was fixed in 3.7.0. Exact lower bound version is probably earlier, +- # but 3.5.0 is what this monkey patch is tested on. +- if StrictVersion("3.5.0") <= v < StrictVersion("3.7.0"): +- from cherrypy.wsgiserver.wsgiserver2 import HTTPConnection,\ +- CP_fileobject +- +- def fixed_init(hc_self, server, sock, makefile=CP_fileobject): +- hc_self.server = server +- hc_self.socket = sock +- hc_self.rfile = makefile(sock, "rb", hc_self.rbufsize) +- hc_self.wfile = makefile(sock, "wb", hc_self.wbufsize) +- hc_self.requests_seen = 0 +- +- HTTPConnection.__init__ = fixed_init +- +-# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify +-# that the ports its listening on are in fact bound. When using the any address +-# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes) +-# ipv6 isn't yet configured / supported and CherryPy throws an uncaught +-# exception. +-if cherrypy is not None: +- v = StrictVersion(cherrypy.__version__) +- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on +- # centos:7) and back to at least 3.0.0. +- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"): +- # https://github.com/cherrypy/cherrypy/issues/1100 +- from cherrypy.process import servers +- servers.wait_for_occupied_port = lambda host, port: None +- + if 'COVERAGE_ENABLED' in os.environ: + import coverage + __cov = coverage.Coverage(config_file="{}/.coveragerc".format(os.path.dirname(__file__)), +diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py +index b7fecf8d85..dfd4160591 100644 +--- a/src/pybind/mgr/prometheus/module.py ++++ b/src/pybind/mgr/prometheus/module.py +@@ -18,20 +18,6 @@ from rbd import RBD + DEFAULT_ADDR = '::' + DEFAULT_PORT = 9283 + +-# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify +-# that the ports its listening on are in fact bound. When using the any address +-# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes) +-# ipv6 isn't yet configured / supported and CherryPy throws an uncaught +-# exception. +-if cherrypy is not None: +- v = StrictVersion(cherrypy.__version__) +- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on +- # centos:7) and back to at least 3.0.0. +- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"): +- # https://github.com/cherrypy/cherrypy/issues/1100 +- from cherrypy.process import servers +- servers.wait_for_occupied_port = lambda host, port: None +- + # cherrypy likes to sys.exit on error. don't let it take us down too! + def os_exit_noop(*args, **kwargs): + pass diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch new file mode 100644 index 000000000000..b04082537b53 --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch @@ -0,0 +1,11 @@ +--- a/cmake/modules/BuildSPDK.cmake 2018-08-09 09:22:34.950684960 +0200 ++++ b/cmake/modules/BuildSPDK.cmake 2018-08-09 09:21:59.986964224 +0200 +@@ -16,7 +16,7 @@ + # unset $CFLAGS, otherwise it will interfere with how SPDK sets + # its include directory. + # unset $LDFLAGS, otherwise SPDK will fail to mock some functions. +- BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} $(MAKE) EXTRA_CFLAGS="-fPIC" ++ BUILD_COMMAND env PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} $(MAKE) EXTRA_CFLAGS="-fPIC" C_OPT="-mssse3" + BUILD_IN_SOURCE 1 + INSTALL_COMMAND "true") + ExternalProject_Get_Property(spdk-ext source_dir) diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch deleted file mode 100644 index 0b6f1d30a4c9..000000000000 --- a/nixpkgs/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch +++ /dev/null @@ -1,58 +0,0 @@ -Seulement dans ceph: ceph.old -diff -ur ceph.old/src/kv/RocksDBStore.cc ceph/src/kv/RocksDBStore.cc ---- ceph.old/src/kv/RocksDBStore.cc 1980-01-02 00:00:00.000000000 +0100 -+++ ceph/src/kv/RocksDBStore.cc 2018-01-24 14:08:35.017553372 +0100 -@@ -505,7 +505,7 @@ - // considering performance overhead, default is disabled - if (g_conf->rocksdb_perf) { - rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); -- rocksdb::perf_context.Reset(); -+ rocksdb::get_perf_context()->Reset(); - } - - RocksDBTransactionImpl * _t = -@@ -532,13 +532,13 @@ - utime_t write_wal_time; - utime_t write_pre_and_post_process_time; - write_wal_time.set_from_double( -- static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000); -+ static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000); - write_memtable_time.set_from_double( -- static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000); -+ static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000); - write_delay_time.set_from_double( -- static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000); -+ static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000); - write_pre_and_post_process_time.set_from_double( -- static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); -+ static_cast<double>(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); - logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); - logger->tinc(l_rocksdb_write_delay_time, write_delay_time); - logger->tinc(l_rocksdb_write_wal_time, write_wal_time); -@@ -558,7 +558,7 @@ - // considering performance overhead, default is disabled - if (g_conf->rocksdb_perf) { - rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); -- rocksdb::perf_context.Reset(); -+ rocksdb::get_perf_context()->Reset(); - } - - RocksDBTransactionImpl * _t = -@@ -586,13 +586,13 @@ - utime_t write_wal_time; - utime_t write_pre_and_post_process_time; - write_wal_time.set_from_double( -- static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000); -+ static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000); - write_memtable_time.set_from_double( -- static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000); -+ static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000); - write_delay_time.set_from_double( -- static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000); -+ static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000); - write_pre_and_post_process_time.set_from_double( -- static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); -+ static_cast<double>(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); - logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); - logger->tinc(l_rocksdb_write_delay_time, write_delay_time); - logger->tinc(l_rocksdb_write_wal_time, write_wal_time); diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch deleted file mode 100644 index 01aa194dddf2..000000000000 --- a/nixpkgs/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru ceph/src/key_value_store/kv_flat_btree_async.cc ceph-copy/src/key_value_store/kv_flat_btree_async.cc ---- ceph/src/key_value_store/kv_flat_btree_async.cc 1980-01-02 00:00:00.000000000 +0100 -+++ ceph-copy/src/key_value_store/kv_flat_btree_async.cc 2018-02-13 21:49:59.232860487 +0100 -@@ -15,13 +15,13 @@ - #include "key_value_store/kv_flat_btree_async.h" - #include "key_value_store/kvs_arg_types.h" - #include "include/rados/librados.hpp" --#include "/usr/include/asm-generic/errno.h" --#include "/usr/include/asm-generic/errno-base.h" - #include "common/ceph_context.h" - #include "common/Clock.h" - #include "include/types.h" - - -+#include <asm-generic/errno.h> -+#include <asm-generic/errno-base.h> - #include <string> - #include <iostream> - #include <cassert> diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index ef3e36ff6275..1755ef625f5a 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -1,12 +1,199 @@ -{ callPackage, fetchgit, fetchpatch, ... } @ args: +{ stdenv, runCommand, fetchurl +, ensureNewerSourcesHook +, cmake, pkgconfig +, which, git +, boost, python3Packages +, libxml2, zlib, lz4 +, openldap, lttng-ust +, babeltrace, gperf +, cunit, snappy +, rocksdb, makeWrapper +, leveldb, oathToolkit, removeReferencesTo -callPackage ./generic.nix (args // rec { - version = "12.2.7"; +# Optional Dependencies +, yasm ? null, fcgi ? null, expat ? null +, curl ? null, fuse ? null +, libedit ? null, libatomic_ops ? null +, libs3 ? null - src = fetchgit { - url = "https://github.com/ceph/ceph.git"; - rev = "refs/tags/v${version}"; - sha256 = "031nfw2g2fdpxxx39g862phgmdx68hj9r54axazandghfhc1bzrl"; +# Mallocs +, jemalloc ? null, gperftools ? null + +# Crypto Dependencies +, cryptopp ? null +, nss ? null, nspr ? null + +# Linux Only Dependencies +, linuxHeaders, utillinux, libuuid, udev, keyutils, rdma-core, rabbitmq-c +, libaio ? null, libxfs ? null, zfs ? null +, ... +}: + +# We must have one crypto library +assert cryptopp != null || (nss != null && nspr != null); + +with stdenv; with stdenv.lib; +let + shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + + optYasm = shouldUsePkg yasm; + optFcgi = shouldUsePkg fcgi; + optExpat = shouldUsePkg expat; + optCurl = shouldUsePkg curl; + optFuse = shouldUsePkg fuse; + optLibedit = shouldUsePkg libedit; + optLibatomic_ops = shouldUsePkg libatomic_ops; + optLibs3 = shouldUsePkg libs3; + + optJemalloc = shouldUsePkg jemalloc; + optGperftools = shouldUsePkg gperftools; + + optCryptopp = shouldUsePkg cryptopp; + optNss = shouldUsePkg nss; + optNspr = shouldUsePkg nspr; + + optLibaio = shouldUsePkg libaio; + optLibxfs = shouldUsePkg libxfs; + optZfs = shouldUsePkg zfs; + + hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; + + + # Malloc implementation (can be jemalloc, tcmalloc or null) + malloc = if optJemalloc != null then optJemalloc else optGperftools; + + # We prefer nss over cryptopp + cryptoStr = if optNss != null && optNspr != null then "nss" else + if optCryptopp != null then "cryptopp" else "none"; + + cryptoLibsMap = { + nss = [ optNss optNspr ]; + cryptopp = [ optCryptopp ]; + none = [ ]; + }; + + ceph-python-env = python3Packages.python.withPackages (ps: [ + ps.sphinx + ps.flask + ps.cython + ps.setuptools + ps.virtualenv + # Libraries needed by the python tools + ps.Mako + ps.cherrypy + ps.pecan + ps.prettytable + ps.pyjwt + ps.webob + ps.bcrypt + ps.six + ]); + + version = "14.2.3"; +in rec { + ceph = stdenv.mkDerivation { + pname = "ceph"; + inherit version; + + src = fetchurl { + url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; + sha256 = "1pa8czb205pz4vjfh82gsgickj3cdjrx51mcx7acsyqgp3dfvl33"; + }; + + patches = [ + ./0000-fix-SPDK-build-env.patch + ./0000-dont-check-cherrypy-version.patch + ]; + + nativeBuildInputs = [ + cmake + pkgconfig which git python3Packages.wrapPython makeWrapper + (ensureNewerSourcesHook { year = "1980"; }) + ]; + + buildInputs = cryptoLibsMap.${cryptoStr} ++ [ + boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 + malloc zlib openldap lttng-ust babeltrace gperf cunit + snappy rocksdb lz4 oathToolkit leveldb + removeReferencesTo + ] ++ optionals stdenv.isLinux [ + linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs + # ceph 14 + rdma-core rabbitmq-c + ] ++ optionals hasRadosgw [ + optFcgi optExpat optCurl optFuse optLibedit + ]; + + preConfigure ='' + substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo" + substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" + # Since Boost 1.67 this seems to have changed + substituteInPlace CMakeLists.txt --replace "list(APPEND BOOST_COMPONENTS python)" "list(APPEND BOOST_COMPONENTS python37)" + substituteInPlace src/CMakeLists.txt --replace "Boost::python " "Boost::python37 " + + # for pybind/rgw to find internal dep + export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" + # install target needs to be in PYTHONPATH for "*.pth support" check to succeed + export PYTHONPATH=${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/python3.7/site-packages/:$out/lib/python3.7/site-packages/ + + patchShebangs src/spdk + ''; + + cmakeFlags = [ + "-DWITH_PYTHON3=ON" + "-DWITH_SYSTEM_ROCKSDB=OFF" + + "-DWITH_SYSTEM_BOOST=ON" + "-DWITH_SYSTEMD=OFF" + "-DWITH_TESTS=OFF" + # TODO breaks with sandbox, tries to download stuff with npm + "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" + ]; + + preFixup = '' + find $lib -type f -exec remove-references-to -t $out '{}' + + mv $out/share/ceph/mgr $lib/lib/ceph/ + ''; + + postFixup = '' + export PYTHONPATH="${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/" + wrapPythonPrograms + wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/" + wrapProgram $out/bin/ceph-volume --prefix PYTHONPATH ":" "${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/" + ''; + + enableParallelBuilding = true; + + outputs = [ "out" "lib" "dev" "doc" "man" ]; + + meta = { + homepage = https://ceph.com/; + description = "Distributed storage system"; + license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; + maintainers = with maintainers; [ adev ak krav johanot ]; + platforms = platforms.unix; + }; + + passthru.version = version; }; -}) + ceph-client = runCommand "ceph-client-${version}" { + meta = { + homepage = https://ceph.com/; + description = "Tools needed to mount Ceph's RADOS Block Devices"; + license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; + maintainers = with maintainers; [ adev ak johanot krav ]; + platforms = platforms.unix; + }; + } '' + mkdir -p $out/{bin,etc,lib/python3.7/site-packages} + cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin + cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin + cp -r ${ceph}/bin/rbd-replay* $out/bin + cp -r ${ceph}/lib/python3.7/site-packages $out/lib/python3.7/ + cp -r ${ceph}/etc/bash_completion.d $out/etc + # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths + substituteInPlace $out/bin/ceph --replace ${ceph} $out + substituteInPlace $out/bin/.ceph-wrapped --replace ${ceph} $out + ''; +} diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix b/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix deleted file mode 100644 index e8a4917be99f..000000000000 --- a/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix +++ /dev/null @@ -1,175 +0,0 @@ -{ stdenv, ensureNewerSourcesHook, cmake, pkgconfig -, which, git -, boost, python2Packages -, libxml2, zlib -, openldap, lttng-ust -, babeltrace, gperf -, cunit, snappy -, rocksdb, makeWrapper - -# Optional Dependencies -, yasm ? null, fcgi ? null, expat ? null -, curl ? null, fuse ? null -, libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null -, libs3 ? null - -# Mallocs -, jemalloc ? null, gperftools ? null - -# Crypto Dependencies -, cryptopp ? null -, nss ? null, nspr ? null - -# Linux Only Dependencies -, linuxHeaders, libuuid, udev, keyutils, libaio ? null, libxfs ? null -, zfs ? null - -# Version specific arguments -, version, src ? [], buildInputs ? [] -, ... -}: - -# We must have one crypto library -assert cryptopp != null || (nss != null && nspr != null); - -with stdenv; -with stdenv.lib; -let - - shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value; - in if lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms - then pkg else null; - - optYasm = shouldUsePkg yasm; - optFcgi = shouldUsePkg fcgi; - optExpat = shouldUsePkg expat; - optCurl = shouldUsePkg curl; - optFuse = shouldUsePkg fuse; - optLibedit = shouldUsePkg libedit; - optLibatomic_ops = shouldUsePkg libatomic_ops; - optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client; - optLibs3 = if versionAtLeast version "10.0.0" then null else shouldUsePkg libs3; - - optJemalloc = shouldUsePkg jemalloc; - optGperftools = shouldUsePkg gperftools; - - optCryptopp = shouldUsePkg cryptopp; - optNss = shouldUsePkg nss; - optNspr = shouldUsePkg nspr; - - optLibaio = shouldUsePkg libaio; - optLibxfs = shouldUsePkg libxfs; - optZfs = shouldUsePkg zfs; - - hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; - - - # TODO: Reenable when kinetic support is fixed - #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null; - hasKinetic = false; - - # Malloc implementation (can be jemalloc, tcmalloc or null) - malloc = if optJemalloc != null then optJemalloc else optGperftools; - - # We prefer nss over cryptopp - cryptoStr = if optNss != null && optNspr != null then "nss" else - if optCryptopp != null then "cryptopp" else "none"; - cryptoLibsMap = { - nss = [ optNss optNspr ]; - cryptopp = [ optCryptopp ]; - none = [ ]; - }; - - ceph-python-env = python2Packages.python.withPackages (ps: [ - ps.sphinx - ps.flask - ps.cython - ps.setuptools - ps.pip - # Libraries needed by the python tools - ps.Mako - ps.pecan - ps.prettytable - ps.webob - ps.cherrypy - ]); - -in -stdenv.mkDerivation { - pname = "ceph"; - inherit version; - - inherit src; - - patches = [ - # ./ceph-patch-cmake-path.patch - ./0001-kv-RocksDBStore-API-break-additional.patch - ] ++ optionals stdenv.isLinux [ - ./0002-fix-absolute-include-path.patch - ]; - - nativeBuildInputs = [ - cmake - pkgconfig which git python2Packages.wrapPython makeWrapper - (ensureNewerSourcesHook { year = "1980"; }) - ]; - - buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ - boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 - malloc zlib openldap lttng-ust babeltrace gperf cunit - snappy rocksdb - ] ++ optionals stdenv.isLinux [ - linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs - ] ++ optionals hasRadosgw [ - optFcgi optExpat optCurl optFuse optLibedit - ] ++ optionals hasKinetic [ - optKinetic-cpp-client - ]; - - - preConfigure ='' - # rip off submodule that interfer with system libs - rm -rf src/boost - rm -rf src/rocksdb - - # require LD_LIBRARY_PATH for cython to find internal dep - export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" - - # requires setuptools due to embedded in-cmake setup.py usage - export PYTHONPATH="${python2Packages.setuptools}/lib/python2.7/site-packages/:$PYTHONPATH" - ''; - - cmakeFlags = [ - "-DENABLE_GIT_VERSION=OFF" - "-DWITH_SYSTEM_BOOST=ON" - "-DWITH_SYSTEM_ROCKSDB=ON" - "-DWITH_LEVELDB=OFF" - - # enforce shared lib - "-DBUILD_SHARED_LIBS=ON" - - # disable cephfs, cmake build broken for now - "-DWITH_CEPHFS=OFF" - "-DWITH_LIBCEPHFS=OFF" - ]; - - postFixup = '' - wrapPythonPrograms - wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages} - ''; - - enableParallelBuilding = true; - - outputs = [ "dev" "lib" "out" "doc" ]; - - meta = { - homepage = https://ceph.com/; - description = "Distributed storage system"; - license = licenses.lgpl21; - maintainers = with maintainers; [ adev ak ]; - platforms = platforms.unix; - broken = true; - }; - - passthru.version = version; -} diff --git a/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix index e6c4474765c3..81faed5bfa8d 100644 --- a/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let version = "0.7.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dislocker"; inherit version; diff --git a/nixpkgs/pkgs/tools/filesystems/duff/default.nix b/nixpkgs/pkgs/tools/filesystems/duff/default.nix index a61c3c80e6d2..3981521097a9 100644 --- a/nixpkgs/pkgs/tools/filesystems/duff/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/duff/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "duff"; # The last release (0.5.2) is more than 2 years old and lacks features like -D, # limiting its usefulness. Upstream appears comatose if not dead. diff --git a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index d8ddde24ade3..ee3cce37bc7c 100644 --- a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -26,6 +26,14 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Remove six failing tests + # https://github.com/NixOS/nixpkgs/issues/65471 + for test in m_image_mmp m_mmp m_mmp_bad_csum m_mmp_bad_magic t_mmp_1on t_mmp_2off; do + rm -r "tests/$test" + done + ''; + configureFlags = if stdenv.isLinux then [ "--enable-elf-shlibs" diff --git a/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix index 274126e1a718..b84992e1acbb 100644 --- a/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, e2fsprogs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2.4"; pname = "extundelete"; diff --git a/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix index 8a417cfe397d..41c4cc84f966 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fuseiso-20070708"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix index ec734e52f733..614e323e6b29 100644 --- a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "gitfs-${version}"; + pname = "gitfs"; version = "0.4.5.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index 606e41e582ee..07ba47dda4d5 100644 --- a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -62,7 +62,7 @@ let ]; in stdenv.mkDerivation -rec { +{ inherit (s) name version; inherit buildInputs propagatedBuildInputs; diff --git a/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix index 25ec31ea698a..2032ca1c1e75 100644 --- a/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix @@ -2,7 +2,7 @@ let version = "332.25"; package_name = "hfsprogs"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${package_name}-${version}"; srcs = [ (fetchurl { diff --git a/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix b/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix index c4910b166de7..049a61658743 100644 --- a/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libuuid, lzo, zlib, acl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mtd-utils"; version = "1.5.2"; diff --git a/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix b/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix index ea321200fb98..dd8116ff4013 100644 --- a/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -8,7 +8,7 @@ let name = "${baseName}-${version}"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = fetchurl { url = sourceInfo.url; sha256 = sourceInfo.sha256; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 408d02bced74..2abab9057376 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; - src = fetchurl rec { + src = fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index ffe31b464b8a..8a1fce780378 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -5,7 +5,7 @@ buildPythonApplication rec { version = "1.99.39"; md5_path = "d249f60aa89b1b4facd63f776925116d"; - src = fetchurl rec { + src = fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; diff --git a/nixpkgs/pkgs/tools/filesystems/relfs/default.nix b/nixpkgs/pkgs/tools/filesystems/relfs/default.nix index 04a15dfa22be..c99a95714c09 100644 --- a/nixpkgs/pkgs/tools/filesystems/relfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/relfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchcvs, ocaml, fuse, postgresql, pcre , libuuid, gnome_vfs, pkgconfig, GConf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "relfs-2008.03.05"; src = fetchcvs { diff --git a/nixpkgs/pkgs/tools/filesystems/rmount/default.nix b/nixpkgs/pkgs/tools/filesystems/rmount/default.nix index cdc90097653f..46be9e30f70f 100644 --- a/nixpkgs/pkgs/tools/filesystems/rmount/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/rmount/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "rmount"; version = "1.0.1"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { rev = "v${version}"; owner = "Luis-Hebendanz"; repo = "rmount"; diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix index 9a0073f939fb..5bd3b27eded1 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix @@ -6,7 +6,7 @@ assert lz4Support -> (lz4 != null); -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "squashfs"; version = "4.4dev_20180612"; diff --git a/nixpkgs/pkgs/tools/filesystems/vmfs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/vmfs-tools/default.nix index 6cc049a44092..c15a782fa3c6 100644 --- a/nixpkgs/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig , asciidoc, docbook_xsl, fuse, libuuid, libxslt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "vmfs-tools"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix b/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix index 135373e09f42..50a50ad18f05 100644 --- a/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, glib, neon, fuse, pkgconfig}: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { name = "wdfs-fuse-1.4.2"; src = fetchurl { url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz"; diff --git a/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix b/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix index 557367ea22cd..ea25b302e355 100644 --- a/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,7 +1,7 @@ { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python , lib, valgrind, makeWrapper, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = fetchFromGitHub { # using unstable release because stable (v1.5.1) has broken repl java plugin rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3"; diff --git a/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix index 0269df84634f..89516d525af6 100644 --- a/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zkfuse"; inherit (zookeeper) version src; diff --git a/nixpkgs/pkgs/tools/graphics/cfdg/src-for-default.nix b/nixpkgs/pkgs/tools/graphics/cfdg/src-for-default.nix index 179f0432dd10..6d98ea240de6 100644 --- a/nixpkgs/pkgs/tools/graphics/cfdg/src-for-default.nix +++ b/nixpkgs/pkgs/tools/graphics/cfdg/src-for-default.nix @@ -1,4 +1,4 @@ -rec { +{ version="3.0.2"; name="cfdg-3.0.2"; hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; diff --git a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix index 04b73995580b..3d48b328934b 100644 --- a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, imagemagick }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cuneiform"; version = "1.1.0"; diff --git a/nixpkgs/pkgs/tools/graphics/eplot/default.nix b/nixpkgs/pkgs/tools/graphics/eplot/default.nix index ad8d9ebc6a22..ff2091fc2998 100644 --- a/nixpkgs/pkgs/tools/graphics/eplot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/eplot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gnuplot, ruby }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "eplot-2.07"; # Upstream has been contacted (2015-03) regarding providing versioned diff --git a/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/nixpkgs/pkgs/tools/graphics/gifski/default.nix index 7719406cb6bf..5875f64f7ef3 100644 --- a/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "gifski-${version}"; + pname = "gifski"; version = "0.8.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 111a9b59afda..5668e755d017 100644 --- a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, python27, wayland, udev, mesa, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "glmark2"; version = "2017-09-01"; diff --git a/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/nixpkgs/pkgs/tools/graphics/gmic/default.nix index 848d804bb385..c487e42329d8 100644 --- a/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -12,7 +12,7 @@ let url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt"; sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gmic"; inherit version; diff --git a/nixpkgs/pkgs/tools/graphics/graphviz/base.nix b/nixpkgs/pkgs/tools/graphics/graphviz/base.nix index 6cdd6dd71c1d..cd2302efd165 100644 --- a/nixpkgs/pkgs/tools/graphics/graphviz/base.nix +++ b/nixpkgs/pkgs/tools/graphics/graphviz/base.nix @@ -24,7 +24,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "graphviz"; inherit version; diff --git a/nixpkgs/pkgs/tools/graphics/graphviz/default.nix b/nixpkgs/pkgs/tools/graphics/graphviz/default.nix index 48b1b0764c51..7249a6cdaad7 100644 --- a/nixpkgs/pkgs/tools/graphics/graphviz/default.nix +++ b/nixpkgs/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ import ./base.nix rec { - rev = "stable_release_${version}"; + rev = "67cd2e5121379a38e0801cc05cce5033f8a2a609"; version = "2.40.1"; sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj"; } diff --git a/nixpkgs/pkgs/tools/graphics/lepton/default.nix b/nixpkgs/pkgs/tools/graphics/lepton/default.nix index b0836d670862..0b6c12639423 100644 --- a/nixpkgs/pkgs/tools/graphics/lepton/default.nix +++ b/nixpkgs/pkgs/tools/graphics/lepton/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, git, glibc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.2.1"; pname = "lepton"; diff --git a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix index b65cbfca7bbe..4826bd64984b 100644 --- a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix +++ b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix @@ -13,7 +13,7 @@ let boost_static = boost165.override { enablePython = true; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "luxcorerender"; version = "2.0"; diff --git a/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index 534cefe9bf6c..9de7603c9730 100644 --- a/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -2,7 +2,7 @@ , makeWrapper, libtiff , enableX11 ? false, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced name = "netpbm-10.82.01"; diff --git a/nixpkgs/pkgs/tools/graphics/nifskope/default.nix b/nixpkgs/pkgs/tools/graphics/nifskope/default.nix index ebebe5087522..0e545fbfab9f 100644 --- a/nixpkgs/pkgs/tools/graphics/nifskope/default.nix +++ b/nixpkgs/pkgs/tools/graphics/nifskope/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nifskope"; version = "2.0.dev7"; diff --git a/nixpkgs/pkgs/tools/graphics/optar/default.nix b/nixpkgs/pkgs/tools/graphics/optar/default.nix index c1138e5f4584..b831e359e9cc 100644 --- a/nixpkgs/pkgs/tools/graphics/optar/default.nix +++ b/nixpkgs/pkgs/tools/graphics/optar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, imagemagick, libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "optar"; version = "20150210"; diff --git a/nixpkgs/pkgs/tools/graphics/pgf/default.nix b/nixpkgs/pkgs/tools/graphics/pgf/default.nix index b65962ee7ba2..6ae45cc85331 100644 --- a/nixpkgs/pkgs/tools/graphics/pgf/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pgf/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { patchPhase = '' sed 1i'#include <inttypes.h>' -i src/PGF.cpp sed s/__int64/int64_t/g -i src/PGF.cpp + rm include/FreeImage.h include/FreeImagePlus.h ''; preConfigure = "dos2unix configure.ac; sh autogen.sh"; diff --git a/nixpkgs/pkgs/tools/graphics/pngquant/default.nix b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix index b519733f964d..51be6afd102e 100644 --- a/nixpkgs/pkgs/tools/graphics/pngquant/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pngquant"; - version = "2.12.1"; + version = "2.12.5"; src = fetchFromGitHub { owner = "pornel"; repo = "pngquant"; rev = version; - sha256 = "0jdvry3kvmmxcgwf5a3zbfz0idl6yl3700ag7pf8sk4lg4qp0llp"; + sha256 = "0sq398iv5cacblz6pb4j2hn16cnszsbkahikdpfq84rb9bj0ya40"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix b/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix index e4163cd93a87..ed8fa5ee5192 100644 --- a/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pngtoico-1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/graphics/qrcode/default.nix b/nixpkgs/pkgs/tools/graphics/qrcode/default.nix index eec8c5158b43..909f0e397268 100644 --- a/nixpkgs/pkgs/tools/graphics/qrcode/default.nix +++ b/nixpkgs/pkgs/tools/graphics/qrcode/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qrcode-git"; version = "20160804"; diff --git a/nixpkgs/pkgs/tools/graphics/rocket/default.nix b/nixpkgs/pkgs/tools/graphics/rocket/default.nix index 8628b72bbae2..97c400fbc9e3 100644 --- a/nixpkgs/pkgs/tools/graphics/rocket/default.nix +++ b/nixpkgs/pkgs/tools/graphics/rocket/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rocket"; version = "2018-06-09"; diff --git a/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix b/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix index a3497aefe102..2c586cd3b1f6 100644 --- a/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix +++ b/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "structure-synth"; version = "v1.5"; diff --git a/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix b/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix index 6e455caf9066..50aeae78fce8 100644 --- a/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix +++ b/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "svgcleaner-${version}"; + pname = "svgcleaner"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/transfig/default.nix b/nixpkgs/pkgs/tools/graphics/transfig/default.nix index ceee3b7674d9..db204113226e 100644 --- a/nixpkgs/pkgs/tools/graphics/transfig/default.nix +++ b/nixpkgs/pkgs/tools/graphics/transfig/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "transfig-3.2.4"; src = fetchurl { url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; diff --git a/nixpkgs/pkgs/tools/graphics/wallutils/default.nix b/nixpkgs/pkgs/tools/graphics/wallutils/default.nix index ba1044e3bb40..1b578628cafa 100644 --- a/nixpkgs/pkgs/tools/graphics/wallutils/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wallutils/default.nix @@ -1,19 +1,19 @@ { buildGoModule, fetchFromGitHub, lib -, wayland, libX11, xbitmaps, libXcursor, libXmu +, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm }: buildGoModule rec { pname = "wallutils"; - version = "5.8.1"; + version = "5.8.2"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "095pgvk4yp2l6xgl63qp61rr2dij51awndwrs5ha9vpdd1jqgvfi"; + sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh"; }; - modSha256 = "1kbggry1qrf0nkvysnaky2nl73l5f0bnc4wx0hfr6ifyagfjzy77"; + modSha256 = "0siw1g3fsk1xjri9k1pb03filax8an5sfza5db52krh80g9xasah"; patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; @@ -22,7 +22,7 @@ buildGoModule rec { sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go ''; - buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu ]; + buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm ]; meta = with lib; { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix index cf0a0f1fa17e..187587fbfb49 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fcitx-skk"; version = "0.1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 3b8b3489a1d2..0a38ccfa3bd8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,5 +1,13 @@ -{ stdenv, fetchurl, intltool, pkgconfig -, gtk3, ibus, libhangul, python3 +{ stdenv +, fetchurl +, substituteAll +, intltool +, pkgconfig +, wrapGAppsHook +, gtk3 +, ibus +, libhangul +, python3 }: stdenv.mkDerivation rec { @@ -11,18 +19,36 @@ stdenv.mkDerivation rec { sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; - buildInputs = [ gtk3 ibus libhangul python3 ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + libhangul = "${libhangul}/lib/libhangul.so.1"; + }) + ]; - nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; + nativeBuildInputs = [ + intltool + pkgconfig + python3.pkgs.wrapPython + wrapGAppsHook + ]; - postFixup = "wrapPythonPrograms"; + buildInputs = [ + gtk3 + ibus + libhangul + (python3.withPackages (pypkgs: with pypkgs; [ + pygobject3 + (toPythonModule ibus) + ])) + ]; meta = with stdenv.lib; { isIbusEngine = true; - description = "Ibus Hangul engine"; - homepage = https://github.com/choehwanjin/ibus-hangul; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ ericsagnes ]; + description = "Ibus Hangul engine"; + homepage = https://github.com/choehwanjin/ibus-hangul; + license = licenses.gpl2; + maintainers = with maintainers; [ ericsagnes ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch new file mode 100644 index 000000000000..7487d074d559 --- /dev/null +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/setup/main.py b/setup/main.py +index 8d581cd..2ac47b9 100644 +--- a/setup/main.py ++++ b/setup/main.py +@@ -37,7 +37,7 @@ + + def get_hangul_keyboard_list(): + from ctypes import CDLL, c_int, c_char_p +- libhangul = CDLL('libhangul.so.1') ++ libhangul = CDLL('@libhangul@') + libhangul.hangul_ic_get_n_keyboards.argtypes = [] + libhangul.hangul_ic_get_n_keyboards.restype = c_int + libhangul.hangul_ic_get_keyboard_id.argtypes = [c_int] diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index c3ee5eafd7be..b77394f218b8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -13,7 +13,7 @@ let rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992"; sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "ibus-table-chinese"; version = "1.8.2"; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix index d36697221a4f..a6c2404ef347 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix @@ -60,7 +60,7 @@ let sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10"; }; }; - ucd = stdenv.mkDerivation rec { + ucd = stdenv.mkDerivation { name = "ucd-12.0.0"; dontUnpack = true; installPhase = '' diff --git a/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix b/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix index cd7d1cd8bbfc..a2f01c7367c8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "keyfuzz"; version = "0.2"; diff --git a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index cf32e8d51ca3..2f8425bd8b54 100644 --- a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -27,7 +27,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "skk-dicts-unstable"; version = "2017-10-26"; srcs = [ small medium large edict assoc ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix index d4ef2e2422ec..19d871bc77fc 100644 --- a/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -8,7 +8,7 @@ # dependencies on a Ruby interpreter etc. # - We for the moment do not package them to keep the dependencies slim. # Probably, shall package the newer tools as skktools-extra in the future. -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "skktools"; version = "1.3.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index 02993b248ab7..afacc302eda1 100644 --- a/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tegaki-zinnia-japanese"; version = "0.3"; diff --git a/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix b/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix index ce87e1a71412..b23e0c369a62 100644 --- a/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zinnia"; version = "2016-08-28"; diff --git a/nixpkgs/pkgs/tools/misc/0x0/default.nix b/nixpkgs/pkgs/tools/misc/0x0/default.nix index a349a3f2fc0e..d78846922c6e 100644 --- a/nixpkgs/pkgs/tools/misc/0x0/default.nix +++ b/nixpkgs/pkgs/tools/misc/0x0/default.nix @@ -1,6 +1,6 @@ { stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "0x0"; version = "2018-06-24"; diff --git a/nixpkgs/pkgs/tools/misc/argtable/default.nix b/nixpkgs/pkgs/tools/misc/argtable/default.nix index 8b2a2a4b2150..c16e4aded0d0 100644 --- a/nixpkgs/pkgs/tools/misc/argtable/default.nix +++ b/nixpkgs/pkgs/tools/misc/argtable/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "argtable"; version = "3.0.1"; diff --git a/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix index 79f72746f905..14ab790d9c76 100644 --- a/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix +++ b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix @@ -1,6 +1,6 @@ { stdenv, python3Packages, fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "bashplotlib"; version = "2019-01-02"; diff --git a/nixpkgs/pkgs/tools/misc/bat/default.nix b/nixpkgs/pkgs/tools/misc/bat/default.nix index 267b820df073..449be0f017f6 100644 --- a/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "07qxghplqq8km4kp9zas2acw302a77y72x3ix1272kb1zxhw4as6"; + sha256 = "1cpa8dal4c27pnbmmrar4vqzcl4h0zf8x1zx1dlf0riavdg9n56y"; fetchSubmodules = true; }; - cargoSha256 = "0j9wxv21a91yfvbbvgn5ms5zi1aipj1k2g42mfdvvw2vsdzqagxz"; + cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2"; nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ]; diff --git a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index af9ad77bddad..2f326a1d6ac7 100644 --- a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.192"; + version = "1.193"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0yjylbj88p2a7qi1wicicl1ivrhp52pnzy44mc1yg6l3n7zifcwn"; + sha256 = "1mykng02fyxshm02kywrk16f27b1jhgn9zcaxcvxd255sn58w68k"; }; buildInputs = [ dpkg ]; diff --git a/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix index c7a9af4abd1a..c0339834b649 100644 --- a/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bibtex2html"; version = "1.99"; diff --git a/nixpkgs/pkgs/tools/misc/blsd/default.nix b/nixpkgs/pkgs/tools/misc/blsd/default.nix index 655fd44c0399..23bd7ed172c4 100644 --- a/nixpkgs/pkgs/tools/misc/blsd/default.nix +++ b/nixpkgs/pkgs/tools/misc/blsd/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: -buildGoPackage rec { +buildGoPackage { pname = "blsd"; version = "2017-07-27"; diff --git a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix index 7391c271cd17..6b7a51e08f51 100644 --- a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "bmap-tools-${version}"; + pname = "bmap-tools"; version = "3.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix index 2ba5499d7f77..c40ccad5e396 100644 --- a/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, python2Packages, fetchFromGitHub }: -python2Packages.buildPythonApplication rec { +python2Packages.buildPythonApplication { pname = "broadlink-cli"; inherit (python2Packages.broadlink) version; diff --git a/nixpkgs/pkgs/tools/misc/capture/default.nix b/nixpkgs/pkgs/tools/misc/capture/default.nix index 377297ee4799..e7134961c252 100644 --- a/nixpkgs/pkgs/tools/misc/capture/default.nix +++ b/nixpkgs/pkgs/tools/misc/capture/default.nix @@ -1,6 +1,6 @@ { stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "capture-unstable"; version = "2019-03-10"; diff --git a/nixpkgs/pkgs/tools/misc/cbmem/default.nix b/nixpkgs/pkgs/tools/misc/cbmem/default.nix deleted file mode 100644 index d2efea1c03a6..000000000000 --- a/nixpkgs/pkgs/tools/misc/cbmem/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "cbmem"; - version = "4.9"; - - src = fetchurl { - url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; - }; - - buildPhase = '' - make -C util/cbmem - ''; - - installPhase = '' - install -Dm755 util/cbmem/cbmem $out/bin/cbmem - ''; - - meta = with stdenv.lib; { - description = "Read coreboot timestamps and console logs"; - homepage = "https://www.coreboot.org"; - license = licenses.gpl2; - maintainers = [ maintainers.petabyteboy ]; - platforms = platforms.linux; - }; -} - diff --git a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix index a1b1b4eac2d5..4d33d957b4d1 100644 --- a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix +++ b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix @@ -7,7 +7,7 @@ , xsel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cht.sh"; version = "unstable-2019-08-06"; diff --git a/nixpkgs/pkgs/tools/misc/contacts/default.nix b/nixpkgs/pkgs/tools/misc/contacts/default.nix index 1b3c5f169699..f3d7fbd81273 100644 --- a/nixpkgs/pkgs/tools/misc/contacts/default.nix +++ b/nixpkgs/pkgs/tools/misc/contacts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.1a-3"; pname = "contacts"; diff --git a/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix b/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix new file mode 100644 index 000000000000..3f6988f1f657 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: + +let + version = "4.10"; + + meta = with stdenv.lib; { + description = "Various coreboot-related tools"; + homepage = "https://www.coreboot.org"; + license = licenses.gpl2; + maintainers = [ maintainers.petabyteboy ]; + platforms = platforms.linux; + }; + + generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec { + inherit pname version meta; + + src = fetchurl { + url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; + sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa"; + }; + + enableParallelBuilding = true; + + postPatch = '' + cd ${path} + ''; + + makeFlags = [ + "INSTALL=install" + "PREFIX=${placeholder "out"}" + ]; + } // args); + + utils = { + msrtool = generic { + pname = "msrtool"; + meta.description = "Dump chipset-specific MSR registers"; + buildInputs = [ pciutils zlib ]; + preConfigure = "export INSTALL=install"; + }; + cbmem = generic { + pname = "cbmem"; + meta.description = "Coreboot console log reader"; + }; + ifdtool = generic { + pname = "ifdtool"; + meta.description = "Extract and dump Intel Firmware Descriptor information"; + }; + intelmetool = generic { + pname = "intelmetool"; + meta.description = "Dump interesting things about Management Engine"; + buildInputs = [ pciutils zlib ]; + }; + cbfstool = generic { + pname = "cbfstool"; + meta.description = "Management utility for CBFS formatted ROM images"; + }; + nvramtool = generic { + pname = "nvramtool"; + meta.description = "Read and write coreboot parameters and display information from the coreboot table in CMOS/NVRAM"; + }; + superiotool = generic { + pname = "superiotool"; + meta.description = "User-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O"; + buildInputs = [ pciutils zlib ]; + }; + ectool = generic { + pname = "ectool"; + meta.description = "Dump the RAM of a laptop's Embedded/Environmental Controller (EC)"; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; + preInstall = "mkdir -p $out/sbin"; + }; + inteltool = generic { + pname = "inteltool"; + meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)"; + buildInputs = [ pciutils zlib ]; + }; + amdfwtool = generic { + pname = "amdfwtool"; + meta.description = "Create AMD firmware combination"; + installPhase = "install -Dm755 amdfwtool $out/bin/amdfwtool"; + }; + acpidump-all = generic { + pname = "acpidump-all"; + path = "util/acpi"; + meta.description = "Walk through all ACPI tables with their addresses"; + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; + installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; + postFixup = let + binPath = [ coreutils acpica-tools iasl gnugrep gnused file ]; + in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}"; + }; + }; + +in utils // { + coreboot-utils = (buildEnv { + name = "coreboot-utils-${version}"; + paths = stdenv.lib.attrValues utils; + postBuild = "rm -rf $out/sbin"; + }) // { + inherit meta version; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix b/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix index f35da52081bc..5792fa4121b4 100644 --- a/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix @@ -5,7 +5,7 @@ let rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; date = "20160316"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/misc/crudini/default.nix b/nixpkgs/pkgs/tools/misc/crudini/default.nix index 7ca103062c11..f5291d0789e6 100644 --- a/nixpkgs/pkgs/tools/misc/crudini/default.nix +++ b/nixpkgs/pkgs/tools/misc/crudini/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, help2man }: python2Packages.buildPythonApplication rec { - name = "crudini-${version}"; + pname = "crudini"; version = "0.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/dbus-map/default.nix b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix index ab52d73ac27b..72687f4bfa48 100644 --- a/nixpkgs/pkgs/tools/misc/dbus-map/default.nix +++ b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dbus-map"; version = "2015-05-28"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/diskus/default.nix b/nixpkgs/pkgs/tools/misc/diskus/default.nix index ef00c753d3aa..591cd5fe0408 100644 --- a/nixpkgs/pkgs/tools/misc/diskus/default.nix +++ b/nixpkgs/pkgs/tools/misc/diskus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "diskus-${version}"; + pname = "diskus"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix index b9a66ba95d9f..4dffae557a4e 100644 --- a/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "dust-${version}"; + pname = "dust"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix index 10fb4cd89bd9..df2e25c7ea33 100644 --- a/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix +++ b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix @@ -1,5 +1,5 @@ { stdenv, ncurses, customConfig ? null, name, src, patches ? [] }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name src patches; diff --git a/nixpkgs/pkgs/tools/misc/dylibbundler/default.nix b/nixpkgs/pkgs/tools/misc/dylibbundler/default.nix index c88e29bb4553..6bb9924ddd09 100644 --- a/nixpkgs/pkgs/tools/misc/dylibbundler/default.nix +++ b/nixpkgs/pkgs/tools/misc/dylibbundler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dylibbundler"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix index bcd3ec6d8f7f..11a46f620c0a 100644 --- a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix +++ b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: let version = "2018-12-06"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "edid-decode-unstable"; inherit version; diff --git a/nixpkgs/pkgs/tools/misc/emv/default.nix b/nixpkgs/pkgs/tools/misc/emv/default.nix index 160c3982cc15..6a5fcfb12174 100644 --- a/nixpkgs/pkgs/tools/misc/emv/default.nix +++ b/nixpkgs/pkgs/tools/misc/emv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "emv"; version = "1.95"; diff --git a/nixpkgs/pkgs/tools/misc/ent/default.nix b/nixpkgs/pkgs/tools/misc/ent/default.nix index d4f69340d0ae..1c0401e2eadc 100644 --- a/nixpkgs/pkgs/tools/misc/ent/default.nix +++ b/nixpkgs/pkgs/tools/misc/ent/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ent-1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix index 1447c70412b6..d94f1c1929ff 100644 --- a/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -5,7 +5,7 @@ with rustPlatform; buildRustPackage rec { - name = "exa-${version}"; + pname = "exa"; version = "0.9.0"; cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf"; diff --git a/nixpkgs/pkgs/tools/misc/fd/default.nix b/nixpkgs/pkgs/tools/misc/fd/default.nix index 91c1b3b70719..7465cb67f61a 100644 --- a/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "fd-${version}"; + pname = "fd"; version = "7.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/fffuu/default.nix b/nixpkgs/pkgs/tools/misc/fffuu/default.nix index 7b275220c197..5d79b26f2308 100644 --- a/nixpkgs/pkgs/tools/misc/fffuu/default.nix +++ b/nixpkgs/pkgs/tools/misc/fffuu/default.nix @@ -1,6 +1,6 @@ { mkDerivation, haskellPackages, fetchFromGitHub, lib }: -mkDerivation rec { +mkDerivation { pname = "fffuu"; version = "unstable-2018-05-26"; diff --git a/nixpkgs/pkgs/tools/misc/findutils/default.nix b/nixpkgs/pkgs/tools/misc/findutils/default.nix index 9db66480cb10..2df8ee420fae 100644 --- a/nixpkgs/pkgs/tools/misc/findutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/findutils/default.nix @@ -3,20 +3,16 @@ }: stdenv.mkDerivation rec { - name = "findutils-4.6.0"; + pname = "findutils"; + version = "4.7.0"; src = fetchurl { - url = "mirror://gnu/findutils/${name}.tar.gz"; - sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"; + url = "mirror://gnu/findutils/${pname}-${version}.tar.xz"; + sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; }; patches = [ - ./memory-leak.patch ./no-install-statedir.patch - - # Prevent tests from failing on old kernels (2.6x) - # getdtablesize reports incorrect values if getrlimit() fails - ./disable-getdtablesize-test.patch ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort diff --git a/nixpkgs/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/nixpkgs/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch deleted file mode 100644 index 611df364b687..000000000000 --- a/nixpkgs/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tests/test-dup2.c b/tests/test-dup2.c ---- a/tests/test-dup2.c -+++ b/tests/test-dup2.c -@@ -157,8 +157,6 @@ main (void) - ASSERT (close (255) == 0); - ASSERT (close (256) == 0); - } -- ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1); -- ASSERT (close (bad_fd - 1) == 0); - errno = 0; - ASSERT (dup2 (fd, bad_fd) == -1); - ASSERT (errno == EBADF); -diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c -index a0325af..a83f8ec 100644 ---- a/tests/test-getdtablesize.c -+++ b/tests/test-getdtablesize.c -@@ -29,8 +29,6 @@ int - main (int argc, char *argv[]) - { - ASSERT (getdtablesize () >= 3); -- ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1); -- ASSERT (dup2 (0, getdtablesize()) == -1); - - return 0; - } diff --git a/nixpkgs/pkgs/tools/misc/findutils/memory-leak.patch b/nixpkgs/pkgs/tools/misc/findutils/memory-leak.patch deleted file mode 100644 index 56f65f856224..000000000000 --- a/nixpkgs/pkgs/tools/misc/findutils/memory-leak.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://git.savannah.gnu.org/cgit/findutils.git/patch/?id=c1556892a -diff --git a/find/fstype.c b/find/fstype.c -index 535f920..a0ac8bc 100644 ---- a/find/fstype.c -+++ b/find/fstype.c -@@ -75,14 +75,7 @@ free_file_system_list (struct mount_entry *p) - while (p) - { - struct mount_entry *pnext = p->me_next; -- -- free (p->me_devname); -- free (p->me_mountdir); -- -- if (p->me_type_malloced) -- free (p->me_type); -- p->me_next = NULL; -- free (p); -+ free_mount_entry (p); - p = pnext; - } - } diff --git a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index 6d24f3a44735..08d091cb3002 100644 --- a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fluent-bit"; version = "1.0.6"; diff --git a/nixpkgs/pkgs/tools/misc/fortune/default.nix b/nixpkgs/pkgs/tools/misc/fortune/default.nix index 871f113a41dd..74c21d21fcc3 100644 --- a/nixpkgs/pkgs/tools/misc/fortune/default.nix +++ b/nixpkgs/pkgs/tools/misc/fortune/default.nix @@ -1,37 +1,38 @@ { stdenv, fetchurl, cmake, recode, perl }: -let srcs = { - fortune = fetchurl { - url = "https://github.com/shlomif/fortune-mod/archive/fortune-mod-${version}.tar.gz"; - sha256 = "89223bb649ea62b030527f181539182d6a17a1a43b0cc499a52732b839f7b691"; - }; - shlomifCommon = fetchurl { - url = https://bitbucket.org/shlomif/shlomif-cmake-modules/raw/default/shlomif-cmake-modules/Shlomif_Common.cmake; - sha256 = "62f188a9f1b7ab0e757eb0bc6540d9c0026d75edc7acc1c3cdf7438871d0a94f"; - }; - }; - version = "2.6.2"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "fortune-mod"; - inherit version; + version = "2.10.0"; - src = srcs.fortune; - - sourceRoot = "fortune-mod-fortune-mod-${version}/fortune-mod"; + src = fetchurl { + url = "https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-${version}.tar.xz"; + sha256 = "07g50hij87jb7m40pkvgd47qfvv4s805lwiz79jbqcxzd7zdyax7"; + }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ recode ]; - preConfigure = '' - cp ${srcs.shlomifCommon} cmake/Shlomif_Common.cmake - ''; - - postInstall = '' - mv $out/games/fortune $out/bin/fortune - rm -r $out/games - ''; + cmakeFlags = [ + "-DLOCALDIR=${placeholder "out"}/share/fortunes" + ]; + + patches = [ (builtins.toFile "not-a-game.patch" '' + diff --git a/CMakeLists.txt b/CMakeLists.txt + index 865e855..5a59370 100644 + --- a/CMakeLists.txt + +++ b/CMakeLists.txt + @@ -154,7 +154,7 @@ ENDMACRO() + my_exe( + "fortune" + "fortune/fortune.c" + - "games" + + "bin" + ) + + my_exe( + -- + '') ]; meta = with stdenv.lib; { description = "A program that displays a pseudorandom message from a database of quotations"; diff --git a/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix b/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix index b8b86e07abb0..771fc354da42 100644 --- a/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "gif-for-cli"; version = "unstable-2018-08-14"; diff --git a/nixpkgs/pkgs/tools/misc/gringo/default.nix b/nixpkgs/pkgs/tools/misc/gringo/default.nix index 51c6d9c20758..705c1a7e1d6a 100644 --- a/nixpkgs/pkgs/tools/misc/gringo/default.nix +++ b/nixpkgs/pkgs/tools/misc/gringo/default.nix @@ -7,7 +7,7 @@ let version = "4.5.4"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gringo"; inherit version; diff --git a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index 7e30ffe0b288..3f5485718dc5 100644 --- a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -10,22 +10,22 @@ with stdenv.lib; let pcSystems = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "i386"; + i686-linux.target = "i386"; + x86_64-linux.target = "i386"; }; efiSystemsBuild = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "aarch64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "aarch64"; }; # For aarch64, we need to use '--target=aarch64-efi' when building, # but '--target=arm64-efi' when installing. Insanity! efiSystemsInstall = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "arm64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "arm64"; }; canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); diff --git a/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix b/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix index 19d8afb18575..6b796dedb0ad 100644 --- a/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -3,9 +3,9 @@ with stdenv.lib; let efiSystemsBuild = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "aarch64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "aarch64"; }; in ( diff --git a/nixpkgs/pkgs/tools/misc/grub/trusted.nix b/nixpkgs/pkgs/tools/misc/grub/trusted.nix index 7b432df3e8b8..1033a489c767 100644 --- a/nixpkgs/pkgs/tools/misc/grub/trusted.nix +++ b/nixpkgs/pkgs/tools/misc/grub/trusted.nix @@ -6,8 +6,8 @@ with stdenv.lib; let pcSystems = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "i386"; + i686-linux.target = "i386"; + x86_64-linux.target = "i386"; }; inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); diff --git a/nixpkgs/pkgs/tools/misc/grub4dos/default.nix b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix index edb9508df31a..2dd8688232f8 100644 --- a/nixpkgs/pkgs/tools/misc/grub4dos/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix @@ -4,7 +4,7 @@ let arch = if stdenv.isi686 then "i386" else if stdenv.isx86_64 then "x86_64" else throw "Unknown architecture"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "grub4dos"; version = "0.4.6a-2019-05-12"; diff --git a/nixpkgs/pkgs/tools/misc/hackertyper/default.nix b/nixpkgs/pkgs/tools/misc/hackertyper/default.nix index 8657e34e1608..4b5973e7eeca 100644 --- a/nixpkgs/pkgs/tools/misc/hackertyper/default.nix +++ b/nixpkgs/pkgs/tools/misc/hackertyper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hackertyper"; version = "2.1"; diff --git a/nixpkgs/pkgs/tools/misc/heatseeker/default.nix b/nixpkgs/pkgs/tools/misc/heatseeker/default.nix index 76795892e715..bf6740d7ee4a 100644 --- a/nixpkgs/pkgs/tools/misc/heatseeker/default.nix +++ b/nixpkgs/pkgs/tools/misc/heatseeker/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "heatseeker-${version}"; + pname = "heatseeker"; version = "1.5.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/heimdall/default.nix b/nixpkgs/pkgs/tools/misc/heimdall/default.nix index 9e21ab5e38ff..a8100e455f0b 100644 --- a/nixpkgs/pkgs/tools/misc/heimdall/default.nix +++ b/nixpkgs/pkgs/tools/misc/heimdall/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake -, zlib, libusb1 -, enableGUI ? false, qtbase ? null }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, zlib, libusb1 +, enableGUI ? false, qtbase ? null +}: -stdenv.mkDerivation rec { +let version = "1.4.2"; in + +mkDerivation { name = "heimdall-${if enableGUI then "gui-" else ""}${version}"; - version = "1.4.2"; src = fetchFromGitHub { owner = "Benjamin-Dobell"; diff --git a/nixpkgs/pkgs/tools/misc/hostsblock/default.nix b/nixpkgs/pkgs/tools/misc/hostsblock/default.nix index 61832a5d3260..a6ed7bf92ff9 100644 --- a/nixpkgs/pkgs/tools/misc/hostsblock/default.nix +++ b/nixpkgs/pkgs/tools/misc/hostsblock/default.nix @@ -19,7 +19,7 @@ ".bp.blogspot.com" ] }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hostsblock"; version = "20161213"; diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index 6b0d5d3387c2..be01c0118b3d 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -1,41 +1,28 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - concurrent-ruby (1.1.5) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) ethon (0.12.0) ffi (>= 1.3.0) ffi (1.11.1) - html-proofer (3.11.1) - activesupport (>= 4.2, < 6.0) + html-proofer (3.12.2) addressable (~> 2.3) - mercenary (~> 0.3.2) - nokogiri (~> 1.9) + mercenary (~> 0.3) + nokogiri (~> 1.10) parallel (~> 1.3) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) - i18n (1.6.0) - concurrent-ruby (~> 1.0) mercenary (0.3.6) mini_portile2 (2.4.0) - minitest (5.11.3) nokogiri (1.10.4) mini_portile2 (~> 2.4.0) parallel (1.17.0) - public_suffix (3.1.1) + public_suffix (4.0.1) rainbow (3.0.0) - thread_safe (0.3.6) typhoeus (1.3.1) ethon (>= 0.9.0) - tzinfo (1.2.5) - thread_safe (~> 0.1) yell (2.2.0) PLATFORMS diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index 256243f3d5d1..2deda655d995 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -1,35 +1,14 @@ { - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; - type = "gem"; - }; - version = "5.2.3"; - }; addressable = { dependencies = ["public_suffix"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; - type = "gem"; - }; - version = "2.6.0"; - }; - concurrent-ruby = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "1.1.5"; + version = "2.7.0"; }; ethon = { dependencies = ["ffi"]; @@ -53,26 +32,15 @@ version = "1.11.1"; }; html-proofer = { - dependencies = ["activesupport" "addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"]; + dependencies = ["addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kpcz7p0yjr1y9fs8gila2bkgb8y6qkyqv5a8yymw0hkvddnqig4"; + sha256 = "0xkcchgvlqkk3xgn11vw8n42bhavj6nn6vqsbycbx1rqxgiljlhy"; type = "gem"; }; - version = "3.11.1"; - }; - i18n = { - dependencies = ["concurrent-ruby"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; - type = "gem"; - }; - version = "1.6.0"; + version = "3.12.2"; }; mercenary = { groups = ["default"]; @@ -94,16 +62,6 @@ }; version = "2.4.0"; }; - minitest = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; - type = "gem"; - }; - version = "5.11.3"; - }; nokogiri = { dependencies = ["mini_portile2"]; groups = ["default"]; @@ -130,10 +88,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; + sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; type = "gem"; }; - version = "3.1.1"; + version = "4.0.1"; }; rainbow = { groups = ["default"]; @@ -145,16 +103,6 @@ }; version = "3.0.0"; }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; typhoeus = { dependencies = ["ethon"]; groups = ["default"]; @@ -166,17 +114,6 @@ }; version = "1.3.1"; }; - tzinfo = { - dependencies = ["thread_safe"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; - type = "gem"; - }; - version = "1.2.5"; - }; yell = { groups = ["default"]; platforms = []; diff --git a/nixpkgs/pkgs/tools/misc/ifdtool/default.nix b/nixpkgs/pkgs/tools/misc/ifdtool/default.nix deleted file mode 100644 index 7fe4ad86b8eb..000000000000 --- a/nixpkgs/pkgs/tools/misc/ifdtool/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "ifdtool"; - version = "4.9"; - - src = fetchurl { - url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; - }; - - buildPhase = '' - make -C util/ifdtool - ''; - - installPhase = '' - install -Dm755 util/ifdtool/ifdtool $out/bin/ifdtool - ''; - - meta = with stdenv.lib; { - description = "Extract and dump Intel Firmware Descriptor information"; - homepage = https://www.coreboot.org; - license = licenses.gpl2; - maintainers = [ maintainers.petabyteboy ]; - platforms = platforms.linux; - }; -} - diff --git a/nixpkgs/pkgs/tools/misc/intelmetool/default.nix b/nixpkgs/pkgs/tools/misc/intelmetool/default.nix deleted file mode 100644 index 87aa7df8d6d7..000000000000 --- a/nixpkgs/pkgs/tools/misc/intelmetool/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchgit, zlib, pciutils }: - -stdenv.mkDerivation rec { - pname = "intelmetool"; - version = "4.8.1"; - - src = fetchgit { - url = "https://review.coreboot.org/coreboot.git"; - rev = version; - sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr"; - fetchSubmodules = false; - }; - - buildInputs = [ zlib pciutils ]; - - buildPhase = '' - make -C util/intelmetool - ''; - - installPhase = '' - mkdir -p $out/bin - cp util/intelmetool/intelmetool $out/bin - ''; - - meta = with stdenv.lib; { - description = "Dump interesting things about Management Engine"; - homepage = https://www.coreboot.org/Nvramtool; - license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/ix/default.nix b/nixpkgs/pkgs/tools/misc/ix/default.nix index fdbd7611dce5..cedaa13b74a0 100644 --- a/nixpkgs/pkgs/tools/misc/ix/default.nix +++ b/nixpkgs/pkgs/tools/misc/ix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ix"; version = "20190815"; diff --git a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix index 08fbba873e5b..b1d71a892d6f 100644 --- a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, jre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "jdiskreport-1.4.1"; builder = ./builder.sh; diff --git a/nixpkgs/pkgs/tools/misc/journaldriver/default.nix b/nixpkgs/pkgs/tools/misc/journaldriver/default.nix index 7e6b6124024a..56a1dc75a455 100644 --- a/nixpkgs/pkgs/tools/misc/journaldriver/default.nix +++ b/nixpkgs/pkgs/tools/misc/journaldriver/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }: rustPlatform.buildRustPackage rec { - name = "journaldriver-${version}"; + pname = "journaldriver"; version = "1.1.0"; cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g"; diff --git a/nixpkgs/pkgs/tools/misc/kargo/default.nix b/nixpkgs/pkgs/tools/misc/kargo/default.nix index 822932dc5ac4..480c0abc728d 100644 --- a/nixpkgs/pkgs/tools/misc/kargo/default.nix +++ b/nixpkgs/pkgs/tools/misc/kargo/default.nix @@ -2,10 +2,10 @@ python2Packages.buildPythonApplication rec { version = "0.4.6"; - name = "kargo-${version}"; + pname = "kargo"; src = fetchurl { - url = "mirror://pypi/k/kargo/${name}.tar.gz"; + url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz"; sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b"; }; diff --git a/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix b/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix index ce343c7cc394..0fd1c7c5cd73 100644 --- a/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, mkDerivation , cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: -mkDerivation rec { +mkDerivation { name = "kdecoration-viewer-2018-07-24"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/kermit/default.nix b/nixpkgs/pkgs/tools/misc/kermit/default.nix index a021064a5ff9..9f739da0afa0 100644 --- a/nixpkgs/pkgs/tools/misc/kermit/default.nix +++ b/nixpkgs/pkgs/tools/misc/kermit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ncurses, glibc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kermit-9.0.302"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix index b6b56e1df937..3667b483383b 100644 --- a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix @@ -17,7 +17,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kisslicer-1.6.3"; src = fetchzip { diff --git a/nixpkgs/pkgs/tools/misc/kronometer/default.nix b/nixpkgs/pkgs/tools/misc/kronometer/default.nix index 4e83c2479f1d..632001f6329a 100644 --- a/nixpkgs/pkgs/tools/misc/kronometer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kronometer/default.nix @@ -4,15 +4,12 @@ kconfig, kcrash, kinit }: -let +mkDerivation rec { pname = "kronometer"; version = "2.2.3"; -in -mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm"; }; @@ -22,6 +19,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kcrash kinit ]; } diff --git a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix index 5955c1104d3f..3d2b7c5b214c 100644 --- a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix +++ b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ldapvi"; version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; diff --git a/nixpkgs/pkgs/tools/misc/logstash/5.x.nix b/nixpkgs/pkgs/tools/misc/logstash/5.x.nix deleted file mode 100644 index 2545dd1e6bc0..000000000000 --- a/nixpkgs/pkgs/tools/misc/logstash/5.x.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, elk5Version, makeWrapper, jre }: - -stdenv.mkDerivation rec { - version = elk5Version; - pname = "logstash"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; - sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0"; - }; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; - - buildInputs = [ - makeWrapper jre - ]; - - installPhase = '' - mkdir -p $out - cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" - - wrapProgram $out/bin/logstash-plugin \ - --set JAVA_HOME "${jre}" - ''; - - meta = with stdenv.lib; { - description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.wjlroe maintainers.offline ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/logstash/6.x.nix b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index be26aee03b98..c926d220b05d 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/6.x.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "178shgxwc9kw9w9vwsvwxp8m8r6lssaw1i32vvmx9na01b4w5m4p" - else "0gyq97qsg7fys9cc5yj4kpcf3xxvdd5qgzal368yg9swps37g5yj"; + then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053" + else "0spxgqsyh72n0l0xh6rljp0lbqz46xmr02sqz25ybycr4qkxdhgk"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix index aa768e532b80..9eff84e67dc5 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "0ls7ia4ldyb7kslmjqhszb30bkammdm5nydc5y7r41zl1zjlhfgc" - else "1mpmfnc57vpjk8x3vibamz8lgq163msf20m1bail4hbwhwsmms9i"; + then "1mw053bx2zh5320p545ax8fnydzqj28r239l7a4m1d2shi89w6s8" + else "0d57ahak4chxmd0pmgkbmig2wacprv120pwmjlx63sxf5vw72yap"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/ltunify/default.nix b/nixpkgs/pkgs/tools/misc/ltunify/default.nix index 4521f8b407a6..84a92ec77128 100644 --- a/nixpkgs/pkgs/tools/misc/ltunify/default.nix +++ b/nixpkgs/pkgs/tools/misc/ltunify/default.nix @@ -3,7 +3,7 @@ # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ltunify"; version = "unstable-20180330"; diff --git a/nixpkgs/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix index ced4a156137d..df1a2daddb91 100644 --- a/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -1,33 +1,47 @@ { stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.7.5"; + name = "man-db-2.8.6.1"; src = fetchurl { url = "mirror://savannah/man-db/${name}.tar.xz"; - sha256 = "056a3il7agfazac12yggcg4gf412yq34k065im0cpfxbcw6xskaw"; + sha256 = "0a1sh5gxa16k6irzf3q2lli8m204w9ik1xm62wjgf1mzknxs4xrc"; }; outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkgconfig makeWrapper groff ] - ++ stdenv.lib.optionals doCheck checkInputs; + nativeBuildInputs = [ pkgconfig makeWrapper groff ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; postPatch = '' - substituteInPlace src/man_db.conf.in \ - --replace "/usr/local/share" "/run/current-system/sw/share" \ - --replace "/usr/share" "/run/current-system/sw/share" + # Remove all mandatory manpaths. Nixpkgs makes no requirements on + # these directories existing. + sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in + + # Add Nixpkgs and NixOS-related manpaths + echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in + echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in + echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in + + # Add mandb locations for the above + echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in + echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in ''; configureFlags = [ "--disable-setuid" + "--disable-cache-owner" "--localstatedir=/var" # Don't try /etc/man_db.conf by default, so we avoid error messages. - "--with-config-file=\${out}/etc/man_db.conf" - "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d" + "--with-config-file=${placeholder "out"}/etc/man_db.conf" + "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + "ac_cv_func__set_invalid_parameter_handler=no" + "ac_cv_func_posix_fadvise=no" + "ac_cv_func_mempcpy=no" ]; preConfigure = '' @@ -57,7 +71,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.hostPlatform.isMusl; /* iconv binary */ + doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; meta = with stdenv.lib; { homepage = http://man-db.nongnu.org; diff --git a/nixpkgs/pkgs/tools/misc/man/conf.patch b/nixpkgs/pkgs/tools/misc/man/conf.patch deleted file mode 100644 index 43e8642fb34a..000000000000 --- a/nixpkgs/pkgs/tools/misc/man/conf.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' man-1.6g-orig/src/man-config.c man-1.6g/src/man-config.c ---- man-1.6g-orig/src/man-config.c 2005-08-21 01:26:06.000000000 +0200 -+++ man-1.6g/src/man-config.c 2012-03-06 11:11:28.159050524 +0100 -@@ -214,8 +214,9 @@ - const char *configuration_file = "[no configuration file]"; - - char *default_config_files[] = { -+ "/etc/man.conf", - CONFIG_FILE, /* compiled-in default */ -- "/etc/man.conf", "/etc/man.config", -+ "/etc/man.config", - "/usr/lib/man.conf", "/usr/lib/man.config", - "/usr/share/misc/man.conf", "/usr/share/misc/man.config" - }; diff --git a/nixpkgs/pkgs/tools/misc/man/default.nix b/nixpkgs/pkgs/tools/misc/man/default.nix deleted file mode 100644 index 2f61a30714e2..000000000000 --- a/nixpkgs/pkgs/tools/misc/man/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchurl, groff, less }: - -stdenv.mkDerivation rec { - name = "man-1.6g"; - - src = fetchurl { - url = "http://primates.ximian.com/~flucifredi/man/${name}.tar.gz"; - sha256 = "17wmp2ahkhl72cvfzshmck22dnq2lbjg0678swihj270yk1vip6c"; - }; - - buildInputs = [ groff less ]; - - preBuild = '' - makeFlagsArray=(bindir=$out/bin sbindir=$out/sbin libdir=$out/lib mandir=$out/share/man) - ''; - - patches = [ - # Search in "share/man" relative to each path in $PATH (in addition to "man"). - ./share.patch - - # Prefer /etc/man.conf over $out/lib/man.conf. Man only reads the - # first file that exists, so this is necessary to allow the - # builtin config to be overriden. - ./conf.patch - ]; - - preConfigure = '' - sed 's/^PREPATH=.*/PREPATH=$PATH/' -i configure - ''; - - postInstall = - '' - # Use UTF-8 by default. Otherwise man won't know how to deal - # with certain characters. - substituteInPlace $out/lib/man.conf \ - --replace "nroff -Tlatin1" "nroff" \ - --replace "eqn -Tlatin1" "eqn -Tutf8" - - # Work around a bug in substituteInPlace. It loses the final - # newline, and man requires every line in man.conf to be - # terminated by a newline. - echo >> $out/lib/man.conf - ''; - - meta = { - homepage = http://primates.ximian.com/~flucifredi/man/; - description = "Tool to read online Unix documentation"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/man/share.patch b/nixpkgs/pkgs/tools/misc/man/share.patch deleted file mode 100644 index 837786e28eba..000000000000 --- a/nixpkgs/pkgs/tools/misc/man/share.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -rc man-1.6f-orig/src/manpath.c man-1.6f/src/manpath.c -*** man-1.6f-orig/src/manpath.c 2006-08-03 23:18:33.000000000 +0200 ---- man-1.6f/src/manpath.c 2008-02-07 15:31:43.000000000 +0100 -*************** -*** 109,121 **** - * or ../man or ../man1 or ../man8 subdirectories. - */ - static char * -! find_man_subdir (char *p) { - int len; - char *t, *sp; - - len = strlen (p); - -! t = my_malloc ((unsigned) len + 20); - - memcpy (t, p, len); - strcpy (t + len, "/man"); ---- 109,121 ---- - * or ../man or ../man1 or ../man8 subdirectories. - */ - static char * -! find_man_subdir (char *p, char * maybe_share) { - int len; - char *t, *sp; - - len = strlen (p); - -! t = my_malloc ((unsigned) len + 30); - - memcpy (t, p, len); - strcpy (t + len, "/man"); -*************** -*** 139,159 **** - } - - /* look for the situation with packagedir/bin and packagedir/man */ -! strcpy (t + len, "/man"); - - if (is_directory (t) == 1) - return t; - - /* look for the situation with pkg/bin and pkg/man1 or pkg/man8 */ - /* (looking for all man[1-9] would probably be a waste of stats) */ -! strcpy (t + len, "/man1"); - - if (is_directory (t) == 1) { - t[len] = 0; - return t; - } - -! strcpy (t + len, "/man8"); - - if (is_directory (t) == 1) { - t[len] = 0; ---- 139,159 ---- - } - - /* look for the situation with packagedir/bin and packagedir/man */ -! sprintf (t + len, "%s/man", maybe_share); - - if (is_directory (t) == 1) - return t; - - /* look for the situation with pkg/bin and pkg/man1 or pkg/man8 */ - /* (looking for all man[1-9] would probably be a waste of stats) */ -! sprintf (t + len, "%s/man1", maybe_share); - - if (is_directory (t) == 1) { - t[len] = 0; - return t; - } - -! sprintf (t + len, "%s/man8", maybe_share); - - if (is_directory (t) == 1) { - t[len] = 0; -*************** -*** 341,347 **** - if (debug) - gripe (IS_NOT_IN_CONFIG); - -! t = find_man_subdir (dir); - if (t != NULL) { - if (debug) - gripe (MAN_NEARBY); ---- 341,347 ---- - if (debug) - gripe (IS_NOT_IN_CONFIG); - -! t = find_man_subdir (dir, ""); - if (t != NULL) { - if (debug) - gripe (MAN_NEARBY); -*************** -*** 352,357 **** ---- 352,370 ---- - if (debug) - gripe (NO_MAN_NEARBY); - } -+ -+ t = find_man_subdir (dir, "/share"); -+ if (t != NULL) { -+ if (debug) -+ gripe (MAN_NEARBY); -+ -+ add_to_mandirlist (t, perrs); -+ free (t); -+ } else { -+ if (debug) -+ gripe (NO_MAN_NEARBY); -+ } -+ - } - } - diff --git a/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix b/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix index 34b10a550f6b..5c175053fc99 100644 --- a/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix +++ b/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "marlin-calc"; version = "2019-06-04"; diff --git a/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix index 334daef44817..ebf93f0684f0 100644 --- a/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "mcfly-${version}"; + pname = "mcfly"; version = "v0.3.1"; rev = "${version}"; diff --git a/nixpkgs/pkgs/tools/misc/megacli/default.nix b/nixpkgs/pkgs/tools/misc/megacli/default.nix index 5121491625f0..e202cc7ae469 100644 --- a/nixpkgs/pkgs/tools/misc/megacli/default.nix +++ b/nixpkgs/pkgs/tools/misc/megacli/default.nix @@ -1,15 +1,13 @@ -{ stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }: +{ stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "megacli"; version = "8.07.14"; - src = - requireFile { - name = "${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip"; - url = https://docs.broadcom.com/docs/12351587; - sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr"; - }; + src = fetchurl { + url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip"; + sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr"; + }; buildInputs = [rpmextract ncurses5 unzip]; libPath = diff --git a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix index b1d1971c75c7..48f048b3abf8 100644 --- a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix +++ b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "memtest86+"; version = "5.01-coreboot-002"; diff --git a/nixpkgs/pkgs/tools/misc/minicom/default.nix b/nixpkgs/pkgs/tools/misc/minicom/default.nix index 3e23e2bddcc1..168e1dac3a32 100644 --- a/nixpkgs/pkgs/tools/misc/minicom/default.nix +++ b/nixpkgs/pkgs/tools/misc/minicom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig , lrzsz, ncurses, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "minicom"; version = "2.7.1"; diff --git a/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 8e65d4d2a543..412726e276d6 100644 --- a/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }: rustPlatform.buildRustPackage rec { - name = "miniserve-${version}"; + pname = "miniserve"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/most/default.nix b/nixpkgs/pkgs/tools/misc/most/default.nix index 6baaa38f1bb1..7adac5ee2ee6 100644 --- a/nixpkgs/pkgs/tools/misc/most/default.nix +++ b/nixpkgs/pkgs/tools/misc/most/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; makeFlags = [ - "DOC_DIR=${placeholder ''doc''}/share/doc/most" + "DOC_DIR=${placeholder "doc"}/share/doc/most" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix index 91dd56c9b0f4..db60010490e5 100644 --- a/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2019-02-13"; pname = "nginx-config-formatter"; diff --git a/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix b/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix index 307a08bbdf93..61aa2c41c4fc 100644 --- a/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix +++ b/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, dbus, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "notify-desktop"; version = "0.2.0"; diff --git a/nixpkgs/pkgs/tools/misc/nvramtool/default.nix b/nixpkgs/pkgs/tools/misc/nvramtool/default.nix deleted file mode 100644 index ecff547e9513..000000000000 --- a/nixpkgs/pkgs/tools/misc/nvramtool/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, iasl, flex, bison }: - -stdenv.mkDerivation rec { - pname = "nvramtool"; - version = "4.8.1"; - - src = fetchgit { - url = "http://review.coreboot.org/p/coreboot"; - rev = "refs/tags/${version}"; - sha256 = "0nrf840jg4fn38zcnz1r10w2yfpvrk1nvsrnbbgdbgkmpjxz0zw9"; - }; - - nativeBuildInputs = [ flex bison ]; - buildInputs = [ iasl ]; - - buildPhase = '' - export LEX=${flex}/bin/flex - make -C util/nvramtool - ''; - - installPhase = '' - mkdir -p $out/bin - cp util/nvramtool/nvramtool $out/bin - ''; - - meta = with stdenv.lib; { - description = "utility for reading/writing coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM"; - homepage = https://www.coreboot.org/Nvramtool; - license = licenses.gpl2; - maintainers = [ maintainers.cryptix ]; - platforms = platforms.linux; - }; -} - diff --git a/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix b/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix index 37cbea46c813..c77ca56655ab 100644 --- a/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "parallel-rust-${version}"; + pname = "parallel-rust"; version = "0.11.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/parcellite/default.nix b/nixpkgs/pkgs/tools/misc/parcellite/default.nix index 5313b69933b6..8dcaed706c13 100644 --- a/nixpkgs/pkgs/tools/misc/parcellite/default.nix +++ b/nixpkgs/pkgs/tools/misc/parcellite/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Lightweight GTK+ clipboard manager"; + description = "Lightweight GTK clipboard manager"; homepage = https://github.com/rickyrockrat/parcellite; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/peruse/default.nix b/nixpkgs/pkgs/tools/misc/peruse/default.nix index 045c004fb6ac..80583ea19cfe 100644 --- a/nixpkgs/pkgs/tools/misc/peruse/default.nix +++ b/nixpkgs/pkgs/tools/misc/peruse/default.nix @@ -8,7 +8,7 @@ let pname = "peruse"; version = "1.2.20180816"; -in mkDerivation rec { +in mkDerivation { name = "${pname}-${version}"; # The last formal release from 2016 uses kirigami1 which is deprecated diff --git a/nixpkgs/pkgs/tools/misc/plotinus/default.nix b/nixpkgs/pkgs/tools/misc/plotinus/default.nix index d2a7f3f37ea1..58a6c7c4071d 100644 --- a/nixpkgs/pkgs/tools/misc/plotinus/default.nix +++ b/nixpkgs/pkgs/tools/misc/plotinus/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "A searchable command palette in every modern GTK+ application"; + description = "A searchable command palette in every modern GTK application"; homepage = https://github.com/p-e-w/plotinus; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/ponysay/default.nix b/nixpkgs/pkgs/tools/misc/ponysay/default.nix index e366a03a7f42..1aa7dbedd930 100644 --- a/nixpkgs/pkgs/tools/misc/ponysay/default.nix +++ b/nixpkgs/pkgs/tools/misc/ponysay/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3, texinfo, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ponysay-3.0.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix b/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix index 7acbbc210614..ff98bce39d8c 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; - name = "${pname}-${version}"; version = "0.1.9"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix b/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix new file mode 100644 index 000000000000..dbd4a4c465ca --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix @@ -0,0 +1,35 @@ +{ stdenvNoCC, fetchFromGitHub, python2 }: + +stdenvNoCC.mkDerivation rec { + pname = "q-text-as-data"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "harelba"; + repo = "q"; + rev = version; + sha256 = "021c2sd6qscz1ipwzzjf43pfd311dcay7yralksl25rs0r7h3li2"; + }; + + buildInputs = [ python2 ]; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp bin/q $out/bin + chmod +x $out/bin/q + ''; + + meta = with stdenvNoCC.lib; { + description = "Run SQL directly on CSV or TSV files"; + longDescription = '' + q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files). + + q treats ordinary files as database tables, and supports all SQL constructs, such as WHERE, GROUP BY, JOINs etc. It supports automatic column name and column type detection, and provides full support for multiple encodings. + ''; + homepage = "http://harelba.github.io/q/"; + license = licenses.gpl3; + maintainers = [ maintainers.taneb ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/rename/default.nix b/nixpkgs/pkgs/tools/misc/rename/default.nix index a2087902c93b..770b229a3159 100644 --- a/nixpkgs/pkgs/tools/misc/rename/default.nix +++ b/nixpkgs/pkgs/tools/misc/rename/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, perlPackages }: -perlPackages.buildPerlPackage rec { +perlPackages.buildPerlPackage { pname = "rename"; version = "1.9"; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix index 2ba3224a5f8b..f66567798ffb 100644 --- a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix +++ b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: -buildPythonApplication rec { +buildPythonApplication { pname = "scfbuild"; version = "1.0.3"; diff --git a/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix index e821d5e4332a..0be5b8d13796 100644 --- a/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix +++ b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sdl-jstest"; version = "2018-06-15"; diff --git a/nixpkgs/pkgs/tools/misc/smc/default.nix b/nixpkgs/pkgs/tools/misc/smc/default.nix index 0e84f738e80e..f442df399d90 100644 --- a/nixpkgs/pkgs/tools/misc/smc/default.nix +++ b/nixpkgs/pkgs/tools/misc/smc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "smc-6.6.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index 487858e61872..c51bf998b322 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.13.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "0y6ixl3i1brak226hh02da1zzlcv41f0kb648dqii6dzyhrwhrld"; + sha256 = "164qxbzlzg53xicp2n5kg9qbmvlckc6rk78n69s82d2d09mbq1ks"; }; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "1xk4ngxhgww921fk40d4ziprnzgp927lhdwwzcifcb0hdyl0854p"; + cargoSha256 = "192lq0wf8c2p3s4n6c0xr02hwyswypxypimbghi4m8f3fgj2l3ig"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix index 35259dada3db..1b949108c54a 100644 --- a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix +++ b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix @@ -61,6 +61,9 @@ stdenv.mkDerivation rec { # Manually expand literal "$(out)", which have failed to expand sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ -i "$out/etc/systemd/system/configure-printer@.service" + + substituteInPlace $out/etc/udev/rules.d/70-printers.rules \ + --replace "udev-configure-printer" "$out/etc/udev/udev-configure-printer" ''; meta = { diff --git a/nixpkgs/pkgs/tools/misc/tealdeer/default.nix b/nixpkgs/pkgs/tools/misc/tealdeer/default.nix index ce633ac4447a..85f90ed1692f 100644 --- a/nixpkgs/pkgs/tools/misc/tealdeer/default.nix +++ b/nixpkgs/pkgs/tools/misc/tealdeer/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }: rustPlatform.buildRustPackage rec { - name = "tealdeer-${version}"; + pname = "tealdeer"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/teamocil/default.nix b/nixpkgs/pkgs/tools/misc/teamocil/default.nix index 82aba6126992..a5e356edbf48 100644 --- a/nixpkgs/pkgs/tools/misc/teamocil/default.nix +++ b/nixpkgs/pkgs/tools/misc/teamocil/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { inherit ruby; pname = "teamocil"; gemdir = ./.; diff --git a/nixpkgs/pkgs/tools/misc/termplay/default.nix b/nixpkgs/pkgs/tools/misc/termplay/default.nix index 4f6a71135aa8..f9ccec87adc0 100644 --- a/nixpkgs/pkgs/tools/misc/termplay/default.nix +++ b/nixpkgs/pkgs/tools/misc/termplay/default.nix @@ -1,6 +1,6 @@ { rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }: rustPlatform.buildRustPackage rec { - name = "termplay-${version}"; + pname = "termplay"; version = "2.0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix index d79e480327c2..59aa3861510c 100644 --- a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, psmisc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tmpwatch-2.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix index fa024e58fa81..e2d263817ee7 100644 --- a/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix +++ b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "togglesg-download-git"; version = "2017-12-07"; diff --git a/nixpkgs/pkgs/tools/misc/ttwatch/default.nix b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix index 59091bcd2bd1..5a2d1aaa4279 100644 --- a/nixpkgs/pkgs/tools/misc/ttwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1 , enableUnsafe ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ttwatch"; version = "2018-12-04"; diff --git a/nixpkgs/pkgs/tools/misc/txr/default.nix b/nixpkgs/pkgs/tools/misc/txr/default.nix index f679131381f1..a71666b7acd5 100644 --- a/nixpkgs/pkgs/tools/misc/txr/default.nix +++ b/nixpkgs/pkgs/tools/misc/txr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "220"; + version = "224"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "00jg1zhsqhi146xrh0bfb2czfgfw9i2xbpqwk3yh0n766wcm4ryd"; + sha256 = "10xz140i4sam9r7r8rz5mz5jbwal7xvaimzrb7lmisqsvby2qcw7"; }; nativeBuildInputs = [ bison flex ]; diff --git a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix index 5c858944b3fe..f2c0f43cca95 100644 --- a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix @@ -3,7 +3,7 @@ , libusb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uhubctl"; version = "unstable-2019-07-31"; diff --git a/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix index d80af088342a..d70fded5e3e4 100644 --- a/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix @@ -6,7 +6,7 @@ # there’s a WIP branch here: # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ultrastar-creator"; version = "2019-04-23"; diff --git a/nixpkgs/pkgs/tools/misc/urjtag/default.nix b/nixpkgs/pkgs/tools/misc/urjtag/default.nix index fe89e74cb697..865fd4f44f84 100644 --- a/nixpkgs/pkgs/tools/misc/urjtag/default.nix +++ b/nixpkgs/pkgs/tools/misc/urjtag/default.nix @@ -7,7 +7,7 @@ , jedecSupport ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.10"; pname = "urjtag"; diff --git a/nixpkgs/pkgs/tools/misc/vimpager/build.nix b/nixpkgs/pkgs/tools/misc/vimpager/build.nix index 858cbe9e317a..19cc6cd2234f 100644 --- a/nixpkgs/pkgs/tools/misc/vimpager/build.nix +++ b/nixpkgs/pkgs/tools/misc/vimpager/build.nix @@ -6,7 +6,7 @@ , sha256 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "vimpager"; diff --git a/nixpkgs/pkgs/tools/misc/vivid/default.nix b/nixpkgs/pkgs/tools/misc/vivid/default.nix index 856bda755cb4..4ffa250bdf53 100644 --- a/nixpkgs/pkgs/tools/misc/vivid/default.nix +++ b/nixpkgs/pkgs/tools/misc/vivid/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "${pname}-${version}"; pname = "vivid"; version = "0.4.0"; diff --git a/nixpkgs/pkgs/tools/misc/void/default.nix b/nixpkgs/pkgs/tools/misc/void/default.nix index be8745802dad..eb14d89bfc92 100644 --- a/nixpkgs/pkgs/tools/misc/void/default.nix +++ b/nixpkgs/pkgs/tools/misc/void/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "void-${version}"; + pname = "void"; version = "1.1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/websocat/default.nix b/nixpkgs/pkgs/tools/misc/websocat/default.nix index a276b13a59ca..b994aecfc0e0 100644 --- a/nixpkgs/pkgs/tools/misc/websocat/default.nix +++ b/nixpkgs/pkgs/tools/misc/websocat/default.nix @@ -2,7 +2,7 @@ }: rustPlatform.buildRustPackage rec { - name = "websocat-${version}"; + pname = "websocat"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix index 444b14c5a63f..b6801130a45d 100644 --- a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { name = "xdxf2slob-unstable-2015-06-30"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/xsel/default.nix b/nixpkgs/pkgs/tools/misc/xsel/default.nix index cd4d709fb769..3d2fb50371ee 100644 --- a/nixpkgs/pkgs/tools/misc/xsel/default.nix +++ b/nixpkgs/pkgs/tools/misc/xsel/default.nix @@ -1,6 +1,6 @@ {stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xsel-unstable"; version = "2018-01-10"; diff --git a/nixpkgs/pkgs/tools/misc/xtitle/default.nix b/nixpkgs/pkgs/tools/misc/xtitle/default.nix index fb4257b35e6b..84cf506fb631 100644 --- a/nixpkgs/pkgs/tools/misc/xtitle/default.nix +++ b/nixpkgs/pkgs/tools/misc/xtitle/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xtitle-0.4.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index 939191b5c8f2..ee5556374742 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "2.1.1"; + version = "3.1.0"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1jmczk6r6609kzbq4ixispkm4qpvw94wdyfps7q3r96x75si1p1s"; + sha256 = "0nb3qzpggyp61lchvprnklby5mf5n0xpn9z8vlhh99pz1k9sqdq1"; }; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix index 657d93a3ca0e..4b19331f3925 100644 --- a/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zsh-autoenv"; version = "2017-12-16"; diff --git a/nixpkgs/pkgs/tools/networking/airfield/node.nix b/nixpkgs/pkgs/tools/networking/airfield/node.nix index 8fe405e1b3e9..4377681e20d8 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/networking/bgpdump/default.nix b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix index 55b168a21aec..2f74ac713d7d 100644 --- a/nixpkgs/pkgs/tools/networking/bgpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, autoreconfHook, zlib, bzip2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bgpdump-2017-09-29"; src = fetchzip { diff --git a/nixpkgs/pkgs/tools/networking/bud/default.nix b/nixpkgs/pkgs/tools/networking/bud/default.nix index 2c5e1a2f8f4a..a79cbdc8bbd8 100644 --- a/nixpkgs/pkgs/tools/networking/bud/default.nix +++ b/nixpkgs/pkgs/tools/networking/bud/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit, python, gyp, utillinux }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bud"; version = "0.34.1"; diff --git a/nixpkgs/pkgs/tools/networking/bukubrow/default.nix b/nixpkgs/pkgs/tools/networking/bukubrow/default.nix index 34b227d5a6d3..e83e72cbfb44 100644 --- a/nixpkgs/pkgs/tools/networking/bukubrow/default.nix +++ b/nixpkgs/pkgs/tools/networking/bukubrow/default.nix @@ -1,34 +1,46 @@ -{ stdenv, rustPlatform, fetchFromGitHub, sqlite }: +{ stdenv, rustPlatform, fetchFromGitHub, sqlite }: let -rustPlatform.buildRustPackage rec { - name = "bukubrow-${version}"; - version = "2.4.0"; +manifest = { + description = "Bukubrow extension host application"; + name = "com.samhh.bukubrow"; + path = "@out@/bin/bukubrow"; + type = "stdio"; +}; + +in rustPlatform.buildRustPackage rec { + pname = "bukubrow-host"; + version = "5.0.0"; src = fetchFromGitHub { owner = "SamHH"; - repo = "bukubrow"; - rev = version; - sha256 = "1wrwav7am73bmgbpwh1pi0b8k7vhydqvw91hmmhnvbjhrhbns7s5"; + repo = pname; + rev = "v${version}"; + sha256 = "1a3gqxj6d1shv3w0v9m8x2xr0bvcynchy778yqalxkc3x4vr0nbn"; }; - sourceRoot = "source/binary"; - cargoSha256 = "0553awiba24a3a8xwjhlwf8yzbs44lnirjvcxnvsgah7dc44r0gj"; + cargoSha256 = "06nh99cvg3y4f98fs0j5bkidzq6fg46wk47z5jfzz5lf72ha54lk"; buildInputs = [ sqlite ]; + passAsFile = [ "firefoxManifest" "chromeManifest" ]; + firefoxManifest = builtins.toJSON (manifest // { + allowed_extensions = [ "bukubrow@samhh.com" ]; + }); + chromeManifest = builtins.toJSON (manifest // { + allowed_origins = [ "chrome-extension://ghniladkapjacfajiooekgkfopkjblpn/" ]; + }); + postBuild = '' + substituteAll $firefoxManifestPath firefox.json + substituteAll $chromeManifestPath chrome.json + ''; postInstall = '' - mkdir -p $out/etc $out/lib/mozilla/native-messaging-hosts - - host_file="$out/bin/bukubrow" - sed -e "s!%%replace%%!$host_file!" browser-hosts/firefox.json > "$out/etc/firefox-host.json" - sed -e "s!%%replace%%!$host_file!" browser-hosts/chrome.json > "$out/etc/chrome-host.json" - - ln -s $out/etc/firefox-host.json $out/lib/mozilla/native-messaging-hosts/com.samhh.bukubrow.json + install -Dm0644 firefox.json $out/lib/mozilla/native-messaging-hosts/com.samhh.bukubrow.json + install -Dm0644 chrome.json $out/etc/chromium/native-messaging-hosts/com.samhh.bukubrow.json ''; meta = with stdenv.lib; { description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager"; - homepage = https://github.com/SamHH/bukubrow; + homepage = https://github.com/SamHH/bukubrow-host; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; diff --git a/nixpkgs/pkgs/tools/networking/carddav-util/default.nix b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix index 7cc89bebf477..08014ed12269 100644 --- a/nixpkgs/pkgs/tools/networking/carddav-util/default.nix +++ b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, python, pythonPackages, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "carddav-0.1-2014-02-26"; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix index dd636173cb71..140105c24754 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "connman-ncurses"; version = "2015-07-21"; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix index 3b30935d6cf1..0cb32ca415f1 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "connman-notify"; version = "2014-06-23"; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix index 0d91dabaaebb..7096b9b75861 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, connman, dmenu }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "connman_dmenu"; version = "git-29-9-2015"; diff --git a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index f0ae7e014beb..dfc56d440e62 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix pname = "dhcpcd"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0p3sc9yfb40fn1z8rvvxqd0jpxsxm1967pp6w77x4v2lc7anm8ik"; + sha256 = "07cg0sp8sk9b6ch2ajmvkbn6z08bgyx8xbd004s5mkasrlgrfx4n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix index 8ed9d1d1d706..a7cc90c2b33a 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libpcap, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dhcpdump-1.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/nixpkgs/pkgs/tools/networking/driftnet/default.nix index 566579555d33..a0f5b5b08420 100644 --- a/nixpkgs/pkgs/tools/networking/driftnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/driftnet/default.nix @@ -4,7 +4,7 @@ with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "driftnet"; version = "1.1.5"; diff --git a/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix b/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix index 3c6c5f3d2992..9d6a1712e673 100644 --- a/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix +++ b/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, makeWrapper , gnugrep, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "easyrsa-2.2.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix index b5d4d5e6dcbe..4d374cece3d7 100644 --- a/nixpkgs/pkgs/tools/networking/easyrsa/default.nix +++ b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix @@ -2,7 +2,7 @@ let version = "3.0.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "easyrsa"; inherit version; diff --git a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix index f5dfff62a965..c490464c31ab 100644 --- a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix +++ b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, tcl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "eggdrop"; version = "1.6.21-nix1"; diff --git a/nixpkgs/pkgs/tools/networking/envoy/default.nix b/nixpkgs/pkgs/tools/networking/envoy/default.nix index 2800139f8fac..f35a90273530 100644 --- a/nixpkgs/pkgs/tools/networking/envoy/default.nix +++ b/nixpkgs/pkgs/tools/networking/envoy/default.nix @@ -127,7 +127,7 @@ let # Generate the BUILD file. buildFile = let field = name: attrs: - if attrs ? "${name}" then " ${name} = ${attrs.${name}},\n" else ""; + if attrs ? ${name} then " ${name} = ${attrs.${name}},\n" else ""; in '' licenses(["notice"]) # Apache 2 diff --git a/nixpkgs/pkgs/tools/networking/fdm/default.nix b/nixpkgs/pkgs/tools/networking/fdm/default.nix index 54e205390666..abb76e633ee7 100644 --- a/nixpkgs/pkgs/tools/networking/fdm/default.nix +++ b/nixpkgs/pkgs/tools/networking/fdm/default.nix @@ -7,7 +7,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/freebind/default.nix b/nixpkgs/pkgs/tools/networking/freebind/default.nix index 4ac979cc4a6c..0c74f14e1744 100644 --- a/nixpkgs/pkgs/tools/networking/freebind/default.nix +++ b/nixpkgs/pkgs/tools/networking/freebind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "freebind"; version = "2017-12-27"; diff --git a/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix b/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix index 913cba54ae88..9559c444059f 100644 --- a/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix @@ -21,6 +21,6 @@ buildPythonApplication rec { description = "Command-line interface to the public Gandi.net API"; homepage = https://cli.gandi.net/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ckampka ]; + maintainers = with maintainers; [ kampka ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/gftp/default.nix b/nixpkgs/pkgs/tools/networking/gftp/default.nix index d8d4353f7820..9431216e2515 100644 --- a/nixpkgs/pkgs/tools/networking/gftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/gftp/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 readline ncurses gettext openssl ]; - meta = { - description = "GTK+-based FTP client"; + meta = { + description = "GTK-based FTP client"; homepage = http://www.gftp.org; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix b/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix index 8261ba6e2842..37d2eea825f0 100644 --- a/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix +++ b/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix @@ -14,8 +14,9 @@ apk = stdenv.mkDerivation { ''; }; in -rustPlatform.buildRustPackage rec { - name = "gnirehtet-${version}"; +rustPlatform.buildRustPackage { + pname = "gnirehtet"; + inherit version; src = fetchFromGitHub { owner = "Genymobile"; diff --git a/nixpkgs/pkgs/tools/networking/httpie/default.nix b/nixpkgs/pkgs/tools/networking/httpie/default.nix index 2a608bf809ac..6395fcf09eb5 100644 --- a/nixpkgs/pkgs/tools/networking/httpie/default.nix +++ b/nixpkgs/pkgs/tools/networking/httpie/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "httpie-1.0.2"; + pname = "httpie"; + version = "1.0.3"; - src = fetchurl { - url = "mirror://pypi/h/httpie/${name}.tar.gz"; - sha256 = "1ax22jh5lpjywpj7lsl072wdhr1pxiqzmxhyph5diwxxzs2nqrzw"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd"; }; propagatedBuildInputs = with pythonPackages; [ pygments requests ]; diff --git a/nixpkgs/pkgs/tools/networking/iftop/default.nix b/nixpkgs/pkgs/tools/networking/iftop/default.nix index 96723146ad41..bc6f657f3781 100644 --- a/nixpkgs/pkgs/tools/networking/iftop/default.nix +++ b/nixpkgs/pkgs/tools/networking/iftop/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, ncurses, libpcap, automake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "iftop-1.0pre4"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/imapproxy/default.nix b/nixpkgs/pkgs/tools/networking/imapproxy/default.nix index 5b54e4099f56..984b0a2f87ea 100644 --- a/nixpkgs/pkgs/tools/networking/imapproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/imapproxy/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, openssl, ncurses}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "imapproxy-1.2.7"; src = fetchurl { url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2; diff --git a/nixpkgs/pkgs/tools/networking/jnettop/default.nix b/nixpkgs/pkgs/tools/networking/jnettop/default.nix index 47aeb8574b68..083ec23af569 100644 --- a/nixpkgs/pkgs/tools/networking/jnettop/default.nix +++ b/nixpkgs/pkgs/tools/networking/jnettop/default.nix @@ -1,6 +1,6 @@ { fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "jnettop-0.13.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/maildrop/default.nix b/nixpkgs/pkgs/tools/networking/maildrop/default.nix index 134e9b6df76d..44c8b9a9c4d5 100644 --- a/nixpkgs/pkgs/tools/networking/maildrop/default.nix +++ b/nixpkgs/pkgs/tools/networking/maildrop/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, pcre, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "maildrop-2.6.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix index 6f0732b8cfdf..b2644d0c2a49 100644 --- a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-polkit" - "--with-udev-base-dir=${placeholder ''out''}/lib/udev" - "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d" - "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "--with-udev-base-dir=${placeholder "out"}/lib/udev" + "--with-dbus-sys-dir=${placeholder "out"}/etc/dbus-1/system.d" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--sysconfdir=/etc" "--localstatedir=/var" "--with-systemd-suspend-resume" diff --git a/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix index 77f797fc7c7c..85de6d131837 100644 --- a/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.06"; pname = "ndjbdns"; diff --git a/nixpkgs/pkgs/tools/networking/netalyzr/default.nix b/nixpkgs/pkgs/tools/networking/netalyzr/default.nix index 940a37ab86fa..969084582aee 100644 --- a/nixpkgs/pkgs/tools/networking/netalyzr/default.nix +++ b/nixpkgs/pkgs/tools/networking/netalyzr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "netalyzr"; version = "57861"; diff --git a/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix b/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix index 062d6e2d0a9c..8da36d72fda2 100644 --- a/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.6.6"; # Upstream recommends and supports git - src = fetchFromGitHub rec { + src = fetchFromGitHub { repo = pname; owner = pname; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/applet.nix b/nixpkgs/pkgs/tools/networking/network-manager/applet.nix index 0fb11e1b0ebb..1a6538ad1044 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/applet.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/applet.nix @@ -2,7 +2,7 @@ , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 -, libappindicator-gtk3, withGnome ? false, gcr }: +, libappindicator-gtk3, withGnome ? false, gcr, glib }: let pname = "network-manager-applet"; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py - substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS $lib/share/gsettings-schemas/${name}/glib-2.0/schemas + substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name} ''; passthru = { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index f4ffe620e744..7773548576b0 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -4,7 +4,7 @@ networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let pname = "NetworkManager-fortisslvpn"; version = "1.2.10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix index d3eb3f799336..27e091b6b602 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix @@ -4,7 +4,7 @@ let pname = "NetworkManager-iodine"; version = "1.2.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/openconnect/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/openconnect/default.nix index 566179d85b36..1fb50686d0d0 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -4,7 +4,7 @@ let pname = "NetworkManager-openconnect"; version = "1.2.4"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix index fa764788e2c6..04ec49f7b9b1 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -4,7 +4,7 @@ let pname = "NetworkManager-openvpn"; version = "1.8.10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix index 3231c276be5b..1aa4cd5658bb 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -3,7 +3,7 @@ let pname = "NetworkManager-vpnc"; version = "1.2.6"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/noip/default.nix b/nixpkgs/pkgs/tools/networking/noip/default.nix index c63d7ac057b1..0ef2ce508671 100644 --- a/nixpkgs/pkgs/tools/networking/noip/default.nix +++ b/nixpkgs/pkgs/tools/networking/noip/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "noip-2.1.9-1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/ofono/default.nix b/nixpkgs/pkgs/tools/networking/ofono/default.nix index 21d1f9ee0675..27f4b9562b38 100644 --- a/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-dbusconfdir=${placeholder ''out''}/share" - "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system" + "--with-dbusconfdir=${placeholder "out"}/share" + "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" "--enable-external-ell" ]; diff --git a/nixpkgs/pkgs/tools/networking/openconnect/default.nix b/nixpkgs/pkgs/tools/networking/openconnect/default.nix index 154788b3c5d3..7e6146294848 100644 --- a/nixpkgs/pkgs/tools/networking/openconnect/default.nix +++ b/nixpkgs/pkgs/tools/networking/openconnect/default.nix @@ -4,13 +4,13 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { pname = "openconnect"; - version = "8.03"; + version = "8.04"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz" ]; - sha256 = "1wlypi68kqqg2mdck8wvf6aanhrmf9i7z6lngyxvcrp23jdzz34h"; + sha256 = "07zqcl2ykdc4mgix9sbv4jgpg7cybifxfgrycvf99ckq7xp9r5wq"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix b/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix index ba8fc6694d17..68d18bff777b 100644 --- a/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix +++ b/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix @@ -2,7 +2,7 @@ assert (openssl != null) == (gnutls == null); -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2018-10-08"; pname = "openconnect_pa"; diff --git a/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 706f2434a955..d86934d079b1 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix index e96aa25feded..0f7e8f2c4450 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -3,7 +3,7 @@ let binPath = lib.makeBinPath [ coreutils openresolv systemd ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "update-resolv-conf-2017-06-21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index fe9a5695a4b3..70e36cb7ec58 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A GTK+ Gnutella client, optimized for speed and scalability"; + description = "A GTK Gnutella client, optimized for speed and scalability"; homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/networking/packetdrill/default.nix b/nixpkgs/pkgs/tools/networking/packetdrill/default.nix index 13aa8fcbd00a..2041d935c942 100644 --- a/nixpkgs/pkgs/tools/networking/packetdrill/default.nix +++ b/nixpkgs/pkgs/tools/networking/packetdrill/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, bison, flex }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.0"; pname = "packetdrill"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/pdnsd/default.nix b/nixpkgs/pkgs/tools/networking/pdnsd/default.nix index 10c004ecd94f..f5d30fa32a8b 100644 --- a/nixpkgs/pkgs/tools/networking/pdnsd/default.nix +++ b/nixpkgs/pkgs/tools/networking/pdnsd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pdnsd-1.2.9a-par"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/pykms/default.nix b/nixpkgs/pkgs/tools/networking/pykms/default.nix index 57cd093e1cd6..fdfa0f808ecd 100644 --- a/nixpkgs/pkgs/tools/networking/pykms/default.nix +++ b/nixpkgs/pkgs/tools/networking/pykms/default.nix @@ -29,7 +29,7 @@ let fi ''); -in buildPythonApplication rec { +in buildPythonApplication { pname = "pykms"; version = "20180208"; diff --git a/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix b/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix index b1d972a733b6..b95d0facda89 100644 --- a/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix +++ b/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "qr-filetransfer-unstable"; version = "2018-10-22"; diff --git a/nixpkgs/pkgs/tools/networking/quicktun/default.nix b/nixpkgs/pkgs/tools/networking/quicktun/default.nix index 12e073865166..87071e23a966 100644 --- a/nixpkgs/pkgs/tools/networking/quicktun/default.nix +++ b/nixpkgs/pkgs/tools/networking/quicktun/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libsodium }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "quicktun"; version = "2.2.5"; diff --git a/nixpkgs/pkgs/tools/networking/redsocks/default.nix b/nixpkgs/pkgs/tools/networking/redsocks/default.nix index 641513eaf472..32a30f48ec65 100644 --- a/nixpkgs/pkgs/tools/networking/redsocks/default.nix +++ b/nixpkgs/pkgs/tools/networking/redsocks/default.nix @@ -4,7 +4,7 @@ let pkg = "redsocks"; version = "0.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pkg}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix b/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix index 2beb8aec3893..bdb526c70543 100644 --- a/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix +++ b/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix @@ -2,7 +2,7 @@ let version = "3.12"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rp-pppoe-" + version; src = fetchurl { url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/s3cmd/default.nix b/nixpkgs/pkgs/tools/networking/s3cmd/default.nix index e74a3554dc29..31b111f2b83d 100644 --- a/nixpkgs/pkgs/tools/networking/s3cmd/default.nix +++ b/nixpkgs/pkgs/tools/networking/s3cmd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "s3cmd-${version}"; + pname = "s3cmd"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/s6-networking/default.nix b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix index b42b3ff5b739..8dfaae63ffaf 100644 --- a/nixpkgs/pkgs/tools/networking/s6-networking/default.nix +++ b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix @@ -11,7 +11,7 @@ let inherit (stdenv) lib; sslSupportEnabled = sslSupport != false; sslLibs = { - "libressl" = libressl; + libressl = libressl; }; in diff --git a/nixpkgs/pkgs/tools/networking/shncpd/default.nix b/nixpkgs/pkgs/tools/networking/shncpd/default.nix index 211758f692b7..be861654f658 100644 --- a/nixpkgs/pkgs/tools/networking/shncpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/shncpd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shncpd"; version = "2016-06-22"; diff --git a/nixpkgs/pkgs/tools/networking/srelay/default.nix b/nixpkgs/pkgs/tools/networking/srelay/default.nix index 7d3f773b1930..b55860a20c17 100644 --- a/nixpkgs/pkgs/tools/networking/srelay/default.nix +++ b/nixpkgs/pkgs/tools/networking/srelay/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "srelay-0.4.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix b/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix index 84e7558713c9..b01d373088b7 100644 --- a/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix @@ -4,7 +4,7 @@ }: stdenvNoCC.mkDerivation rec { - name = "ssh-agents-${version}"; + pname = "ssh-agents"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix index 0264da5c8175..cb07d73a6319 100644 --- a/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ssh-ident"; version = "2016-04-21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/nixpkgs/pkgs/tools/networking/ssldump/default.nix index ad8f98302642..0081e7d1ddb9 100644 --- a/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssldump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, openssl, libpcap }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ssldump"; version = "0.9b3"; diff --git a/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/nixpkgs/pkgs/tools/networking/subfinder/default.nix index b05ab3eeb88b..65b88a34fb09 100644 --- a/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "subfinder-git"; version = "2018-07-15"; diff --git a/nixpkgs/pkgs/tools/networking/surfraw/default.nix b/nixpkgs/pkgs/tools/networking/surfraw/default.nix index 80daf6447efa..d69221d9d50f 100644 --- a/nixpkgs/pkgs/tools/networking/surfraw/default.nix +++ b/nixpkgs/pkgs/tools/networking/surfraw/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, perl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "surfraw-2.3.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/tcpdump/default.nix b/nixpkgs/pkgs/tools/networking/tcpdump/default.nix index a04d47b64144..9cebc267260b 100644 --- a/nixpkgs/pkgs/tools/networking/tcpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpdump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libpcap, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tcpdump"; version = "4.9.2"; diff --git a/nixpkgs/pkgs/tools/networking/tinc/default.nix b/nixpkgs/pkgs/tools/networking/tinc/default.nix index cf4a2bad78b9..e331916626e3 100644 --- a/nixpkgs/pkgs/tools/networking/tinc/default.nix +++ b/nixpkgs/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.35"; + version = "1.0.36"; pname = "tinc"; src = fetchurl { url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q"; + sha256 = "021i2sl2mjscbm8g59d7vs74iw3gf0m48wg7w3zhwj6czarkpxs0"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/nixpkgs/pkgs/tools/networking/tlspool/default.nix b/nixpkgs/pkgs/tools/networking/tlspool/default.nix index b992fef2253f..df199869e605 100644 --- a/nixpkgs/pkgs/tools/networking/tlspool/default.nix +++ b/nixpkgs/pkgs/tools/networking/tlspool/default.nix @@ -9,7 +9,7 @@ let version = "20180227"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "arpa2"; diff --git a/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/nixpkgs/pkgs/tools/networking/tox-node/default.nix index f72d004c291b..f47ccab45ea4 100644 --- a/nixpkgs/pkgs/tools/networking/tox-node/default.nix +++ b/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -6,7 +6,7 @@ with rustPlatform; buildRustPackage rec { - name = "tox-node-${version}"; + pname = "tox-node"; version = "0.0.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/toxvpn/default.nix b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix index ccb9f3bc0d6b..fed7eccdf481 100644 --- a/nixpkgs/pkgs/tools/networking/toxvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "toxvpn-2018-04-17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/uget/default.nix b/nixpkgs/pkgs/tools/networking/uget/default.nix index 6b9d0bfa5dd5..78dcb00eb78a 100644 --- a/nixpkgs/pkgs/tools/networking/uget/default.nix +++ b/nixpkgs/pkgs/tools/networking/uget/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")''; meta = with stdenv.lib; { - description = "Download manager using gtk+ and libcurl"; + description = "Download manager using GTK and libcurl"; longDescription = '' uGet is a VERY Powerful download manager application with a large inventory of features but is still very light-weight and low on diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index 660ffcb823b3..8a4b6e6650e6 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg"; + sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/nixpkgs/pkgs/tools/networking/unbound/python.nix b/nixpkgs/pkgs/tools/networking/unbound/python.nix index f6b5852a6752..fdd110e14b3c 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/python.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/python.nix @@ -4,11 +4,11 @@ let inherit (pythonPackages) python; in stdenv.mkDerivation rec { pname = "pyunbound"; - version = "1.9.0"; + version = "1.9.3"; src = fetchurl { url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; - sha256 = "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1"; + sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"; }; buildInputs = [ openssl expat libevent swig python ]; diff --git a/nixpkgs/pkgs/tools/networking/vlan/default.nix b/nixpkgs/pkgs/tools/networking/vlan/default.nix index 1684da45ccc3..7a6a37c91128 100644 --- a/nixpkgs/pkgs/tools/networking/vlan/default.nix +++ b/nixpkgs/pkgs/tools/networking/vlan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "vlan-1.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/vpnc/default.nix b/nixpkgs/pkgs/tools/networking/vpnc/default.nix index 6a23c81569f0..424355e41df8 100644 --- a/nixpkgs/pkgs/tools/networking/vpnc/default.nix +++ b/nixpkgs/pkgs/tools/networking/vpnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "vpnc-0.5.3-post-r550"; src = fetchsvn { url = "https://svn.unix-ag.uni-kl.de/vpnc"; diff --git a/nixpkgs/pkgs/tools/networking/webalizer/default.nix b/nixpkgs/pkgs/tools/networking/webalizer/default.nix index e9b9452c7563..bd80eae2bebc 100644 --- a/nixpkgs/pkgs/tools/networking/webalizer/default.nix +++ b/nixpkgs/pkgs/tools/networking/webalizer/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation { configureFlags = [ "--enable-dns" "--enable-geoip" - "--disable-static" "--enable-shared" ]; diff --git a/nixpkgs/pkgs/tools/nix/nix-script/default.nix b/nixpkgs/pkgs/tools/nix/nix-script/default.nix index 664e55125b54..d69b5943123c 100644 --- a/nixpkgs/pkgs/tools/nix/nix-script/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-script/default.nix @@ -1,6 +1,6 @@ { stdenv, haskellPackages, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nix-script"; version = "2015-09-22"; diff --git a/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix new file mode 100644 index 000000000000..c782607da854 --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + pname = "nix-store-gcs-proxy"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "tweag"; + repo = "nix-store-gcs-proxy"; + rev = "v${version}"; + sha256 = "0804p65px4wd7gzxggpdxsazkd1hbz1p15zzaxf9ygc6sh26ncln"; + }; + + goPackagePath = "github.com/tweag/nix-store-gcs-proxy"; + + goDeps = ./deps.nix; + + meta = { + description = "A HTTP nix store that proxies requests to Google Storage"; + homepage = "https://github.com/tweag/nix-store-gcs-proxy"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ zimbatm ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix new file mode 100644 index 000000000000..b5ae542876d7 --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix @@ -0,0 +1,813 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.37.2"; + sha256 = "1w6crdxy9vzd8vm672hng22spwld6d60z58kbr28dkiiz694wqvs"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/Shopify/sarama"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/sarama"; + rev = "v1.19.0"; + sha256 = "0q1z3pvcd011yprwzws2s293v4cjvsszhai6vnfrahjcbsz79q0z"; + }; + } + { + goPackagePath = "github.com/Shopify/toxiproxy"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/toxiproxy"; + rev = "v2.1.4"; + sha256 = "07yhsvscdv1qjfc2fyyh9qsrrdwrrw04wadk5gaq4qddcway7vig"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/anmitsu/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/anmitsu/go-shlex"; + rev = "648efa622239"; + sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7"; + }; + } + { + goPackagePath = "github.com/apache/thrift"; + fetch = { + type = "git"; + url = "https://github.com/apache/thrift"; + rev = "v0.12.0"; + sha256 = "0g2g61rs189nimg3631wxfwdx12dsdz70qvncczlyvn34pcj7yby"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/bradfitz/go-smtpd"; + fetch = { + type = "git"; + url = "https://github.com/bradfitz/go-smtpd"; + rev = "deb6d6237625"; + sha256 = "1i33brqd44h0a9hbdnclka0hfg0f6qi5xy23f0ap9yixkhj4k9p6"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "c6f51f82210d"; + sha256 = "1vnccmnkjl6n539l4cliz6sznpqn6igf5v7mbmsgahb838742clb"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/eapache/go-resiliency"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-resiliency"; + rev = "v1.1.0"; + sha256 = "1zmgw3c4w5r6m2r340n4jc5l5ll3m3nbszqrmrgbqc2xixxyk2gx"; + }; + } + { + goPackagePath = "github.com/eapache/go-xerial-snappy"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-xerial-snappy"; + rev = "776d5712da21"; + sha256 = "0ncc41dv7xwb1znyzmzh7cvs6j5fzz0f1n8h1v3grl9ma6s1si9d"; + }; + } + { + goPackagePath = "github.com/eapache/queue"; + fetch = { + type = "git"; + url = "https://github.com/eapache/queue"; + rev = "v1.1.0"; + sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f8568"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/gliderlabs/ssh"; + fetch = { + type = "git"; + url = "https://github.com/gliderlabs/ssh"; + rev = "v0.1.1"; + sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.2.0"; + sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.2.0"; + sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "2e65f85255db"; + sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "4030bb1f1f0c"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "v17.0.0"; + sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { + goPackagePath = "github.com/google/martian"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v2.1.0"; + sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; + }; + } + { + goPackagePath = "github.com/google/pprof"; + fetch = { + type = "git"; + url = "https://github.com/google/pprof"; + rev = "3ea8567a2e57"; + sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "v2.0.4"; + sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "9cad4c3443a7"; + sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.0"; + sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/jellevandenhooff/dkim"; + fetch = { + type = "git"; + url = "https://github.com/jellevandenhooff/dkim"; + rev = "f50fe3d243e1"; + sha256 = "0qf5pypxfpciivj0v728i24rfjwhnwm07945mj6p3cw4gdphqhm0"; + }; + } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "af01ea7f8024"; + sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.3"; + sha256 = "0knzlvndfgjm2k23vhp2xj1cv3fm31vbg5b20gdl1vnxk7rh549h"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.7.0"; + sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.4.3"; + sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + }; + } + { + goPackagePath = "github.com/openzipkin/zipkin-go"; + fetch = { + type = "git"; + url = "https://github.com/openzipkin/zipkin-go"; + rev = "v0.1.6"; + sha256 = "0fyf69w66khj3dxdpqydwjdhhhyhlh3caxa5ybnd1h2f6b5gbvvv"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "v2.0.5"; + sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "3c4408c8b829"; + sha256 = "06d9cxxxkglks8fpfg3spxscyrq4lw7fckm4p6f0wshq65am2lxw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "56726106282f"; + sha256 = "19y4qs9mkxiiab5sh3b7cccjpl3xbp6sy8812ig9f1zg8vzkzj7j"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.2.0"; + sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "bf6a532e95b1"; + sha256 = "0k65i2ikf3jp6863mpc1raf928i78r8jd7zn9djx6f4izls6l6j1"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "3113b8401b8a"; + sha256 = "1m5q5dsvkqz809aag6dyan74wdrp69g2mb9killbv7z4ls2mlfr3"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/tarm/serial"; + fetch = { + type = "git"; + url = "https://github.com/tarm/serial"; + rev = "98f6abe2eb07"; + sha256 = "1yj4jiv2f3x3iawxdflrlmdan0k9xsbnccgc9yz658rmif1ag3pb"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "github.com/urfave/negroni"; + fetch = { + type = "git"; + url = "https://github.com/urfave/negroni"; + rev = "v1.0.0"; + sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.19.2"; + sha256 = "1vlik5xwwrhcyy9yx2yc3y02y6hp9q80591hbhncv9c8wwfg9gjc"; + }; + } + { + goPackagePath = "go4.org"; + fetch = { + type = "git"; + url = "https://github.com/go4org/go4"; + rev = "417644f6feb5"; + sha256 = "013cvdg4fj15l9xg84br0vkb2d99j04s5b4g7zssqhng8dkwgr37"; + }; + } + { + goPackagePath = "golang.org/x/build"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/build"; + rev = "5284462c4bec"; + sha256 = "0w649zbs4n64b6rjx92hy7vc1y9sv4khhk5igbz8w7sxvz8778ij"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "509febef88a4"; + sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "5614ed5bae6f"; + sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d8887717615a"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "e64efc72b421"; + sha256 = "0djvwz2avx7knsjbl434vw1wqbrg53xp1kh599gfixn5icrggz4m"; + }; + } + { + goPackagePath = "golang.org/x/perf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/perf"; + rev = "6e6d33e29852"; + sha256 = "1cyiy459bkjqnzgk051lsksz46hdkjc34q33zf946kiv3hilp1v2"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "e225da77a7e6"; + sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "17ff2d5776d2"; + sha256 = "1rrh2mnmyxr45nsvy42zq3w3ly6gw6rl993knwvf1w71kyv0jjnj"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "85acf8d2951c"; + sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "e65039ee4138"; + sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "v0.3.0"; + sha256 = "1vvrhiq2zs677iz2j6s9iv4q3j3nhxz5ci9y4zrak248lrdln0zk"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "5fe7a883aa19"; + sha256 = "0qjkwig0r42q0j2qv57s4ahsgmmp41dz3ih3rnaqg0619n5w7lbs"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.19.0"; + sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.1"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "grpc.go4.org"; + fetch = { + type = "git"; + url = "https://github.com/go4org/grpc"; + rev = "11d0a25b4919"; + sha256 = "1d6akp2b3aa2viwbikc3jndhiljgjj87r4z7mg5b03f97f2wmz4f"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "3f1c8253044a"; + sha256 = "0d3vgh0fgfj1z7i648g1s6x2pwxd07sxfjwg1xn3yagr9h06jh3h"; + }; + } +] diff --git a/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix index 69f4fc435c91..13b7ffd2af71 100644 --- a/nixpkgs/pkgs/tools/nix/nixdoc/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { - name = "nixdoc-${version}"; + pname = "nixdoc"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix b/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix index 51e4e22bc5b6..7ac73fac39e5 100644 --- a/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "0nz4njmrwacizz9z89ligxr2gyggk65vq9cmd6s4hn133gajf2n1"; + sha256 = "07hnyx616dk03md00pmgpb5c2sp9w0n5l94s82arair0kpi0ncy0"; }; - cargoSha256 = "0p3qa1asdvw2npav4281lzndjczrzac6fr8z4y61m7rbn363s8sa"; + cargoSha256 = "0wfx7shsdqrwbnzr2a0fnly1kd93mxbm96zjq5pzrq94lphkhqhz"; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-download/crates-io.nix b/nixpkgs/pkgs/tools/package-management/cargo-download/crates-io.nix index d120a05e00d7..e0c0abf4dc6e 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-download/crates-io.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-download/crates-io.nix @@ -14,7 +14,7 @@ rec { authors = [ "Remi Rampin <remirampin@gmail.com>" ]; sha256 = "1974q3nysai026zhz24df506cxwi09jdzqksll4h7ibpb5n9g1d4"; }; - features_.adler32."1.0.2" = deps: f: updateFeatures f (rec { + features_.adler32."1.0.2" = deps: f: updateFeatures f ({ adler32."1.0.2".default = (f.adler32."1.0.2".default or true); }) []; @@ -35,7 +35,7 @@ rec { (crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps) ]); }; - features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec { + features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({ aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true); memchr."${deps.aho_corasick."0.5.3".memchr}".default = true; }) [ @@ -53,7 +53,7 @@ rec { authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ]; sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; }; - features_.ansi_term."0.9.0" = deps: f: updateFeatures f (rec { + features_.ansi_term."0.9.0" = deps: f: updateFeatures f ({ ansi_term."0.9.0".default = (f.ansi_term."0.9.0".default or true); }) []; @@ -110,7 +110,7 @@ rec { (crates."winapi"."${deps."atty"."0.2.3"."winapi"}" deps) ]) else []); }; - features_.atty."0.2.3" = deps: f: updateFeatures f (rec { + features_.atty."0.2.3" = deps: f: updateFeatures f ({ atty."0.2.3".default = (f.atty."0.2.3".default or true); kernel32_sys."${deps.atty."0.2.3".kernel32_sys}".default = true; libc."${deps.atty."0.2.3".libc}".default = (f.libc."${deps.atty."0.2.3".libc}".default or false); @@ -138,7 +138,7 @@ rec { (crates."safemem"."${deps."base64"."0.9.3"."safemem"}" deps) ]); }; - features_.base64."0.9.3" = deps: f: updateFeatures f (rec { + features_.base64."0.9.3" = deps: f: updateFeatures f ({ base64."0.9.3".default = (f.base64."0.9.3".default or true); byteorder."${deps.base64."0.9.3".byteorder}".default = true; safemem."${deps.base64."0.9.3".safemem}".default = true; @@ -158,7 +158,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; }; - features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec { + features_.bitflags."0.7.0" = deps: f: updateFeatures f ({ bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true); }) []; @@ -196,7 +196,7 @@ rec { sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; features = mkFeatures (features."bitflags"."1.0.4" or {}); }; - features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + features_.bitflags."1.0.4" = deps: f: updateFeatures f ({ bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); }) []; @@ -288,7 +288,7 @@ rec { (crates."time"."${deps."cargo_download"."0.1.2"."time"}" deps) ]); }; - features_.cargo_download."0.1.2" = deps: f: updateFeatures f (rec { + features_.cargo_download."0.1.2" = deps: f: updateFeatures f ({ ansi_term."${deps.cargo_download."0.1.2".ansi_term}".default = true; cargo_download."0.1.2".default = (f.cargo_download."0.1.2".default or true); clap."${deps.cargo_download."0.1.2".clap}".default = true; @@ -344,7 +344,7 @@ rec { authors = [ "Skyler Lipthay <skyler.lipthay@gmail.com>" ]; sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n"; }; - features_.case."0.1.0" = deps: f: updateFeatures f (rec { + features_.case."0.1.0" = deps: f: updateFeatures f ({ case."0.1.0".default = (f.case."0.1.0".default or true); }) []; @@ -383,7 +383,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; }; - features_.cfg_if."0.1.2" = deps: f: updateFeatures f (rec { + features_.cfg_if."0.1.2" = deps: f: updateFeatures f ({ cfg_if."0.1.2".default = (f.cfg_if."0.1.2".default or true); }) []; @@ -402,7 +402,7 @@ rec { (crates."time"."${deps."chrono"."0.2.25"."time"}" deps) ]); }; - features_.chrono."0.2.25" = deps: f: updateFeatures f (rec { + features_.chrono."0.2.25" = deps: f: updateFeatures f ({ chrono."0.2.25".default = (f.chrono."0.2.25".default or true); num."${deps.chrono."0.2.25".num}".default = (f.num."${deps.chrono."0.2.25".num}".default or false); time."${deps.chrono."0.2.25".time}".default = true; @@ -542,7 +542,7 @@ rec { (crates."custom_derive"."${deps."conv"."0.3.3"."custom_derive"}" deps) ]); }; - features_.conv."0.3.3" = deps: f: updateFeatures f (rec { + features_.conv."0.3.3" = deps: f: updateFeatures f ({ conv."0.3.3".default = (f.conv."0.3.3".default or true); custom_derive."${deps.conv."0.3.3".custom_derive}".default = true; }) [ @@ -610,7 +610,7 @@ rec { ]); features = mkFeatures (features."core_foundation_sys"."0.5.1" or {}); }; - features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f (rec { + features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f ({ core_foundation_sys."0.5.1".default = (f.core_foundation_sys."0.5.1".default or true); libc."${deps.core_foundation_sys."0.5.1".libc}".default = true; }) [ @@ -628,7 +628,7 @@ rec { authors = [ "Sam Rijs <srijs@airpost.net>" "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "1rwvhb98w41mk5phr84mryally58f68h0v933772gdxqvqbcayqy"; }; - features_.crc32fast."1.1.1" = deps: f: updateFeatures f (rec { + features_.crc32fast."1.1.1" = deps: f: updateFeatures f ({ crc32fast."1.1.1".default = (f.crc32fast."1.1.1".default or true); }) []; @@ -644,7 +644,7 @@ rec { sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq"; features = mkFeatures (features."crossbeam"."0.2.10" or {}); }; - features_.crossbeam."0.2.10" = deps: f: updateFeatures f (rec { + features_.crossbeam."0.2.10" = deps: f: updateFeatures f ({ crossbeam."0.2.10".default = (f.crossbeam."0.2.10".default or true); }) []; @@ -663,7 +663,7 @@ rec { (crates."crossbeam_utils"."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps) ]); }; - features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f (rec { + features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f ({ crossbeam_deque."0.6.2".default = (f.crossbeam_deque."0.6.2".default or true); crossbeam_epoch."${deps.crossbeam_deque."0.6.2".crossbeam_epoch}".default = true; crossbeam_utils."${deps.crossbeam_deque."0.6.2".crossbeam_utils}".default = true; @@ -798,7 +798,7 @@ rec { (crates."syn"."${deps."derive_error"."0.0.3"."syn"}" deps) ]); }; - features_.derive_error."0.0.3" = deps: f: updateFeatures f (rec { + features_.derive_error."0.0.3" = deps: f: updateFeatures f ({ case."${deps.derive_error."0.0.3".case}".default = true; derive_error."0.0.3".default = (f.derive_error."0.0.3".default or true); quote."${deps.derive_error."0.0.3".quote}".default = true; @@ -820,7 +820,7 @@ rec { authors = [ "David Tolnay <dtolnay@gmail.com>" ]; sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; }; - features_.dtoa."0.4.2" = deps: f: updateFeatures f (rec { + features_.dtoa."0.4.2" = deps: f: updateFeatures f ({ dtoa."0.4.2".default = (f.dtoa."0.4.2".default or true); }) []; @@ -907,7 +907,7 @@ rec { authors = [ "Ben Wilber <benwilber@gmail.com>" ]; sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip"; }; - features_.exitcode."1.1.2" = deps: f: updateFeatures f (rec { + features_.exitcode."1.1.2" = deps: f: updateFeatures f ({ exitcode."1.1.2".default = (f.exitcode."1.1.2".default or true); }) []; @@ -931,7 +931,7 @@ rec { (crates."libc"."${deps."filetime"."0.1.14"."libc"}" deps) ]) else []); }; - features_.filetime."0.1.14" = deps: f: updateFeatures f (rec { + features_.filetime."0.1.14" = deps: f: updateFeatures f ({ cfg_if."${deps.filetime."0.1.14".cfg_if}".default = true; filetime."0.1.14".default = (f.filetime."0.1.14".default or true); libc."${deps.filetime."0.1.14".libc}".default = true; @@ -997,7 +997,7 @@ rec { sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip"; libPath = "lib.rs"; }; - features_.fnv."1.0.6" = deps: f: updateFeatures f (rec { + features_.fnv."1.0.6" = deps: f: updateFeatures f ({ fnv."1.0.6".default = (f.fnv."1.0.6".default or true); }) []; @@ -1015,7 +1015,7 @@ rec { (crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) ]); }; - features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec { + features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({ foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true); foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true; }) [ @@ -1033,7 +1033,7 @@ rec { authors = [ "Steven Fackler <sfackler@gmail.com>" ]; sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; }; - features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec { + features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({ foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true); }) []; @@ -1051,7 +1051,7 @@ rec { (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps) ]); }; - features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f ({ fuchsia_zircon."0.2.1".default = (f.fuchsia_zircon."0.2.1".default or true); fuchsia_zircon_sys."${deps.fuchsia_zircon."0.2.1".fuchsia_zircon_sys}".default = true; }) [ @@ -1073,7 +1073,7 @@ rec { (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) ]); }; - features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({ bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; @@ -1096,7 +1096,7 @@ rec { (crates."bitflags"."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps) ]); }; - features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f ({ bitflags."${deps.fuchsia_zircon_sys."0.2.0".bitflags}".default = true; fuchsia_zircon_sys."0.2.0".default = (f.fuchsia_zircon_sys."0.2.0".default or true); }) [ @@ -1114,7 +1114,7 @@ rec { authors = [ "Raph Levien <raph@google.com>" ]; sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; }; - features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({ fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); }) []; @@ -1206,7 +1206,7 @@ rec { ]); features = mkFeatures (features."h2"."0.1.13" or {}); }; - features_.h2."0.1.13" = deps: f: updateFeatures f (rec { + features_.h2."0.1.13" = deps: f: updateFeatures f ({ byteorder."${deps.h2."0.1.13".byteorder}".default = true; bytes."${deps.h2."0.1.13".bytes}".default = true; fnv."${deps.h2."0.1.13".fnv}".default = true; @@ -1247,7 +1247,7 @@ rec { (crates."itoa"."${deps."http"."0.1.14"."itoa"}" deps) ]); }; - features_.http."0.1.14" = deps: f: updateFeatures f (rec { + features_.http."0.1.14" = deps: f: updateFeatures f ({ bytes."${deps.http."0.1.14".bytes}".default = true; fnv."${deps.http."0.1.14".fnv}".default = true; http."0.1.14".default = (f.http."0.1.14".default or true); @@ -1454,7 +1454,7 @@ rec { (crates."unicode_normalization"."${deps."idna"."0.1.4"."unicode_normalization"}" deps) ]); }; - features_.idna."0.1.4" = deps: f: updateFeatures f (rec { + features_.idna."0.1.4" = deps: f: updateFeatures f ({ idna."0.1.4".default = (f.idna."0.1.4".default or true); matches."${deps.idna."0.1.4".matches}".default = true; unicode_bidi."${deps.idna."0.1.4".unicode_bidi}".default = true; @@ -1506,7 +1506,7 @@ rec { (crates."winapi"."${deps."iovec"."0.1.1"."winapi"}" deps) ]) else []); }; - features_.iovec."0.1.1" = deps: f: updateFeatures f (rec { + features_.iovec."0.1.1" = deps: f: updateFeatures f ({ iovec."0.1.1".default = (f.iovec."0.1.1".default or true); libc."${deps.iovec."0.1.1".libc}".default = true; winapi."${deps.iovec."0.1.1".winapi}".default = true; @@ -1533,7 +1533,7 @@ rec { (crates."winapi"."${deps."isatty"."0.1.5"."winapi"}" deps) ]) else []); }; - features_.isatty."0.1.5" = deps: f: updateFeatures f (rec { + features_.isatty."0.1.5" = deps: f: updateFeatures f ({ isatty."0.1.5".default = (f.isatty."0.1.5".default or true); kernel32_sys."${deps.isatty."0.1.5".kernel32_sys}".default = true; libc."${deps.isatty."0.1.5".libc}".default = true; @@ -1558,7 +1558,7 @@ rec { (crates."either"."${deps."itertools"."0.6.5"."either"}" deps) ]); }; - features_.itertools."0.6.5" = deps: f: updateFeatures f (rec { + features_.itertools."0.6.5" = deps: f: updateFeatures f ({ either."${deps.itertools."0.6.5".either}".default = (f.either."${deps.itertools."0.6.5".either}".default or false); itertools."0.6.5".default = (f.itertools."0.6.5".default or true); }) [ @@ -1577,7 +1577,7 @@ rec { sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; features = mkFeatures (features."itoa"."0.3.4" or {}); }; - features_.itoa."0.3.4" = deps: f: updateFeatures f (rec { + features_.itoa."0.3.4" = deps: f: updateFeatures f ({ itoa."0.3.4".default = (f.itoa."0.3.4".default or true); }) []; @@ -1623,7 +1623,7 @@ rec { (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) ]); }; - features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({ kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; @@ -1765,7 +1765,7 @@ rec { (crates."crc32fast"."${deps."libflate"."0.1.19"."crc32fast"}" deps) ]); }; - features_.libflate."0.1.19" = deps: f: updateFeatures f (rec { + features_.libflate."0.1.19" = deps: f: updateFeatures f ({ adler32."${deps.libflate."0.1.19".adler32}".default = true; byteorder."${deps.libflate."0.1.19".byteorder}".default = true; crc32fast."${deps.libflate."0.1.19".crc32fast}".default = true; @@ -1792,7 +1792,7 @@ rec { ++ (if features.lock_api."0.1.5".owning_ref or false then [ (crates.owning_ref."${deps."lock_api"."0.1.5".owning_ref}" deps) ] else [])); features = mkFeatures (features."lock_api"."0.1.5" or {}); }; - features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec { + features_.lock_api."0.1.5" = deps: f: updateFeatures f ({ lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true); owning_ref."${deps.lock_api."0.1.5".owning_ref}".default = true; scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false); @@ -1838,7 +1838,7 @@ rec { ]); features = mkFeatures (features."log"."0.4.6" or {}); }; - features_.log."0.4.6" = deps: f: updateFeatures f (rec { + features_.log."0.4.6" = deps: f: updateFeatures f ({ cfg_if."${deps.log."0.4.6".cfg_if}".default = true; log."0.4.6".default = (f.log."0.4.6".default or true); }) [ @@ -1856,7 +1856,7 @@ rec { authors = [ "bluss" ]; sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h"; }; - features_.maplit."0.1.6" = deps: f: updateFeatures f (rec { + features_.maplit."0.1.6" = deps: f: updateFeatures f ({ maplit."0.1.6".default = (f.maplit."0.1.6".default or true); }) []; @@ -1872,7 +1872,7 @@ rec { sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; libPath = "lib.rs"; }; - features_.matches."0.1.6" = deps: f: updateFeatures f (rec { + features_.matches."0.1.6" = deps: f: updateFeatures f ({ matches."0.1.6".default = (f.matches."0.1.6".default or true); }) []; @@ -1890,7 +1890,7 @@ rec { (crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps) ]); }; - features_.memchr."0.1.11" = deps: f: updateFeatures f (rec { + features_.memchr."0.1.11" = deps: f: updateFeatures f ({ libc."${deps.memchr."0.1.11".libc}".default = true; memchr."0.1.11".default = (f.memchr."0.1.11".default or true); }) [ @@ -1908,7 +1908,7 @@ rec { authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ]; sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf"; }; - features_.memoffset."0.2.1" = deps: f: updateFeatures f (rec { + features_.memoffset."0.2.1" = deps: f: updateFeatures f ({ memoffset."0.2.1".default = (f.memoffset."0.2.1".default or true); }) []; @@ -1926,7 +1926,7 @@ rec { (crates."unicase"."${deps."mime"."0.3.12"."unicase"}" deps) ]); }; - features_.mime."0.3.12" = deps: f: updateFeatures f (rec { + features_.mime."0.3.12" = deps: f: updateFeatures f ({ mime."0.3.12".default = (f.mime."0.3.12".default or true); unicase."${deps.mime."0.3.12".unicase}".default = true; }) [ @@ -1955,7 +1955,7 @@ rec { ]); features = mkFeatures (features."mime_guess"."2.0.0-alpha.6" or {}); }; - features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f (rec { + features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f ({ mime."${deps.mime_guess."2.0.0-alpha.6".mime}".default = true; mime_guess."2.0.0-alpha.6".default = (f.mime_guess."2.0.0-alpha.6".default or true); phf = fold recursiveUpdate {} [ @@ -1993,7 +1993,7 @@ rec { (crates."cc"."${deps."miniz_sys"."0.1.10"."cc"}" deps) ]); }; - features_.miniz_sys."0.1.10" = deps: f: updateFeatures f (rec { + features_.miniz_sys."0.1.10" = deps: f: updateFeatures f ({ cc."${deps.miniz_sys."0.1.10".cc}".default = true; libc."${deps.miniz_sys."0.1.10".libc}".default = true; miniz_sys."0.1.10".default = (f.miniz_sys."0.1.10".default or true); @@ -2083,7 +2083,7 @@ rec { (crates."ws2_32_sys"."${deps."miow"."0.2.1"."ws2_32_sys"}" deps) ]); }; - features_.miow."0.2.1" = deps: f: updateFeatures f (rec { + features_.miow."0.2.1" = deps: f: updateFeatures f ({ kernel32_sys."${deps.miow."0.2.1".kernel32_sys}".default = true; miow."0.2.1".default = (f.miow."0.2.1".default or true); net2."${deps.miow."0.2.1".net2}".default = (f.net2."${deps.miow."0.2.1".net2}".default or false); @@ -2126,7 +2126,7 @@ rec { ]) else []); features = mkFeatures (features."native_tls"."0.2.2" or {}); }; - features_.native_tls."0.2.2" = deps: f: updateFeatures f (rec { + features_.native_tls."0.2.2" = deps: f: updateFeatures f ({ lazy_static."${deps.native_tls."0.2.2".lazy_static}".default = true; libc."${deps.native_tls."0.2.2".libc}".default = true; log."${deps.native_tls."0.2.2".log}".default = true; @@ -2296,7 +2296,7 @@ rec { (crates."num_traits"."${deps."num_integer"."0.1.35"."num_traits"}" deps) ]); }; - features_.num_integer."0.1.35" = deps: f: updateFeatures f (rec { + features_.num_integer."0.1.35" = deps: f: updateFeatures f ({ num_integer."0.1.35".default = (f.num_integer."0.1.35".default or true); num_traits."${deps.num_integer."0.1.35".num_traits}".default = true; }) [ @@ -2318,7 +2318,7 @@ rec { (crates."num_traits"."${deps."num_iter"."0.1.34"."num_traits"}" deps) ]); }; - features_.num_iter."0.1.34" = deps: f: updateFeatures f (rec { + features_.num_iter."0.1.34" = deps: f: updateFeatures f ({ num_integer."${deps.num_iter."0.1.34".num_integer}".default = true; num_iter."0.1.34".default = (f.num_iter."0.1.34".default or true); num_traits."${deps.num_iter."0.1.34".num_traits}".default = true; @@ -2338,7 +2338,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; }; - features_.num_traits."0.1.40" = deps: f: updateFeatures f (rec { + features_.num_traits."0.1.40" = deps: f: updateFeatures f ({ num_traits."0.1.40".default = (f.num_traits."0.1.40".default or true); }) []; @@ -2356,7 +2356,7 @@ rec { (crates."libc"."${deps."num_cpus"."1.8.0"."libc"}" deps) ]); }; - features_.num_cpus."1.8.0" = deps: f: updateFeatures f (rec { + features_.num_cpus."1.8.0" = deps: f: updateFeatures f ({ libc."${deps.num_cpus."1.8.0".libc}".default = true; num_cpus."1.8.0".default = (f.num_cpus."1.8.0".default or true); }) [ @@ -2417,7 +2417,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; }; - features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec { + features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({ openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true); }) []; @@ -2475,7 +2475,7 @@ rec { (crates."stable_deref_trait"."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps) ]); }; - features_.owning_ref."0.4.0" = deps: f: updateFeatures f (rec { + features_.owning_ref."0.4.0" = deps: f: updateFeatures f ({ owning_ref."0.4.0".default = (f.owning_ref."0.4.0".default or true); stable_deref_trait."${deps.owning_ref."0.4.0".stable_deref_trait}".default = true; }) [ @@ -2609,7 +2609,7 @@ rec { sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; libPath = "lib.rs"; }; - features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({ percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); }) []; @@ -2661,7 +2661,7 @@ rec { (crates."phf_shared"."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps) ]); }; - features_.phf_codegen."0.7.21" = deps: f: updateFeatures f (rec { + features_.phf_codegen."0.7.21" = deps: f: updateFeatures f ({ phf_codegen."0.7.21".default = (f.phf_codegen."0.7.21".default or true); phf_generator."${deps.phf_codegen."0.7.21".phf_generator}".default = true; phf_shared."${deps.phf_codegen."0.7.21".phf_shared}".default = true; @@ -2685,7 +2685,7 @@ rec { (crates."rand"."${deps."phf_generator"."0.7.21"."rand"}" deps) ]); }; - features_.phf_generator."0.7.21" = deps: f: updateFeatures f (rec { + features_.phf_generator."0.7.21" = deps: f: updateFeatures f ({ phf_generator."0.7.21".default = (f.phf_generator."0.7.21".default or true); phf_shared."${deps.phf_generator."0.7.21".phf_shared}".default = true; rand."${deps.phf_generator."0.7.21".rand}".default = true; @@ -2711,7 +2711,7 @@ rec { ++ (if features.phf_shared."0.7.21".unicase or false then [ (crates.unicase."${deps."phf_shared"."0.7.21".unicase}" deps) ] else [])); features = mkFeatures (features."phf_shared"."0.7.21" or {}); }; - features_.phf_shared."0.7.21" = deps: f: updateFeatures f (rec { + features_.phf_shared."0.7.21" = deps: f: updateFeatures f ({ phf_shared."0.7.21".default = (f.phf_shared."0.7.21".default or true); siphasher."${deps.phf_shared."0.7.21".siphasher}".default = true; unicase."${deps.phf_shared."0.7.21".unicase}".default = true; @@ -2731,7 +2731,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; }; - features_.pkg_config."0.3.9" = deps: f: updateFeatures f (rec { + features_.pkg_config."0.3.9" = deps: f: updateFeatures f ({ pkg_config."0.3.9".default = (f.pkg_config."0.3.9".default or true); }) []; @@ -2746,7 +2746,7 @@ rec { authors = [ "David Tolnay <dtolnay@gmail.com>" ]; sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; }; - features_.quote."0.3.15" = deps: f: updateFeatures f (rec { + features_.quote."0.3.15" = deps: f: updateFeatures f ({ quote."0.3.15".default = (f.quote."0.3.15".default or true); }) []; @@ -3036,7 +3036,7 @@ rec { (crates."rustc_version"."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps) ]); }; - features_.rand_chacha."0.1.0" = deps: f: updateFeatures f (rec { + features_.rand_chacha."0.1.0" = deps: f: updateFeatures f ({ rand_chacha."0.1.0".default = (f.rand_chacha."0.1.0".default or true); rand_core."${deps.rand_chacha."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.0".rand_core}".default or false); rustc_version."${deps.rand_chacha."0.1.0".rustc_version}".default = true; @@ -3131,7 +3131,7 @@ rec { (crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps) ]); }; - features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec { + features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({ rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false); rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true); }) [ @@ -3259,7 +3259,7 @@ rec { sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4"; libName = "syscall"; }; - features_.redox_syscall."0.1.31" = deps: f: updateFeatures f (rec { + features_.redox_syscall."0.1.31" = deps: f: updateFeatures f ({ redox_syscall."0.1.31".default = (f.redox_syscall."0.1.31".default or true); }) []; @@ -3278,7 +3278,7 @@ rec { (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) ]); }; - features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({ redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); }) [ @@ -3336,7 +3336,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; }; - features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({ regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true); }) []; @@ -3354,7 +3354,7 @@ rec { (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) ]) else []); }; - features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec { + features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({ remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); winapi = fold recursiveUpdate {} [ { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } @@ -3479,7 +3479,7 @@ rec { (crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps) ]); }; - features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec { + features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({ rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true); semver."${deps.rustc_version."0.2.3".semver}".default = true; }) [ @@ -3523,7 +3523,7 @@ rec { (crates."winapi"."${deps."schannel"."0.1.14"."winapi"}" deps) ]); }; - features_.schannel."0.1.14" = deps: f: updateFeatures f (rec { + features_.schannel."0.1.14" = deps: f: updateFeatures f ({ lazy_static."${deps.schannel."0.1.14".lazy_static}".default = true; schannel."0.1.14".default = (f.schannel."0.1.14".default or true); winapi = fold recursiveUpdate {} [ @@ -3706,7 +3706,7 @@ rec { authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; }; - features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec { + features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({ semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true); }) []; @@ -3798,7 +3798,7 @@ rec { (crates."url"."${deps."serde_urlencoded"."0.5.1"."url"}" deps) ]); }; - features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f (rec { + features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f ({ dtoa."${deps.serde_urlencoded."0.5.1".dtoa}".default = true; itoa."${deps.serde_urlencoded."0.5.1".itoa}".default = true; serde."${deps.serde_urlencoded."0.5.1".serde}".default = true; @@ -3824,7 +3824,7 @@ rec { dependencies = mapFeatures features ([ ]); }; - features_.siphasher."0.2.2" = deps: f: updateFeatures f (rec { + features_.siphasher."0.2.2" = deps: f: updateFeatures f ({ siphasher."0.2.2".default = (f.siphasher."0.2.2".default or true); }) []; @@ -3839,7 +3839,7 @@ rec { authors = [ "Carl Lerche <me@carllerche.com>" ]; sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0"; }; - features_.slab."0.4.0" = deps: f: updateFeatures f (rec { + features_.slab."0.4.0" = deps: f: updateFeatures f ({ slab."0.4.0".default = (f.slab."0.4.0".default or true); }) []; @@ -3884,7 +3884,7 @@ rec { (crates."slog_term"."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps) ]); }; - features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f (rec { + features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f ({ log."${deps.slog_envlogger."0.5.0".log}".default = true; regex."${deps.slog_envlogger."0.5.0".regex}".default = true; slog."${deps.slog_envlogger."0.5.0".slog}".default = true; @@ -3915,7 +3915,7 @@ rec { (crates."thread_local"."${deps."slog_extra"."0.1.2"."thread_local"}" deps) ]); }; - features_.slog_extra."0.1.2" = deps: f: updateFeatures f (rec { + features_.slog_extra."0.1.2" = deps: f: updateFeatures f ({ slog."${deps.slog_extra."0.1.2".slog}".default = true; slog_extra."0.1.2".default = (f.slog_extra."0.1.2".default or true); thread_local."${deps.slog_extra."0.1.2".thread_local}".default = true; @@ -3943,7 +3943,7 @@ rec { (crates."slog_term"."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps) ]); }; - features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f (rec { + features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f ({ crossbeam."${deps.slog_stdlog."1.1.0".crossbeam}".default = true; lazy_static."${deps.slog_stdlog."1.1.0".lazy_static}".default = true; log."${deps.slog_stdlog."1.1.0".log}".default = true; @@ -3975,7 +3975,7 @@ rec { (crates."thread_local"."${deps."slog_stream"."1.2.1"."thread_local"}" deps) ]); }; - features_.slog_stream."1.2.1" = deps: f: updateFeatures f (rec { + features_.slog_stream."1.2.1" = deps: f: updateFeatures f ({ slog."${deps.slog_stream."1.2.1".slog}".default = true; slog_extra."${deps.slog_stream."1.2.1".slog_extra}".default = true; slog_stream."1.2.1".default = (f.slog_stream."1.2.1".default or true); @@ -4005,7 +4005,7 @@ rec { (crates."thread_local"."${deps."slog_term"."1.5.0"."thread_local"}" deps) ]); }; - features_.slog_term."1.5.0" = deps: f: updateFeatures f (rec { + features_.slog_term."1.5.0" = deps: f: updateFeatures f ({ chrono."${deps.slog_term."1.5.0".chrono}".default = true; isatty."${deps.slog_term."1.5.0".isatty}".default = true; slog."${deps.slog_term."1.5.0".slog}".default = true; @@ -4082,7 +4082,7 @@ rec { authors = [ "Carl Lerche <me@carllerche.com>" ]; sha256 = "1120qvf02aydqj0k3kpr8d7zybq0y5arnmgmfsdw75r8qwz75wc6"; }; - features_.string."0.1.2" = deps: f: updateFeatures f (rec { + features_.string."0.1.2" = deps: f: updateFeatures f ({ string."0.1.2".default = (f.string."0.1.2".default or true); }) []; @@ -4097,7 +4097,7 @@ rec { authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; }; - features_.strsim."0.6.0" = deps: f: updateFeatures f (rec { + features_.strsim."0.6.0" = deps: f: updateFeatures f ({ strsim."0.6.0".default = (f.strsim."0.6.0".default or true); }) []; @@ -4165,7 +4165,7 @@ rec { (crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps) ]); }; - features_.synom."0.11.3" = deps: f: updateFeatures f (rec { + features_.synom."0.11.3" = deps: f: updateFeatures f ({ synom."0.11.3".default = (f.synom."0.11.3".default or true); unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true; }) [ @@ -4233,7 +4233,7 @@ rec { (crates."winapi"."${deps."tempfile"."3.0.5"."winapi"}" deps) ]) else []); }; - features_.tempfile."3.0.5" = deps: f: updateFeatures f (rec { + features_.tempfile."3.0.5" = deps: f: updateFeatures f ({ cfg_if."${deps.tempfile."3.0.5".cfg_if}".default = true; libc."${deps.tempfile."3.0.5".libc}".default = true; rand."${deps.tempfile."3.0.5".rand}".default = true; @@ -4273,7 +4273,7 @@ rec { (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) ]) else []); }; - features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + features_.termion."1.5.1" = deps: f: updateFeatures f ({ libc."${deps.termion."1.5.1".libc}".default = true; redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; @@ -4298,7 +4298,7 @@ rec { (crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps) ]); }; - features_.textwrap."0.9.0" = deps: f: updateFeatures f (rec { + features_.textwrap."0.9.0" = deps: f: updateFeatures f ({ textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true); unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true; }) [ @@ -4320,7 +4320,7 @@ rec { (crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps) ]); }; - features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec { + features_.thread_id."2.0.0" = deps: f: updateFeatures f ({ kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true; libc."${deps.thread_id."2.0.0".libc}".default = true; thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true); @@ -4343,7 +4343,7 @@ rec { (crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps) ]); }; - features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec { + features_.thread_local."0.2.7" = deps: f: updateFeatures f ({ thread_id."${deps.thread_local."0.2.7".thread_id}".default = true; thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true); }) [ @@ -4365,7 +4365,7 @@ rec { (crates."unreachable"."${deps."thread_local"."0.3.4"."unreachable"}" deps) ]); }; - features_.thread_local."0.3.4" = deps: f: updateFeatures f (rec { + features_.thread_local."0.3.4" = deps: f: updateFeatures f ({ lazy_static."${deps.thread_local."0.3.4".lazy_static}".default = true; thread_local."0.3.4".default = (f.thread_local."0.3.4".default or true); unreachable."${deps.thread_local."0.3.4".unreachable}".default = true; @@ -4395,7 +4395,7 @@ rec { (crates."winapi"."${deps."time"."0.1.38"."winapi"}" deps) ]) else []); }; - features_.time."0.1.38" = deps: f: updateFeatures f (rec { + features_.time."0.1.38" = deps: f: updateFeatures f ({ kernel32_sys."${deps.time."0.1.38".kernel32_sys}".default = true; libc."${deps.time."0.1.38".libc}".default = true; redox_syscall."${deps.time."0.1.38".redox_syscall}".default = true; @@ -4431,7 +4431,7 @@ rec { (crates."tokio_udp"."${deps."tokio"."0.1.7"."tokio_udp"}" deps) ]); }; - features_.tokio."0.1.7" = deps: f: updateFeatures f (rec { + features_.tokio."0.1.7" = deps: f: updateFeatures f ({ futures."${deps.tokio."0.1.7".futures}".default = true; mio."${deps.tokio."0.1.7".mio}".default = true; tokio."0.1.7".default = (f.tokio."0.1.7".default or true); @@ -4472,7 +4472,7 @@ rec { (crates."tokio_io"."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps) ]); }; - features_.tokio_codec."0.1.1" = deps: f: updateFeatures f (rec { + features_.tokio_codec."0.1.1" = deps: f: updateFeatures f ({ bytes."${deps.tokio_codec."0.1.1".bytes}".default = true; futures."${deps.tokio_codec."0.1.1".futures}".default = true; tokio_codec."0.1.1".default = (f.tokio_codec."0.1.1".default or true); @@ -4497,7 +4497,7 @@ rec { (crates."futures"."${deps."tokio_executor"."0.1.5"."futures"}" deps) ]); }; - features_.tokio_executor."0.1.5" = deps: f: updateFeatures f (rec { + features_.tokio_executor."0.1.5" = deps: f: updateFeatures f ({ futures."${deps.tokio_executor."0.1.5".futures}".default = true; tokio_executor."0.1.5".default = (f.tokio_executor."0.1.5".default or true); }) [ @@ -4520,7 +4520,7 @@ rec { (crates."tokio_threadpool"."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps) ]); }; - features_.tokio_fs."0.1.4" = deps: f: updateFeatures f (rec { + features_.tokio_fs."0.1.4" = deps: f: updateFeatures f ({ futures."${deps.tokio_fs."0.1.4".futures}".default = true; tokio_fs."0.1.4".default = (f.tokio_fs."0.1.4".default or true); tokio_io."${deps.tokio_fs."0.1.4".tokio_io}".default = true; @@ -4547,7 +4547,7 @@ rec { (crates."log"."${deps."tokio_io"."0.1.10"."log"}" deps) ]); }; - features_.tokio_io."0.1.10" = deps: f: updateFeatures f (rec { + features_.tokio_io."0.1.10" = deps: f: updateFeatures f ({ bytes."${deps.tokio_io."0.1.10".bytes}".default = true; futures."${deps.tokio_io."0.1.10".futures}".default = true; log."${deps.tokio_io."0.1.10".log}".default = true; @@ -4581,7 +4581,7 @@ rec { (crates."tokio_io"."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps) ]); }; - features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f (rec { + features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f ({ crossbeam_utils."${deps.tokio_reactor."0.1.7".crossbeam_utils}".default = true; futures."${deps.tokio_reactor."0.1.7".futures}".default = true; lazy_static."${deps.tokio_reactor."0.1.7".lazy_static}".default = true; @@ -4625,7 +4625,7 @@ rec { (crates."tokio_reactor"."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps) ]); }; - features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f (rec { + features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f ({ bytes."${deps.tokio_tcp."0.1.2".bytes}".default = true; futures."${deps.tokio_tcp."0.1.2".futures}".default = true; iovec."${deps.tokio_tcp."0.1.2".iovec}".default = true; @@ -4662,7 +4662,7 @@ rec { (crates."tokio_executor"."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps) ]); }; - features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f (rec { + features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f ({ crossbeam_deque."${deps.tokio_threadpool."0.1.9".crossbeam_deque}".default = true; crossbeam_utils."${deps.tokio_threadpool."0.1.9".crossbeam_utils}".default = true; futures."${deps.tokio_threadpool."0.1.9".futures}".default = true; @@ -4696,7 +4696,7 @@ rec { (crates."tokio_executor"."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps) ]); }; - features_.tokio_timer."0.2.5" = deps: f: updateFeatures f (rec { + features_.tokio_timer."0.2.5" = deps: f: updateFeatures f ({ futures."${deps.tokio_timer."0.2.5".futures}".default = true; tokio_executor."${deps.tokio_timer."0.2.5".tokio_executor}".default = true; tokio_timer."0.2.5".default = (f.tokio_timer."0.2.5".default or true); @@ -4725,7 +4725,7 @@ rec { (crates."tokio_reactor"."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps) ]); }; - features_.tokio_udp."0.1.3" = deps: f: updateFeatures f (rec { + features_.tokio_udp."0.1.3" = deps: f: updateFeatures f ({ bytes."${deps.tokio_udp."0.1.3".bytes}".default = true; futures."${deps.tokio_udp."0.1.3".futures}".default = true; log."${deps.tokio_udp."0.1.3".log}".default = true; @@ -4755,7 +4755,7 @@ rec { authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; sha256 = "1k8xc0jpbrmzp0fwghdh6pwzjb9xx2p8yy0xxnnb8065smc5fsrv"; }; - features_.try_lock."0.2.2" = deps: f: updateFeatures f (rec { + features_.try_lock."0.2.2" = deps: f: updateFeatures f ({ try_lock."0.2.2".default = (f.try_lock."0.2.2".default or true); }) []; @@ -4812,7 +4812,7 @@ rec { ]); features = mkFeatures (features."unicase"."2.1.0" or {}); }; - features_.unicase."2.1.0" = deps: f: updateFeatures f (rec { + features_.unicase."2.1.0" = deps: f: updateFeatures f ({ unicase."2.1.0".default = (f.unicase."2.1.0".default or true); version_check."${deps.unicase."2.1.0".version_check}".default = true; }) [ @@ -4867,7 +4867,7 @@ rec { authors = [ "kwantam <kwantam@gmail.com>" ]; sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5"; }; - features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f (rec { + features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f ({ unicode_normalization."0.1.5".default = (f.unicode_normalization."0.1.5".default or true); }) []; @@ -4883,7 +4883,7 @@ rec { sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; features = mkFeatures (features."unicode_width"."0.1.4" or {}); }; - features_.unicode_width."0.1.4" = deps: f: updateFeatures f (rec { + features_.unicode_width."0.1.4" = deps: f: updateFeatures f ({ unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true); }) []; @@ -4899,7 +4899,7 @@ rec { sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; features = mkFeatures (features."unicode_xid"."0.0.4" or {}); }; - features_.unicode_xid."0.0.4" = deps: f: updateFeatures f (rec { + features_.unicode_xid."0.0.4" = deps: f: updateFeatures f ({ unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true); }) []; @@ -4917,7 +4917,7 @@ rec { (crates."void"."${deps."unreachable"."1.0.0"."void"}" deps) ]); }; - features_.unreachable."1.0.0" = deps: f: updateFeatures f (rec { + features_.unreachable."1.0.0" = deps: f: updateFeatures f ({ unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true); void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false); }) [ @@ -4973,7 +4973,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; }; - features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec { + features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({ utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true); }) []; @@ -5040,7 +5040,7 @@ rec { authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; }; - features_.vcpkg."0.2.2" = deps: f: updateFeatures f (rec { + features_.vcpkg."0.2.2" = deps: f: updateFeatures f ({ vcpkg."0.2.2".default = (f.vcpkg."0.2.2".default or true); }) []; @@ -5083,7 +5083,7 @@ rec { authors = [ "Sergio Benitez <sb@sergio.bz>" ]; sha256 = "0z635wdclv9bvafj11fpgndn7y79ibpsnc364pm61i1m4wwg8msg"; }; - features_.version_check."0.1.3" = deps: f: updateFeatures f (rec { + features_.version_check."0.1.3" = deps: f: updateFeatures f ({ version_check."0.1.3".default = (f.version_check."0.1.3".default or true); }) []; @@ -5125,7 +5125,7 @@ rec { (crates."try_lock"."${deps."want"."0.0.6"."try_lock"}" deps) ]); }; - features_.want."0.0.6" = deps: f: updateFeatures f (rec { + features_.want."0.0.6" = deps: f: updateFeatures f ({ futures."${deps.want."0.0.6".futures}".default = true; log."${deps.want."0.0.6".log}".default = true; try_lock."${deps.want."0.0.6".try_lock}".default = true; @@ -5147,7 +5147,7 @@ rec { authors = [ "Peter Atashian <retep998@gmail.com>" ]; sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; }; - features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + features_.winapi."0.2.8" = deps: f: updateFeatures f ({ winapi."0.2.8".default = (f.winapi."0.2.8".default or true); }) []; @@ -5170,7 +5170,7 @@ rec { ]) else []); features = mkFeatures (features."winapi"."0.3.6" or {}); }; - features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + features_.winapi."0.3.6" = deps: f: updateFeatures f ({ winapi."0.3.6".default = (f.winapi."0.3.6".default or true); winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; @@ -5191,7 +5191,7 @@ rec { sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; libName = "build"; }; - features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({ winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); }) []; @@ -5207,7 +5207,7 @@ rec { sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; build = "build.rs"; }; - features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); }) []; @@ -5223,7 +5223,7 @@ rec { sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; build = "build.rs"; }; - features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); }) []; @@ -5247,7 +5247,7 @@ rec { (crates."winapi_build"."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps) ]); }; - features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f (rec { + features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f ({ winapi."${deps.ws2_32_sys."0.2.1".winapi}".default = true; winapi_build."${deps.ws2_32_sys."0.2.1".winapi_build}".default = true; ws2_32_sys."0.2.1".default = (f.ws2_32_sys."0.2.1".default or true); diff --git a/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix index 5e635f0fc26f..2fe89ccfa986 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "cargo-graph-${version}"; + pname = "cargo-graph"; version = "0.2.0-d895af1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix index 619fbb115976..c8a43bda64a4 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "cargo-license-${version}"; + pname = "cargo-license"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix index 2521a2ceebf6..2dcb03048577 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { - name = "cargo-release-${version}"; + pname = "cargo-release"; version = "0.10.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix index 8b654188c51a..8c3035ae79aa 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { - name = "cargo-tree-${version}"; + pname = "cargo-tree"; version = "0.26.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/cargo-update/cargo-update.nix b/nixpkgs/pkgs/tools/package-management/cargo-update/cargo-update.nix index 1bd8aadf4982..9b8cf24605a5 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-update/cargo-update.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-update/cargo-update.nix @@ -520,7 +520,7 @@ rec { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - advapi32_sys_0_2_0_features = f: updateFeatures f (rec { + advapi32_sys_0_2_0_features = f: updateFeatures f ({ advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -528,14 +528,14 @@ rec { aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { dependencies = mapFeatures features ([ memchr_2_0_1 ]); }; - aho_corasick_0_6_4_features = f: updateFeatures f (rec { + aho_corasick_0_6_4_features = f: updateFeatures f ({ aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); memchr_2_0_1.default = true; }) [ memchr_2_0_1_features ]; ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); }; - ansi_term_0_11_0_features = f: updateFeatures f (rec { + ansi_term_0_11_0_features = f: updateFeatures f ({ ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); winapi_0_3_4.consoleapi = true; winapi_0_3_4.default = true; @@ -543,7 +543,7 @@ rec { winapi_0_3_4.processenv = true; }) [ winapi_0_3_4_features ]; array_tool_1_0_3 = { features?(array_tool_1_0_3_features {}) }: array_tool_1_0_3_ {}; - array_tool_1_0_3_features = f: updateFeatures f (rec { + array_tool_1_0_3_features = f: updateFeatures f ({ array_tool_1_0_3.default = (f.array_tool_1_0_3.default or true); }) []; atty_0_2_10 = { features?(atty_0_2_10_features {}) }: atty_0_2_10_ { @@ -551,7 +551,7 @@ rec { ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); }; - atty_0_2_10_features = f: updateFeatures f (rec { + atty_0_2_10_features = f: updateFeatures f ({ atty_0_2_10.default = (f.atty_0_2_10.default or true); libc_0_2_40.default = (f.libc_0_2_40.default or false); termion_1_5_1.default = true; @@ -575,14 +575,14 @@ rec { bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ { features = mkFeatures (features.bitflags_1_0_3 or {}); }; - bitflags_1_0_3_features = f: updateFeatures f (rec { + bitflags_1_0_3_features = f: updateFeatures f ({ bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true); }) []; cargo_update_1_5_2 = { features?(cargo_update_1_5_2_features {}) }: cargo_update_1_5_2_ { dependencies = mapFeatures features ([ array_tool_1_0_3 clap_2_31_2 git2_0_6_11 json_0_11_13 lazy_static_1_0_0 lazysort_0_2_0 regex_0_2_11 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 tabwriter_1_0_4 toml_0_4_6 url_1_7_0 ]); buildDependencies = mapFeatures features ([ embed_resource_1_1_4 ]); }; - cargo_update_1_5_2_features = f: updateFeatures f (rec { + cargo_update_1_5_2_features = f: updateFeatures f ({ array_tool_1_0_3.default = true; cargo_update_1_5_2.default = (f.cargo_update_1_5_2.default or true); clap_2_31_2.default = true; @@ -677,7 +677,7 @@ rec { cmake_0_1_31 = { features?(cmake_0_1_31_features {}) }: cmake_0_1_31_ { dependencies = mapFeatures features ([ cc_1_0_15 ]); }; - cmake_0_1_31_features = f: updateFeatures f (rec { + cmake_0_1_31_features = f: updateFeatures f ({ cc_1_0_15.default = true; cmake_0_1_31.default = (f.cmake_0_1_31.default or true); }) [ cc_1_0_15_features ]; @@ -688,7 +688,7 @@ rec { ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); }; - curl_sys_0_4_5_features = f: updateFeatures f (rec { + curl_sys_0_4_5_features = f: updateFeatures f ({ cc_1_0_15.default = true; curl_sys_0_4_5.default = (f.curl_sys_0_4_5.default or true); libc_0_2_40.default = true; @@ -702,20 +702,20 @@ rec { embed_resource_1_1_4 = { features?(embed_resource_1_1_4_features {}) }: embed_resource_1_1_4_ { dependencies = (if kernel == "windows" && abi == "msvc" then mapFeatures features ([ winreg_0_4_0 ]) else []); }; - embed_resource_1_1_4_features = f: updateFeatures f (rec { + embed_resource_1_1_4_features = f: updateFeatures f ({ embed_resource_1_1_4.default = (f.embed_resource_1_1_4.default or true); winreg_0_4_0.default = (f.winreg_0_4_0.default or false); }) [ winreg_0_4_0_features ]; fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]); }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3_features = f: updateFeatures f ({ bitflags_1_0_3.default = true; fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); fuchsia_zircon_sys_0_3_3.default = true; }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ]; fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f ({ fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); }) []; git2_0_6_11 = { features?(git2_0_6_11_features {}) }: git2_0_6_11_ { @@ -769,21 +769,21 @@ rec { idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ { dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]); }; - idna_0_1_4_features = f: updateFeatures f (rec { + idna_0_1_4_features = f: updateFeatures f ({ idna_0_1_4.default = (f.idna_0_1_4.default or true); matches_0_1_6.default = true; unicode_bidi_0_3_4.default = true; unicode_normalization_0_1_7.default = true; }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ]; json_0_11_13 = { features?(json_0_11_13_features {}) }: json_0_11_13_ {}; - json_0_11_13_features = f: updateFeatures f (rec { + json_0_11_13_features = f: updateFeatures f ({ json_0_11_13.default = (f.json_0_11_13.default or true); }) []; kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -811,7 +811,7 @@ rec { dependencies = mapFeatures features ([ rand_0_3_22 ]); features = mkFeatures (features.lazysort_0_2_0 or {}); }; - lazysort_0_2_0_features = f: updateFeatures f (rec { + lazysort_0_2_0_features = f: updateFeatures f ({ lazysort_0_2_0.default = (f.lazysort_0_2_0.default or true); rand_0_3_22.default = true; }) [ rand_0_3_22_features ]; @@ -863,7 +863,7 @@ rec { ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []); buildDependencies = mapFeatures features ([ cmake_0_1_31 pkg_config_0_3_11 ]); }; - libssh2_sys_0_2_7_features = f: updateFeatures f (rec { + libssh2_sys_0_2_7_features = f: updateFeatures f ({ cmake_0_1_31.default = true; libc_0_2_40.default = true; libssh2_sys_0_2_7.default = (f.libssh2_sys_0_2_7.default or true); @@ -876,14 +876,14 @@ rec { ++ (if abi == "msvc" then mapFeatures features ([]) else []); buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); }; - libz_sys_1_0_18_features = f: updateFeatures f (rec { + libz_sys_1_0_18_features = f: updateFeatures f ({ cc_1_0_15.default = true; libc_0_2_40.default = true; libz_sys_1_0_18.default = (f.libz_sys_1_0_18.default or true); pkg_config_0_3_11.default = true; }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ]; matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {}; - matches_0_1_6_features = f: updateFeatures f (rec { + matches_0_1_6_features = f: updateFeatures f ({ matches_0_1_6.default = (f.matches_0_1_6.default or true); }) []; memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { @@ -910,7 +910,7 @@ rec { (memchr_2_0_1.default or false); }) [ libc_0_2_40_features ]; openssl_probe_0_1_2 = { features?(openssl_probe_0_1_2_features {}) }: openssl_probe_0_1_2_ {}; - openssl_probe_0_1_2_features = f: updateFeatures f (rec { + openssl_probe_0_1_2_features = f: updateFeatures f ({ openssl_probe_0_1_2.default = (f.openssl_probe_0_1_2.default or true); }) []; openssl_sys_0_9_30 = { features?(openssl_sys_0_9_30_features {}) }: openssl_sys_0_9_30_ { @@ -918,18 +918,18 @@ rec { ++ (if abi == "msvc" then mapFeatures features ([]) else []); buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); }; - openssl_sys_0_9_30_features = f: updateFeatures f (rec { + openssl_sys_0_9_30_features = f: updateFeatures f ({ cc_1_0_15.default = true; libc_0_2_40.default = true; openssl_sys_0_9_30.default = (f.openssl_sys_0_9_30.default or true); pkg_config_0_3_11.default = true; }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ]; percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {}; - percent_encoding_1_0_1_features = f: updateFeatures f (rec { + percent_encoding_1_0_1_features = f: updateFeatures f ({ percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true); }) []; pkg_config_0_3_11 = { features?(pkg_config_0_3_11_features {}) }: pkg_config_0_3_11_ {}; - pkg_config_0_3_11_features = f: updateFeatures f (rec { + pkg_config_0_3_11_features = f: updateFeatures f ({ pkg_config_0_3_11.default = (f.pkg_config_0_3_11.default or true); }) []; proc_macro2_0_3_8 = { features?(proc_macro2_0_3_8_features {}) }: proc_macro2_0_3_8_ { @@ -1007,13 +1007,13 @@ rec { winapi_0_3_4.winnt = true; }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; - redox_syscall_0_1_37_features = f: updateFeatures f (rec { + redox_syscall_0_1_37_features = f: updateFeatures f ({ redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); }) []; redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_termios_0_1_1_features = f: updateFeatures f ({ redox_syscall_0_1_37.default = true; redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); }) [ redox_syscall_0_1_37_features ]; @@ -1036,7 +1036,7 @@ rec { regex_syntax_0_5_6 = { features?(regex_syntax_0_5_6_features {}) }: regex_syntax_0_5_6_ { dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); }; - regex_syntax_0_5_6_features = f: updateFeatures f (rec { + regex_syntax_0_5_6_features = f: updateFeatures f ({ regex_syntax_0_5_6.default = (f.regex_syntax_0_5_6.default or true); ucd_util_0_1_1.default = true; }) [ ucd_util_0_1_1_features ]; @@ -1055,7 +1055,7 @@ rec { serde_1_0_55.default = true; }) [ semver_parser_0_7_0_features serde_1_0_55_features ]; semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; - semver_parser_0_7_0_features = f: updateFeatures f (rec { + semver_parser_0_7_0_features = f: updateFeatures f ({ semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); }) []; serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ { @@ -1081,7 +1081,7 @@ rec { dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]); features = mkFeatures (features.serde_derive_1_0_55 or {}); }; - serde_derive_1_0_55_features = f: updateFeatures f (rec { + serde_derive_1_0_55_features = f: updateFeatures f ({ proc_macro2_0_3_8.default = true; quote_0_5_2.default = true; serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true); @@ -1089,7 +1089,7 @@ rec { syn_0_13_10.visit = true; }) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ]; strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f (rec { + strsim_0_7_0_features = f: updateFeatures f ({ strsim_0_7_0.default = (f.strsim_0_7_0.default or true); }) []; syn_0_13_10 = { features?(syn_0_13_10_features {}) }: syn_0_13_10_ { @@ -1155,7 +1155,7 @@ rec { dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); }; - termion_1_5_1_features = f: updateFeatures f (rec { + termion_1_5_1_features = f: updateFeatures f ({ libc_0_2_40.default = true; redox_syscall_0_1_37.default = true; redox_termios_0_1_1.default = true; @@ -1164,14 +1164,14 @@ rec { textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); }; - textwrap_0_9_0_features = f: updateFeatures f (rec { + textwrap_0_9_0_features = f: updateFeatures f ({ textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); unicode_width_0_1_4.default = true; }) [ unicode_width_0_1_4_features ]; thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); }; - thread_local_0_3_5_features = f: updateFeatures f (rec { + thread_local_0_3_5_features = f: updateFeatures f ({ lazy_static_1_0_0.default = true; thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); unreachable_1_0_0.default = true; @@ -1179,12 +1179,12 @@ rec { toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { dependencies = mapFeatures features ([ serde_1_0_55 ]); }; - toml_0_4_6_features = f: updateFeatures f (rec { + toml_0_4_6_features = f: updateFeatures f ({ serde_1_0_55.default = true; toml_0_4_6.default = (f.toml_0_4_6.default or true); }) [ serde_1_0_55_features ]; ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; - ucd_util_0_1_1_features = f: updateFeatures f (rec { + ucd_util_0_1_1_features = f: updateFeatures f ({ ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); }) []; unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { @@ -1208,25 +1208,25 @@ rec { (unicode_bidi_0_3_4.with_serde or false); }) [ matches_0_1_6_features ]; unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {}; - unicode_normalization_0_1_7_features = f: updateFeatures f (rec { + unicode_normalization_0_1_7_features = f: updateFeatures f ({ unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true); }) []; unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4_features = f: updateFeatures f ({ unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { features = mkFeatures (features.unicode_xid_0_1_0 or {}); }; - unicode_xid_0_1_0_features = f: updateFeatures f (rec { + unicode_xid_0_1_0_features = f: updateFeatures f ({ unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); }) []; unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { dependencies = mapFeatures features ([ void_1_0_2 ]); }; - unreachable_1_0_0_features = f: updateFeatures f (rec { + unreachable_1_0_0_features = f: updateFeatures f ({ unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); void_1_0_2.default = (f.void_1_0_2.default or false); }) [ void_1_0_2_features ]; @@ -1249,11 +1249,11 @@ rec { (url_1_7_0.heap_size or false); }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ]; utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f (rec { + utf8_ranges_1_0_0_features = f: updateFeatures f ({ utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); }) []; vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; - vcpkg_0_2_3_features = f: updateFeatures f (rec { + vcpkg_0_2_3_features = f: updateFeatures f ({ vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); }) []; vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ { @@ -1278,7 +1278,7 @@ rec { (void_1_0_2.default or false); }) []; winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8_features = f: updateFeatures f ({ winapi_0_2_8.default = (f.winapi_0_2_8.default or true); }) []; winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { @@ -1286,21 +1286,21 @@ rec { ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); features = mkFeatures (features.winapi_0_3_4 or {}); }; - winapi_0_3_4_features = f: updateFeatures f (rec { + winapi_0_3_4_features = f: updateFeatures f ({ winapi_0_3_4.default = (f.winapi_0_3_4.default or true); winapi_i686_pc_windows_gnu_0_4_0.default = true; winapi_x86_64_pc_windows_gnu_0_4_0.default = true; }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1_features = f: updateFeatures f ({ winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); }) []; winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({ winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); }) []; winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({ winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); }) []; winreg_0_4_0 = { features?(winreg_0_4_0_features {}) }: winreg_0_4_0_ { diff --git a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index 5049a90c7a7c..e1ae6bc88b8e 100644 --- a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2019-06-25"; + version = "2019-09-04"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "95d55b8da152f1efffb7713c82ead83a3fcf476d"; - sha256 = "1zbx051rc0b880wjl832m9sliwrhrm1dbdxw8734gvc0pfz6qwn1"; + rev = "1923ac3358cbd2d75352c2db2178314eb4623818"; + sha256 = "1xdsz62sjh8j3p8jfz449gv9vl01adk3qdyjvbpgi7y5c09ymwg7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/package-management/morph/default.nix b/nixpkgs/pkgs/tools/package-management/morph/default.nix index 9804c0fa1851..0daba5fadf3a 100644 --- a/nixpkgs/pkgs/tools/package-management/morph/default.nix +++ b/nixpkgs/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "morph"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "0jhypvj45yjg4cn4rvb2j9091pl6z5j541vcfaln5sb3ds14fkwf"; + sha256 = "1lp5nsril9pnqllkpmvj8wd2f7p4xzwc2z3f5j6yfakd2sg41kgc"; }; goPackagePath = "github.com/dbcdk/morph"; diff --git a/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 5cbb207ec4f4..b1f3c553bf10 100644 --- a/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nfpm"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "090mxkmbfzi3mby18zhrr34fr6vzc7j0r2ss3rjr5lyfgilw1qwr"; + sha256 = "0hfzk4hpk35j070hhpsjjpxhcrrddi6f1z070iypajcw96qz6lli"; }; modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-du/default.nix b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix index 9b666dbfa642..17d023f6daf3 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-du/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: rustPlatform.buildRustPackage rec { - name = "nix-du-${version}"; + pname = "nix-du"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/nix-index/default.nix b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix index 62e0bc81afaf..1d025581b614 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-index/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix @@ -3,7 +3,7 @@ }: rustPlatform.buildRustPackage rec { - name = "nix-index-${version}"; + pname = "nix-index"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix index 660dce347a5b..b191d1c32111 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix @@ -9,7 +9,7 @@ let sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nix-serve-0.2-${substring 0 7 rev}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 6e7aac706538..69489e271cba 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -174,10 +174,10 @@ in rec { }; nixStable = callPackage common (rec { - name = "nix-2.2.2"; + name = "nix-2.3"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c"; + sha256 = "b1d1b4d87390941fc64b19776f1ed9e3871231d38f5a1f295dd13925acd3a98d"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/nixpkgs/pkgs/tools/package-management/nixui/default.nix b/nixpkgs/pkgs/tools/package-management/nixui/default.nix index b495577ef664..131a3bb5fddc 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/default.nix @@ -24,7 +24,7 @@ let genericName = "NixUI"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nixui"; inherit version src; installPhase = '' diff --git a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix index 8fe405e1b3e9..4377681e20d8 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix b/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix index 8575f126e624..1c97757ff8a6 100644 --- a/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix +++ b/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "opkg-utils-20141030"; # No releases, only a git tree diff --git a/nixpkgs/pkgs/tools/package-management/python2nix/default.nix b/nixpkgs/pkgs/tools/package-management/python2nix/default.nix index 1a7c24e2c38a..675ec61f4db9 100644 --- a/nixpkgs/pkgs/tools/package-management/python2nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/python2nix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { name = "python2nix-20140927"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/xbps/default.nix b/nixpkgs/pkgs/tools/package-management/xbps/default.nix index 5954ca4959b6..f83a1498825b 100644 --- a/nixpkgs/pkgs/tools/package-management/xbps/default.nix +++ b/nixpkgs/pkgs/tools/package-management/xbps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xbps"; - version = "0.56"; + version = "0.57"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "0hqvq6fq62l5sgm4fy3zb0ks889d21mqz4f4my3iifs6c9f50na2"; + sha256 = "1aaa0h265lx85hmcvg7zpg7iiq6dzzlyxqazn1s387ss709i5gxn"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./cert-paths.patch ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + postPatch = '' # fix unprefixed ranlib (needed on cross) substituteInPlace lib/Makefile \ diff --git a/nixpkgs/pkgs/tools/security/afl/libdislocator.nix b/nixpkgs/pkgs/tools/security/afl/libdislocator.nix index 58b25e6d3ee5..47e74573b81f 100644 --- a/nixpkgs/pkgs/tools/security/afl/libdislocator.nix +++ b/nixpkgs/pkgs/tools/security/afl/libdislocator.nix @@ -1,6 +1,6 @@ { stdenv, afl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = (builtins.parseDrvName afl.name).version; pname = "libdislocator"; diff --git a/nixpkgs/pkgs/tools/security/afl/qemu.nix b/nixpkgs/pkgs/tools/security/afl/qemu.nix index 9e0f19361fb0..d80d301351f4 100644 --- a/nixpkgs/pkgs/tools/security/afl/qemu.nix +++ b/nixpkgs/pkgs/tools/security/afl/qemu.nix @@ -11,7 +11,7 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user" else throw "afl: no support for ${stdenv.hostPlatform.system}!"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "afl-${qemuName}"; srcs = [ diff --git a/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index 19c9acc0a457..6b3a922bbe5c 100644 --- a/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -4,7 +4,7 @@ assert testQR -> zbar != false; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "asc-key-to-qr-code-gif"; version = "20180613"; diff --git a/nixpkgs/pkgs/tools/security/b2sum/default.nix b/nixpkgs/pkgs/tools/security/b2sum/default.nix index 2fa50f91111a..fdd4f2c73fd4 100644 --- a/nixpkgs/pkgs/tools/security/b2sum/default.nix +++ b/nixpkgs/pkgs/tools/security/b2sum/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "b2sum"; version = "unstable-2018-06-11"; diff --git a/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix index c6d2cbd53c9d..b745a2c872e7 100644 --- a/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix +++ b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bash-supergenpass-unstable"; version = "2018-04-18"; diff --git a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix index 41e23864c44d..66560873b4c5 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/nixpkgs/pkgs/tools/security/bitwarden/default.nix index e6874d085d29..d94e02c4adca 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - "x86_64-linux" = "1.15.2"; + x86_64-linux = "1.15.2"; }.${system} or ""; sha256 = { - "x86_64-linux" = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f"; + x86_64-linux = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/security/default.nix b/nixpkgs/pkgs/tools/security/default.nix index cee198c1b3be..0e57a5bab884 100644 --- a/nixpkgs/pkgs/tools/security/default.nix +++ b/nixpkgs/pkgs/tools/security/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.0.1"; pname = "ecdsatool"; diff --git a/nixpkgs/pkgs/tools/security/ecdsautils/default.nix b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix index 00dac6e94294..13280e3226d9 100644 --- a/nixpkgs/pkgs/tools/security/ecdsautils/default.nix +++ b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4.0"; pname = "ecdsautils"; diff --git a/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix b/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix index 4acef56a2c58..fcb8d091d933 100644 --- a/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix +++ b/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix @@ -4,7 +4,7 @@ , python2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ecryptfs-helper"; version = "20160722"; diff --git a/nixpkgs/pkgs/tools/security/enpass/default.nix b/nixpkgs/pkgs/tools/security/enpass/default.nix index 8ba80c464579..89e09a47858d 100644 --- a/nixpkgs/pkgs/tools/security/enpass/default.nix +++ b/nixpkgs/pkgs/tools/security/enpass/default.nix @@ -39,7 +39,7 @@ let libuuid cups ]); - package = stdenv.mkDerivation rec { + package = stdenv.mkDerivation { inherit (data) version; pname = "enpass"; @@ -80,7 +80,7 @@ let ''; }; updater = { - update = stdenv.mkDerivation rec { + update = stdenv.mkDerivation { name = "enpass-update-script"; SCRIPT =./update_script.py; diff --git a/nixpkgs/pkgs/tools/security/fprot/default.nix b/nixpkgs/pkgs/tools/security/fprot/default.nix index 59d126c5e2c9..3fff99a6ce10 100644 --- a/nixpkgs/pkgs/tools/security/fprot/default.nix +++ b/nixpkgs/pkgs/tools/security/fprot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "f-prot"; version = "6.2.1"; diff --git a/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix b/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix new file mode 100644 index 000000000000..04fa923ce2cc --- /dev/null +++ b/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, fetchFromGitLab +, python3 +, wrapGAppsHook +, gobject-introspection +, gtk3 +, glib +, gnome3 +, gst_all_1 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gnome-keysign"; + version = "1.0.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = version; + sha256 = "0iy70dskd7wly37lpb2ypd9phhyml5j3c7rzajii4f2s7zgb3abg"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ] ++ (with python3.pkgs; [ + Babel + lxml + ]); + + buildInputs = [ + # TODO: add avahi support + gtk3 + glib + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) + gst_all_1.gst-plugins-bad # for zbar plug-in + ]; + + propagatedBuildInputs = with python3.pkgs; [ + dbus-python + future + gpgme + magic-wormhole + pygobject3 + pybluez + qrcode + requests + twisted + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + # bunch of linting + doCheck = false; + + meta = with stdenv.lib; { + description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys"; + homepage = https://wiki.gnome.org/Apps/Keysign; + license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/security/haka/default.nix b/nixpkgs/pkgs/tools/security/haka/default.nix index c4b96f04dc27..bd7d356c1a0e 100644 --- a/nixpkgs/pkgs/tools/security/haka/default.nix +++ b/nixpkgs/pkgs/tools/security/haka/default.nix @@ -2,7 +2,7 @@ let version = "0.3.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "haka"; inherit version; diff --git a/nixpkgs/pkgs/tools/security/hash_extender/default.nix b/nixpkgs/pkgs/tools/security/hash_extender/default.nix index 9efa7e2afa29..30ba2fb30872 100644 --- a/nixpkgs/pkgs/tools/security/hash_extender/default.nix +++ b/nixpkgs/pkgs/tools/security/hash_extender/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hash_extender"; version = "2017-04-10"; diff --git a/nixpkgs/pkgs/tools/security/ifdnfc/default.nix b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix index 8f30b5885e40..5ec66a5b98cc 100644 --- a/nixpkgs/pkgs/tools/security/ifdnfc/default.nix +++ b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix @@ -4,7 +4,7 @@ , libnfc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ifdnfc"; version = "2016-03-01"; diff --git a/nixpkgs/pkgs/tools/security/jd-gui/default.nix b/nixpkgs/pkgs/tools/security/jd-gui/default.nix index 2eda19088376..213f7c30051a 100644 --- a/nixpkgs/pkgs/tools/security/jd-gui/default.nix +++ b/nixpkgs/pkgs/tools/security/jd-gui/default.nix @@ -63,7 +63,7 @@ let categories = "Development;Debugger;"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name version src; nativeBuildInputs = [ gradle_2_5 perl makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/keybase/kbfs.nix b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix index 302e996213dd..9448182a65a7 100644 --- a/nixpkgs/pkgs/tools/security/keybase/kbfs.nix +++ b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, keybase }: -buildGoPackage rec { +buildGoPackage { pname = "kbfs"; inherit (keybase) src version; diff --git a/nixpkgs/pkgs/tools/security/libacr38u/default.nix b/nixpkgs/pkgs/tools/security/libacr38u/default.nix index 4af6e3de3cf9..248fbe008fc7 100644 --- a/nixpkgs/pkgs/tools/security/libacr38u/default.nix +++ b/nixpkgs/pkgs/tools/security/libacr38u/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, pcsclite , libusb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.7.11"; pname = "libacr38u"; diff --git a/nixpkgs/pkgs/tools/security/logkeys/default.nix b/nixpkgs/pkgs/tools/security/logkeys/default.nix index a325c47ca0d9..f06ce2f246a4 100644 --- a/nixpkgs/pkgs/tools/security/logkeys/default.nix +++ b/nixpkgs/pkgs/tools/security/logkeys/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "logkeys"; version = "2018-01-22"; diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 99d7556db2db..2aae6fc49d96 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/4.16.1" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.45" diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index a84e3d08f438..931ea65f54a7 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,17 +1,24 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: dbec1c2d2ae4bd77276cbfb3c6ee2902048b9453 - ref: refs/tags/4.16.1 + revision: 2b9e74c7a8a4423ea195e75abca1f56c354e5541 + ref: refs/tags/5.0.45 specs: - metasploit-framework (4.16.1) + metasploit-framework (5.0.45) actionpack (~> 4.2.6) activerecord (~> 4.2.6) activesupport (~> 4.2.6) + aws-sdk-ec2 + aws-sdk-iam + aws-sdk-s3 backports - bcrypt + bcrypt (= 3.1.12) bcrypt_pbkdf bit-struct + concurrent-ruby (= 1.0.5) dnsruby + ed25519 + em-http-request + faker filesize jsobfu json @@ -19,9 +26,10 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 1.3.1) - metasploit_data_models - metasploit_payloads-mettle (= 0.2.0) + metasploit-payloads (= 1.3.70) + metasploit_data_models (= 3.0.10) + metasploit_payloads-mettle (= 0.5.16) + mqtt msgpack nessus_rest net-ssh @@ -35,11 +43,9 @@ GIT patch_finder pcaprub pdf-reader - pg (= 0.20.0) + pg (~> 0.20) railties rb-readline - rbnacl (< 5.0.0) - rbnacl-libsodium recog redcarpet rex-arch @@ -51,23 +57,26 @@ GIT rex-mime rex-nop rex-ole - rex-powershell (< 0.1.73) + rex-powershell rex-random_identifier rex-registry rex-rop_builder - rex-socket + rex-socket (= 0.1.17) rex-sslscan rex-struct2 rex-text rex-zip - robots + ruby-macho ruby_smb rubyntlm rubyzip + sinatra sqlite3 sshkey + thin tzinfo tzinfo-data + warden windows_error xdr xmlrpc @@ -75,66 +84,109 @@ GIT GEM remote: https://rubygems.org/ specs: - Ascii85 (1.0.2) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + Ascii85 (1.0.3) + actionpack (4.2.11.1) + actionview (= 4.2.11.1) + activesupport (= 4.2.11.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (4.2.9) - activesupport (= 4.2.9) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) - activesupport (4.2.9) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) arel (6.0.4) - arel-helpers (2.4.0) - activerecord (>= 3.1.0, < 6) - backports (3.8.0) - bcrypt (3.1.11) - bcrypt_pbkdf (1.0.0) - bindata (2.4.0) + arel-helpers (2.10.0) + activerecord (>= 3.1.0, < 7) + aws-eventstream (1.0.3) + aws-partitions (1.208.0) + aws-sdk-core (3.66.0) + aws-eventstream (~> 1.0, >= 1.0.2) + aws-partitions (~> 1.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-ec2 (1.106.0) + aws-sdk-core (~> 3, >= 3.61.1) + aws-sigv4 (~> 1.1) + aws-sdk-iam (1.29.0) + aws-sdk-core (~> 3, >= 3.61.1) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.24.0) + aws-sdk-core (~> 3, >= 3.61.1) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.48.0) + aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) + backports (3.15.0) + bcrypt (3.1.12) + bcrypt_pbkdf (1.0.1) + bindata (2.4.4) bit-struct (0.16) builder (3.2.3) - dnsruby (1.60.2) + concurrent-ruby (1.0.5) + cookiejar (0.3.3) + crass (1.0.4) + daemons (1.3.1) + dnsruby (1.61.3) + addressable (~> 2.5) + ed25519 (1.2.4) + em-http-request (1.1.5) + addressable (>= 2.3.4) + cookiejar (!= 0.3.1) + em-socksify (>= 0.3) + eventmachine (>= 1.0.3) + http_parser.rb (>= 0.6.0) + em-socksify (0.3.2) + eventmachine (>= 1.0.0.beta.4) erubis (2.7.0) - faraday (0.13.1) + eventmachine (1.2.7) + faker (2.2.1) + i18n (>= 0.8) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.9.18) - filesize (0.1.1) + filesize (0.2.0) hashery (2.1.2) - i18n (0.8.6) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.1.0) - loofah (2.0.3) + json (2.2.0) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - metasm (1.0.3) + metasm (1.0.4) metasploit-concern (2.0.5) activemodel (~> 4.2.6) activesupport (~> 4.2.6) railties (~> 4.2.6) - metasploit-credential (2.0.12) + metasploit-credential (3.0.3) metasploit-concern metasploit-model - metasploit_data_models + metasploit_data_models (>= 3.0.0) + net-ssh pg railties rex-socket @@ -144,8 +196,8 @@ GEM activemodel (~> 4.2.6) activesupport (~> 4.2.6) railties (~> 4.2.6) - metasploit-payloads (1.3.1) - metasploit_data_models (2.0.15) + metasploit-payloads (1.3.70) + metasploit_data_models (3.0.10) activerecord (~> 4.2.6) activesupport (~> 4.2.6) arel-helpers @@ -155,77 +207,76 @@ GEM postgres_ext railties (~> 4.2.6) recog (~> 2.0) - metasploit_payloads-mettle (0.2.0) - mini_portile2 (2.2.0) - minitest (5.10.3) - msgpack (1.1.0) - multipart-post (2.0.0) + metasploit_payloads-mettle (0.5.16) + mini_portile2 (2.4.0) + minitest (5.11.3) + mqtt (0.5.0) + msgpack (1.3.1) + multipart-post (2.1.1) nessus_rest (0.1.6) - net-ssh (4.1.0) - network_interface (0.0.1) - nexpose (6.1.1) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - octokit (4.7.0) + net-ssh (5.2.0) + network_interface (0.0.2) + nexpose (7.2.1) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) + octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) - openssl-ccm (1.2.1) + openssl-ccm (1.2.2) openvas-omp (0.0.4) packetfu (1.1.13) pcaprub patch_finder (1.0.2) - pcaprub (0.12.4) - pdf-reader (2.0.0) + pcaprub (0.13.0) + pdf-reader (2.2.1) Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (0.20.0) + pg (0.21.0) pg_array_parser (0.0.9) - postgres_ext (3.0.0) - activerecord (>= 4.0.0) + postgres_ext (3.0.1) + activerecord (~> 4.0) arel (>= 4.0.1) pg_array_parser (~> 0.0.9) - public_suffix (2.0.5) + public_suffix (4.0.1) rack (1.6.11) + rack-protection (1.5.5) + rack rack-test (0.6.3) rack (>= 1.0) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + rails-html-sanitizer (1.2.0) + loofah (~> 2.2, >= 2.2.2) + railties (4.2.11.1) + actionpack (= 4.2.11.1) + activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.3) rb-readline (0.5.5) - rbnacl (4.0.2) - ffi - rbnacl-libsodium (1.0.13) - rbnacl (>= 3.0.1) - recog (2.1.12) + recog (2.3.2) nokogiri - redcarpet (3.4.0) - rex-arch (0.1.11) + redcarpet (3.5.0) + rex-arch (0.1.13) rex-text - rex-bin_tools (0.1.4) + rex-bin_tools (0.1.6) metasm rex-arch rex-core rex-struct2 rex-text - rex-core (0.1.12) + rex-core (0.1.13) rex-encoder (0.1.4) metasm rex-arch rex-text - rex-exploitation (0.1.14) + rex-exploitation (0.1.21) jsobfu metasm rex-arch @@ -238,47 +289,58 @@ GEM rex-arch rex-ole (0.1.6) rex-text - rex-powershell (0.1.72) + rex-powershell (0.1.82) rex-random_identifier rex-text - rex-random_identifier (0.1.2) + rex-random_identifier (0.1.4) rex-text rex-registry (0.1.3) rex-rop_builder (0.1.3) metasm rex-core rex-text - rex-socket (0.1.8) + rex-socket (0.1.17) rex-core rex-sslscan (0.1.5) rex-core rex-socket rex-text rex-struct2 (0.1.2) - rex-text (0.2.15) + rex-text (0.2.23) rex-zip (0.1.3) rex-text rkelly-remix (0.0.7) - robots (0.10.1) + ruby-macho (2.2.0) ruby-rc4 (0.1.5) - ruby_smb (0.0.18) + ruby_smb (1.1.0) bindata rubyntlm windows_error rubyntlm (0.6.2) - rubyzip (1.2.1) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) - sqlite3 (1.3.13) - sshkey (1.9.0) - thor (0.20.0) + rubyzip (1.2.3) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) + sinatra (1.4.8) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + sqlite3 (1.4.1) + sshkey (2.0.0) + thin (1.7.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.20.3) thread_safe (0.3.6) + tilt (2.0.9) ttfunk (1.5.1) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2017.2) + tzinfo-data (1.2019.2) tzinfo (>= 1.0.0) + warden (1.2.7) + rack (>= 1.0) windows_error (0.1.2) xdr (2.0.0) activemodel (>= 4.2.7) @@ -292,4 +354,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/nixpkgs/pkgs/tools/security/metasploit/default.nix b/nixpkgs/pkgs/tools/security/metasploit/default.nix index 50341e873fad..8b67e90f415c 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -17,13 +17,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "4.16.1"; + version = "5.0.45"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "1vilyy0dqzp8kbbpvs2zrv2ac7s39w2vv7mrbzgcjgh2bj7c6bg1"; + sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 938817cb64f6..28cc83b240f2 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -1,59 +1,73 @@ { actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kgrq74gp2czzxr0f2sqrc98llz03lgq498300z2z5n4khgznwc4"; + sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh"; type = "gem"; }; - version = "4.2.9"; + version = "4.2.11.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04kgp4gmahw31miz8xdq1pns14qmvvzd14fgfv7fg9klkw3bxyyp"; + sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p"; type = "gem"; }; - version = "4.2.9"; + version = "4.2.11.1"; }; activemodel = { dependencies = ["activesupport" "builder"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxmivny0ka5s3iyap08sn9bp2bd9wrhqp2njfw26hr9wsjk5kfv"; + sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33"; type = "gem"; }; - version = "4.2.9"; + version = "4.2.11.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18i790dfhi4ndypd1pj9pv08knpxr2sayvvwfq7axj5jfwgpmrqb"; + sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p"; type = "gem"; }; - version = "4.2.9"; + version = "4.2.11.1"; }; activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0a362p3m2m2kljichar2pwq0qm4vblc3njy1rdzm09ckzd45sp"; + sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; type = "gem"; }; - version = "4.2.9"; + version = "4.2.11.1"; }; addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "2.5.1"; + version = "2.7.0"; }; afm = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06kj9hgd0z8pj27bxp2diwqh6fv7qhwwm17z64rhdc4sfn76jgn8"; @@ -62,6 +76,8 @@ version = "0.2.2"; }; arel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4"; @@ -71,54 +87,154 @@ }; arel-helpers = { dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sx4qbzhld3a99175p2krz3hv1npc42rv3sd8x4awzkgplg3zy9c"; + sha256 = "0lb52rd20ix7khh70vrwd85qivir9sis62s055k3zr5h9iy3lyqi"; type = "gem"; }; - version = "2.4.0"; + version = "2.10.0"; }; Ascii85 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j95sbxd18kc8rhcnvl1w37kflqpax1r12h1x47gh4xxn3mz4m7q"; + sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + type = "gem"; + }; + version = "1.0.3"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vkjw8cxssfwplrcl593gp4jxxiajihb8gqmpgzyac8i3xigpacb"; + type = "gem"; + }; + version = "1.208.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18h35j7wp7n6zc5r6dpixjcyjshqmpkhwph9qgpv2g0db37zlxyk"; + type = "gem"; + }; + version = "3.66.0"; + }; + aws-sdk-ec2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sb04blmc0lgdgq909cj8cm63zl2idgc5mcysj6cg4rvm8699ahp"; + type = "gem"; + }; + version = "1.106.0"; + }; + aws-sdk-iam = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ypv1cmmrc496myllqd8dqz422qm1i0bhskkvqb9b2lbagmzr3l9"; + type = "gem"; + }; + version = "1.29.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14blvvfz67rhffi4ahby50jiip5f0hm85mcxlx6y93g0cfrnxh3m"; + type = "gem"; + }; + version = "1.24.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14iv2wqvvbiz0gdms21i9n6rh8390r1yg4zcf8pzzfplbqfwqw4w"; + type = "gem"; + }; + version = "1.48.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; + type = "gem"; + }; + version = "1.1.0"; }; backports = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcz0z6jms5jydr1r95kf1bpk3ms618hgr26c62h34icy9i1dpm"; + sha256 = "0cczfi1yp7a68bg7ipzi4lvrmi4xsi36n9a19krr4yb3nfwd8fn2"; type = "gem"; }; - version = "3.8.0"; + version = "3.15.0"; }; bcrypt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50"; + sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy"; type = "gem"; }; - version = "3.1.11"; + version = "3.1.12"; }; bcrypt_pbkdf = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv"; + sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; bindata = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10sii2chgnkp2jw830sbr2wb20p8p1wcwrl9jhadkw94f505qcyg"; + sha256 = "0kz42nvxnk1j9cj0i8lcnhprcgdqsqska92g6l19ziadydfk2gqy"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.4"; }; bit-struct = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1w7x1fh4a6inpb46imhdf4xrq0z4d6zdpg7sdf8n98pif2hx50sx"; @@ -127,6 +243,8 @@ version = "0.16"; }; builder = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; @@ -134,15 +252,92 @@ }; version = "3.2.3"; }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + cookiejar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; + type = "gem"; + }; + version = "0.3.3"; + }; + crass = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + type = "gem"; + }; + version = "1.0.4"; + }; + daemons = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + type = "gem"; + }; + version = "1.3.1"; + }; dnsruby = { + dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qfvpkka69f8vnmda3zhkr54fjpf7pwgmbx0gcsxg3jd6c7sjs1d"; + sha256 = "139cbl2k934q7d50g7hi8r4im69ca3iv16y9plq9yc6mgjq1cgfk"; type = "gem"; }; - version = "1.60.2"; + version = "1.61.3"; + }; + ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; + type = "gem"; + }; + version = "1.2.4"; + }; + em-http-request = { + dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx"; + type = "gem"; + }; + version = "1.1.5"; + }; + em-socksify = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk"; + type = "gem"; + }; + version = "0.3.2"; }; erubis = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; @@ -150,32 +345,51 @@ }; version = "2.7.0"; }; - faraday = { - dependencies = ["multipart-post"]; + eventmachine = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "0.13.1"; + version = "1.2.7"; }; - ffi = { + faker = { + dependencies = ["i18n"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + sha256 = "1wpzpqzpqd9jjzm3ap8182sfbnhdahcxpbg0dssbwq13qdf1s5xs"; type = "gem"; }; - version = "1.9.18"; + version = "2.2.1"; + }; + faraday = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + type = "gem"; + }; + version = "0.15.4"; }; filesize = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "061qmg82mm9xnmnq3b7gbi24g28xk62w0b0nw86gybd07m1jn989"; + sha256 = "17p7rf1x7h3ivaznb4n4kmxnnzj25zaviryqgn2n12v2kmibhp8g"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; hashery = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj"; @@ -183,16 +397,41 @@ }; version = "2.1.2"; }; + "http_parser.rb" = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + type = "gem"; + }; + version = "0.9.5"; + }; + jmespath = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3aqvzfsj786kwjj70jsjpxm6ffw5pwhalzr2abjfv2bdc7k9kw"; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; type = "gem"; }; - version = "0.8.6"; + version = "1.4.0"; }; jsobfu = { dependencies = ["rkelly-remix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hchns89cfj0gggm2zbr7ghb630imxm2x2d21ffx2jlasn9xbkyk"; @@ -201,32 +440,40 @@ version = "0.4.2"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; loofah = { - dependencies = ["nokogiri"]; + dependencies = ["crass" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; + sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; type = "gem"; }; - version = "2.0.3"; + version = "2.2.3"; }; metasm = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gss57q4lv6l0jkih77zffrpjjzgkdcsy7b9nvvawyzknis9w4s5"; + sha256 = "0mbmpc8vsi574s78f23bhiqk07sr6yrrrmk702lfv61ql4ah5l89"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; metasploit-concern = { dependencies = ["activemodel" "activesupport" "railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0v9lm225fhzhnbjcc0vwb38ybikxwzlv8116rrrkndzs8qy79297"; @@ -235,27 +482,33 @@ version = "2.0.5"; }; metasploit-credential = { - dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"]; + dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "net-ssh" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1flahrcl5hf4bncqs40mry6pkffvmir85kqzkad22x3dh6crw50i"; + sha256 = "0m6j149x502p00y2jzra65281dhhw3m8a41pwfn1sk9wv7aiclvl"; type = "gem"; }; - version = "2.0.12"; + version = "3.0.3"; }; metasploit-framework = { - dependencies = ["actionpack" "activerecord" "activesupport" "backports" "bcrypt" "bcrypt_pbkdf" "bit-struct" "dnsruby" "filesize" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "msgpack" "nessus_rest" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "railties" "rb-readline" "rbnacl" "rbnacl-libsodium" "recog" "redcarpet" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "robots" "ruby_smb" "rubyntlm" "rubyzip" "sqlite3" "sshkey" "tzinfo" "tzinfo-data" "windows_error" "xdr" "xmlrpc"]; + dependencies = ["actionpack" "activerecord" "activesupport" "aws-sdk-ec2" "aws-sdk-iam" "aws-sdk-s3" "backports" "bcrypt" "bcrypt_pbkdf" "bit-struct" "concurrent-ruby" "dnsruby" "ed25519" "em-http-request" "faker" "filesize" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "mqtt" "msgpack" "nessus_rest" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "railties" "rb-readline" "recog" "redcarpet" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "ruby-macho" "ruby_smb" "rubyntlm" "rubyzip" "sinatra" "sqlite3" "sshkey" "thin" "tzinfo" "tzinfo-data" "warden" "windows_error" "xdr" "xmlrpc"]; + groups = ["default"]; + platforms = []; source = { fetchSubmodules = false; - rev = "dbec1c2d2ae4bd77276cbfb3c6ee2902048b9453"; - sha256 = "06a2dc64wl8w02zimf44hch4cap7ckw42kg1x01lmcwaa8d5q09w"; + rev = "2b9e74c7a8a4423ea195e75abca1f56c354e5541"; + sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "4.16.1"; + version = "5.0.45"; }; metasploit-model = { dependencies = ["activemodel" "activesupport" "railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05pnai1cv00xw87rrz38dz4s3ss45s90290d0knsy1mq6rp8yvmw"; @@ -264,63 +517,89 @@ version = "2.0.4"; }; metasploit-payloads = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0icha08z4c5rnyp66xcyn9c8lbv43gx7hgs9rsm3539gj8c40znx"; + sha256 = "01s3xmgw4fp2ic0wql8lswa86q3lgr3z687idx3xkfii3dskjpp3"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.70"; }; metasploit_data_models = { dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "postgres_ext" "railties" "recog"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j3ijxn6n3ack9572a74cwknijymy41c8rx34njyhg25lx4hbvah"; + sha256 = "1h59lblfrx8gsnqr10wk958zp6rsjy3qib3hb87s3nm6m1zhm2bc"; type = "gem"; }; - version = "2.0.15"; + version = "3.0.10"; }; metasploit_payloads-mettle = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y2nfzgs17pq3xvlw14jgjcksr4h8p4miypxk9a87l1h7xv7dcgn"; + sha256 = "1x2rgs2r16m8z87j5z78vp49xvr2sr4dxjgbi6d0nxrlr52pd8yf"; type = "gem"; }; - version = "0.2.0"; + version = "0.5.16"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + mqtt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2"; + sha256 = "0d1khsry5mf63y03r6v91f4vrbn88277ksv7d69z3xmqs9sgpri9"; type = "gem"; }; - version = "5.10.3"; + version = "0.5.0"; }; msgpack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7"; + sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.1"; }; multipart-post = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; nessus_rest = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1allyrd4rll333zbmsi3hcyg6cw1dhc4bg347ibsw191nswnp8ci"; @@ -329,56 +608,70 @@ version = "0.1.6"; }; net-ssh = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "4.1.0"; + version = "5.2.0"; }; network_interface = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ir4c1vbz1y0gxyih024262i7ig1nji1lkylcrn9pjzx3798p97a"; + sha256 = "1xh4knfq77ii4pjzsd2z1p3nd6nrcdjhb2vi5gw36jqj43ffw0zp"; type = "gem"; }; - version = "0.0.1"; + version = "0.0.2"; }; nexpose = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnyvj09z8r3chhj930fdnashbfcfv0vw2drjvsrcnm7firdhdzb"; + sha256 = "0i108glkklwgjxhfhnlqf4b16plqf9b84qpfz0pnl2pbnal5af8m"; type = "gem"; }; - version = "6.1.1"; + version = "7.2.1"; }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.8.0"; + version = "1.10.4"; }; octokit = { dependencies = ["sawyer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6cm7bi0y7ysjgwws3paaipqdld6c0m0niazrjahhpz88qqq1g4"; + sha256 = "1w7agbfg39jzqk81yad9xhscg31869277ysr2iwdvpjafl5lj4ha"; type = "gem"; }; - version = "4.7.0"; + version = "4.14.0"; }; openssl-ccm = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18h5lxv0zh4j2f0wnhdmfz63x02vbzbq2k1clz6kzr0q83h8kj9c"; + sha256 = "0gxwxk657jya2s5m8cpckvgy5m7qx0hzfp8xvc0hg2wf1lg5gwp0"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; openvas-omp = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "14xf614vd76qjdjxjv14mmjar6s64fwp4cwb7bv5g1wc29srg28x"; @@ -388,6 +681,8 @@ }; packetfu = { dependencies = ["pcaprub"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll"; @@ -396,6 +691,8 @@ version = "1.1.13"; }; patch_finder = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1md9scls55n1riw26vw1ak0ajq38dfygr36l0h00wqhv51cq745m"; @@ -404,31 +701,39 @@ version = "1.0.2"; }; pcaprub = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz"; + sha256 = "0h4iarqdych6v4jm5s0ywkc01qspadz8sf6qn7pkqmszq4iqv67q"; type = "gem"; }; - version = "0.12.4"; + version = "0.13.0"; }; pdf-reader = { dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nlammdpjy3padmzxhsql7mw31jyqp88n6bdffiarv5kzl4s3y7p"; + sha256 = "14lqdbiwn2qwgbvnnzxg7haqiy026d8x37hp45c3m9jb9rym92ps"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.1"; }; pg = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03xcgwjs6faxis81jxf2plnlalg55dhhafqv3kvjxfr8ic7plpw5"; + sha256 = "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh"; type = "gem"; }; - version = "0.20.0"; + version = "0.21.0"; }; pg_array_parser = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1034dhg8h53j48sfm373js54skg4vpndjga6hzn2zylflikrrf3s"; @@ -438,22 +743,28 @@ }; postgres_ext = { dependencies = ["activerecord" "arel" "pg_array_parser"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lbp1qf5s1addhznm7d4bzks9adh7jpilgcsr8k7mbd0a1ailcgc"; + sha256 = "0ni1ajzxvc17ba4rgl27cd3645ddbpqpfckv7m08sfgk015hh7dq"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; type = "gem"; }; - version = "2.0.5"; + version = "4.0.1"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; @@ -461,8 +772,21 @@ }; version = "1.6.11"; }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + type = "gem"; + }; + version = "1.5.5"; + }; rack-test = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; @@ -472,6 +796,8 @@ }; rails-deprecated_sanitizer = { dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; @@ -481,40 +807,50 @@ }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ny7mbjxhq20rzg4pivvyvk14irmc7cn20kxfk3vc0z2r2c49p8r"; + sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; rails-html-sanitizer = { dependencies = ["loofah"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; + sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; type = "gem"; }; - version = "1.0.3"; + version = "1.2.0"; }; railties = { dependencies = ["actionpack" "activesupport" "rake" "thor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g5jnk1zllm2fr06lixq7gv8l2cwqc99akv7886gz6lshijpfyxd"; + sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m"; type = "gem"; }; - version = "4.2.9"; + version = "4.2.11.1"; }; rake = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; type = "gem"; }; - version = "12.0.0"; + version = "12.3.3"; }; rb-readline = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "14w79a121czmvk1s953qfzww30mqjb2zc0k9qhi0ivxxk3hxg6wy"; @@ -522,69 +858,63 @@ }; version = "0.5.5"; }; - rbnacl = { - dependencies = ["ffi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48"; - type = "gem"; - }; - version = "4.0.2"; - }; - rbnacl-libsodium = { - dependencies = ["rbnacl"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1323fli41m01af13xz5xvabsjnz09si1b9l4qd2p802kq0dr61gd"; - type = "gem"; - }; - version = "1.0.13"; - }; recog = { dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h023ykrrra74bpbibkyg083kafaswvraw4naw9p1ghcjzn9ggj3"; + sha256 = "0kbv0j82zf90sc9hhwna2bkb5zv0nxagk22gxyfy82kjmcz71c6k"; type = "gem"; }; - version = "2.1.12"; + version = "2.3.2"; }; redcarpet = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; rex-arch = { dependencies = ["rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1izzalmjwdyib8y0xlgys8qb60di6xyjk485ylgh14p47wkyc6yp"; + sha256 = "0cvdy2ysiphdig258lkicbxqq2y47bkl69kgj4kkj8w338rb5kwa"; type = "gem"; }; - version = "0.1.11"; + version = "0.1.13"; }; rex-bin_tools = { dependencies = ["metasm" "rex-arch" "rex-core" "rex-struct2" "rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hi1cjr68adp47nxbjfprvn0r3b72r4ib82x9j33bf2pny6nvaw"; + sha256 = "19q4cj7cis29k3zx9j2gp4h3ib0zig2fa4rs56c1gjr32f192zzk"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.6"; }; rex-core = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dwf4pw7bpx8xvlv241imxvwhvjfv0cw9kl7ipsv40yazy5lzpk"; + sha256 = "1b9pf7f8m2zjck65dpp8h8v4n0a05kfas6cn9adv0w8d9z58aqvv"; type = "gem"; }; - version = "0.1.12"; + version = "0.1.13"; }; rex-encoder = { dependencies = ["metasm" "rex-arch" "rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z"; @@ -594,14 +924,18 @@ }; rex-exploitation = { dependencies = ["jsobfu" "metasm" "rex-arch" "rex-encoder" "rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gbj28jqaaldpk4qzysgcl6m0wcqx3gcldarqdk55p5z9zasrk19"; + sha256 = "0b2jg7mccwc34j9mfpndh7b387723qas38qsd906bs4s8b6hf05c"; type = "gem"; }; - version = "0.1.14"; + version = "0.1.21"; }; rex-java = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i"; @@ -611,6 +945,8 @@ }; rex-mime = { dependencies = ["rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a"; @@ -620,6 +956,8 @@ }; rex-nop = { dependencies = ["rex-arch"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny"; @@ -629,6 +967,8 @@ }; rex-ole = { dependencies = ["rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww"; @@ -638,23 +978,29 @@ }; rex-powershell = { dependencies = ["rex-random_identifier" "rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nl60fdd1rlckk95d3s3y873w84vb0sgwvwxdzv414qxz8icpjnm"; + sha256 = "1fcyiz8cgcv6pcn5w969ac4wwhr1cz6jk6kf6p8gyw5rjrlwfz0j"; type = "gem"; }; - version = "0.1.72"; + version = "0.1.82"; }; rex-random_identifier = { dependencies = ["rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cksrljaw61mdjvbmj9vqqhd8nra7jv466w5nim47n73rj72jc19"; + sha256 = "0fg94sczff5c2rlvqqgw2dndlqyzjil5rjk3p9f46ss2hc8zxlbk"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.4"; }; rex-registry = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q"; @@ -664,6 +1010,8 @@ }; rex-rop_builder = { dependencies = ["metasm" "rex-core" "rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy"; @@ -673,15 +1021,19 @@ }; rex-socket = { dependencies = ["rex-core"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkr64qrfy2mcv6cpp2z2rn9npgn9s0yyagzjh7kawbm80ldwf2h"; + sha256 = "136szyv31fcdzmcgs44vg009k3ssyawkqppkhm3xyv2ivpp1mlgv"; type = "gem"; }; - version = "0.1.8"; + version = "0.1.17"; }; rex-sslscan = { dependencies = ["rex-core" "rex-socket" "rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06gbx45q653ajcx099p0yxdqqxazfznbrqshd4nwiwg1p498lmyx"; @@ -690,6 +1042,8 @@ version = "0.1.5"; }; rex-struct2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452"; @@ -698,15 +1052,19 @@ version = "0.1.2"; }; rex-text = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "024miva867h4wv4y1lnxxrw2d7p51va32ismxqf3fsz4s9cqc88m"; + sha256 = "0cmfwzd3r6xzhaw5l2grgiivql1yynh620drg8h39q8hiixya6xz"; type = "gem"; }; - version = "0.2.15"; + version = "0.2.23"; }; rex-zip = { dependencies = ["rex-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7"; @@ -715,6 +1073,8 @@ version = "0.1.3"; }; rkelly-remix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j"; @@ -722,15 +1082,19 @@ }; version = "0.0.7"; }; - robots = { + ruby-macho = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "141gvihcr2c0dpzl3dqyh8kqc9121prfdql2iamaaw0mf9qs3njs"; + sha256 = "1k5vvk9d13pixhbram6fs74ibgmr2dngv7bks13npcjb42q275if"; type = "gem"; }; - version = "0.10.1"; + version = "2.2.0"; }; ruby-rc4 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00"; @@ -740,14 +1104,18 @@ }; ruby_smb = { dependencies = ["bindata" "rubyntlm" "windows_error"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jby5wlppxhc2jlqldic05aqd5l57171lsxqv86702grk665n612"; + sha256 = "125pimmaskp13nkk5j138nfk1kd8n91sfdlx4dhj2j9zk342wsf4"; type = "gem"; }; - version = "0.0.18"; + version = "1.1.0"; }; rubyntlm = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; @@ -756,47 +1124,81 @@ version = "0.6.2"; }; rubyzip = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.3"; }; sawyer = { dependencies = ["addressable" "faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + type = "gem"; + }; + version = "0.8.2"; + }; + sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; type = "gem"; }; - version = "0.8.1"; + version = "1.4.8"; }; sqlite3 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494"; type = "gem"; }; - version = "1.3.13"; + version = "1.4.1"; }; sshkey = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; + type = "gem"; + }; + version = "1.7.2"; }; thor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; type = "gem"; }; - version = "0.20.0"; + version = "0.20.3"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -804,7 +1206,19 @@ }; version = "0.3.6"; }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + type = "gem"; + }; + version = "2.0.9"; + }; ttfunk = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd"; @@ -814,23 +1228,40 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl"; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.5"; }; tzinfo-data = { dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m507in0d7vlfgasxpkz3y1a44zp532k9qlqcaz90ay939sz9h5q"; + type = "gem"; + }; + version = "1.2019.2"; + }; + warden = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n83rmy476d4qmzq74qx0j7lbcpskbvrj1bmy3np4d5pydyw2yky"; + sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12"; type = "gem"; }; - version = "1.2017.2"; + version = "1.2.7"; }; windows_error = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0kbcv9j5sc7pvjzf1dkp6h69i6lmj205zyy2arxcfgqg11bsz2kp"; @@ -840,6 +1271,8 @@ }; xdr = { dependencies = ["activemodel" "activesupport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0c5cp1k4ij3xq1q6fb0f6xv5b65wy18y7bhwvsdx8wd0zyg3x96m"; @@ -848,6 +1281,8 @@ version = "2.0.0"; }; xmlrpc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683"; diff --git a/nixpkgs/pkgs/tools/security/mfcuk/default.nix b/nixpkgs/pkgs/tools/security/mfcuk/default.nix index 9098457cec17..a23e29175615 100644 --- a/nixpkgs/pkgs/tools/security/mfcuk/default.nix +++ b/nixpkgs/pkgs/tools/security/mfcuk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libnfc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mfcuk"; version = "0.3.8"; diff --git a/nixpkgs/pkgs/tools/security/mkrand/default.nix b/nixpkgs/pkgs/tools/security/mkrand/default.nix index 5d1cfdd40232..bb9c932d19e3 100644 --- a/nixpkgs/pkgs/tools/security/mkrand/default.nix +++ b/nixpkgs/pkgs/tools/security/mkrand/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mkrand-0.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/notary/default.nix b/nixpkgs/pkgs/tools/security/notary/default.nix index 17473b639881..f1a61adabbb6 100644 --- a/nixpkgs/pkgs/tools/security/notary/default.nix +++ b/nixpkgs/pkgs/tools/security/notary/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { buildPhase = '' runHook preBuild cd go/src/github.com/theupdateframework/notary - make client GITCOMMIT=${gitcommit} + SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit} runHook postBuild ''; diff --git a/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix index 9e154c19a9c0..e31d62dc8b7a 100644 --- a/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix +++ b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix @@ -5,7 +5,7 @@ let if stdenv.isDarwin then xmlsec else pam; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "oath-toolkit-2.6.2"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/security/pinentry/default.nix b/nixpkgs/pkgs/tools/security/pinentry/default.nix index ac6a50960ad2..25e018de6276 100644 --- a/nixpkgs/pkgs/tools/security/pinentry/default.nix +++ b/nixpkgs/pkgs/tools/security/pinentry/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; longDescription = '' - Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users + Pinentry provides a console and (optional) GTK and Qt GUIs allowing users to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; maintainers = [ maintainers.ttuegel ]; diff --git a/nixpkgs/pkgs/tools/security/pinentry/mac.nix b/nixpkgs/pkgs/tools/security/pinentry/mac.nix index 1fbb52985fb1..25fa180c48b9 100644 --- a/nixpkgs/pkgs/tools/security/pinentry/mac.nix +++ b/nixpkgs/pkgs/tools/security/pinentry/mac.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pinentry-mac-0.9.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/qesteidutil/default.nix b/nixpkgs/pkgs/tools/security/qesteidutil/default.nix index 5ce5672eb254..fac855f232a6 100644 --- a/nixpkgs/pkgs/tools/security/qesteidutil/default.nix +++ b/nixpkgs/pkgs/tools/security/qesteidutil/default.nix @@ -3,7 +3,7 @@ , pkgconfig, pcsclite, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-08-21"; pname = "qesteidutil"; diff --git a/nixpkgs/pkgs/tools/security/rarcrack/default.nix b/nixpkgs/pkgs/tools/security/rarcrack/default.nix index 0227268cf436..65158b3c5fe3 100644 --- a/nixpkgs/pkgs/tools/security/rarcrack/default.nix +++ b/nixpkgs/pkgs/tools/security/rarcrack/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rarcrack"; version = "0.2"; diff --git a/nixpkgs/pkgs/tools/security/sbsigntool/default.nix b/nixpkgs/pkgs/tools/security/sbsigntool/default.nix index aaac975bb813..e0e2896f6ffc 100644 --- a/nixpkgs/pkgs/tools/security/sbsigntool/default.nix +++ b/nixpkgs/pkgs/tools/security/sbsigntool/default.nix @@ -3,7 +3,7 @@ , openssl, libuuid, gnu-efi, libbfd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sbsigntool"; version = "0.9.1"; diff --git a/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/nixpkgs/pkgs/tools/security/secp256k1/default.nix index c9ba2a8ac6dd..7189032454d6 100644 --- a/nixpkgs/pkgs/tools/security/secp256k1/default.nix +++ b/nixpkgs/pkgs/tools/security/secp256k1/default.nix @@ -15,7 +15,7 @@ let inherit (stdenv.lib) optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "secp256k1"; # I can't find any version numbers, so we're just using the date of the diff --git a/nixpkgs/pkgs/tools/security/sequoia/default.nix b/nixpkgs/pkgs/tools/security/sequoia/default.nix index 5d9ffca69375..9d6928abf86f 100644 --- a/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj"; + sha256 = "0gvczghyik56jlnb8cz7jg2l3nbm519gf19g7l5blxci3009v23d"; }; - cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi"; + cargoSha256 = "0dk9sjcbmygbdpwqnah5krli1p9j5hahgiqrca9c0kfpfiwgx62q"; nativeBuildInputs = [ pkgconfig @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { ; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; buildFlags = [ diff --git a/nixpkgs/pkgs/tools/security/ssss/default.nix b/nixpkgs/pkgs/tools/security/ssss/default.nix index 3bbcdafcdcdd..157e007c534a 100644 --- a/nixpkgs/pkgs/tools/security/ssss/default.nix +++ b/nixpkgs/pkgs/tools/security/ssss/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ssss-0.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/tpm-luks/default.nix b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix index ca78c5d73ffb..94d833ca7462 100644 --- a/nixpkgs/pkgs/tools/security/tpm-luks/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tpm-luks"; version = "git-2015-07-11"; diff --git a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index d33cdeb1c56f..87f2e922ff74 100644 --- a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -6,23 +6,23 @@ let sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0"; }; - "i686-linux" = fetchurl { + i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867"; }; - "x86_64-darwin" = fetchurl { + x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea"; }; - "i686-darwin" = fetchurl { + i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be"; }; - "aarch64-linux" = fetchurl { + aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f"; }; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { pname = "vault-bin"; inherit version; - src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/tools/system/bar/default.nix b/nixpkgs/pkgs/tools/system/bar/default.nix index cd4770bf609a..a295da844af2 100644 --- a/nixpkgs/pkgs/tools/system/bar/default.nix +++ b/nixpkgs/pkgs/tools/system/bar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bar-1.11.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/collectd/data.nix b/nixpkgs/pkgs/tools/system/collectd/data.nix index 0874aa7410c0..378eb62d6cc5 100644 --- a/nixpkgs/pkgs/tools/system/collectd/data.nix +++ b/nixpkgs/pkgs/tools/system/collectd/data.nix @@ -1,6 +1,6 @@ { stdenv, collectd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (collectd) meta version; pname = "collectd-data"; diff --git a/nixpkgs/pkgs/tools/system/colorls/default.nix b/nixpkgs/pkgs/tools/system/colorls/default.nix index 62670fa11a08..1631b9f72180 100644 --- a/nixpkgs/pkgs/tools/system/colorls/default.nix +++ b/nixpkgs/pkgs/tools/system/colorls/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, ruby, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "colorls"; gemdir = ./.; diff --git a/nixpkgs/pkgs/tools/system/das_watchdog/default.nix b/nixpkgs/pkgs/tools/system/das_watchdog/default.nix index c8f7e77b1562..29767c879ffb 100644 --- a/nixpkgs/pkgs/tools/system/das_watchdog/default.nix +++ b/nixpkgs/pkgs/tools/system/das_watchdog/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "das_watchdog"; version = "git-2015-09-12"; diff --git a/nixpkgs/pkgs/tools/system/datefudge/default.nix b/nixpkgs/pkgs/tools/system/datefudge/default.nix index 4018801f2490..6927c64bf483 100644 --- a/nixpkgs/pkgs/tools/system/datefudge/default.nix +++ b/nixpkgs/pkgs/tools/system/datefudge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "datefudge"; version = "1.22"; diff --git a/nixpkgs/pkgs/tools/system/dog/default.nix b/nixpkgs/pkgs/tools/system/dog/default.nix index 25f2673c0ac7..8bb84c562b64 100644 --- a/nixpkgs/pkgs/tools/system/dog/default.nix +++ b/nixpkgs/pkgs/tools/system/dog/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dog-1.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/hardlink/default.nix b/nixpkgs/pkgs/tools/system/hardlink/default.nix index 187c046875f7..d1d2b7a3e769 100644 --- a/nixpkgs/pkgs/tools/system/hardlink/default.nix +++ b/nixpkgs/pkgs/tools/system/hardlink/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pcre2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hardlink"; version = "1.3-4"; diff --git a/nixpkgs/pkgs/tools/system/illum/default.nix b/nixpkgs/pkgs/tools/system/illum/default.nix index 9d89e0714c48..767fccbd3882 100644 --- a/nixpkgs/pkgs/tools/system/illum/default.nix +++ b/nixpkgs/pkgs/tools/system/illum/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4"; pname = "illum"; diff --git a/nixpkgs/pkgs/tools/system/ior/default.nix b/nixpkgs/pkgs/tools/system/ior/default.nix index 83c0a287533a..6217f601121c 100644 --- a/nixpkgs/pkgs/tools/system/ior/default.nix +++ b/nixpkgs/pkgs/tools/system/ior/default.nix @@ -5,7 +5,7 @@ let sha256 = "039rh4z3lsj4vqjsqgakk0b7dkrdrkkzj0p1cjikpc9gn36zpghc"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ior"; inherit version; diff --git a/nixpkgs/pkgs/tools/system/journalbeat/default.nix b/nixpkgs/pkgs/tools/system/journalbeat/default.nix deleted file mode 100644 index 0a04581264e0..000000000000 --- a/nixpkgs/pkgs/tools/system/journalbeat/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, systemd, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "journalbeat"; - version = "5.6.8"; - - src = fetchFromGitHub { - owner = "mheese"; - repo = "journalbeat"; - rev = "v${version}"; - sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a"; - }; - - goPackagePath = "github.com/mheese/journalbeat"; - - buildInputs = [ systemd.dev ]; - - postFixup = let libPath = lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" - ''; - - meta = with lib; { - homepage = https://github.com/mheese/journalbeat; - description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch"; - license = licenses.asl20; - maintainers = with maintainers; [ mbrgm ]; - }; -} diff --git a/nixpkgs/pkgs/tools/system/mq-cli/default.nix b/nixpkgs/pkgs/tools/system/mq-cli/default.nix index 078cc614bb42..930bf8382c64 100644 --- a/nixpkgs/pkgs/tools/system/mq-cli/default.nix +++ b/nixpkgs/pkgs/tools/system/mq-cli/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "mq-cli-${version}"; + pname = "mq-cli"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index dc169ee23b47..30ebd4969dc5 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -12,12 +12,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.16.0"; + version = "1.17.0"; pname = "netdata"; src = fetchurl { url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; - sha256 = "0kwbrkv7g9m7l580myd2r8bpxqn6fxmx5vd6xh7x94wygfffhann"; + sha256 = "099xvndf5lql4ipwqhm38lpc65yicmpmkk3a7c2j4m48l3vqw9y6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/system/pcstat/default.nix b/nixpkgs/pkgs/tools/system/pcstat/default.nix index b5842ad37c31..5a1bad1092db 100644 --- a/nixpkgs/pkgs/tools/system/pcstat/default.nix +++ b/nixpkgs/pkgs/tools/system/pcstat/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "pcstat-unstable"; version = "2017-05-28"; diff --git a/nixpkgs/pkgs/tools/system/plan9port/default.nix b/nixpkgs/pkgs/tools/system/plan9port/default.nix index 4c011a0b212d..21487e66bcd9 100644 --- a/nixpkgs/pkgs/tools/system/plan9port/default.nix +++ b/nixpkgs/pkgs/tools/system/plan9port/default.nix @@ -5,7 +5,7 @@ , perl ? null # For building web manuals }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "plan9port"; version = "2019-02-25"; diff --git a/nixpkgs/pkgs/tools/system/proot/default.nix b/nixpkgs/pkgs/tools/system/proot/default.nix index 79b86f1383c0..0764844dbfc9 100644 --- a/nixpkgs/pkgs/tools/system/proot/default.nix +++ b/nixpkgs/pkgs/tools/system/proot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , talloc, docutils, swig, python, coreutils, enablePython ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "proot"; version = "20190510"; diff --git a/nixpkgs/pkgs/tools/system/ps_mem/default.nix b/nixpkgs/pkgs/tools/system/ps_mem/default.nix index 3e7bb301a6b9..6fe35f6dcf38 100644 --- a/nixpkgs/pkgs/tools/system/ps_mem/default.nix +++ b/nixpkgs/pkgs/tools/system/ps_mem/default.nix @@ -3,7 +3,7 @@ let version = "3.12"; pname = "ps_mem"; -in pythonPackages.buildPythonApplication rec { +in pythonPackages.buildPythonApplication { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index ab7fdf7c4bf8..9a9879d55641 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.10.01"; + version = "0.10.02"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0gcgm96prkzysszgq34cpx30y0bx9b5zll7943zwg3941fkg4x2a"; + sha256 = "100daxz0j80jhmpfnqa78mvfwq1qj7zb67y7w9f747a0f1havvim"; }; # All platforms inputs then Linux-only ones diff --git a/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix index 4c4ad91e7279..0a2b7ab4f3bc 100644 --- a/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "SystemdJournal2Gelf-unstable"; version = "20190702"; diff --git a/nixpkgs/pkgs/tools/text/agrep/default.nix b/nixpkgs/pkgs/tools/text/agrep/default.nix index a37531572d7b..902067b3d535 100644 --- a/nixpkgs/pkgs/tools/text/agrep/default.nix +++ b/nixpkgs/pkgs/tools/text/agrep/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "agrep"; version = "3.41.5"; diff --git a/nixpkgs/pkgs/tools/text/coloursum/default.nix b/nixpkgs/pkgs/tools/text/coloursum/default.nix index 49db5e13d721..212f071f2769 100644 --- a/nixpkgs/pkgs/tools/text/coloursum/default.nix +++ b/nixpkgs/pkgs/tools/text/coloursum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "coloursum-${version}"; + pname = "coloursum"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/gawk/default.nix b/nixpkgs/pkgs/tools/text/gawk/default.nix index f0947004b4b1..7a5f6c8dd818 100644 --- a/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-4.2.1"; + name = "gawk-5.0.1"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi"; + sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; }; # When we do build separate interactive version, it makes sense to always include man. diff --git a/nixpkgs/pkgs/tools/text/jsawk/default.nix b/nixpkgs/pkgs/tools/text/jsawk/default.nix index 18336fcf059f..c7f4002e2d3a 100644 --- a/nixpkgs/pkgs/tools/text/jsawk/default.nix +++ b/nixpkgs/pkgs/tools/text/jsawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, spidermonkey }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jsawk"; version = "1.5-pre"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/mdbook/default.nix b/nixpkgs/pkgs/tools/text/mdbook/default.nix index de395f183d18..3123d31a7b54 100644 --- a/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }: rustPlatform.buildRustPackage rec { - name = "mdbook-${version}"; + pname = "mdbook"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/mecab/base.nix b/nixpkgs/pkgs/tools/text/mecab/base.nix index 7509f3e9c483..e97980ef3d2d 100644 --- a/nixpkgs/pkgs/tools/text/mecab/base.nix +++ b/nixpkgs/pkgs/tools/text/mecab/base.nix @@ -1,6 +1,6 @@ { fetchurl }: -rec { +{ version = "0.996"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/mecab/ipadic.nix b/nixpkgs/pkgs/tools/text/mecab/ipadic.nix index 991d0735bab2..3b011787c7cb 100644 --- a/nixpkgs/pkgs/tools/text/mecab/ipadic.nix +++ b/nixpkgs/pkgs/tools/text/mecab/ipadic.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mecab-nodic }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mecab-ipadic"; version = "2.7.0-20070801"; diff --git a/nixpkgs/pkgs/tools/text/miller/default.nix b/nixpkgs/pkgs/tools/text/miller/default.nix index 9de7efa3a816..d271490ca1c1 100644 --- a/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/nixpkgs/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; - rev = "${version}"; - sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg"; + rev = "v${version}"; + sha256 = "1zkh87vq0gqcx6z6yzf1rq30jmdgdpp0rx5f0vvl0zcn0hc2smpz"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/nixpkgs/pkgs/tools/text/papertrail/default.nix b/nixpkgs/pkgs/tools/text/papertrail/default.nix index 05213ff1a870..be85511a92b8 100644 --- a/nixpkgs/pkgs/tools/text/papertrail/default.nix +++ b/nixpkgs/pkgs/tools/text/papertrail/default.nix @@ -1,7 +1,7 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript }: let - papertrail-env = bundlerEnv rec { + papertrail-env = bundlerEnv { name = "papertrail-env"; inherit ruby; gemfile = ./Gemfile; diff --git a/nixpkgs/pkgs/tools/text/patchutils/0.3.3.nix b/nixpkgs/pkgs/tools/text/patchutils/0.3.3.nix index b324137be6aa..f50354199c3f 100644 --- a/nixpkgs/pkgs/tools/text/patchutils/0.3.3.nix +++ b/nixpkgs/pkgs/tools/text/patchutils/0.3.3.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "0.3.3"; sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i"; patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one diff --git a/nixpkgs/pkgs/tools/text/patchutils/default.nix b/nixpkgs/pkgs/tools/text/patchutils/default.nix index eab0e98f95c7..902773f40fa4 100644 --- a/nixpkgs/pkgs/tools/text/patchutils/default.nix +++ b/nixpkgs/pkgs/tools/text/patchutils/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "0.3.4"; sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg"; }) diff --git a/nixpkgs/pkgs/tools/text/podiff/default.nix b/nixpkgs/pkgs/tools/text/podiff/default.nix index efe19a1b5cef..a71ef2f06bd0 100644 --- a/nixpkgs/pkgs/tools/text/podiff/default.nix +++ b/nixpkgs/pkgs/tools/text/podiff/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "podiff"; version = "1.1"; diff --git a/nixpkgs/pkgs/tools/text/recode/default.nix b/nixpkgs/pkgs/tools/text/recode/default.nix index 9edbaff99295..3437400269c3 100644 --- a/nixpkgs/pkgs/tools/text/recode/default.nix +++ b/nixpkgs/pkgs/tools/text/recode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook , texinfo, libiconv, libintl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "recode-3.7-2fd838565"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/shab/default.nix b/nixpkgs/pkgs/tools/text/shab/default.nix index 73323c784fd7..02d2d545122a 100644 --- a/nixpkgs/pkgs/tools/text/shab/default.nix +++ b/nixpkgs/pkgs/tools/text/shab/default.nix @@ -19,7 +19,6 @@ let done ''; - doBuild = false; doCheck = true; doInstallCheck = true; diff --git a/nixpkgs/pkgs/tools/text/staccato/default.nix b/nixpkgs/pkgs/tools/text/staccato/default.nix index f88ac6951bfc..a68d2266b431 100644 --- a/nixpkgs/pkgs/tools/text/staccato/default.nix +++ b/nixpkgs/pkgs/tools/text/staccato/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "staccato-${version}"; + pname = "staccato"; version = "0.1.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix index 388dcc6b583f..b38c2b3e34de 100644 --- a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jing-trang"; version = "20151127"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ jdk ant saxon ]; + CLASSPATH = "lib/saxon.jar"; + preBuild = "ant"; installPhase = '' diff --git a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix index 40013c7f46d5..3be952358b65 100644 --- a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xml2-0.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/xsv/default.nix b/nixpkgs/pkgs/tools/text/xsv/default.nix index 479085be0e1d..cf44782432c4 100644 --- a/nixpkgs/pkgs/tools/text/xsv/default.nix +++ b/nixpkgs/pkgs/tools/text/xsv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "xsv-${version}"; + pname = "xsv"; version = "0.13.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/yaml-merge/default.nix b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix index 00673341cfc6..95a94cee7c4b 100644 --- a/nixpkgs/pkgs/tools/text/yaml-merge/default.nix +++ b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name= "yaml-merge-2016-02-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/zimreader/default.nix b/nixpkgs/pkgs/tools/text/zimreader/default.nix index fbd9bc3fa20a..15e5ddf2f199 100644 --- a/nixpkgs/pkgs/tools/text/zimreader/default.nix +++ b/nixpkgs/pkgs/tools/text/zimreader/default.nix @@ -2,7 +2,7 @@ , zimlib, cxxtools, tntnet }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zimreader-0.92"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix index d18a5e2c7442..83aa667f58fd 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix @@ -111,7 +111,7 @@ let }; # there are no archives or tags, using latest commit in master branch as per 2013-09-22 - matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl rec { + matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl { name = "mplw-${commit}.tar.gz"; url = "https://api.github.com/repos/lvv/mplw/tarball/${commit}"; sha256 = "0yfhkm2dr8gnp0fcg25x89hwiymkri2m5cyqzmzragzwj0hbmcf1"; diff --git a/nixpkgs/pkgs/tools/typesetting/biber/default.nix b/nixpkgs/pkgs/tools/typesetting/biber/default.nix index 6d26129f2c12..55349641ab62 100644 --- a/nixpkgs/pkgs/tools/typesetting/biber/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/biber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, shortenPerlShebang, texlive }: +{ stdenv, fetchpatch, perlPackages, shortenPerlShebang, texlive }: let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); @@ -10,6 +10,20 @@ perlPackages.buildPerlModule { src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; + patches = stdenv.lib.optionals (stdenv.lib.versionAtLeast perlPackages.perl.version "5.30") [ + (fetchpatch { + name = "biber-fix-tests.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812"; + sha256 = "1ninf46bxf4hm0p5arqbxqyv8r98xdwab34vvp467q1v23kfbhya"; + }) + + (fetchpatch { + name = "biber-fix-tests-2.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests-2.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812"; + sha256 = "1l8pk454kkm0szxrv9rv9m2a0llw1jm7ffhgpyg4zfiw246n62x0"; + }) + ]; + buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K diff --git a/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix b/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix index 2c0e2f29d24f..ff63ece34173 100644 --- a/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix @@ -5,24 +5,24 @@ let fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version; sha256 = { - "x86_64-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - "i686-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - "x86_64-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - "i686-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - "x86_64-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - "i686-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); + x86_64-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; + i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; + x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; + i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; + x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; + i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; + }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); url = { - "x86_64-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - "i686-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - "x86_64-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - "i686-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - "x86_64-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - "i686-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); - -in stdenv.mkDerivation rec { + x86_64-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; + i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; + x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; + i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; + x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; + i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; + }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); + +in stdenv.mkDerivation { pname = "kindlegen"; inherit version; diff --git a/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix b/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix index cd78f63ef78c..4cdbac7d6381 100644 --- a/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "multimarkdown"; version = "4.7.1"; diff --git a/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix index ad9684910c0b..dee6ec3c6fff 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -3,7 +3,7 @@ }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pdf2htmlEX-0.14.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix b/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix index 31184e11399b..f8b17be01ddc 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.1.7"; pname = "pdfsandwich"; diff --git a/nixpkgs/pkgs/tools/typesetting/psutils/default.nix b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix index 25f12838be08..39beab751a7a 100644 --- a/nixpkgs/pkgs/tools/typesetting/psutils/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "psutils-17"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index a7886f317c15..98c80da5b2c1 100644 --- a/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -2,7 +2,7 @@ , darwin, fontconfig, harfbuzz, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "tectonic-${version}"; + pname = "tectonic"; version = "0.1.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index c27c68741fc7..f250dfb69dec 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -17,7 +17,7 @@ let year = "2018"; version = year; # keep names simple for now - common = rec { + common = { src = fetchurl { urls = [ "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0414-source.tar.xz" diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index a3b58e7274de..651ff88b6f2e 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -84,8 +84,8 @@ let # the fake derivations are used for filtering of hyphenation patterns else { inherit pname version; tlType = "run"; } )] - ++ lib.optional (attrs.sha512 ? "doc") (mkPkgV "doc") - ++ lib.optional (attrs.sha512 ? "source") (mkPkgV "source") + ++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc") + ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source") ++ lib.optional (bin ? ${pname}) ( bin.${pname} // { inherit pname; tlType = "bin"; } ) ++ combinePkgs (attrs.deps or {}); diff --git a/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix index a08f32ce9c29..5ee1adda483b 100644 --- a/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tikzit"; version = "2.1.4"; diff --git a/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix index df9a607d4f27..eb026e5557eb 100644 --- a/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,49 +1,55 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl -, glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }: +{ stdenv, fetchFromGitHub +, autoreconfHook +, gtk2 +, libxml2 +, libxslt +, pango +, pangoxsl +, perl +, pkgconfig +, popt +}: stdenv.mkDerivation rec { pname = "xmlroff"; - version = "0.6.2"; + version = "0.6.3"; - src = fetchurl { - url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz"; - sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - autoconf - automake libxml2 libxslt - libtool - glib pango pangoxsl gtk2 popt ]; + sourceRoot = "source/xmlroff/"; + + enableParallelBuilding = true; + configureScript = "./autogen.sh"; configureFlags = [ - "--disable-pangoxsl" "--disable-gp" ]; - hardeningDisable = [ "format" ]; - preBuild = '' substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl" - substituteInPlace Makefile --replace "docs" "" + substituteInPlace Makefile --replace "docs" "" # docs target wants to download from network ''; - sourceRoot = "${pname}-${version}/xmlroff/"; - - patches = [./xmlroff.patch]; - - meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd3; + meta = with stdenv.lib; { + description = "XSL Formatter"; + homepage = "http://xmlroff.org/"; + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/tools/typesetting/xmlroff/xmlroff.patch b/nixpkgs/pkgs/tools/typesetting/xmlroff/xmlroff.patch deleted file mode 100644 index 6f0246e96796..000000000000 --- a/nixpkgs/pkgs/tools/typesetting/xmlroff/xmlroff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h -+++ xmlroff-0.6.2/libfo/fo-libfo-basic.h -@@ -11,8 +11,7 @@ - #define __FO_LIBFO_BASIC_H__ - - #include <stdio.h> --#include <glib/gtypes.h> --#include <glib/gerror.h> -+#include <glib.h> - - G_BEGIN_DECLS diff --git a/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix index b136e9c5ab75..a4089636b951 100644 --- a/nixpkgs/pkgs/tools/video/atomicparsley/default.nix +++ b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchhg, autoreconfHook, zlib, Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "atomicparsley"; version = "0.9.6"; diff --git a/nixpkgs/pkgs/tools/video/dvgrab/default.nix b/nixpkgs/pkgs/tools/video/dvgrab/default.nix index 752a6f314325..8fe2a70dcb44 100644 --- a/nixpkgs/pkgs/tools/video/dvgrab/default.nix +++ b/nixpkgs/pkgs/tools/video/dvgrab/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv , libavc1394, pkgconfig, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dvgrab-2016-05-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/video/untrunc/default.nix b/nixpkgs/pkgs/tools/video/untrunc/default.nix index a87015ecf96b..c7b76e0cb6ea 100644 --- a/nixpkgs/pkgs/tools/video/untrunc/default.nix +++ b/nixpkgs/pkgs/tools/video/untrunc/default.nix @@ -1,6 +1,6 @@ { stdenv, gcc, libav_12, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "untrunc"; version = "2018.01.13"; diff --git a/nixpkgs/pkgs/tools/video/vncrec/default.nix b/nixpkgs/pkgs/tools/video/vncrec/default.nix index 411409495934..c09da3dd2316 100644 --- a/nixpkgs/pkgs/tools/video/vncrec/default.nix +++ b/nixpkgs/pkgs/tools/video/vncrec/default.nix @@ -2,7 +2,7 @@ , libXaw, libXext, libSM, libICE, libXpm, libXp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "vncrec-0.2"; # version taken from Arch AUR src = fetchurl { diff --git a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index 76813f4f246c..580c2f9a01f3 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -2,7 +2,7 @@ let version = "0.7.9"; -in pythonPackages.buildPythonApplication rec { +in pythonPackages.buildPythonApplication { pname = "cloud-init"; inherit version; namePrefix = ""; diff --git a/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix index 5b310992afb6..cb31a66ea72d 100644 --- a/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix @@ -2,7 +2,7 @@ let inherit (python2Packages) buildPythonApplication boto m2crypto; -in buildPythonApplication rec { +in buildPythonApplication { name = "euca2ools-2.1.4"; namePrefix = ""; diff --git a/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix index 8dbeecc56054..10103be26308 100644 --- a/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "marathonctl-unstable"; version = "2017-03-06"; diff --git a/nixpkgs/pkgs/tools/virtualization/udocker/default.nix b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix index 7d06b59b013c..5f4d982d86d9 100644 --- a/nixpkgs/pkgs/tools/virtualization/udocker/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix @@ -5,7 +5,7 @@ buildPythonApplication rec { version = "1.1.3"; pname = "udocker"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "indigo-dc"; repo = "udocker" ; rev = "v${version}"; diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 202590f626f4..046c6bc9acc3 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -265,7 +265,6 @@ mapAliases ({ plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 pmtools = acpica-tools; # added 2018-11-01 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postgresql94 = postgresql_9_4; postgresql95 = postgresql_9_5; postgresql96 = postgresql_9_6; postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead"; @@ -303,8 +302,9 @@ mapAliases ({ rssglx = rss-glx; #added 2015-03-25 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; - ruby_2_2_9 = throw "deprecated 2018-0213: use ruby_2_2 instead"; - ruby_2_3_6 = throw "deprecated 2018-0213: use ruby_2_3 instead"; + ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby"; + ruby_2_3_6 = throw "deprecated 2018-0213: use a newer version of ruby"; + ruby_2_3 = throw "deprecated 2019-09-06: use a newer version of ruby"; ruby_2_4_3 = throw "deprecated 2018-0213: use ruby_2_4 instead"; ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; @@ -373,13 +373,13 @@ mapAliases ({ ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 + usbguard-nox = usbguard; # added 2019-09-04 v4l_utils = v4l-utils; # added 2019-08-07 vimbWrapper = vimb; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 vorbisTools = vorbis-tools; # added 2016-01-26 webkit = webkitgtk; # added 2019-03-05 - weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 @@ -435,6 +435,9 @@ mapAliases ({ # added 2019-08-01 mumble_git = pkgs.mumble_rc; murmur_git = pkgs.murmur_rc; + + # added 2019-09-06 + zeroc_ice = pkgs.zeroc-ice; } // (with ocaml-ng; { # added 2016-09-14 ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 2a13064e6e31..b048534331eb 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -360,6 +360,8 @@ in inherit url; }; + installShellFiles = callPackage ../build-support/install-shell-files {}; + lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } @@ -389,6 +391,8 @@ in nix-gitignore = callPackage ../build-support/nix-gitignore { }; + ociTools = callPackage ../build-support/oci-tools { }; + pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } @@ -1062,34 +1066,14 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/5.x.nix { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }) - filebeat5 - heartbeat5 - metricbeat5 - packetbeat5; - - journalbeat5 = callPackage ../tools/system/journalbeat { }; - - inherit (callPackages ../misc/logging/beats/6.x.nix { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }) + inherit (callPackages ../misc/logging/beats/6.x.nix { }) filebeat6 heartbeat6 metricbeat6 packetbeat6 journalbeat6; - inherit (callPackages ../misc/logging/beats/7.x.nix { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }) + inherit (callPackages ../misc/logging/beats/7.x.nix { }) filebeat7 heartbeat7 metricbeat7 @@ -1394,6 +1378,20 @@ in corebird = callPackage ../applications/networking/corebird { }; + inherit (callPackage ../tools/misc/coreboot-utils { }) + msrtool + cbmem + ifdtool + intelmetool + cbfstool + nvramtool + superiotool + ectool + inteltool + amdfwtool + acpidump-all + coreboot-utils; + corosync = callPackage ../servers/corosync { }; cowsay = callPackage ../tools/misc/cowsay { }; @@ -1698,9 +1696,7 @@ in gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { }; - goa = callPackage ../development/tools/goa { - buildGoPackage = buildGo110Package; - }; + goa = callPackage ../development/tools/goa { }; gohai = callPackage ../tools/system/gohai { }; @@ -2179,9 +2175,11 @@ in nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; libceph = ceph.lib; - ceph = callPackage ../tools/filesystems/ceph { - boost = boost166.override { enablePython = true; }; - }; + inherit (callPackages ../tools/filesystems/ceph { + boost = boost167.override { enablePython = true; python = python37; }; + }) + ceph + ceph-client; ceph-dev = ceph; inherit (callPackages ../tools/security/certmgr { }) @@ -2371,7 +2369,7 @@ in m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { + mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -2519,7 +2517,7 @@ in curl = callPackage ../tools/networking/curl { }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; curlie = callPackage ../tools/networking/curlie { }; @@ -2604,17 +2602,13 @@ in dev86 = callPackage ../development/compilers/dev86 { }; - diskrsync = callPackage ../tools/backup/diskrsync { - buildGoPackage = buildGo110Package; - }; + diskrsync = callPackage ../tools/backup/diskrsync { }; djbdns = callPackage ../tools/networking/djbdns { }; dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { }; - dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { - buildGoPackage = buildGo110Package; - }; + dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { }; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; @@ -2807,6 +2801,8 @@ in sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; + strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + tealdeer = callPackage ../tools/misc/tealdeer { }; teamocil = callPackage ../tools/misc/teamocil { }; @@ -2869,13 +2865,9 @@ in evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.16"; - elk6Version = "6.7.2"; - elk7Version = "7.0.1"; + elk6Version = "6.8.3"; + elk7Version = "7.3.1"; - elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { - utillinux = utillinuxMinimal; - }; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { utillinux = utillinuxMinimal; }; @@ -2898,9 +2890,6 @@ in elasticsearch = elasticsearch-oss; } ); - elasticsearch5Plugins = elasticsearchPlugins.override { - elasticsearch = elasticsearch5; - }; elasticsearch6Plugins = elasticsearchPlugins.override { elasticsearch = elasticsearch6-oss; }; @@ -2917,13 +2906,7 @@ in sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; }; }); - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "3.12"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1aqjl8dk9amd4zr99n8v2qxzgmr2hdvqfma4zh7a41rj6336c9sr"; - }; - }); + pyyaml = super.pyyaml_3; }; }).pkgs; toPythonApplication elasticsearch-curator; @@ -3048,7 +3031,7 @@ in m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; - mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { + mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -3450,6 +3433,8 @@ in gnome-builder = callPackage ../applications/editors/gnome-builder { }; + gnome-keysign = callPackage ../tools/security/gnome-keysign { }; + gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; gnome-photos = callPackage ../applications/graphics/gnome-photos { @@ -4024,9 +4009,7 @@ in ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; - ipget = callPackage ../applications/networking/ipget { - buildGoPackage = buildGo110Package; - }; + ipget = callPackage ../applications/networking/ipget { }; ipmitool = callPackage ../tools/system/ipmitool { openssl = openssl_1_0_2; @@ -4162,7 +4145,7 @@ in kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { }; - kakounePlugins = callPackage ../applications/editors/kakoune/plugins.nix { }; + kakounePlugins = callPackage ../applications/editors/kakoune/plugins { }; kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; kakoune = wrapKakoune kakoune-unwrapped { }; @@ -4197,7 +4180,6 @@ in keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { enableUnfree = false; @@ -4299,7 +4281,6 @@ in lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { enableUnfree = false; @@ -4352,6 +4333,8 @@ in memtester = callPackage ../tools/system/memtester { }; + mhonarc = perlPackages.MHonArc; + minergate = callPackage ../applications/misc/minergate { }; minergate-cli = callPackage ../applications/misc/minergate-cli { }; @@ -4700,12 +4683,7 @@ in makefile2graph = callPackage ../development/tools/analysis/makefile2graph { }; - # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because - # it looks like gnulib is broken on non-linux, so it seems likely that this would cause - # trouble on bsd and/or cygwin as well. - man = if stdenv.isLinux then man-db else man-old; - - man-old = callPackage ../tools/misc/man { }; + man = man-db; man-db = callPackage ../tools/misc/man-db { }; @@ -4890,7 +4868,7 @@ in mt-st = callPackage ../tools/backup/mt-st {}; - multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec { + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; libbtree = callPackage ../tools/text/multitran/libbtree { }; @@ -5101,9 +5079,7 @@ in nnn = callPackage ../applications/misc/nnn { }; - notary = callPackage ../tools/security/notary { - buildGoPackage = buildGo110Package; - }; + notary = callPackage ../tools/security/notary { }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -5719,6 +5695,8 @@ in ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; + q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; + qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; qastools = libsForQt5.callPackage ../tools/audio/qastools { }; @@ -6525,9 +6503,7 @@ in tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); - tmsu = callPackage ../tools/filesystems/tmsu { - go = go_1_10; - }; + tmsu = callPackage ../tools/filesystems/tmsu { }; toilet = callPackage ../tools/misc/toilet { }; @@ -7362,6 +7338,24 @@ in then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix; + adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; + + adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; @@ -7841,7 +7835,7 @@ in psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); - "tacacs+" = callPackage ../servers/tacacs+ { }; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { @@ -7903,10 +7897,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_10 = callPackage ../development/compilers/go/1.10.nix { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - go_1_11 = callPackage ../development/compilers/go/1.11.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; }; @@ -7949,15 +7939,15 @@ in hugs = callPackage ../development/interpreters/hugs { }; - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx11 = - if stdenv.isDarwin then - null + openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { }; + + openjdk8-bootstrap = + if adoptopenjdk-hotspot-bin-8.meta.available then + adoptopenjdk-hotspot-bin-8 else - callPackage ../development/compilers/openjdk/openjfx/11.nix { - openjdk = openjdk11; - }; + callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; /* legacy jdk for use as needed by older apps */ openjdk8 = @@ -7965,10 +7955,21 @@ in callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { - bootjdk = bootjdk.override { version = "8"; }; inherit (gnome2) GConf gnome_vfs; }; + openjdk8_headless = + if stdenv.isDarwin || stdenv.isAarch64 then + openjdk8 + else + openjdk8.override { headless = true; }; + + openjdk11-bootstrap = + if adoptopenjdk-hotspot-bin-11.meta.available then + adoptopenjdk-hotspot-bin-11 + else + callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + /* currently maintained LTS JDK */ openjdk11 = if stdenv.isDarwin then @@ -7979,62 +7980,43 @@ in inherit (gnome2) GConf gnome_vfs; }; - openjfx12 = + openjdk11_headless = if stdenv.isDarwin then - null + openjdk11 else - callPackage ../development/compilers/openjdk/openjfx/12.nix { - openjdk = openjdk12; - bootjdk = openjdk11; - }; + openjdk11.override { headless = true; }; /* current JDK */ openjdk12 = if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/default.nix { } + callPackage ../development/compilers/openjdk/darwin { } else - callPackage ../development/compilers/openjdk/default.nix { + callPackage ../development/compilers/openjdk { openjfx = openjfx12; inherit (gnome2) GConf gnome_vfs; - bootjdk = openjdk11; }; + openjdk12_headless = + if stdenv.isDarwin then + openjdk12 + else + openjdk12.override { headless = true; }; + openjdk = openjdk8; + openjdk_headless = openjdk8_headless; - jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk8.jre // { outputs = [ "jre" ]; })); - jre8_headless = - if stdenv.isAarch32 || stdenv.isAarch64 then - oraclejre8 - else if stdenv.isDarwin then - jre8 - else - lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk8 = openjdk8; + jre8 = openjdk8.jre; + jre8_headless = openjdk8_headless.jre; - jdk11 = openjdk11 // { outputs = [ "out" ]; }; - jdk11_headless = - if stdenv.isDarwin then - jdk11 - else - lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless" - (lib.addMetaAttrs {} - ((openjdk11.override { minimal = true; }) // {})); + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; - jdk12 = openjdk12 // { outputs = [ "out" ]; }; - jdk12_headless = - if stdenv.isDarwin then - jdk12 - else - lib.setName "openjdk-${lib.getVersion pkgs.openjdk12}-headless" - (lib.addMetaAttrs {} - ((openjdk12.override { minimal = true; }) // {})); + jdk12 = openjdk12; + jdk12_headless = openjdk12_headless; jdk = jdk8; - jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8; + jre = jre8; jre_headless = jre8_headless; inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; @@ -8269,7 +8251,9 @@ in neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { }; + nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; nasm = callPackage ../development/compilers/nasm { }; @@ -8962,14 +8946,24 @@ in ruby_2_0 ruby_2_1 ruby_2_2 - ruby_2_3 ruby_2_4 ruby_2_5 ruby_2_6; - ruby = ruby_2_5; + ruby = ruby_2_6; + + rubyPackages_1_9 = recurseIntoAttrs ruby_1_9.gems; + rubyPackages_2_0 = recurseIntoAttrs ruby_2_0.gems; + rubyPackages_2_1 = recurseIntoAttrs ruby_2_1.gems; + rubyPackages_2_2 = recurseIntoAttrs ruby_2_2.gems; + rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; + rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; + rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; - ruby_2_3-gems = recurseIntoAttrs ruby_2_3.gems; + ruby_1_9-gems = recurseIntoAttrs ruby_1_9.gems; + ruby_2_0-gems = recurseIntoAttrs ruby_2_0.gems; + ruby_2_1-gems = recurseIntoAttrs ruby_2_1.gems; + ruby_2_2-gems = recurseIntoAttrs ruby_2_2.gems; ruby_2_4-gems = recurseIntoAttrs ruby_2_4.gems; ruby_2_5-gems = recurseIntoAttrs ruby_2_5.gems; ruby_2_6-gems = recurseIntoAttrs ruby_2_6.gems; @@ -9101,6 +9095,8 @@ in mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; + rappel = callPackage ../development/misc/rappel/default.nix { }; + pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; @@ -9335,6 +9331,8 @@ in chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; + chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { }; + chrpath = callPackage ../development/tools/misc/chrpath { }; chruby = callPackage ../development/tools/misc/chruby { rubies = null; }; @@ -10483,6 +10481,8 @@ in clearsilver = callPackage ../development/libraries/clearsilver { }; + clipp = callPackage ../development/libraries/clipp { }; + clipper = callPackage ../development/libraries/clipper { }; cln = callPackage ../development/libraries/cln { }; @@ -11210,7 +11210,7 @@ in elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; - gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { + gtk2 = callPackage ../development/libraries/gtk/2.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -11220,7 +11220,7 @@ in gdktarget = "x11"; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { + gtk3 = callPackage ../development/libraries/gtk/3.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -11280,9 +11280,7 @@ in gumbo = callPackage ../development/libraries/gumbo { }; - gvfs = callPackage ../development/libraries/gvfs { - gnome = res.gnome3; - }; + gvfs = callPackage ../development/libraries/gvfs { }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -11390,8 +11388,6 @@ in ilmbase = callPackage ../development/libraries/ilmbase { }; - intelmetool = callPackage ../tools/misc/intelmetool { }; - imlib = callPackage ../development/libraries/imlib { libpng = libpng12; }; @@ -12579,7 +12575,7 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec { + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { src = pkgs.fetchurl { url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; @@ -12714,7 +12710,7 @@ in withGUI = false; }; - mlt = callPackage ../development/libraries/mlt {}; + mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; }; mono-addins = callPackage ../development/libraries/mono-addins { }; @@ -13224,7 +13220,8 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - qt5 = qt512; + # TODO bump to 5.12 on darwin once it's not broken + qt5 = if stdenv.isDarwin then qt511 else qt512; libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -13297,7 +13294,7 @@ in kpmcore = callPackage ../development/libraries/kpmcore { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { - ffmpeg = ffmpeg_2; + ffmpeg = ffmpeg_4; }; openbr = callPackage ../development/libraries/openbr { }; @@ -13773,6 +13770,8 @@ in sundials = callPackage ../development/libraries/sundials { }; + sundials_3 = callPackage ../development/libraries/sundials/3.x.nix { }; + sutils = callPackage ../tools/misc/sutils { }; svrcore = callPackage ../development/libraries/svrcore { }; @@ -14369,9 +14368,6 @@ in ### DEVELOPMENT / GO MODULES - buildGo110Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_10; - }; buildGo111Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_11; }; @@ -14752,9 +14748,7 @@ in mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca { - buildGoPackage = buildGo110Package; - }; + meguca = callPackage ../servers/meguca { }; memcached = callPackage ../servers/memcached {}; @@ -15020,20 +15014,10 @@ in seabios = callPackage ../applications/virtualization/seabios { }; - cbfstool = callPackage ../applications/virtualization/cbfstool { }; - - ifdtool = callPackage ../tools/misc/ifdtool { }; - - cbmem = callPackage ../tools/misc/cbmem { }; - - nvramtool = callPackage ../tools/misc/nvramtool { }; - vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; pgbouncer = callPackage ../servers/sql/pgbouncer { }; - pgpool94 = pgpool.override { postgresql = postgresql_9_4; }; - pgpool = callPackage ../servers/sql/pgpool { pam = if stdenv.isLinux then pam else null; libmemcached = null; # Detection is broken upstream @@ -15044,7 +15028,6 @@ in timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; inherit (import ../servers/sql/postgresql pkgs) - postgresql_9_4 postgresql_9_5 postgresql_9_6 postgresql_10 @@ -15056,16 +15039,10 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; - inherit (callPackage ../servers/monitoring/prometheus { - buildGoPackage = buildGo110Package; - }) prometheus_1; - - inherit (callPackage ../servers/monitoring/prometheus { }) - prometheus_2; - prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = prometheus_1; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; + prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; @@ -15086,11 +15063,10 @@ in prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; + prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; - prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { - buildGoPackage = buildGo110Package; - }; + prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; @@ -15295,8 +15271,7 @@ in inherit (callPackages ../servers/unifi { }) unifiLTS - unifiStable - unifiTesting; + unifiStable; unifi = unifiStable; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; @@ -15535,9 +15510,7 @@ in dstat = callPackage ../os-specific/linux/dstat { }; # unstable until the first 1.x release - fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { - buildGoPackage = buildGo110Package; - }; + fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; @@ -15897,6 +15870,8 @@ in nvidia_x11_beta = nvidiaPackages.beta; nvidia_x11 = nvidiaPackages.stable; + openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; + ply = callPackage ../os-specific/linux/ply { }; r8168 = callPackage ../os-specific/linux/r8168 { }; @@ -15937,7 +15912,7 @@ in perf = callPackage ../os-specific/linux/kernel/perf.nix { }; - phc-intel = callPackage ../os-specific/linux/phc-intel { }; + phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; # Disable for kernels 4.15 and above due to compatibility issues prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; @@ -16320,7 +16295,7 @@ in semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; - powerdns = callPackage ../servers/dns/powerdns { libressl = libressl_2_8; }; + powerdns = callPackage ../servers/dns/powerdns { }; dnsdist = callPackage ../servers/dns/dnsdist { }; @@ -16536,14 +16511,10 @@ in upower = callPackage ../os-specific/linux/upower { }; - usbguard = libsForQt5.callPackage ../os-specific/linux/usbguard { + usbguard = callPackage ../os-specific/linux/usbguard { libgcrypt = null; }; - usbguard-nox = usbguard.override { - withGui = false; - }; - usbtop = callPackage ../os-specific/linux/usbtop { }; usbutils = callPackage ../os-specific/linux/usbutils { }; @@ -16574,6 +16545,8 @@ in wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; + xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { }; + xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { }; xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { }; @@ -16872,6 +16845,10 @@ in liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { }; + libevdevc = callPackage ../os-specific/linux/libevdevc { }; + + libgestures = callPackage ../os-specific/linux/libgestures { }; + liberastika = callPackage ../data/fonts/liberastika { }; libertine = callPackage ../data/fonts/libertine { }; @@ -17397,6 +17374,8 @@ in avocode = callPackage ../applications/graphics/avocode {}; + azpainter = callPackage ../applications/graphics/azpainter { }; + cadence = libsForQt5.callPackage ../applications/audio/cadence { }; milkytracker = callPackage ../applications/audio/milkytracker { }; @@ -19242,7 +19221,7 @@ in links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { + linphone = callPackage ../applications/networking/instant-messengers/linphone { polarssl = mbedtls_1_3; }; @@ -19389,6 +19368,8 @@ in mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; + michabo = libsForQt5.callPackage ../applications/misc/michabo { }; + mid2key = callPackage ../applications/audio/mid2key { }; midori-unwrapped = callPackage ../applications/networking/browsers/midori { }; @@ -19574,15 +19555,7 @@ in speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - }) mumble mumble_rc murmur; - - inherit (callPackages ../applications/networking/mumble { - avahi = avahi-compat; - jackSupport = config.mumble.jackSupport or false; - speechdSupport = config.mumble.speechdSupport or false; - pulseSupport = config.pulseaudio or false; - iceSupport = false; - }) murmur_rc; + }) mumble mumble_rc murmur murmur_rc; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux" @@ -19894,6 +19867,8 @@ in openmpt123 = callPackage ../applications/audio/openmpt123 { }; + openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon; + opusfile = callPackage ../applications/audio/opusfile { }; opusTools = callPackage ../applications/audio/opus-tools { }; @@ -20394,7 +20369,7 @@ in sakura = callPackage ../applications/misc/sakura { }; - sayonara = callPackage ../applications/audio/sayonara { }; + sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; @@ -20490,9 +20465,7 @@ in wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = callPackage ../applications/audio/sonic-pi { - ruby = ruby_2_3; - }; + sonic-pi = callPackage ../applications/audio/sonic-pi { }; st = callPackage ../applications/misc/st { conf = config.st.conf or null; @@ -21225,6 +21198,7 @@ in libva = null; libwebp = null; xwayland = null; + pipewire = null; }; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; @@ -21655,7 +21629,13 @@ in zathura = callPackage ../applications/misc/zathura { }; - zeroc_ice = callPackage ../development/libraries/zeroc-ice { + zeroc-ice = callPackage ../development/libraries/zeroc-ice { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; + + zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -21736,9 +21716,6 @@ in inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; - go-ethereum-classic = callPackage ../applications/blockchains/go-ethereum-classic { - buildGoPackage = buildGo110Package; - }; jormungandr = callPackage ../applications/blockchains/jormungandr { }; @@ -22192,7 +22169,7 @@ in mrrescue = callPackage ../games/mrrescue { }; mudlet = libsForQt5.callPackage ../games/mudlet { - inherit (lua51Packages) luafilesystem lrexlib-pcre luazip luasql-sqlite3; + lua = lua5_1; }; n2048 = callPackage ../games/n2048 {}; @@ -22672,6 +22649,7 @@ in gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; + arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { }; battery-status = callPackage ../desktops/gnome-3/extensions/battery-status { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; @@ -24146,6 +24124,8 @@ in nix-serve = callPackage ../tools/package-management/nix-serve { }; + nixfmt = haskell.lib.justStaticExecutables haskellPackages.nixfmt; + nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; @@ -24880,4 +24860,6 @@ in verifpal = callPackage ../tools/security/verifpal {}; + nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {}; + } diff --git a/nixpkgs/pkgs/top-level/beam-packages.nix b/nixpkgs/pkgs/top-level/beam-packages.nix index df9d3dbcff5b..7496449c044c 100644 --- a/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/nixpkgs/pkgs/top-level/beam-packages.nix @@ -82,7 +82,7 @@ rec { # Each field in this tuple represents all Beam packages in nixpkgs built with # appropriate Erlang/OTP version. - packages = rec { + packages = { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; diff --git a/nixpkgs/pkgs/top-level/dotnet-packages.nix b/nixpkgs/pkgs/top-level/dotnet-packages.nix index e89a7d9df2aa..f06b4f1c2866 100644 --- a/nixpkgs/pkgs/top-level/dotnet-packages.nix +++ b/nixpkgs/pkgs/top-level/dotnet-packages.nix @@ -430,14 +430,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - Deedle = fetchNuGet rec { + Deedle = fetchNuGet { baseName = "Deedle"; version = "1.2.5"; sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw"; outputFiles = [ "*" ]; }; - ExcelDna = buildDotnetPackage rec { + ExcelDna = buildDotnetPackage { baseName = "Excel-DNA"; version = "0.32.0"; @@ -496,7 +496,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - ExtCore = buildDotnetPackage rec { + ExtCore = buildDotnetPackage { baseName = "ExtCore"; version = "0.8.46"; @@ -564,7 +564,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - FSharpCompilerService = buildDotnetPackage rec { + FSharpCompilerService = buildDotnetPackage { baseName = "FSharp.Compiler.Service"; version = "0.0.90"; @@ -667,7 +667,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # }; # }; - GitVersionTree = buildDotnetPackage rec { + GitVersionTree = buildDotnetPackage { baseName = "GitVersionTree"; version = "2013-10-01"; @@ -927,7 +927,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - UnionArgParser = buildDotnetPackage rec { + UnionArgParser = buildDotnetPackage { baseName = "UnionArgParser"; version = "0.8.7"; diff --git a/nixpkgs/pkgs/top-level/emscripten-packages.nix b/nixpkgs/pkgs/top-level/emscripten-packages.nix index 5b5b32b89da5..a36c89fac0ab 100644 --- a/nixpkgs/pkgs/top-level/emscripten-packages.nix +++ b/nixpkgs/pkgs/top-level/emscripten-packages.nix @@ -134,7 +134,7 @@ rec { zlib = (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation - (old: rec { + (old: { buildInputs = old.buildInputs ++ [ pkgconfig ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; diff --git a/nixpkgs/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix index 86e8228f1870..49bfc58adf06 100644 --- a/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -105,7 +105,7 @@ in { (pkgs.lib.attrNames compiler); in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs integerSimpleGhcNames - (name: compiler."${name}".override { enableIntegerSimple = true; })); + (name: compiler.${name}.override { enableIntegerSimple = true; })); }; # Default overrides that are applied to all package sets. @@ -176,9 +176,9 @@ in { integerSimpleGhcNames = pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes) (pkgs.lib.attrNames packages); - in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { - ghc = bh.compiler.integer-simple."${name}"; - buildHaskellPackages = bh.packages.integer-simple."${name}"; + in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override { + ghc = bh.compiler.integer-simple.${name}; + buildHaskellPackages = bh.packages.integer-simple.${name}; overrides = _self : _super : { integer-simple = null; integer-gmp = null; diff --git a/nixpkgs/pkgs/top-level/haxe-packages.nix b/nixpkgs/pkgs/top-level/haxe-packages.nix index 35b0b42da3fe..06b82a478a87 100644 --- a/nixpkgs/pkgs/top-level/haxe-packages.nix +++ b/nixpkgs/pkgs/top-level/haxe-packages.nix @@ -99,7 +99,7 @@ let hxnodejs_6 = let libname = "hxnodejs"; version = "6.9.0"; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { name = "${libname}-${version}"; src = fetchFromGitHub { owner = "HaxeFoundation"; diff --git a/nixpkgs/pkgs/top-level/lua-packages.nix b/nixpkgs/pkgs/top-level/lua-packages.nix index 2d34bdaabc00..c9e9305666e2 100644 --- a/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/nixpkgs/pkgs/top-level/lua-packages.nix @@ -64,17 +64,18 @@ in with self; { getLuaPathList = majorVersion: [ - "lib/lua/${majorVersion}/?.lua" "share/lua/${majorVersion}/?.lua" - "share/lua/${majorVersion}/?/init.lua" "lib/lua/${majorVersion}/?/init.lua" + "share/lua/${majorVersion}/?.lua" + "share/lua/${majorVersion}/?/init.lua" ]; getLuaCPathList = majorVersion: [ - "lib/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?/init.so" + "lib/lua/${majorVersion}/?.so" ]; # helper functions for dealing with LUA_PATH and LUA_CPATH - getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; - getLuaPath = lib : getPath lib "lua"; - getLuaCPath = lib : getPath lib "so"; + getPath = drv: pathListForVersion: + lib.concatMapStringsSep ";" (path: "${drv}/${path}") (pathListForVersion lua.luaversion); + getLuaPath = drv: getPath drv getLuaPathList; + getLuaCPath = drv: getPath drv getLuaCPathList; #define build lua package function buildLuaPackage = callPackage ../development/lua-modules/generic { diff --git a/nixpkgs/pkgs/top-level/make-tarball.nix b/nixpkgs/pkgs/top-level/make-tarball.nix index 6f30bd06a81c..288971403f1a 100644 --- a/nixpkgs/pkgs/top-level/make-tarball.nix +++ b/nixpkgs/pkgs/top-level/make-tarball.nix @@ -11,7 +11,7 @@ with pkgs; -releaseTools.sourceTarball rec { +releaseTools.sourceTarball { name = "nixpkgs-tarball"; src = nixpkgs; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index 9dbc36e8601f..372036147443 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -553,6 +553,10 @@ let ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { }; + ocplib-json-typed-browser = callPackage ../development/ocaml-modules/ocplib-json-typed/browser.nix { }; + + ocplib-json-typed-bson = callPackage ../development/ocaml-modules/ocplib-json-typed/bson.nix { }; + ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index fb9132731fc2..5dda58b8d64c 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -7537,7 +7537,7 @@ let }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { - description = "Perl interface to the 3.x series of the gtk+ toolkit"; + description = "Perl interface to the 3.x series of the GTK toolkit"; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -10661,23 +10661,26 @@ let }; }; - MHonArc = buildPerlPackage { + MHonArc = buildPerlPackage rec { pname = "MHonArc"; - version = "2.6.18"; + version = "2.6.19"; src = fetchurl { - url = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/MHonArc-2.6.18.tar.gz"; - sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2"; + url = "https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${version}.tar.gz"; + sha256 = "0ll3v93yji334zqp6xfzfxc0127pmjcznmai1l5q6dzawrs2igzq"; }; + + patches = [ ../development/perl-modules/mhonarc.patch ]; + outputs = [ "out" "dev" ]; # no "devdoc" installTargets = "install"; meta = with stdenv.lib; { - homepage = http://dcssrv1.oit.uci.edu/indiv/ehood/mhonarch.html; + homepage = "https://www.mhonarc.org/"; description = "A mail-to-HTML converter"; maintainers = with maintainers; [ lovek323 ]; - license = licenses.gpl2; + license = licenses.gpl2; }; }; @@ -19379,7 +19382,7 @@ let }; propagatedBuildInputs = [ AlienWxWidgets ]; # Testing requires an X server: - # Error: Unable to initialize GTK+, is DISPLAY set properly?" + # Error: Unable to initialize GTK, is DISPLAY set properly?" doCheck = false; buildInputs = [ ExtUtilsXSpp ]; }; diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix index 879ffc9f441c..fc6d76743385 100644 --- a/nixpkgs/pkgs/top-level/php-packages.nix +++ b/nixpkgs/pkgs/top-level/php-packages.nix @@ -15,7 +15,7 @@ let isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; - apcu = buildPecl rec { + apcu = buildPecl { version = "5.1.17"; pname = "apcu"; @@ -29,7 +29,7 @@ let outputs = [ "out" "dev" ]; }; - apcu_bc = buildPecl rec { + apcu_bc = buildPecl { version = "1.0.5"; pname = "apcu_bc"; @@ -38,7 +38,7 @@ let buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - ast = buildPecl rec { + ast = buildPecl { version = "1.0.3"; pname = "ast"; @@ -142,7 +142,7 @@ let ]; }; - event = buildPecl rec { + event = buildPecl { version = "2.5.3"; pname = "event"; @@ -167,7 +167,7 @@ let }; }; - igbinary = buildPecl rec { + igbinary = buildPecl { version = "3.0.1"; pname = "igbinary"; @@ -178,7 +178,7 @@ let outputs = [ "out" "dev" ]; }; - imagick = buildPecl rec { + imagick = buildPecl { version = "3.4.4"; pname = "imagick"; @@ -189,7 +189,7 @@ let buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - mailparse = buildPecl rec { + mailparse = buildPecl { version = "3.0.3"; pname = "mailparse"; @@ -232,7 +232,7 @@ let ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; }; - oci8 = buildPecl rec { + oci8 = buildPecl { version = "2.2.0"; pname = "oci8"; @@ -245,14 +245,14 @@ let ''; }; - pcs = buildPecl rec { + pcs = buildPecl { version = "1.3.3"; pname = "pcs"; sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; }; - pdo_sqlsrv = buildPecl rec { + pdo_sqlsrv = buildPecl { version = "5.6.1"; pname = "pdo_sqlsrv"; @@ -427,7 +427,7 @@ let pinba = if isPhp73 then pinba73 else pinba7; - pinba7 = assert !isPhp73; buildPecl rec { + pinba7 = assert !isPhp73; buildPecl { version = "1.1.1"; pname = "pinba"; @@ -448,7 +448,7 @@ let }; }; - pinba73 = assert isPhp73; buildPecl rec { + pinba73 = assert isPhp73; buildPecl { version = "1.1.2-dev"; pname = "pinba"; @@ -469,7 +469,7 @@ let }; }; - protobuf = buildPecl rec { + protobuf = buildPecl { version = "3.9.0"; pname = "protobuf"; @@ -529,7 +529,7 @@ let buildInputs = with pkgs; [ pcre.dev ]; }; - pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec { + pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl { version = "3.2.0-dev"; pname = "pthreads"; @@ -543,14 +543,14 @@ let buildInputs = with pkgs; [ pcre2.dev ]; }; - redis = buildPecl rec { + redis = buildPecl { version = "5.0.2"; pname = "redis"; sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f"; }; - sqlsrv = buildPecl rec { + sqlsrv = buildPecl { version = "5.6.1"; pname = "sqlsrv"; @@ -559,7 +559,7 @@ let buildInputs = [ pkgs.unixODBC ]; }; - v8 = buildPecl rec { + v8 = buildPecl { version = "0.2.2"; pname = "v8"; @@ -570,7 +570,7 @@ let meta.broken = true; }; - v8js = assert !isPhp73; buildPecl rec { + v8js = assert !isPhp73; buildPecl { version = "2.1.0"; pname = "v8js"; @@ -581,7 +581,7 @@ let meta.broken = true; }; - xdebug = buildPecl rec { + xdebug = buildPecl { version = "2.7.1"; pname = "xdebug"; @@ -591,7 +591,7 @@ let checkTarget = "test"; }; - yaml = buildPecl rec { + yaml = buildPecl { version = "2.0.4"; pname = "yaml"; @@ -604,7 +604,7 @@ let nativeBuildInputs = [ pkgs.pkgconfig ]; }; - zmq = assert !isPhp73; buildPecl rec { + zmq = assert !isPhp73; buildPecl { version = "1.1.3"; pname = "zmq"; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 8c764e873138..8a6f09e6e788 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -841,6 +841,8 @@ in { pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + purl = callPackage ../development/python-modules/purl { }; + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; pymysql = callPackage ../development/python-modules/pymysql { }; @@ -2437,6 +2439,8 @@ in { ijson = callPackage ../development/python-modules/ijson {}; + imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); + imagesize = callPackage ../development/python-modules/imagesize { }; image-match = callPackage ../development/python-modules/image-match { }; @@ -2590,6 +2594,9 @@ in { odfpy = callPackage ../development/python-modules/odfpy { }; + openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; + openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + oset = callPackage ../development/python-modules/oset { }; pamela = callPackage ../development/python-modules/pamela { }; @@ -2668,7 +2675,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; - pycuda = callPackage ../development/python-modules/pycuda rec { + pycuda = callPackage ../development/python-modules/pycuda { cudatoolkit = pkgs.cudatoolkit_7_5; inherit (pkgs.stdenv) mkDerivation; }; @@ -3002,8 +3009,6 @@ in { effect = callPackage ../development/python-modules/effect {}; - elpy = callPackage ../development/python-modules/elpy { }; - enum = callPackage ../development/python-modules/enum { }; enum-compat = callPackage ../development/python-modules/enum-compat { }; @@ -3977,10 +3982,10 @@ in { blas = pkgs.openblasCompat; }; numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec { - version = "1.16.4"; + version = "1.16.5"; src = oldAttrs.src.override { inherit version; - sha256 = "1ivrwh66cmly7xh1dl7pybizfz5rcicn4kkkx5g29v4gll9bwhkj"; + sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c"; }; }); in if pythonOlder "3.5" then numpy_2 else numpy_; @@ -4430,6 +4435,8 @@ in { pyupdate = callPackage ../development/python-modules/pyupdate {}; + pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + pyx = callPackage ../development/python-modules/pyx { }; mmpython = callPackage ../development/python-modules/mmpython { }; @@ -4576,6 +4583,8 @@ in { python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; + python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; + python-ptrace = callPackage ../development/python-modules/python-ptrace { }; python-wifi = callPackage ../development/python-modules/python-wifi { }; @@ -4660,6 +4669,8 @@ in { inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package }; + rfc6555 = callPackage ../development/python-modules/rfc6555 { }; + qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; quamash = callPackage ../development/python-modules/quamash { }; @@ -4837,6 +4848,8 @@ in { scikit-build = callPackage ../development/python-modules/scikit-build { }; + scikits-odes = callPackage ../development/python-modules/scikits-odes { }; + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; scikit-tda = callPackage ../development/python-modules/scikit-tda { }; @@ -6179,10 +6192,14 @@ in { yattag = callPackage ../development/python-modules/yattag { }; + xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); + z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python; + zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; + zm-py = callPackage ../development/python-modules/zm-py { }; rfc7464 = callPackage ../development/python-modules/rfc7464 { }; diff --git a/nixpkgs/pkgs/top-level/release-small.nix b/nixpkgs/pkgs/top-level/release-small.nix index 17239c6d879b..1ed3601270f8 100644 --- a/nixpkgs/pkgs/top-level/release-small.nix +++ b/nixpkgs/pkgs/top-level/release-small.nix @@ -14,7 +14,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; officialRelease = false; }; -} // (mapTestOn (rec { +} // (mapTestOn ({ aspell = all; at = linux; diff --git a/nixpkgs/pkgs/top-level/release.nix b/nixpkgs/pkgs/top-level/release.nix index 9ae5a9e1fbdc..da81a696337d 100644 --- a/nixpkgs/pkgs/top-level/release.nix +++ b/nixpkgs/pkgs/top-level/release.nix @@ -102,7 +102,7 @@ let # Needed for support jobs.nix-info.x86_64-linux jobs.nix-info-tested.x86_64-linux - # Ensure that X11/GTK+ are in order. + # Ensure that X11/GTK are in order. jobs.thunderbird.x86_64-linux jobs.unar.x86_64-linux @@ -185,7 +185,7 @@ let }; }; - } // (mapTestOn ((packagePlatforms pkgs) // rec { + } // (mapTestOn ((packagePlatforms pkgs) // { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; diff --git a/nixpkgs/pkgs/top-level/ruby-packages.nix b/nixpkgs/pkgs/top-level/ruby-packages.nix index 4453c52d23c6..2e751242a7c3 100644 --- a/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -77,14 +77,15 @@ version = "4.2.11.1"; }; addressable = { + dependencies = ["public_suffix"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "2.4.0"; + version = "2.7.0"; }; arel = { groups = ["default"]; @@ -112,10 +113,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gjcdixk9az5nw5v2fg6dy6ms7ylmnxvyf8vdpqqwd2kxv6g27fi"; + sha256 = "0saginz71qy4k1hz3sffrjd6zcw54jsm61f7jks02fxys31ir865"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; atomos = { groups = ["default"]; @@ -184,10 +185,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ns7hvlihdcs5xql26gm1lcrkwpalhlh164rdqvkawlmf3b5l69"; + sha256 = "1380dvd5dbnhlvagb9z9cr62kh1knza7bcgr9msqshj55iqk4p0k"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; camping = { dependencies = ["mab" "rack"]; @@ -205,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; + sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; charlock_holmes = { groups = ["default"]; @@ -225,20 +226,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; clamp = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yxch6hs4nlyflpnhvy7kqc5dwih7c8hz698liw81msfq69nwihw"; + sha256 = "0dka8f3hwzz7p558kiyyrdabljvwp71cbzk46akb3kvnvhcyjx89"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; cld3 = { dependencies = ["ffi"]; @@ -257,10 +258,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv"; + sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.5"; }; cocoapods-acknowledgements = { dependencies = ["activesupport" "redcarpet"]; @@ -284,15 +285,15 @@ version = "1.0.3"; }; cocoapods-bin = { - dependencies = ["cocoapods" "parallel"]; + dependencies = ["cocoapods" "cocoapods-generate" "parallel"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nlrd1s0pd1rpa8z3mpp704ms5vkp9bps1x9w90hpfv66805bxig"; + sha256 = "03x5grabb8nyky0nq1h78vmlka66pkgdif0f6i6nhjfy96gpil87"; type = "gem"; }; - version = "0.1.17"; + version = "0.1.18"; }; cocoapods-browser = { dependencies = ["cocoapods"]; @@ -353,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31"; + sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.5"; }; cocoapods-coverage = { dependencies = ["cocoapods-testing" "slather"]; @@ -627,10 +628,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl"; + sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; cocoapods-try = { groups = ["default"]; @@ -668,10 +669,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pgzgg4b3d4jw6fk3l8pgl28x7qn5dpnm293zsnxcramj106hqkf"; + sha256 = "1ln4kywj4bx32qyqvr0byi3g4fk8yj026n00xch782x0147f8lka"; type = "gem"; }; - version = "0.0.7"; + version = "0.0.11"; }; cocoapods-wholemodule = { groups = ["default"]; @@ -841,10 +842,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1375dyawvcp81d94jkjwjjkj3j23gsp06cfwh15g695l4g3ssswc"; + sha256 = "17hkd62ig9b0czv192kqdfq7gw0a8hgq07yclri6myc8y5lmfin5"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.5"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -903,10 +904,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vcplvlykirg2vc56jjxavgpkllzq26xgp7ind7wc5ikaqaz64gn"; + sha256 = "05qmrx7l8abpbvp0z01fdpc731c4k6akk67l424vdp5dywhachpr"; type = "gem"; }; - version = "0.64.0"; + version = "0.66.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -1030,10 +1031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "129f33jx230g9pv8x38z8lhal5gn4aci1jrj1nlbn2vhs9fdfvya"; + sha256 = "0bvw0xlq0nrvzv559d3kbihc8m3iv3q70cs6xan0n6dywxayizbf"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; gh_inspector = { groups = ["default"]; @@ -1051,10 +1052,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fq0i2nzls6z5qgxrg1jz6ncxx0ffh228c2m1rlkq3fl2k081wck"; + sha256 = "1cv617ad4bhd3qhi5m0638v0mf9kw32g7r89c754xsmmas921igc"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; gitlab-markup = { groups = ["default"]; @@ -1072,10 +1073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12gqv5dw9mjmv1azaazvn9v14czjvqs2j3b0ml00ywz8pf4yzyqc"; + sha256 = "08cqwk8valxv4bls891f3ciqa258vbsfgqd3mymf62qdld8m9y3z"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; globalid = { dependencies = ["activesupport"]; @@ -1094,10 +1095,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j677ddfba5kl6xb2j36x99vi7jyi0hq81a6xajrnmqlaw49bjjv"; + sha256 = "14kcf8079wmimzy78yysizsl44d6iaw2pp5xj70vdxg342r4a6k5"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1116,10 +1117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azpyx11fin7zcmfik8kphvh6wc7q59zsfvibaxrrx5bg6z4s1bh"; + sha256 = "0hgb555j5pimy8pjpf20pzbmhpr1wx59phlwbwsq37zjv89wirva"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; hashie = { groups = ["default"]; @@ -1171,6 +1172,16 @@ }; version = "0.8.6"; }; + http-accept = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6"; + type = "gem"; + }; + version = "1.7.0"; + }; http-cookie = { dependencies = ["domain_name"]; groups = ["default"]; @@ -1255,26 +1266,26 @@ version = "2.9.1"; }; jekyll = { - dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz"; + sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa"; type = "gem"; }; - version = "3.8.6"; + version = "4.0.0"; }; jekyll-sass-converter = { - dependencies = ["sass"]; + dependencies = ["sassc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"; + sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2"; type = "gem"; }; - version = "1.5.2"; + version = "2.0.0"; }; jekyll-watch = { dependencies = ["listen"]; @@ -1322,10 +1333,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; type = "gem"; }; - version = "1.17.0"; + version = "2.1.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; }; libv8 = { groups = ["default"]; @@ -1468,20 +1490,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12pn04c9vs0x6zb3f2mh8lfrd27vjb6xnw24dgdys2ks0q1k71sz"; + sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; type = "gem"; }; - version = "4.9.3"; + version = "4.9.5"; }; mini_mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; mini_portile2 = { groups = ["default"]; @@ -1518,10 +1540,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn"; + sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; multi_json = { groups = ["default"]; @@ -1629,10 +1651,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr"; + sha256 = "1bi1r1xvlxpkghvmk1js88djlw7vi4ky6ildk8akn73hkf5phd2j"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -1640,10 +1662,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; opus-ruby = { dependencies = ["ffi"]; @@ -1684,10 +1706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12k8irw0jcjgx5k5x9dk6v8zlkr5ss36960350paci8mblan23ka"; + sha256 = "03jdjphc5vk9a9rgvkfhz78dfyxi67a20c12h6pcd22r5xq8hzj0"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; parallel = { groups = ["default"]; @@ -1705,10 +1727,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; + sha256 = "1s1plz33jjd0wm0vlspl5hg1rcg772zm5ibbix9binpd03jrbb8c"; type = "gem"; }; - version = "2.6.3.0"; + version = "2.6.4.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -1756,10 +1778,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s56ym0chq3fycl29vqabcalqdcf7y2f25pmihjwqgbmrmzdyvr1"; + sha256 = "1mvs1hs8ry3s4fh8sd94zhpn2pdasdqwpf5nylgxnp8x3xa2dmnd"; type = "gem"; }; - version = "1.3.7"; + version = "1.3.8"; }; polyglot = { groups = ["default"]; @@ -1809,10 +1831,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zslmlkp3hlp9hgy2ln9k2krd71sz5ar6gwi37miqbsxdn79vwzn"; + sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -1820,10 +1842,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rllmkw3zwqkyf8ixa3s4f717l61vb9z12f7j6p45521v6yl6zd6"; + sha256 = "1d8hnqdr2acrlw5rp1wlyz1lwarfc6my5h9m5a7b3259zc4y9f5q"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; rack = { groups = ["default"]; @@ -1896,10 +1918,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; type = "gem"; }; - version = "1.0.4"; + version = "1.2.0"; }; railties = { dependencies = ["actionpack" "activesupport" "rake" "thor"]; @@ -1989,10 +2011,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; redis = { groups = ["default"]; @@ -2037,35 +2059,35 @@ version = "2.0.0"; }; rest-client = { - dependencies = ["http-cookie" "mime-types" "netrc"]; + dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; + sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rmagick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16mhgkfx01dx936x81w5aw9az9c18i9z526w782mc7jrhixzp5n8"; + sha256 = "06ya2zpz2g3g4c90bmd1z11qkajls3srq5b7cswrjq8ima568ja0"; type = "gem"; }; - version = "3.2.0"; + version = "4.0.0"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz"; type = "gem"; }; - version = "3.5.1"; + version = "3.10.0"; }; rpam2 = { groups = ["default"]; @@ -2137,10 +2159,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2"; + sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk"; type = "gem"; }; - version = "0.72.0"; + version = "0.74.0"; }; rubocop-performance = { dependencies = ["rubocop"]; @@ -2148,10 +2170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "138gd0xl86403g0gm731ishf7iadwhq4vih4hf0p6bzrczi1ig61"; + sha256 = "1ssizdnyai2hxdp6nd4b9hqyrc4gwhjlznhrdliz8wj4p8cvas44"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; ruby-graphviz = { groups = ["default"]; @@ -2260,10 +2282,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pwlx4j3dz82b0p90r0k55qn2hxplhm3d8xp1xi1dvdvqm93zxd"; + sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6"; type = "gem"; }; - version = "0.28.2"; + version = "0.28.3.1"; }; safe_yaml = { groups = ["default"]; @@ -2275,38 +2297,16 @@ }; version = "1.0.5"; }; - sass = { - dependencies = ["sass-listen"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; - type = "gem"; - }; - version = "3.7.4"; - }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; - type = "gem"; - }; - version = "4.0.0"; - }; sassc = { - dependencies = ["ffi" "rake"]; + dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; + sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf"; type = "gem"; }; - version = "2.0.1"; + version = "2.2.0"; }; scrypt = { dependencies = ["ffi-compiler"]; @@ -2324,20 +2324,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c39fdwwg9f2n6jsp1r7jhyqwl871bw22jffrmqdw3253rfj903a"; + sha256 = "1w4qv3mcz005lb3wrh55imh6551lhf0qpslb3xw3b6chf746s0rj"; type = "gem"; }; - version = "0.8.8"; + version = "0.8.9"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15l36hqw9spk86vrzlxjmsavchn2442axz40g1wn5z7r13ksksa9"; + sha256 = "1r920jps2mpvz5ww9rzs3svprfjxz0vsy6dsa1cinsk3qizqbq7a"; type = "gem"; }; - version = "5.22.0"; + version = "5.24.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2455,6 +2455,17 @@ }; version = "0.7.1"; }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; therubyracer = { dependencies = ["libv8" "ref"]; groups = ["default"]; @@ -2606,10 +2617,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; + sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; xctasks = { dependencies = ["nokogiri" "rake"]; @@ -2652,4 +2663,4 @@ }; version = "1.4.11"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/top-level/stage.nix b/nixpkgs/pkgs/top-level/stage.nix index 9f4b63293ef6..4fe067694dcd 100644 --- a/nixpkgs/pkgs/top-level/stage.nix +++ b/nixpkgs/pkgs/top-level/stage.nix @@ -169,9 +169,9 @@ let then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { abi = { - "gnu" = lib.systems.parse.abis.musl; - "gnueabi" = lib.systems.parse.abis.musleabi; - "gnueabihf" = lib.systems.parse.abis.musleabihf; + gnu = lib.systems.parse.abis.musl; + gnueabi = lib.systems.parse.abis.musleabi; + gnueabihf = lib.systems.parse.abis.musleabihf; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; }; @@ -217,9 +217,9 @@ let crossSystem = { parsed = stdenv.hostPlatform.parsed // { abi = { - "gnu" = lib.systems.parse.abis.musl; - "gnueabi" = lib.systems.parse.abis.musleabi; - "gnueabihf" = lib.systems.parse.abis.musleabihf; + gnu = lib.systems.parse.abis.musl; + gnueabi = lib.systems.parse.abis.musleabi; + gnueabihf = lib.systems.parse.abis.musleabihf; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; }; |